diff --git a/.dockerignore b/.dockerignore index 3c59143e27a0..a9994625f8f7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -27,6 +27,10 @@ node_modules # exclude build binaries except a pre-built .war file build/* !build/libs/*.war +# exlude the .cache of angular +.cache +# exclude the .gradle cache +.gradle ######################### # exclude Artemis configs @@ -38,6 +42,13 @@ build/* # exclude the docker files and the /docker/.docker-data folders docker/ +###################### +# Artemis resources +###################### +/src/main/resources/config/application-local*.yml +/src/main/resources/id_* +/src/main/resources/known_hosts + # files inside of the root directory not needed CITATION.cff CODE_OF_CONDUCT.md diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e0eb0a988fd..88a0060022dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,6 +137,8 @@ jobs: context: . tags: ghcr.io/ls1intum/artemis:${{ steps.compute-tag.outputs.result }} push: true + cache-from: type=gha + cache-to: type=gha,mode=min # TODO: Push to Docker Hub (develop + tag) diff --git a/build.gradle b/build.gradle index 38ef660f1364..cf76b55cd46c 100644 --- a/build.gradle +++ b/build.gradle @@ -347,6 +347,7 @@ dependencies { implementation "commons-fileupload:commons-fileupload:1.5" implementation "net.lingala.zip4j:zip4j:2.11.5" implementation "org.jgrapht:jgrapht-core:1.5.2" + implementation 'com.github.seancfoley:ipaddress:5.4.0' annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}" @@ -431,6 +432,11 @@ node { npmVersion = "${npm_version}" } +// Set the npm cache (used in the Dockerfile) +task npmSetCacheDockerfile(type: NpmTask) { + args = ['set', 'cache', '/opt/artemis/.npm'] +} + // Command to execute the JavaDoc checkstyle verification ./gradlew checkstyleMain checkstyle { toolVersion "${checkstyle_version}" diff --git a/docker/artemis/Dockerfile b/docker/artemis/Dockerfile index a437f1bc0cd7..055216235890 100644 --- a/docker/artemis/Dockerfile +++ b/docker/artemis/Dockerfile @@ -24,18 +24,44 @@ ARG WAR_FILE_STAGE="builder" #----------------------------------------------------------------------------------------------------------------------- FROM --platform=$BUILDPLATFORM docker.io/library/eclipse-temurin:17-jdk as builder -WORKDIR /opt/artemis - # some Apple M1 (arm64) builds need python3 and build-essential(make+gcc) for node-gyp to not fail RUN echo "Installing build dependencies" \ && apt-get update && apt-get install -y --no-install-recommends python3 build-essential \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +WORKDIR /opt/artemis +# copy gradle related files +COPY gradlew gradlew.bat ./ +COPY build.gradle gradle.properties settings.gradle ./ +COPY gradle gradle/ +# copy npm related files and install node modules +# (from https://stackoverflow.com/questions/63961934/how-to-use-docker-build-cache-when-version-bumping-a-react-app) +COPY package.json package-lock.json ./ +RUN \ + # Mount global cache for Gradle (project cache in /opt/artemis/.gradle doesn't seem to be populated) + --mount=type=cache,target=/root/.gradle/caches \ + # Mount cache for npm + --mount=type=cache,target=/opt/artemis/.npm \ + # Create .npm directory if not yet available + mkdir -p /opt/artemis/.npm \ + # Set .npm directory as npm cache + && ./gradlew -i --stacktrace --no-daemon -Pprod -Pwar npmSetCacheDockerfile \ + # Pre-populate the npm and gradle caches if related files change (see COPY statements above) + && ./gradlew -i --stacktrace --no-daemon -Pprod -Pwar npm_ci + # so far just using the .dockerignore to define what isn't necessary here COPY . . -RUN ./gradlew -i --stacktrace --no-daemon -Pprod -Pwar clean bootWar +RUN \ + # Mount global cache for Gradle (project cache in /opt/artemis/.gradle doesn't seem to be populated) + --mount=type=cache,target=/root/.gradle/caches \ + # Mount cache for npm + --mount=type=cache,target=/opt/artemis/.npm \ + # Mount cache for the Angular CLI + --mount=type=cache,target=/opt/artemis/.cache \ + # Build the .war file + ./gradlew -i --stacktrace --no-daemon -Pprod -Pwar clean bootWar #----------------------------------------------------------------------------------------------------------------------- # external build stage @@ -73,7 +99,8 @@ RUN echo "Installing needed dependencies" \ && rm -rf /var/lib/apt/lists/* # See https://github.com/ls1intum/Artemis/issues/4439 -RUN echo "Fixing locales" \ +RUN \ + echo "Fixing locales" \ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ && locale-gen ENV LC_ALL en_US.UTF-8 @@ -81,7 +108,8 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 # Create directories for volumes, create artemis user and set right owners -RUN mkdir -p /opt/artemis/config /opt/artemis/data /opt/artemis/public/content \ +RUN \ + mkdir -p /opt/artemis/config /opt/artemis/data /opt/artemis/public/content \ && groupadd --gid ${GID} artemis \ && useradd -m --gid ${GID} --uid ${UID} --shell /bin/bash artemis \ && chown -R artemis:artemis /opt/artemis diff --git a/docs/dev/setup.rst b/docs/dev/setup.rst index 568762fe24df..61ef3cd621f8 100644 --- a/docs/dev/setup.rst +++ b/docs/dev/setup.rst @@ -931,7 +931,7 @@ Other useful commands ``docker compose start ``) - Restart a service: ``docker compose restart `` - Remove all local Docker containers: ``docker container rm $(docker ps -a -q)`` -- Remove all local Artemis Docker images: ``docker rmi $(docker images -q ghcr.io/ls1intum/artemis)`` +- Remove all local Artemis Docker images: ``docker rmi $(docker images --filter=reference="ghcr.io/ls1intum/artemis:*" -q)`` ------------------------------------------------------------------------------------------------------------------------ diff --git a/jest.config.js b/jest.config.js index 26ab84c96cca..83b872ba835c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,10 +1,53 @@ -const esModules = ['lodash-es', 'franc-min', 'trigram-utils', 'n-gram', 'collapse-white-space', '@angular/animations', '@angular/common', '@ls1intum/apollon', - '@angular/compiler', '@angular/core', '@angular/forms', '@angular/localize', '@angular/platform-browser', '@angular/platform-browser-dynamic', '@angular/router', - '@ngx-translate/core', '@ngx-translate/http-loader', '@fortawesome/angular-fontawesome', '@angular/cdk', '@angular/material', '@angular/cdk', 'dayjs/esm', - 'rxjs/operators', '@ng-bootstrap/ng-bootstrap', 'ngx-webstorage', '@ctrl/ngx-emoji-mart', 'ngx-device-detector', '@swimlane/ngx-charts', - '@angular/service-worker', '@danielmoncada/angular-datetime-picker', '@flaviosantoro92/ngx-datatable', 'd3-color', 'd3-interpolate', 'd3-transition', 'd3-brush', - 'd3-drag', 'd3-selection', 'd3-scale', 'd3-array', 'd3-format', 'd3-shape', 'd3-path', 'd3-ease', 'd3-time', 'd3-hierarchy', 'ngx-infinite-scroll', 'internmap', - '@swimlane/ngx-graph'].join('|'); +const esModules = [ + 'lodash-es', + 'franc-min', + 'trigram-utils', + 'n-gram', + 'collapse-white-space', + '@angular/animations', + '@angular/common', + '@ls1intum/apollon', + '@angular/compiler', + '@angular/core', + '@angular/forms', + '@angular/localize', + '@angular/platform-browser', + '@angular/platform-browser-dynamic', + '@angular/router', + '@ngx-translate/core', + '@ngx-translate/http-loader', + '@fortawesome/angular-fontawesome', + '@angular/cdk', + '@angular/material', + '@angular/cdk', + 'dayjs/esm', + 'rxjs/operators', + '@ng-bootstrap/ng-bootstrap', + 'ngx-webstorage', + '@ctrl/ngx-emoji-mart', + 'ngx-device-detector', + '@swimlane/ngx-charts', + '@angular/service-worker', + '@danielmoncada/angular-datetime-picker', + '@flaviosantoro92/ngx-datatable', + 'd3-color', + 'd3-interpolate', + 'd3-transition', + 'd3-brush', + 'd3-drag', + 'd3-selection', + 'd3-scale', + 'd3-array', + 'd3-format', + 'd3-shape', + 'd3-path', + 'd3-ease', + 'd3-time', + 'd3-hierarchy', + 'ngx-infinite-scroll', + 'internmap', + '@swimlane/ngx-graph', +].join('|'); const { compilerOptions: { baseUrl = './' }, @@ -12,25 +55,24 @@ const { module.exports = { globalSetup: 'jest-preset-angular/global-setup', - globals: { - 'ts-jest': { - tsconfig: '/tsconfig.spec.json', - stringifyContentPathRegex: '\\.html$', - isolatedModules: true, - diagnostics: { - ignoreCodes: [151001], - }, - }, - }, testEnvironmentOptions: { - url: 'https://artemis.fake/test' + url: 'https://artemis.fake/test', }, roots: ['', `/${baseUrl}`], modulePaths: [`/${baseUrl}`], setupFiles: ['jest-date-mock'], cacheDirectory: '/build/jest-cache', coverageDirectory: '/build/test-results/', - reporters: ['default', ['jest-junit', { outputDirectory: '/build/test-results/', outputName: 'TESTS-results-jest.xml' }]], + reporters: [ + 'default', + [ + 'jest-junit', + { + outputDirectory: '/build/test-results/', + outputName: 'TESTS-results-jest.xml', + }, + ], + ], collectCoverageFrom: ['src/main/webapp/**/*.{js,jsx,ts,tsx}', '!src/main/webapp/**/*.module.{js,jsx,ts,tsx}'], coveragePathIgnorePatterns: [ '/node_modules/', @@ -53,24 +95,34 @@ module.exports = { 'src/main/webapp/app/exercises/modeling/manage/modeling-exercise.route.ts', 'src/main/webapp/app/exam/manage/exam-management.route.ts', 'src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.route.ts', - 'src/main/webapp/app/core/config/prod.config.ts' + 'src/main/webapp/app/core/config/prod.config.ts', ], coverageThreshold: { global: { // TODO: in the future, the following values should increase to at least 90% - statements: 85.6, - branches: 72.8, - functions: 79.4, - lines: 85.8, + statements: 85.9, + branches: 73.2, + functions: 79.7, + lines: 86.1, }, }, - coverageReporters: ["clover", "json", "lcov", "text-summary"], + coverageReporters: ['clover', 'json', 'lcov', 'text-summary'], setupFilesAfterEnv: ['/src/test/javascript/spec/jest-test-setup.ts', 'jest-extended/all'], moduleFileExtensions: ['ts', 'html', 'js', 'json', 'mjs'], resolver: '/jest.resolver.js', transformIgnorePatterns: [`/node_modules/(?!${esModules})`], transform: { - '^.+\\.(ts|js|mjs|html|svg)$': 'jest-preset-angular', + '^.+\\.(ts|js|mjs|html|svg)$': [ + 'jest-preset-angular', + { + tsconfig: '/tsconfig.spec.json', + stringifyContentPathRegex: '\\.html$', + isolatedModules: true, + diagnostics: { + ignoreCodes: [151001], + }, + }, + ], }, modulePathIgnorePatterns: [], testTimeout: 3000, @@ -84,7 +136,7 @@ module.exports = { '/src/test/javascript/spec/util/**/*.spec.ts', '/src/test/javascript/spec/interceptor/**/*.spec.ts', '/src/test/javascript/spec/config/**/*.spec.ts', - '/src/test/javascript/spec/core/**/*.spec.ts' + '/src/test/javascript/spec/core/**/*.spec.ts', ], moduleNameMapper: { '^app/(.*)': '/src/main/webapp/app/$1', @@ -94,6 +146,6 @@ module.exports = { '@env': '/src/main/webapp/environments/environment', '@src/(.*)': '/src/src/$1', '@state/(.*)': '/src/app/state/$1', - "^lodash-es$": "lodash" + '^lodash-es$': 'lodash', }, }; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousExamSessions.java b/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousExamSessions.java index cd23985ea56f..d473fcf14b4f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousExamSessions.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousExamSessions.java @@ -4,7 +4,7 @@ /** * A set of related exam sessions that are suspicious. - * An exam session is suspicious if it shares the same browser fingerprint hash or user agent or IP address with another + * An exam session is suspicious if it fulfills one of the criteria defined in {@link SuspiciousSessionReason}. * exam session that attempts a different student exam. * * @param examSessions the set of exam sessions that are suspicious diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionReason.java b/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionReason.java index be87111202ce..2ebe5c9449ab 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionReason.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionReason.java @@ -4,5 +4,6 @@ * Enum representing reasons why a session is considered suspicious. */ public enum SuspiciousSessionReason { - SAME_IP_ADDRESS, SAME_BROWSER_FINGERPRINT + DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS, DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT, SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES, + SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS, IP_ADDRESS_OUTSIDE_OF_RANGE } diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java b/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java new file mode 100644 index 000000000000..8ab8a718d940 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/domain/exam/SuspiciousSessionsAnalysisOptions.java @@ -0,0 +1,15 @@ +package de.tum.in.www1.artemis.domain.exam; + +/** + * Options for the analysis of suspicious sessions. + * The options define which criteria are used to determine whether a session is suspicious. + * + * @param sameBrowserFingerprintDifferentStudentExams whether sessions should be analyzed for the same browser fingerprint but different student exams + * @param sameIpAddressDifferentStudentExams whether sessions should be analyzed for the same IP address but different student exams + * @param differentIpAddressesSameStudentExam whether sessions should be analyzed for different IP addresses but the same student exam + * @param differentBrowserFingerprintsSameStudentExam whether sessions should be analyzed for different browser fingerprints but the same student exam + * @param ipAddressOutsideOfRange whether sessions should be analyzed for IP addresses outside the specified IP range + */ +public record SuspiciousSessionsAnalysisOptions(boolean sameIpAddressDifferentStudentExams, boolean sameBrowserFingerprintDifferentStudentExams, + boolean differentIpAddressesSameStudentExam, boolean differentBrowserFingerprintsSameStudentExam, boolean ipAddressOutsideOfRange) { +} diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettings.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettings.java index 1d603967c8e3..d3ad1282b64a 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettings.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/iris/settings/IrisSubSettings.java @@ -32,6 +32,14 @@ public class IrisSubSettings extends DomainObject { @Column(name = "preferredModel") private String preferredModel; + @Nullable + @Column(name = "rateLimit") + private Integer rateLimit; + + @Nullable + @Column(name = "rateLimitTimeframeHours") + private Integer rateLimitTimeframeHours; + public boolean isEnabled() { return enabled; } @@ -57,4 +65,22 @@ public String getPreferredModel() { public void setPreferredModel(@Nullable String preferredModel) { this.preferredModel = preferredModel; } + + @Nullable + public Integer getRateLimit() { + return rateLimit; + } + + public void setRateLimit(@Nullable Integer rateLimit) { + this.rateLimit = rateLimit; + } + + @Nullable + public Integer getRateLimitTimeframeHours() { + return rateLimitTimeframeHours; + } + + public void setRateLimitTimeframeHours(@Nullable Integer rateLimitTimeframeHours) { + this.rateLimitTimeframeHours = rateLimitTimeframeHours; + } } diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ParticipationRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ParticipationRepository.java index 797c71e83bca..ae1c0a02b16d 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ParticipationRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ParticipationRepository.java @@ -18,18 +18,20 @@ public interface ParticipationRepository extends JpaRepository { @Query(""" - SELECT DISTINCT p FROM Participation p - LEFT JOIN FETCH p.results - LEFT JOIN FETCH p.submissions s - LEFT JOIN FETCH s.results + SELECT DISTINCT p + FROM Participation p + LEFT JOIN FETCH p.results + LEFT JOIN FETCH p.submissions s + LEFT JOIN FETCH s.results WHERE p.id = :#{#participationId} """) Optional findByIdWithResultsAndSubmissionsResults(@Param("participationId") Long participationId); @Query(""" - SELECT p FROM Participation p - LEFT JOIN FETCH p.submissions s - LEFT JOIN FETCH s.results r + SELECT p + FROM Participation p + LEFT JOIN FETCH p.submissions s + LEFT JOIN FETCH s.results r WHERE p.id = :participationId AND (s.id = (SELECT max(s2.id) FROM p.submissions s2) OR s.id = NULL) """) @@ -49,9 +51,10 @@ default Participation findByIdWithLatestSubmissionElseThrow(Long participationId } @Query(""" - SELECT p FROM Participation p - LEFT JOIN FETCH p.submissions s - WHERE p.id = :#{#participationId} + SELECT p + FROM Participation p + LEFT JOIN FETCH p.submissions s + WHERE p.id = :participationId AND (s.type <> 'ILLEGAL' OR s.type IS NULL) """) Optional findWithEagerLegalSubmissionsById(@Param("participationId") Long participationId); @@ -61,6 +64,19 @@ default Participation findByIdWithLegalSubmissionsElseThrow(long participationId return findWithEagerLegalSubmissionsById(participationId).orElseThrow(() -> new EntityNotFoundException("Participation", participationId)); } + @Query(""" + SELECT p + FROM Participation p + LEFT JOIN FETCH p.submissions s + WHERE p.id = :participationId + """) + Optional findWithEagerSubmissionsById(@Param("participationId") Long participationId); + + @NotNull + default Participation findByIdWithSubmissionsElseThrow(long participationId) { + return findWithEagerSubmissionsById(participationId).orElseThrow(() -> new EntityNotFoundException("Participation", participationId)); + } + @NotNull default Participation findByIdElseThrow(long participationId) { return findById(participationId).orElseThrow(() -> new EntityNotFoundException("Participation", participationId)); @@ -69,7 +85,7 @@ default Participation findByIdElseThrow(long participationId) { @Query(""" SELECT max(p.individualDueDate) FROM Participation p - WHERE p.exercise.id = :#{#exerciseId} + WHERE p.exercise.id = :exerciseId AND p.individualDueDate IS NOT null """) Optional findLatestIndividualDueDate(@Param("exerciseId") Long exerciseId); @@ -77,7 +93,7 @@ SELECT max(p.individualDueDate) @Query(""" SELECT min(p.individualDueDate) FROM Participation p - WHERE p.exercise.id = :#{#exerciseId} + WHERE p.exercise.id = :exerciseId AND p.individualDueDate IS NOT null """) Optional findEarliestIndividualDueDate(@Param("exerciseId") Long exerciseId); diff --git a/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java index b28f79788423..4cdf3ef5505d 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java @@ -320,11 +320,11 @@ default Page searchAllUsersByLoginOrNameInGroupAndConvertToDTO(Pageable */ @EntityGraph(type = LOAD, attributePaths = { "groups", "authorities" }) @Query(""" - SELECT user + SELECT DISTINCT user FROM User user WHERE user.isDeleted = false AND user.login IN :#{#logins} """) - List findAllByLogins(@Param("logins") Set logins); + Set findAllByLogins(@Param("logins") Set logins); /** * Searches for users by their login or full name. diff --git a/src/main/java/de/tum/in/www1/artemis/security/OAuth2JWKSService.java b/src/main/java/de/tum/in/www1/artemis/security/OAuth2JWKSService.java index aa3145aa9c59..06ee441cd64a 100644 --- a/src/main/java/de/tum/in/www1/artemis/security/OAuth2JWKSService.java +++ b/src/main/java/de/tum/in/www1/artemis/security/OAuth2JWKSService.java @@ -9,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; import org.springframework.security.crypto.keygen.Base64StringKeyGenerator; import org.springframework.security.crypto.keygen.StringKeyGenerator; import org.springframework.security.oauth2.client.registration.ClientRegistration; @@ -27,6 +28,7 @@ * On initialisation, each ClientRegistration gets assigned a fresh generated RSAKey. */ @Component +@Profile("lti") public class OAuth2JWKSService { private final OnlineCourseConfigurationService onlineCourseConfigurationService; @@ -83,7 +85,7 @@ public JWKSet getJwkSet() { private List generateOAuth2ClientKeys() { List keys = new LinkedList<>(); - onlineCourseConfigurationService.getAllClientRegistrations().forEach(c -> generateAndAddKey(c, keys)); + onlineCourseConfigurationService.getAllClientRegistrations().forEach(clientRegistration -> generateAndAddKey(clientRegistration, keys)); return keys; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationService.java b/src/main/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationService.java index 9a4f476f71bb..7950fd919db7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/OnlineCourseConfigurationService.java @@ -12,6 +12,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Profile; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.core.AuthorizationGrantType; @@ -27,6 +28,7 @@ * Service Implementation for OnlineCourseConfiguration. */ @Service +@Profile("lti") public class OnlineCourseConfigurationService implements ClientRegistrationRepository { private final Logger log = LoggerFactory.getLogger(OnlineCourseConfigurationService.class); @@ -112,8 +114,8 @@ public ClientRegistration getClientRegistration(OnlineCourseConfiguration online catch (IllegalArgumentException e) { // Log a warning for rare scenarios i.e. ClientId is empty. This can occur when online courses lack an external LMS connection or use LTI v1.0. log.warn("Could not build Client Registration from onlineCourseConfiguration for course with ID: {} and title: {}. Reason: {}", - Optional.ofNullable(onlineCourseConfiguration).map(OnlineCourseConfiguration::getCourse).map(Course::getId).orElse(null), - Optional.ofNullable(onlineCourseConfiguration).map(OnlineCourseConfiguration::getCourse).map(Course::getTitle).orElse(""), e.getMessage()); + Optional.of(onlineCourseConfiguration).map(OnlineCourseConfiguration::getCourse).map(Course::getId).orElse(null), + Optional.of(onlineCourseConfiguration).map(OnlineCourseConfiguration::getCourse).map(Course::getTitle).orElse(""), e.getMessage()); return null; } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIBuildJobExecutionService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIBuildJobExecutionService.java index a2a160e4e2aa..dec7453e8f85 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIBuildJobExecutionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIBuildJobExecutionService.java @@ -43,8 +43,8 @@ /** * This service contains the logic to execute a build job for a programming exercise participation in the local CI system. - * The {@link #runBuildJob(ProgrammingExerciseParticipation, String, String)} method is wrapped into a Callable by the {@link LocalCIBuildJobManagementService} and submitted to the - * executor service. + * The {@link #runBuildJob(ProgrammingExerciseParticipation, String, String, String)} method is wrapped into a Callable by the {@link LocalCIBuildJobManagementService} and + * submitted to the executor service. */ @Service @Profile("localci") @@ -68,8 +68,8 @@ public class LocalCIBuildJobExecutionService { @Value("${artemis.version-control.url}") private URL localVCBaseUrl; - @Value("${artemis.version-control.local-vcs-repo-path}") - private String localVCBasePath; + @Value("${artemis.repo-clone-path}") + private String repoClonePath; public LocalCIBuildJobExecutionService(LocalCIBuildPlanService localCIBuildPlanService, Optional versionControlService, LocalCIContainerService localCIContainerService, AuxiliaryRepositoryRepository auxiliaryRepositoryRepository, XMLInputFactory localCIXMLInputFactory) { @@ -104,10 +104,11 @@ public String toString() { * @param commitHash The commit hash of the commit that should be built. If it is null, the latest commit of the default branch will be built. * @param containerName The name of the Docker container that will be used to run the build job. * It needs to be prepared beforehand to stop and remove the container if something goes wrong here. + * @param dockerImage The Docker image that will be used to run the build job. * @return The build result. * @throws LocalCIException If some error occurs while preparing or running the build job. */ - public LocalCIBuildResult runBuildJob(ProgrammingExerciseParticipation participation, String commitHash, String containerName) { + public LocalCIBuildResult runBuildJob(ProgrammingExerciseParticipation participation, String commitHash, String containerName, String dockerImage) { // Update the build plan status to "BUILDING". localCIBuildPlanService.updateBuildPlanStatus(participation, ContinuousIntegrationService.BuildStatus.BUILDING); @@ -144,7 +145,7 @@ public LocalCIBuildResult runBuildJob(ProgrammingExerciseParticipation participa for (int i = 0; i < auxiliaryRepositories.size(); i++) { auxiliaryRepositoriesUrls[i] = new LocalVCRepositoryUrl(auxiliaryRepositories.get(i).getRepositoryUrl(), localVCBaseUrl); - auxiliaryRepositoriesPaths[i] = auxiliaryRepositoriesUrls[i].getLocalRepositoryPath(localVCBasePath).toAbsolutePath(); + auxiliaryRepositoriesPaths[i] = auxiliaryRepositoriesUrls[i].getRepoClonePath(repoClonePath).toAbsolutePath(); auxiliaryRepositoryNames[i] = auxiliaryRepositories.get(i).getName(); } } @@ -157,8 +158,8 @@ public LocalCIBuildResult runBuildJob(ProgrammingExerciseParticipation participa throw new LocalCIException("Error while creating LocalVCRepositoryUrl", e); } - Path assignmentRepositoryPath = assignmentRepositoryUrl.getLocalRepositoryPath(localVCBasePath).toAbsolutePath(); - Path testsRepositoryPath = testsRepositoryUrl.getLocalRepositoryPath(localVCBasePath).toAbsolutePath(); + Path assignmentRepositoryPath = assignmentRepositoryUrl.getRepoClonePath(repoClonePath).toAbsolutePath(); + Path testsRepositoryPath = testsRepositoryUrl.getRepoClonePath(repoClonePath).toAbsolutePath(); String branch; try { @@ -171,7 +172,7 @@ public LocalCIBuildResult runBuildJob(ProgrammingExerciseParticipation participa // Create the container from the "ls1tum/artemis-maven-template" image with the local paths to the Git repositories and the shell script bound to it. Also give the // container information about the branch and commit hash to be used. // This does not start the container yet. - CreateContainerResponse container = localCIContainerService.configureContainer(containerName, branch, commitHash); + CreateContainerResponse container = localCIContainerService.configureContainer(containerName, branch, commitHash, dockerImage); return runScriptAndParseResults(participation, containerName, container.getId(), branch, commitHash, assignmentRepositoryPath, testsRepositoryPath, auxiliaryRepositoriesPaths, auxiliaryRepositoryNames, buildScriptPath); @@ -227,7 +228,7 @@ private LocalCIBuildResult runScriptAndParseResults(ProgrammingExerciseParticipa return constructFailedBuildResult(branch, assignmentRepoCommitHash, testRepoCommitHash, buildCompletedDate); } - List testResultsPaths = getTestResultPath(participation.getProgrammingExercise()); + List testResultsPaths = getTestResultPaths(participation.getProgrammingExercise()); // Get an input stream of the test result files. List testResultsTarInputStreams = new ArrayList<>(); @@ -269,34 +270,47 @@ private LocalCIBuildResult runScriptAndParseResults(ProgrammingExerciseParticipa // --- Helper methods ---- - private List getTestResultPath(ProgrammingExercise programmingExercise) { - List testResultPaths = new ArrayList<>(); + private List getTestResultPaths(ProgrammingExercise programmingExercise) { switch (programmingExercise.getProgrammingLanguage()) { case JAVA, KOTLIN -> { - if (ProjectType.isMavenProject(programmingExercise.getProjectType())) { - if (programmingExercise.hasSequentialTestRuns()) { - testResultPaths.add("/repositories/test-repository/structural/target/surefire-reports"); - testResultPaths.add("/repositories/test-repository/behavior/target/surefire-reports"); - } - else { - testResultPaths.add("/repositories/test-repository/target/surefire-reports"); - } - } - else { - if (programmingExercise.hasSequentialTestRuns()) { - testResultPaths.add("/repositories/test-repository/build/test-results/behaviorTests"); - testResultPaths.add("/repositories/test-repository/build/test-results/structuralTests"); - } - else { - testResultPaths.add("/repositories/test-repository/build/test-results/test"); - } - } - return testResultPaths; + return getJavaKotlinTestResultPaths(programmingExercise); + } + case PYTHON -> { + return getPythonTestResultPaths(); } default -> throw new IllegalArgumentException("Programming language " + programmingExercise.getProgrammingLanguage() + " is not supported"); } } + private List getJavaKotlinTestResultPaths(ProgrammingExercise programmingExercise) { + List testResultPaths = new ArrayList<>(); + if (ProjectType.isMavenProject(programmingExercise.getProjectType())) { + if (programmingExercise.hasSequentialTestRuns()) { + testResultPaths.add("/repositories/test-repository/structural/target/surefire-reports"); + testResultPaths.add("/repositories/test-repository/behavior/target/surefire-reports"); + } + else { + testResultPaths.add("/repositories/test-repository/target/surefire-reports"); + } + } + else { + if (programmingExercise.hasSequentialTestRuns()) { + testResultPaths.add("/repositories/test-repository/build/test-results/behaviorTests"); + testResultPaths.add("/repositories/test-repository/build/test-results/structuralTests"); + } + else { + testResultPaths.add("/repositories/test-repository/build/test-results/test"); + } + } + return testResultPaths; + } + + private List getPythonTestResultPaths() { + List testResultPaths = new ArrayList<>(); + testResultPaths.add("/repositories/test-repository/test-reports"); + return testResultPaths; + } + private LocalCIBuildResult parseTestResults(List testResultsTarInputStreams, String assignmentRepoBranchName, String assignmentRepoCommitHash, String testsRepoCommitHash, ZonedDateTime buildCompletedDate) throws IOException, XMLStreamException { @@ -330,7 +344,8 @@ private boolean isValidTestResultFile(TarArchiveEntry tarArchiveEntry) { int lastIndexOfSlash = name.lastIndexOf('/'); String result = (lastIndexOfSlash != -1 && lastIndexOfSlash + 1 < name.length()) ? name.substring(lastIndexOfSlash + 1) : name; - return !tarArchiveEntry.isDirectory() && result.endsWith(".xml") && result.startsWith("TEST-"); + // Java test result files are named "TEST-*.xml", Python test result files are named "*results.xml". + return !tarArchiveEntry.isDirectory() && ((result.endsWith(".xml") && result.startsWith("TEST-")) || result.endsWith("results.xml")); } private String readTarEntryContent(TarArchiveInputStream tarArchiveInputStream) throws IOException { @@ -356,6 +371,10 @@ private void processTestResultFile(String testResultFileString, List addBuildJobToQueue(ProgrammingExerc ProgrammingExercise programmingExercise = participation.getProgrammingExercise(); - List supportedProjectTypes = localCIProgrammingLanguageFeatureService.getProgrammingLanguageFeatures(programmingExercise.getProgrammingLanguage()) - .projectTypes(); + ProgrammingLanguage programmingLanguage = programmingExercise.getProgrammingLanguage(); + + ProjectType projectType = programmingExercise.getProjectType(); + + String dockerImage = programmingLanguageConfiguration.getImage(programmingLanguage, Optional.ofNullable(projectType)); - var projectType = programmingExercise.getProjectType(); + List supportedProjectTypes = localCIProgrammingLanguageFeatureService.getProgrammingLanguageFeatures(programmingLanguage).projectTypes(); - if (projectType == null || !supportedProjectTypes.contains(programmingExercise.getProjectType())) { + if (projectType != null && !supportedProjectTypes.contains(programmingExercise.getProjectType())) { throw new LocalCIException("The project type " + programmingExercise.getProjectType() + " is not supported by the local CI."); } @@ -95,7 +102,7 @@ public CompletableFuture addBuildJobToQueue(ProgrammingExerc String containerName = "artemis-local-ci-" + participation.getId() + "-" + ZonedDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")); // Prepare a Callable that will later be called. It contains the actual steps needed to execute the build job. - Callable buildJob = () -> localCIBuildJobExecutionService.runBuildJob(participation, commitHash, containerName); + Callable buildJob = () -> localCIBuildJobExecutionService.runBuildJob(participation, commitHash, containerName, dockerImage); // Wrap the buildJob Callable in a BuildJobTimeoutCallable, so that the build job is cancelled if it takes too long. BuildJobTimeoutCallable timedBuildJob = new BuildJobTimeoutCallable<>(buildJob, timeoutSeconds); diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIContainerService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIContainerService.java index 0732e58357ec..e83d5387126d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIContainerService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIContainerService.java @@ -66,10 +66,11 @@ public LocalCIContainerService(DockerClient dockerClient) { * @param containerName the name of the container to be created * @param branch the branch to checkout * @param commitHash the commit hash to checkout. If it is null, the latest commit of the branch will be checked out. + * @param image the Docker image to use for the container * @return {@link CreateContainerResponse} that can be used to start the container */ - public CreateContainerResponse configureContainer(String containerName, String branch, String commitHash) { - return dockerClient.createContainerCmd(dockerImage).withName(containerName).withHostConfig(HostConfig.newHostConfig().withAutoRemove(true)) + public CreateContainerResponse configureContainer(String containerName, String branch, String commitHash, String image) { + return dockerClient.createContainerCmd(image).withName(containerName).withHostConfig(HostConfig.newHostConfig().withAutoRemove(true)) .withEnv("ARTEMIS_BUILD_TOOL=gradle", "ARTEMIS_DEFAULT_BRANCH=" + branch, "ARTEMIS_ASSIGNMENT_REPOSITORY_COMMIT_HASH=" + (commitHash != null ? commitHash : "")) // Command to run when the container starts. This is the command that will be executed in the container's main process, which runs in the foreground and blocks the // container from exiting until it finishes. @@ -307,45 +308,64 @@ public Path createBuildScript(ProgrammingExercise programmingExercise, List scriptForJavaKotlin(programmingExercise, buildScript, hasSequentialTestRuns); + case PYTHON -> scriptForPython(buildScript); default -> throw new IllegalArgumentException("No build stage setup for programming language " + programmingExercise.getProgrammingLanguage()); } @@ -359,6 +379,23 @@ public Path createBuildScript(ProgrammingExercise programmingExercise, List auxiliaryRepositories) { + StringBuilder buildScript = new StringBuilder(); + for (AuxiliaryRepository auxiliaryRepository : auxiliaryRepositories) { + buildScript.append(" git clone --depth 1 --branch $ARTEMIS_DEFAULT_BRANCH file:///").append(auxiliaryRepository.getName()).append("-repository\n"); + } + return buildScript; + } + + private StringBuilder copyAuxiliaryRepositories(List auxiliaryRepositories, String source) { + StringBuilder buildScript = new StringBuilder(); + for (AuxiliaryRepository auxiliaryRepository : auxiliaryRepositories) { + buildScript.append(" cp -a ").append(source).append(auxiliaryRepository.getName()).append("-repository/. /repositories/test-repository/") + .append(auxiliaryRepository.getCheckoutDirectory()).append("/\n"); + } + return buildScript; + } + private void scriptForJavaKotlin(ProgrammingExercise programmingExercise, StringBuilder buildScript, boolean hasSequentialTestRuns) { boolean isMaven = ProjectType.isMavenProject(programmingExercise.getProjectType()); @@ -398,6 +435,18 @@ private void scriptForJavaKotlin(ProgrammingExercise programmingExercise, String } } + private void scriptForPython(StringBuilder buildScript) { + buildScript.append(""" + python3 -m compileall . -q || error=true + if [ ! $error ] + then + pytest --junitxml=test-reports/results.xml + else + exit 1 + fi + """); + } + /** * Deletes the build script for a given programming exercise. * The build script is stored in a file in the local-ci-scripts directory. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java index 3be1c6fca9c8..30603c6ff307 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java @@ -23,7 +23,7 @@ public LocalCIProgrammingLanguageFeatureService() { // TODO LOCALVC_CI: Local CI is not supporting EMPTY at the moment. programmingLanguageFeatures.put(JAVA, new ProgrammingLanguageFeature(JAVA, true, false, true, true, false, List.of(PLAIN_GRADLE, GRADLE_GRADLE, PLAIN_MAVEN, MAVEN_MAVEN), false, false, true)); - // TODO LOCALVC_CI: Local CI is not supporting Python at the moment. + programmingLanguageFeatures.put(PYTHON, new ProgrammingLanguageFeature(PYTHON, false, false, true, false, false, List.of(), false, false, true)); // TODO LOCALVC_CI: Local CI is not supporting C at the moment. // TODO LOCALVC_CI: Local CI is not supporting Haskell at the moment. // TODO LOCALVC_CI: Local CI is not supporting Kotlin at the moment. diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIService.java index e8306d789aa7..ee4f0e261052 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIService.java @@ -5,12 +5,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration; import de.tum.in.www1.artemis.domain.ProgrammingExercise; import de.tum.in.www1.artemis.domain.VcsRepositoryUrl; import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; @@ -38,20 +38,22 @@ public class LocalCIService extends AbstractContinuousIntegrationService { private final LocalCIDockerService localCIDockerService; - @Value("${artemis.continuous-integration.build.images.java.default}") - String dockerImage; + private final ProgrammingLanguageConfiguration programmingLanguageConfiguration; public LocalCIService(ProgrammingSubmissionRepository programmingSubmissionRepository, FeedbackRepository feedbackRepository, BuildLogEntryService buildLogService, - BuildLogStatisticsEntryRepository buildLogStatisticsEntryRepository, TestwiseCoverageService testwiseCoverageService, LocalCIDockerService localCIDockerService) { + BuildLogStatisticsEntryRepository buildLogStatisticsEntryRepository, TestwiseCoverageService testwiseCoverageService, LocalCIDockerService localCIDockerService, + ProgrammingLanguageConfiguration programmingLanguageConfiguration) { super(programmingSubmissionRepository, feedbackRepository, buildLogService, buildLogStatisticsEntryRepository, testwiseCoverageService); this.localCIDockerService = localCIDockerService; + this.programmingLanguageConfiguration = programmingLanguageConfiguration; } @Override public void createBuildPlanForExercise(ProgrammingExercise programmingExercise, String planKey, VcsRepositoryUrl sourceCodeRepositoryURL, VcsRepositoryUrl testRepositoryURL, VcsRepositoryUrl solutionRepositoryURL) { // Only check whether the docker image needed for the build plan exists. - localCIDockerService.pullDockerImage(dockerImage); + localCIDockerService.pullDockerImage( + programmingLanguageConfiguration.getImage(programmingExercise.getProgrammingLanguage(), Optional.ofNullable(programmingExercise.getProjectType()))); } @Override diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCRepositoryUrl.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCRepositoryUrl.java index d9a3067f46c6..68cacd5648a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCRepositoryUrl.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localvc/LocalVCRepositoryUrl.java @@ -151,4 +151,14 @@ public boolean isPracticeRepository() { public Path getLocalRepositoryPath(String localVCBasePath) { return Paths.get(localVCBasePath, projectKey, repositorySlug + ".git"); } + + /** + * Get the path to the cloned repository + * + * @param baseRepoClonePath the base path of the cloned repositories + * @return the path to the cloned repository + */ + public Path getRepoClonePath(String baseRepoClonePath) { + return Paths.get(baseRepoClonePath, "git", projectKey, repositorySlug); + } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamSessionService.java index 76b184ee0b02..b548978b4a1f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamSessionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamSessionService.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.security.web.util.matcher.IpAddressMatcher; import org.springframework.stereotype.Service; import de.tum.in.www1.artemis.domain.exam.*; @@ -15,6 +16,7 @@ import de.tum.in.www1.artemis.repository.StudentExamRepository; import de.tum.in.www1.artemis.web.rest.dto.*; import inet.ipaddr.IPAddress; +import inet.ipaddr.IPAddressString; /** * Service Implementation for managing ExamSession. @@ -80,45 +82,223 @@ public boolean checkExamSessionIsInitial(Long studentExamId) { /** * Retrieves all suspicious exam sessions for given exam id - * An exam session is suspicious if it has the same browser fingerprint or ip address and belongs to a different student exam + * For a detailed description of the criteria, see {@link SuspiciousSessionsAnalysisOptions} * - * @param examId id of the exam for which suspicious exam sessions shall be retrieved + * @param examId id of the exam for which suspicious exam sessions shall be retrieved + * @param analysisOptions options for the analysis of suspicious sessions + * @param ipSubnet subnet for the analysis of suspicious sessions * @return set of suspicious exam sessions */ - public Set retrieveAllSuspiciousExamSessionsByExamId(long examId) { + public Set retrieveAllSuspiciousExamSessionsByExamId(long examId, SuspiciousSessionsAnalysisOptions analysisOptions, Optional ipSubnet) { Set suspiciousExamSessions = new HashSet<>(); Set examSessions = examSessionRepository.findAllExamSessionsByExamId(examId); - examSessions = filterEqualExamSessionsForSameStudentExam(examSessions); - // first step find all sessions that have matching browser fingerprint and ip address - findSuspiciousSessionsForGivenCriteria(examSessions, examId, examSessionRepository::findAllExamSessionsWithTheSameIpAddressAndBrowserFingerprintByExamIdAndExamSession, - suspiciousExamSessions); - // second step find all sessions that have only matching browser fingerprint - findSuspiciousSessionsForGivenCriteria(examSessions, examId, examSessionRepository::findAllExamSessionsWithTheSameBrowserFingerprintByExamIdAndExamSession, - suspiciousExamSessions); - // third step find all sessions that have only matching ip address - findSuspiciousSessionsForGivenCriteria(examSessions, examId, examSessionRepository::findAllExamSessionsWithTheSameIpAddressByExamIdAndExamSession, suspiciousExamSessions); - + Set filteredSessions = filterEqualExamSessionsForSameStudentExam(examSessions); + Set studentExams = new HashSet<>(); + boolean studentExamsFetched = false; // flag to avoid fetching student exams twice + analyzeSessionsOfDifferentStudentExams(examId, analysisOptions, suspiciousExamSessions, filteredSessions); + analyzeSessionsOfTheSameStudentExam(examId, analysisOptions, suspiciousExamSessions, studentExams, studentExamsFetched); + analyzeIpAddressesOutsideOfRange(analysisOptions, ipSubnet, suspiciousExamSessions, examSessions); return convertSuspiciousSessionsToDTO(suspiciousExamSessions); } /** - * Finds suspicious exam sessions according to the criteria given and adds them to the set of suspicious exam sessions + * Finds all exam sessions that have a IP address outside a given subnet + * + * @param analysisOptions options for the analysis of suspicious sessions + * @param ipSubnet subnet for the analysis of suspicious sessions + * @param suspiciousExamSessions set of suspicious exam sessions + * @param examSessions set of exam sessions to analyze + */ + private void analyzeIpAddressesOutsideOfRange(SuspiciousSessionsAnalysisOptions analysisOptions, Optional ipSubnet, Set suspiciousExamSessions, + Set examSessions) { + Set filteredSessions; + if (analysisOptions.ipAddressOutsideOfRange()) { + // seventh step find all sessions that have ip address outside of range + filteredSessions = filterEqualExamSessionsForSameStudentExam(examSessions); + findSessionsWithIPAddressOutsideOfRange(filteredSessions, ipSubnet.orElseThrow(), suspiciousExamSessions); + } + } + + /** + * Finds all suspicious exam sessions that belong to the same student exam + * + * @param examId id of the exam for which suspicious exam sessions shall be retrieved + * @param analysisOptions options for the analysis of suspicious sessions + * @param suspiciousExamSessions set of suspicious exam sessions + * @param studentExams set of student exams + * @param studentExamsFetched flag to avoid fetching student exams twice + */ + private void analyzeSessionsOfTheSameStudentExam(long examId, SuspiciousSessionsAnalysisOptions analysisOptions, Set suspiciousExamSessions, + Set studentExams, boolean studentExamsFetched) { + if (analysisOptions.differentIpAddressesSameStudentExam() && analysisOptions.differentBrowserFingerprintsSameStudentExam()) { + studentExams = studentExamRepository.findByExamIdWithSessions(examId); + studentExamsFetched = true; + // fourth step find all sessions that belong to the same student exam but have different browser fingerprints and ip addresses + analyzeSessionOfStudentExamsForGivenCriteria(studentExams, true, true, suspiciousExamSessions); + } + if (analysisOptions.differentBrowserFingerprintsSameStudentExam()) { + if (!studentExamsFetched) { + studentExams = studentExamRepository.findByExamIdWithSessions(examId); + studentExamsFetched = true; + } + // fifth step find all sessions that belong to the same student exam but have different browser fingerprints + analyzeSessionOfStudentExamsForGivenCriteria(studentExams, false, true, suspiciousExamSessions); + } + if (analysisOptions.differentIpAddressesSameStudentExam()) { + if (!studentExamsFetched) { + studentExams = studentExamRepository.findByExamIdWithSessions(examId); + } + // sixth step find all sessions that belong to the same student exam but have different ip addresses + analyzeSessionOfStudentExamsForGivenCriteria(studentExams, true, false, suspiciousExamSessions); + } + } + + /** + * Finds all suspicious exam sessions that belong to different student exams * - * @param examSessions set of exam sessions to be processed * @param examId id of the exam for which suspicious exam sessions shall be retrieved - * @param criteriaFilter function that returns a set of exam sessions that match the given criteria - * @param suspiciousExamSessions set of suspicious exam sessions to which the found suspicious exam sessions shall be added + * @param analysisOptions options for the analysis of suspicious sessions + * @param suspiciousExamSessions set of suspicious exam sessions + * @param filteredSessions set of exam sessions to analyze + */ + private void analyzeSessionsOfDifferentStudentExams(long examId, SuspiciousSessionsAnalysisOptions analysisOptions, Set suspiciousExamSessions, + Set filteredSessions) { + if (analysisOptions.sameIpAddressDifferentStudentExams() && analysisOptions.sameBrowserFingerprintDifferentStudentExams()) { + // first step find all sessions that have matching browser fingerprint and ip address + findSuspiciousSessionsForGivenCriteria(filteredSessions, examId, + examSessionRepository::findAllExamSessionsWithTheSameIpAddressAndBrowserFingerprintByExamIdAndExamSession, suspiciousExamSessions, true, true); + } + if (analysisOptions.sameBrowserFingerprintDifferentStudentExams()) { + // second step find all sessions that have only matching browser fingerprint + findSuspiciousSessionsForGivenCriteria(filteredSessions, examId, examSessionRepository::findAllExamSessionsWithTheSameBrowserFingerprintByExamIdAndExamSession, + suspiciousExamSessions, false, true); + } + if (analysisOptions.sameIpAddressDifferentStudentExams()) { + // third step find all sessions that have only matching ip address + findSuspiciousSessionsForGivenCriteria(filteredSessions, examId, examSessionRepository::findAllExamSessionsWithTheSameIpAddressByExamIdAndExamSession, + suspiciousExamSessions, true, false); + } + } + + /** + * Finds all suspicious exam sessions that belong to the same student exam + * + * @param studentExams set of student exams + * @param analyzeDifferentIp true if the ip addresses shall be compared, otherwise false + * @param analyzeDifferentFingerprint true if the browser fingerprints shall be compared, otherwise false + * @param suspiciousExamSessions set of suspicious exam sessions */ - private void findSuspiciousSessionsForGivenCriteria(Set examSessions, long examId, BiFunction> criteriaFilter, + private static void analyzeSessionOfStudentExamsForGivenCriteria(Set studentExams, boolean analyzeDifferentIp, boolean analyzeDifferentFingerprint, Set suspiciousExamSessions) { + for (var studentExam : studentExams) { + analyzeSessionsOfStudentExam(analyzeDifferentIp, analyzeDifferentFingerprint, suspiciousExamSessions, studentExam); + } + } + /** + * Finds all suspicious exam sessions that belong to the same student exam + * + * @param analyzeDifferentIp true if the ip addresses shall be compared, otherwise false + * @param analyzeDifferentFingerprint true if the browser fingerprints shall be compared, otherwise false + * @param suspiciousExamSessions set of suspicious exam sessions + * @param studentExam student exam for which the exam sessions shall be analyzed + */ + private static void analyzeSessionsOfStudentExam(boolean analyzeDifferentIp, boolean analyzeDifferentFingerprint, Set suspiciousExamSessions, + StudentExam studentExam) { + var relatedSuspiciousExamSessions = new HashSet(); + Set examSessions = studentExam.getExamSessions(); + Set filteredSessions = filterEqualExamSessionsForSameStudentExam(examSessions); + for (var examSession : filteredSessions) { + for (var examSession2 : filteredSessions) { + compareStudentExamSessions(analyzeDifferentIp, analyzeDifferentFingerprint, relatedSuspiciousExamSessions, examSession, examSession2); + } + } + if (!relatedSuspiciousExamSessions.isEmpty() && !isSubsetOfFoundSuspiciousSessions(relatedSuspiciousExamSessions, suspiciousExamSessions)) { + suspiciousExamSessions.add(new SuspiciousExamSessions(relatedSuspiciousExamSessions)); + } + } + + /** + * Compares two exam sessions of the same student exam and adds the suspicious reasons to the exam sessions if they are suspicious + * + * @param analyzeDifferentIp true if the ip addresses shall be compared, otherwise false + * @param analyzeDifferentFingerprint true if the browser fingerprints shall be compared, otherwise false + * @param relatedSuspiciousExamSessions set of related suspicious exam sessions + * @param examSession first exam session to compare + * @param examSession2 second exam session to compare + */ + private static void compareStudentExamSessions(boolean analyzeDifferentIp, boolean analyzeDifferentFingerprint, HashSet relatedSuspiciousExamSessions, + ExamSession examSession, ExamSession examSession2) { + if (Objects.equals(examSession.getId(), examSession2.getId())) { + return; + } + if (analyzeDifferentIp && !Objects.equals(examSession.getIpAddress(), examSession2.getIpAddress())) { + examSession.addSuspiciousReason(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES); + examSession2.addSuspiciousReason(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES); + relatedSuspiciousExamSessions.add(examSession); + relatedSuspiciousExamSessions.add(examSession2); + + } + if (analyzeDifferentFingerprint && !Objects.equals(examSession.getBrowserFingerprintHash(), examSession2.getBrowserFingerprintHash())) { + examSession.addSuspiciousReason(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS); + examSession2.addSuspiciousReason(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS); + relatedSuspiciousExamSessions.add(examSession); + relatedSuspiciousExamSessions.add(examSession2); + } + } + + private void findSessionsWithIPAddressOutsideOfRange(Set examSessions, String ipSubnet, Set suspiciousExamSessions) { + var examSessionsWithIPAddressOutsideOfRange = new HashSet(); + for (var examSession : examSessions) { + if (!checkIPIsInGivenRange(ipSubnet, examSession.getIpAddress())) { + examSession.setSuspiciousReasons(new HashSet<>()); + examSession.addSuspiciousReason(SuspiciousSessionReason.IP_ADDRESS_OUTSIDE_OF_RANGE); + examSessionsWithIPAddressOutsideOfRange.add(examSession); + } + } + if (!examSessionsWithIPAddressOutsideOfRange.isEmpty()) { + suspiciousExamSessions.add(new SuspiciousExamSessions(examSessionsWithIPAddressOutsideOfRange)); + } + } + + private boolean checkIPIsInGivenRange(String ipSubnet, String ipAddress) { + IpAddressMatcher ipAddressMatcher = new IpAddressMatcher(ipSubnet); + // if they are not both IPv4 or IPv6, we cannot check if the address is in the subnet and return true + if (!checkIfSubnetAndAddressHaveTheSameVersion(ipSubnet, ipAddress, IPAddress.IPVersion.IPV4) + && !checkIfSubnetAndAddressHaveTheSameVersion(ipSubnet, ipAddress, IPAddress.IPVersion.IPV6)) { + log.debug("IP address {} and subnet {} have different versions", ipAddress, ipSubnet); + return true; + } + return ipAddressMatcher.matches(ipAddress); + + } + + private static boolean checkIfSubnetAndAddressHaveTheSameVersion(String ipSubnet, String ipAddress, IPAddress.IPVersion version) { + var address = new IPAddressString(ipAddress).getAddress(version); + var ipSubnetAddress = new IPAddressString(ipSubnet).getAddress(version); + // return false if one of the addresses is null, not the expected version (IPv4 or IPv6) + return address != null && ipSubnetAddress != null; + } + + /** + * Finds suspicious exam sessions according to the criteria given and adds them to the set of suspicious exam sessions + * + * @param examSessions set of exam sessions to be processed + * @param examId id of the exam for which suspicious exam sessions shall be retrieved + * @param criteriaFilter function that returns a set of exam sessions that match the given criteria + * @param suspiciousExamSessions set of suspicious exam sessions to which the found suspicious exam sessions shall be added + * @param analyzeDifferentStudentExamsSameIp true if the ip addresses shall be compared, otherwise false + * @param analyzeDifferentStudentExamsSameBrowserFingerprint true if the browser fingerprints shall be compared, otherwise false + */ + private static void findSuspiciousSessionsForGivenCriteria(Set examSessions, long examId, BiFunction> criteriaFilter, + Set suspiciousExamSessions, boolean analyzeDifferentStudentExamsSameIp, boolean analyzeDifferentStudentExamsSameBrowserFingerprint) { for (var examSession : examSessions) { Set relatedExamSessions = criteriaFilter.apply(examId, examSession); relatedExamSessions = filterEqualRelatedExamSessionsOfSameStudentExam(relatedExamSessions); if (!relatedExamSessions.isEmpty() && !isSubsetOfFoundSuspiciousSessions(relatedExamSessions, suspiciousExamSessions)) { - addSuspiciousReasons(examSession, relatedExamSessions); - relatedExamSessions.add(examSession); + var session = addSuspiciousReasons(examSession, relatedExamSessions, analyzeDifferentStudentExamsSameIp, analyzeDifferentStudentExamsSameBrowserFingerprint); + relatedExamSessions.add(session); suspiciousExamSessions.add(new SuspiciousExamSessions(relatedExamSessions)); } } @@ -134,7 +314,7 @@ private void findSuspiciousSessionsForGivenCriteria(Set examSession * @param suspiciousExamSessions a set of suspicious exam sessions that have already been found * @return true if the given set of exam sessions is a subset of suspicious exam sessions that have already been found, otherwise false. */ - private boolean isSubsetOfFoundSuspiciousSessions(Set relatedExamSessions, Set suspiciousExamSessions) { + private static boolean isSubsetOfFoundSuspiciousSessions(Set relatedExamSessions, Set suspiciousExamSessions) { for (var suspiciousExamSession : suspiciousExamSessions) { if (suspiciousExamSession.examSessions().containsAll(relatedExamSessions)) { return true; @@ -151,7 +331,7 @@ private boolean isSubsetOfFoundSuspiciousSessions(Set relatedExamSe * @param examSessions exam sessions to filter * @return filtered exam sessions */ - private Set filterEqualExamSessionsForSameStudentExam(Set examSessions) { + private static Set filterEqualExamSessionsForSameStudentExam(Set examSessions) { Set filteredSessions = new HashSet<>(); Set processedSessionKeys = new HashSet<>(); @@ -174,7 +354,7 @@ private Set filterEqualExamSessionsForSameStudentExam(Set filterEqualRelatedExamSessionsOfSameStudentExam(Set examSessions) { + private static Set filterEqualRelatedExamSessionsOfSameStudentExam(Set examSessions) { Set filteredSessions = new HashSet<>(); Set processedSessionsStudentExamIds = new HashSet<>(); @@ -191,7 +371,7 @@ private Set filterEqualRelatedExamSessionsOfSameStudentExam(Set convertSuspiciousSessionsToDTO(Set suspiciousExamSessions) { + private static Set convertSuspiciousSessionsToDTO(Set suspiciousExamSessions) { Set suspiciousExamSessionsDTO = new HashSet<>(); for (var suspiciousExamSession : suspiciousExamSessions) { Set examSessionDTOs = new HashSet<>(); @@ -212,21 +392,39 @@ private Set convertSuspiciousSessionsToDTO(Set relatedExamSessions) { + private static ExamSession addSuspiciousReasons(ExamSession session, Set relatedExamSessions, boolean analyzeDifferentStudentExamsSameIp, + boolean analyzeDifferentStudentExamsSameBrowserFingerprint) { + ExamSession sessionCopy = new ExamSession(); + sessionCopy.setId(session.getId()); + sessionCopy.setSuspiciousReasons(new HashSet<>()); + sessionCopy.setBrowserFingerprintHash(session.getBrowserFingerprintHash()); + sessionCopy.setIpAddress(session.getIpAddress()); + sessionCopy.setUserAgent(session.getUserAgent()); + sessionCopy.setStudentExam(session.getStudentExam()); + sessionCopy.setCreatedDate(session.getCreatedDate()); + sessionCopy.setInstanceId(session.getInstanceId()); + sessionCopy.setSessionToken(session.getSessionToken()); + for (var relatedExamSession : relatedExamSessions) { - if (relatedExamSession.hasSameBrowserFingerprint(session)) { - relatedExamSession.addSuspiciousReason(SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT); - session.addSuspiciousReason(SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT); + relatedExamSession.setSuspiciousReasons(new HashSet<>()); + // if we do not check the analysis criteria, we might add reasons that should not be analyzed + if (relatedExamSession.hasSameBrowserFingerprint(session) && analyzeDifferentStudentExamsSameBrowserFingerprint) { + relatedExamSession.addSuspiciousReason(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT); + sessionCopy.addSuspiciousReason(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT); } - if (relatedExamSession.hasSameIpAddress(session)) { - relatedExamSession.addSuspiciousReason(SuspiciousSessionReason.SAME_IP_ADDRESS); - session.addSuspiciousReason(SuspiciousSessionReason.SAME_IP_ADDRESS); + if (relatedExamSession.hasSameIpAddress(session) && analyzeDifferentStudentExamsSameIp) { + relatedExamSession.addSuspiciousReason(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS); + sessionCopy.addSuspiciousReason(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS); } } + return sessionCopy; } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisRateLimitService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisRateLimitService.java index b43979dd6168..02265c7261f9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisRateLimitService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisRateLimitService.java @@ -1,8 +1,8 @@ package de.tum.in.www1.artemis.service.iris; import java.time.ZonedDateTime; +import java.util.Objects; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @@ -19,14 +19,11 @@ public class IrisRateLimitService { private final IrisMessageRepository irisMessageRepository; - @Value("${artemis.iris.rate-limit:5}") - private int rateLimit; + private final IrisSettingsService irisSettingsService; - @Value("${artemis.iris.rate-limit-timeframe-hours:24}") - private int rateLimitTimeframeHours; - - public IrisRateLimitService(IrisMessageRepository irisMessageRepository) { + public IrisRateLimitService(IrisMessageRepository irisMessageRepository, IrisSettingsService irisSettingsService) { this.irisMessageRepository = irisMessageRepository; + this.irisSettingsService = irisSettingsService; } /** @@ -37,11 +34,15 @@ public IrisRateLimitService(IrisMessageRepository irisMessageRepository) { * @return the rate limit information */ public IrisRateLimitInformation getRateLimitInformation(User user) { + var globalSettings = irisSettingsService.getGlobalSettings(); + var irisChatSettings = globalSettings.getIrisChatSettings(); + var rateLimitTimeframeHours = Objects.requireNonNullElse(irisChatSettings.getRateLimitTimeframeHours(), 0); var start = ZonedDateTime.now().minusHours(rateLimitTimeframeHours); var end = ZonedDateTime.now(); var currentMessageCount = irisMessageRepository.countLlmResponsesOfUserWithinTimeframe(user.getId(), start, end); + var rateLimit = Objects.requireNonNullElse(irisChatSettings.getRateLimit(), -1); - return new IrisRateLimitInformation(currentMessageCount, rateLimit); + return new IrisRateLimitInformation(currentMessageCount, rateLimit, rateLimitTimeframeHours); } /** @@ -65,7 +66,7 @@ public void checkRateLimitElseThrow(User user) { * @param currentMessageCount the current rate limit * @param rateLimit the max rate limit */ - public record IrisRateLimitInformation(int currentMessageCount, int rateLimit) { + public record IrisRateLimitInformation(int currentMessageCount, int rateLimit, int rateLimitTimeframeHours) { /** * Checks if the rate limit is exceeded. diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java index 9cf590bfc52e..e01cd22855cd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java @@ -17,6 +17,7 @@ import de.tum.in.www1.artemis.service.iris.session.IrisChatSessionService; import de.tum.in.www1.artemis.service.iris.session.IrisHestiaSessionService; import de.tum.in.www1.artemis.service.iris.session.IrisSessionSubServiceInterface; +import de.tum.in.www1.artemis.web.rest.errors.ConflictException; /** * Service for managing Iris sessions. @@ -58,6 +59,9 @@ public void checkIsIrisActivated(IrisSession session) { * @return The created session */ public IrisSession createChatSessionForProgrammingExercise(ProgrammingExercise exercise, User user) { + if (exercise.isExamExercise()) { + throw new ConflictException("Iris is not supported for exam exercises", "Iris", "irisExamExercise"); + } var irisSession = new IrisChatSession(); irisSession.setExercise(exercise); irisSession.setUser(user); diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSettingsService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSettingsService.java index 02f75f29f7e6..11f5215fd7d2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSettingsService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSettingsService.java @@ -21,8 +21,10 @@ import de.tum.in.www1.artemis.repository.CourseRepository; import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; +import de.tum.in.www1.artemis.service.AuthorizationCheckService; import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; +import de.tum.in.www1.artemis.web.rest.errors.ConflictException; /** * Service for managing {@link IrisSettings}. @@ -39,12 +41,15 @@ public class IrisSettingsService { private final ProgrammingExerciseRepository programmingExerciseRepository; + private final AuthorizationCheckService authCheckService; + public IrisSettingsService(CourseRepository courseRepository, ApplicationContext applicationContext, IrisSettingsRepository irisSettingsRepository, - ProgrammingExerciseRepository programmingExerciseRepository) { + ProgrammingExerciseRepository programmingExerciseRepository, AuthorizationCheckService authCheckService) { this.courseRepository = courseRepository; this.applicationContext = applicationContext; this.irisSettingsRepository = irisSettingsRepository; this.programmingExerciseRepository = programmingExerciseRepository; + this.authCheckService = authCheckService; } /** @@ -360,6 +365,9 @@ public IrisSettings saveIrisSettings(Course course, IrisSettings settings) { * @return the saved Iris settings */ public IrisSettings saveIrisSettings(ProgrammingExercise exercise, IrisSettings settings) { + if (exercise.isExamExercise()) { + throw new ConflictException("Iris is not supported for exam exercises", "Iris", "irisExamExercise"); + } var existingSettingsOptional = getIrisSettings(exercise); if (existingSettingsOptional.isPresent()) { var existingSettings = existingSettingsOptional.get(); @@ -389,8 +397,12 @@ private IrisSubSettings copyIrisSubSettings(IrisSubSettings target, IrisSubSetti if (target == null || source == null) { return source; } - target.setEnabled(source.isEnabled()); - target.setPreferredModel(source.getPreferredModel()); + if (authCheckService.isAdmin()) { + target.setEnabled(source.isEnabled()); + target.setPreferredModel(source.getPreferredModel()); + target.setRateLimit(source.getRateLimit()); + target.setRateLimitTimeframeHours(source.getRateLimitTimeframeHours()); + } if (!Objects.equals(source.getTemplate(), target.getTemplate())) { target.setTemplate(source.getTemplate()); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatSessionService.java index 508e8c5b7afa..32e73233c803 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatSessionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatSessionService.java @@ -32,6 +32,7 @@ import de.tum.in.www1.artemis.service.iris.IrisWebsocketService; import de.tum.in.www1.artemis.service.iris.exception.IrisNoResponseException; import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException; +import de.tum.in.www1.artemis.web.rest.errors.ConflictException; import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException; /** @@ -123,6 +124,9 @@ public void requestAndHandleResponse(IrisSession session) { if (!(fullSession instanceof IrisChatSession chatSession)) { throw new BadRequestException("Trying to get Iris response for session " + session.getId() + " without exercise"); } + if (((IrisChatSession) fullSession).getExercise().isExamExercise()) { + throw new ConflictException("Iris is not supported for exam exercises", "Iris", "irisExamExercise"); + } var exercise = chatSession.getExercise(); parameters.put("exercise", exercise); parameters.put("course", exercise.getCourseViaExerciseGroupOrCourseMember()); diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/AnswerMessageService.java b/src/main/java/de/tum/in/www1/artemis/service/metis/AnswerMessageService.java index 4ab685d8ab6e..d5b18bbcb5fe 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/AnswerMessageService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/metis/AnswerMessageService.java @@ -87,7 +87,7 @@ public AnswerPost createAnswerMessage(Long courseId, AnswerPost answerMessage) { channelAuthorizationService.isAllowedToCreateNewAnswerPostInChannel(channel, author); } - parseUserMentions(course, answerMessage.getContent()); + Set mentionedUsers = parseUserMentions(course, answerMessage.getContent()); // use post from database rather than user input answerMessage.setPost(post); @@ -98,12 +98,7 @@ public AnswerPost createAnswerMessage(Long courseId, AnswerPost answerMessage) { AnswerPost savedAnswerMessage = answerPostRepository.save(answerMessage); savedAnswerMessage.getPost().setConversation(conversation); this.preparePostAndBroadcast(savedAnswerMessage, course); - Set usersInvolved = conversationMessageRepository.findUsersWhoRepliedInMessage(post.getId()); - // do not notify the author of the post if they are not part of the conversation (e.g. if they left or have been removed from the conversation) - if (conversationService.isMember(post.getConversation().getId(), post.getAuthor().getId())) { - usersInvolved.add(post.getAuthor()); - } - usersInvolved.forEach(userInvolved -> singleUserNotificationService.notifyUserAboutNewMessageReply(savedAnswerMessage, userInvolved, author)); + this.singleUserNotificationService.notifyInvolvedUsersAboutNewMessageReply(post, mentionedUsers, savedAnswerMessage, author); return savedAnswerMessage; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/ConversationMessagingService.java b/src/main/java/de/tum/in/www1/artemis/service/metis/ConversationMessagingService.java index c4c0443ef63d..c1210490f282 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/ConversationMessagingService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/metis/ConversationMessagingService.java @@ -101,7 +101,7 @@ public Post createMessage(Long courseId, Post newMessage) { channelAuthorizationService.isAllowedToCreateNewPostInChannel(channel, author); } - parseUserMentions(course, newMessage.getContent()); + Set mentionedUsers = parseUserMentions(course, newMessage.getContent()); // update last message date of conversation conversation.setLastMessageDate(ZonedDateTime.now()); @@ -121,14 +121,16 @@ public Post createMessage(Long courseId, Post newMessage) { } // TODO: we should consider invoking the following method async to avoid that authors wait for the message creation if many notifications are sent - notifyAboutMessageCreation(author, savedConversation, course, createdMessage); + notifyAboutMessageCreation(author, savedConversation, course, createdMessage, mentionedUsers); return createdMessage; } - private void notifyAboutMessageCreation(User author, Conversation conversation, Course course, Post createdMessage) { + private void notifyAboutMessageCreation(User author, Conversation conversation, Course course, Post createdMessage, Set mentionedUsers) { Set webSocketRecipients = getWebSocketRecipients(conversation).collect(Collectors.toSet()); Set broadcastRecipients = webSocketRecipients.stream().map(ConversationWebSocketRecipientSummary::user).collect(Collectors.toSet()); + // Add all mentioned users, including the author (if mentioned). Since working with sets, there are no duplicate user entries + broadcastRecipients.addAll(mentionedUsers); // Websocket notification 1: this notifies everyone including the author that there is a new message broadcastForPost(new PostDTO(createdMessage, MetisCrudAction.CREATE), course, broadcastRecipients); @@ -150,7 +152,7 @@ private void notifyAboutMessageCreation(User author, Conversation conversation, // creation of message posts should not trigger entity creation alert // Websocket notification 3 - var notificationRecipients = filterNotificationRecipients(author, conversation, webSocketRecipients); + Set notificationRecipients = filterNotificationRecipients(author, conversation, webSocketRecipients, mentionedUsers); conversationNotificationService.notifyAboutNewMessage(createdMessage, notificationRecipients, course); } @@ -164,16 +166,18 @@ private void notifyAboutMessageCreation(User author, Conversation conversation, * @param author the author of the message * @param conversation the conversation the new message has been written in * @param webSocketRecipients the list of users that should be filtered + * @param mentionedUsers users mentioend within the message * @return filtered list of users that are supposed to receive a notification */ - private Set filterNotificationRecipients(User author, Conversation conversation, Set webSocketRecipients) { + private Set filterNotificationRecipients(User author, Conversation conversation, Set webSocketRecipients, + Set mentionedUsers) { // Initialize filter with check for author Predicate filter = recipientSummary -> !Objects.equals(recipientSummary.user().getId(), author.getId()); if (conversation instanceof Channel channel) { // If a channel is not an announcement channel, filter out users, that hid the conversation if (!channel.getIsAnnouncementChannel()) { - filter = filter.and(recipientSummary -> !recipientSummary.isConversationHidden()); + filter = filter.and(recipientSummary -> !recipientSummary.isConversationHidden() || mentionedUsers.contains(recipientSummary.user())); } // If a channel is not visible to students, filter out participants that are only students diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java b/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java index d0eb3dbff757..14a5cb90fa8c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java @@ -243,8 +243,9 @@ else if (authorizationCheckService.isTeachingAssistantInCourse(postingCourse, po * * @param course course of the posting * @param postingContent content of the posting + * @return set of mentioned users */ - protected void parseUserMentions(@NotNull Course course, String postingContent) { + protected Set parseUserMentions(@NotNull Course course, String postingContent) { // Define a regular expression to match text enclosed in [user]...[/user] tags, along with login inside parentheses () within those tags. // It makes use of the possessive quantifier "*+" to avoid backtracking and increase performance. // Explanation: @@ -269,7 +270,7 @@ protected void parseUserMentions(@NotNull Course course, String postingContent) matches.put(userLogin, fullName); } - List mentionedUsers = userRepository.findAllByLogins(matches.keySet()); + Set mentionedUsers = userRepository.findAllByLogins(matches.keySet()); if (mentionedUsers.size() != matches.size()) { throw new BadRequestAlertException("At least one of the mentioned users does not exist", METIS_POST_ENTITY_NAME, "invalidUserMention"); @@ -285,5 +286,7 @@ protected void parseUserMentions(@NotNull Course course, String postingContent) throw new BadRequestAlertException("The user " + user.getLogin() + " is not a member of the course", METIS_POST_ENTITY_NAME, "invalidUserMention"); } }); + + return mentionedUsers; } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java index cb79cddfb225..98a90822e83c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java @@ -3,14 +3,12 @@ import static de.tum.in.www1.artemis.domain.enumeration.NotificationType.*; import static de.tum.in.www1.artemis.domain.notification.NotificationConstants.*; import static de.tum.in.www1.artemis.domain.notification.SingleUserNotificationFactory.createNotification; -import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel.*; +import static de.tum.in.www1.artemis.service.notifications.NotificationSettingsCommunicationChannel.WEBAPP; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import de.tum.in.www1.artemis.domain.*; @@ -18,6 +16,7 @@ import de.tum.in.www1.artemis.domain.metis.AnswerPost; import de.tum.in.www1.artemis.domain.metis.Post; import de.tum.in.www1.artemis.domain.metis.Posting; +import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; import de.tum.in.www1.artemis.domain.notification.NotificationConstants; import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; @@ -27,8 +26,12 @@ import de.tum.in.www1.artemis.repository.SingleUserNotificationRepository; import de.tum.in.www1.artemis.repository.StudentParticipationRepository; import de.tum.in.www1.artemis.repository.UserRepository; +import de.tum.in.www1.artemis.repository.metis.ConversationMessageRepository; +import de.tum.in.www1.artemis.security.SecurityUtils; +import de.tum.in.www1.artemis.service.AuthorizationCheckService; import de.tum.in.www1.artemis.service.ExerciseDateService; import de.tum.in.www1.artemis.service.WebsocketMessagingService; +import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; @Service public class SingleUserNotificationService { @@ -45,15 +48,25 @@ public class SingleUserNotificationService { private final StudentParticipationRepository studentParticipationRepository; + private final ConversationMessageRepository conversationMessageRepository; + + private final ConversationService conversationService; + + private final AuthorizationCheckService authorizationCheckService; + public SingleUserNotificationService(SingleUserNotificationRepository singleUserNotificationRepository, UserRepository userRepository, WebsocketMessagingService websocketMessagingService, GeneralInstantNotificationService notificationService, NotificationSettingsService notificationSettingsService, - StudentParticipationRepository studentParticipationRepository) { + StudentParticipationRepository studentParticipationRepository, ConversationMessageRepository conversationMessageRepository, ConversationService conversationService, + AuthorizationCheckService authorizationCheckService) { this.singleUserNotificationRepository = singleUserNotificationRepository; this.userRepository = userRepository; this.websocketMessagingService = websocketMessagingService; this.notificationService = notificationService; this.notificationSettingsService = notificationSettingsService; this.studentParticipationRepository = studentParticipationRepository; + this.conversationMessageRepository = conversationMessageRepository; + this.conversationService = conversationService; + this.authorizationCheckService = authorizationCheckService; } /** @@ -362,6 +375,39 @@ public void notifyUserAboutNewMessageReply(AnswerPost answerPost, User user, Use notifyRecipientWithNotificationType(new NewReplyNotificationSubject(answerPost, user, responsibleUser), CONVERSATION_NEW_REPLY_MESSAGE, null, responsibleUser); } + /** + * Notifies involved users about the new answer message, i.e. the author of the original message, users that have also replied, and mentioned users + * + * @param post the message the answer belongs to + * @param mentionedUsers users mentioned in the answer message + * @param savedAnswerMessage the answer message + * @param author the author of the answer message + */ + @Async + public void notifyInvolvedUsersAboutNewMessageReply(Post post, Set mentionedUsers, AnswerPost savedAnswerMessage, User author) { + SecurityUtils.setAuthorizationObject(); // required for async + Set usersInvolved = conversationMessageRepository.findUsersWhoRepliedInMessage(post.getId()); + // do not notify the author of the post if they are not part of the conversation (e.g. if they left or have been removed from the conversation) + if (conversationService.isMember(post.getConversation().getId(), post.getAuthor().getId())) { + usersInvolved.add(post.getAuthor()); + } + + mentionedUsers.forEach(user -> { + boolean isChannelAndCourseWide = post.getConversation() instanceof Channel channel && channel.getIsCourseWide(); + boolean isChannelVisibleToStudents = !(post.getConversation() instanceof Channel channel) || conversationService.isChannelVisibleToStudents(channel); + boolean isChannelVisibleToMentionedUser = isChannelVisibleToStudents || authorizationCheckService.isAtLeastTeachingAssistantInCourse(post.getCourse(), user); + + // Only send a notification to the mentioned user if... + // (for course-wide channels) ...the course-wide channel is visible + // (for all other cases) ...the user is a member of the conversation + if ((isChannelAndCourseWide && isChannelVisibleToMentionedUser) || conversationService.isMember(post.getConversation().getId(), user.getId())) { + usersInvolved.add(user); + } + }); + + usersInvolved.forEach(userInvolved -> notifyUserAboutNewMessageReply(savedAnswerMessage, userInvolved, author)); + } + /** * Saves the given notification in database and sends it to the client via websocket. * Also creates and sends an instant notification. diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportService.java index 4cc23398df63..e061f54e99d7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportService.java @@ -286,7 +286,7 @@ public ProgrammingExercise importProgrammingExercise(ProgrammingExercise origina if (recreateBuildPlans) { // Create completely new build plans for the exercise - programmingExerciseService.setupBuildPlansForNewExercise(importedProgrammingExercise, true); + programmingExerciseService.setupBuildPlansForNewExercise(importedProgrammingExercise, false); } else { // We have removed the automatic build trigger from test to base for new programming exercises. diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java index bfad5dbc39e4..3805305e6917 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java @@ -193,14 +193,14 @@ public ProgrammingExerciseService(ProgrammingExerciseRepository programmingExerc * * * @param programmingExercise The programmingExercise that should be setup - * @param imported defines if the programming exercise is imported + * @param isImportedFromFile defines if the programming exercise is imported from a file * @return The new setup exercise * @throws GitAPIException If something during the communication with the remote Git repository went wrong * @throws IOException If the template files couldn't be read */ @Transactional // TODO: apply the transaction on a smaller scope // ok because we create many objects in a rather complex way and need a rollback in case of exceptions - public ProgrammingExercise createProgrammingExercise(ProgrammingExercise programmingExercise, boolean imported) throws GitAPIException, IOException { + public ProgrammingExercise createProgrammingExercise(ProgrammingExercise programmingExercise, boolean isImportedFromFile) throws GitAPIException, IOException { programmingExercise.generateAndSetProjectKey(); final User exerciseCreator = userRepository.getUser(); @@ -223,7 +223,7 @@ public ProgrammingExercise createProgrammingExercise(ProgrammingExercise program channelService.createExerciseChannel(savedProgrammingExercise, Optional.ofNullable(programmingExercise.getChannelName())); - setupBuildPlansForNewExercise(savedProgrammingExercise, imported); + setupBuildPlansForNewExercise(savedProgrammingExercise, isImportedFromFile); // save to get the id required for the webhook savedProgrammingExercise = programmingExerciseRepository.saveAndFlush(savedProgrammingExercise); @@ -346,10 +346,10 @@ public void validateStaticCodeAnalysisSettings(ProgrammingExercise programmingEx * * @param programmingExercise Programming exercise for the build plans should be generated. The programming * exercise should contain a fully initialized template and solution participation. - * @param isImported defines if the programming exercise is imported from a source exercise, if the + * @param isImportedFromFile defines if the programming exercise is imported from a file, if the * exercise is imported, the build plans will not be triggered to prevent erroneous builds */ - public void setupBuildPlansForNewExercise(ProgrammingExercise programmingExercise, boolean isImported) { + public void setupBuildPlansForNewExercise(ProgrammingExercise programmingExercise, boolean isImportedFromFile) { String projectKey = programmingExercise.getProjectKey(); // Get URLs for repos var exerciseRepoUrl = programmingExercise.getVcsTemplateRepositoryUrl(); @@ -370,7 +370,7 @@ public void setupBuildPlansForNewExercise(ProgrammingExercise programmingExercis // if the exercise is imported from a file, the changes fixing the project name will trigger a first build anyway, so // we do not trigger them here - if (!isImported) { + if (!isImportedFromFile) { // trigger BASE and SOLUTION build plans once here continuousIntegrationTriggerService.orElseThrow().triggerBuild(programmingExercise.getTemplateParticipation()); continuousIntegrationTriggerService.orElseThrow().triggerBuild(programmingExercise.getSolutionParticipation()); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java index fd60d8d6d1d7..5fc8d4b36b10 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java @@ -17,6 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Profile; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; import org.springframework.data.domain.Page; @@ -77,9 +78,9 @@ public class CourseResource { private final AuthorizationCheckService authCheckService; - private final OnlineCourseConfigurationService onlineCourseConfigurationService; + private final Optional onlineCourseConfigurationService; - private final OAuth2JWKSService oAuth2JWKSService; + private final Optional oAuth2JWKSService; private final CourseRepository courseRepository; @@ -115,7 +116,7 @@ public class CourseResource { private final LearningPathService learningPathService; public CourseResource(UserRepository userRepository, CourseService courseService, CourseRepository courseRepository, ExerciseService exerciseService, - OAuth2JWKSService oAuth2JWKSService, OnlineCourseConfigurationService onlineCourseConfigurationService, AuthorizationCheckService authCheckService, + Optional oAuth2JWKSService, Optional onlineCourseConfigurationService, AuthorizationCheckService authCheckService, TutorParticipationRepository tutorParticipationRepository, SubmissionService submissionService, Optional optionalVcsUserManagementService, AssessmentDashboardService assessmentDashboardService, ExerciseRepository exerciseRepository, Optional optionalCiUserManagementService, FileService fileService, TutorialGroupsConfigurationService tutorialGroupsConfigurationService, GradingScaleService gradingScaleService, @@ -231,8 +232,8 @@ public ResponseEntity updateCourse(@PathVariable Long courseId, @Request } if (courseUpdate.isOnlineCourse() != existingCourse.isOnlineCourse()) { - if (courseUpdate.isOnlineCourse()) { - onlineCourseConfigurationService.createOnlineCourseConfiguration(courseUpdate); + if (courseUpdate.isOnlineCourse() && onlineCourseConfigurationService.isPresent()) { + onlineCourseConfigurationService.get().createOnlineCourseConfiguration(courseUpdate); } else { courseUpdate.setOnlineCourseConfiguration(null); @@ -278,6 +279,7 @@ public ResponseEntity updateCourse(@PathVariable Long courseId, @Request */ @PutMapping("courses/{courseId}/onlineCourseConfiguration") @EnforceAtLeastInstructor + @Profile("lti") public ResponseEntity updateOnlineCourseConfiguration(@PathVariable Long courseId, @RequestBody OnlineCourseConfiguration onlineCourseConfiguration) { log.debug("REST request to update the online course configuration for Course : {}", courseId); @@ -294,12 +296,14 @@ public ResponseEntity updateOnlineCourseConfiguration OnlineCourseConfiguration.ENTITY_NAME, "idMismatch"); } - onlineCourseConfigurationService.validateOnlineCourseConfiguration(onlineCourseConfiguration); - course.setOnlineCourseConfiguration(onlineCourseConfiguration); + if (onlineCourseConfigurationService.isPresent()) { + onlineCourseConfigurationService.get().validateOnlineCourseConfiguration(onlineCourseConfiguration); + course.setOnlineCourseConfiguration(onlineCourseConfiguration); + } courseRepository.save(course); - oAuth2JWKSService.updateKey(course.getOnlineCourseConfiguration().getRegistrationId()); + oAuth2JWKSService.ifPresent(auth2JWKSService -> auth2JWKSService.updateKey(course.getOnlineCourseConfiguration().getRegistrationId())); return ResponseEntity.ok(onlineCourseConfiguration); } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java index 25ba7982aa8c..0baac7253b6e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamResource.java @@ -31,9 +31,7 @@ import de.tum.in.www1.artemis.config.Constants; import de.tum.in.www1.artemis.domain.*; -import de.tum.in.www1.artemis.domain.exam.Exam; -import de.tum.in.www1.artemis.domain.exam.ExerciseGroup; -import de.tum.in.www1.artemis.domain.exam.StudentExam; +import de.tum.in.www1.artemis.domain.exam.*; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.participation.TutorParticipation; import de.tum.in.www1.artemis.repository.*; @@ -191,6 +189,7 @@ public ResponseEntity createExam(@PathVariable Long courseId, @RequestBody @EnforceAtLeastInstructor public ResponseEntity updateExam(@PathVariable Long courseId, @RequestBody Exam updatedExam) throws URISyntaxException { log.debug("REST request to update an exam : {}", updatedExam); + if (updatedExam.getId() == null) { return createExam(courseId, updatedExam); } @@ -201,6 +200,7 @@ public ResponseEntity updateExam(@PathVariable Long courseId, @RequestBody // Make sure that the original references are preserved. Exam originalExam = examRepository.findByIdElseThrow(updatedExam.getId()); + var originalExamDuration = originalExam.getDuration(); // The Exam Mode cannot be changed after creation -> Compare request with version in the database if (updatedExam.isTestExam() != originalExam.isTestExam()) { @@ -216,21 +216,22 @@ public ResponseEntity updateExam(@PathVariable Long courseId, @RequestBody Exam savedExam = examRepository.save(updatedExam); + // NOTE: We have to get exercises and groups as we need them for re-scheduling + Exam examWithExercises = examService.findByIdWithExerciseGroupsAndExercisesElseThrow(savedExam.getId()); + // We can't test dates for equality as the dates retrieved from the database lose precision. Also use instant to take timezones into account Comparator comparator = Comparator.comparing(date -> date.truncatedTo(ChronoUnit.SECONDS).toInstant()); if (comparator.compare(originalExam.getVisibleDate(), updatedExam.getVisibleDate()) != 0 || comparator.compare(originalExam.getStartDate(), updatedExam.getStartDate()) != 0) { - // get all exercises - Exam examWithExercises = examService.findByIdWithExerciseGroupsAndExercisesElseThrow(savedExam.getId()); // for all programming exercises in the exam, send their ids for scheduling examWithExercises.getExerciseGroups().stream().flatMap(group -> group.getExercises().stream()).filter(ProgrammingExercise.class::isInstance).map(Exercise::getId) .forEach(instanceMessageSendService::sendProgrammingExerciseSchedule); } - if (comparator.compare(originalExam.getEndDate(), updatedExam.getEndDate()) != 0) { - // get all exercises - Exam examWithExercises = examService.findByIdWithExerciseGroupsAndExercisesElseThrow(savedExam.getId()); - examService.scheduleModelingExercises(examWithExercises); + // NOTE: if the end date was changed, we need to update student exams and re-schedule exercises + if (!originalExam.getEndDate().equals(savedExam.getEndDate())) { + int workingTimeChange = savedExam.getDuration() - originalExamDuration; + updateStudentExamsAndRescheduleExercises(examWithExercises, originalExamDuration, workingTimeChange); } if (updatedChannel != null) { @@ -259,9 +260,7 @@ public ResponseEntity updateExamWorkingTime(@PathVariable Long courseId, @ throw new BadRequestException(); } - var now = now(); - - // We have to get exercise groups as `scheduleModelingExercises` needs them + // NOTE: We have to get exercise groups as `scheduleModelingExercises` needs them Exam exam = examService.findByIdWithExerciseGroupsAndExercisesElseThrow(examId); var originalExamDuration = exam.getDuration(); @@ -270,10 +269,18 @@ public ResponseEntity updateExamWorkingTime(@PathVariable Long courseId, @ exam.setWorkingTime(exam.getWorkingTime() + workingTimeChange); examRepository.save(exam); + // 2. Re-calculate the working times of all student exams + updateStudentExamsAndRescheduleExercises(exam, originalExamDuration, workingTimeChange); + + return ResponseEntity.ok(exam); + } + + private void updateStudentExamsAndRescheduleExercises(Exam exam, Integer originalExamDuration, Integer workingTimeChange) { + var now = now(); + User instructor = userRepository.getUser(); - // 2. Re-calculate the working times of all student exams - var studentExams = studentExamRepository.findByExamId(examId); + var studentExams = studentExamRepository.findByExamId(exam.getId()); for (var studentExam : studentExams) { Integer originalStudentWorkingTime = studentExam.getWorkingTime(); int originalTimeExtension = originalStudentWorkingTime - originalExamDuration; @@ -288,7 +295,9 @@ public ResponseEntity updateExamWorkingTime(@PathVariable Long courseId, @ int adjustedWorkingTime = Math.max(newNormalWorkingTime + timeAdjustment, 0); studentExam.setWorkingTime(adjustedWorkingTime); } + // TODO: probably batch these updates? var savedStudentExam = studentExamRepository.save(studentExam); + // NOTE: if the exam is already visible, notify the student about the working time change if (now.isAfter(exam.getVisibleDate())) { examLiveEventsService.createAndSendWorkingTimeUpdateEvent(savedStudentExam, savedStudentExam.getWorkingTime(), originalStudentWorkingTime, true, instructor); @@ -300,12 +309,10 @@ public ResponseEntity updateExamWorkingTime(@PathVariable Long courseId, @ instanceMessageSendService.sendRescheduleAllStudentExams(exam.getId()); } + // NOTE: potentially re-schedule clustering of modeling submissions (in case Compass is active) if (now.isBefore(examDateService.getLatestIndividualExamEndDate(exam))) { - // potentially re-schedule clustering of modeling submissions (in case Compass is active) examService.scheduleModelingExercises(exam); } - - return ResponseEntity.ok(exam); } /** @@ -1307,19 +1314,43 @@ public List getAllExercisesWithPotentialP /** * GET /courses/{courseId}/exams/{examId}/suspicious-sessions : Get all exam sessions that are suspicious for exam. - * For an explanation when a session is suspicious, see {@link ExamSessionService#retrieveAllSuspiciousExamSessionsByExamId(long)} + * For an explanation when a session is suspicious, see {@link ExamSessionService#retrieveAllSuspiciousExamSessionsByExamId(long, SuspiciousSessionsAnalysisOptions, Optional)} * - * @param courseId the id of the course - * @param examId the id of the exam + * @param courseId the id of the course + * @param examId the id of the exam + * @param analyzeSessionsWithTheSameIp whether to analyze for sessions with the same IP address that belong to different student exams + * @param analyzeSessionsWithTheSameBrowserFingerprint whether to analyze sessions with the same browser fingerprint that belong to different student + * exams + * @param analyzeSessionsForTheSameStudentExamWithDifferentIpAddresses whether to analyze sessions with different IP addresses that belong to the same student exam + * @param analyzeSessionsForTheSameStudentExamWithDifferentBrowserFingerprints whether to analyze sessions with different browser fingerprints that belong to the same student + * exam + * @param analyzeSessionsIpOutsideOfRange whether to analyze sessions with IP addresses outside a given subnet + * If this is true, the subnet needs to be provided as a request parameter + * @param ipSubnet the subnet to use for analyzing sessions with IP addresses outside the subnet (optional) * @return a set containing all tuples of exam sessions that are suspicious. */ @GetMapping("courses/{courseId}/exams/{examId}/suspicious-sessions") @EnforceAtLeastInstructor - public Set getAllSuspiciousExamSessions(@PathVariable long courseId, @PathVariable long examId) { + public Set getAllSuspiciousExamSessions(@PathVariable long courseId, @PathVariable long examId, + @RequestParam("differentStudentExamsSameIPAddress") boolean analyzeSessionsWithTheSameIp, + @RequestParam("differentStudentExamsSameBrowserFingerprint") boolean analyzeSessionsWithTheSameBrowserFingerprint, + @RequestParam("sameStudentExamDifferentIPAddresses") boolean analyzeSessionsForTheSameStudentExamWithDifferentIpAddresses, + @RequestParam("sameStudentExamDifferentBrowserFingerprints") boolean analyzeSessionsForTheSameStudentExamWithDifferentBrowserFingerprints, + @RequestParam("ipOutsideOfRange") boolean analyzeSessionsIpOutsideOfRange, @RequestParam(required = false) String ipSubnet) { log.debug("REST request to get all exam sessions that are suspicious for exam : {}", examId); Course course = courseRepository.findByIdElseThrow(courseId); authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, course, null); - return examSessionService.retrieveAllSuspiciousExamSessionsByExamId(examId); + if (analyzeSessionsIpOutsideOfRange) { + if (ipSubnet == null) { + throw new BadRequestAlertException("If you want to analyze sessions with IP outside of range, you need to provide a subnet", ENTITY_NAME, + "missingLowerOrUpperBoundIp"); + } + } + SuspiciousSessionsAnalysisOptions options = new SuspiciousSessionsAnalysisOptions(analyzeSessionsWithTheSameIp, analyzeSessionsWithTheSameBrowserFingerprint, + analyzeSessionsForTheSameStudentExamWithDifferentIpAddresses, analyzeSessionsForTheSameStudentExamWithDifferentBrowserFingerprints, + analyzeSessionsIpOutsideOfRange); + return examSessionService.retrieveAllSuspiciousExamSessionsByExamId(examId, options, Optional.ofNullable(ipSubnet)); + } } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/StudentExamResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/StudentExamResource.java index ae684d3fcce3..fff5e0e73b15 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/StudentExamResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/StudentExamResource.java @@ -771,11 +771,12 @@ public ResponseEntity submitStudentExam(@PathVariable Long courseId if (studentExam.isSubmitted()) { throw new BadRequestException(); } - if (studentExam.getIndividualEndDateWithGracePeriod().isAfter(now())) { - throw new AccessForbiddenException("Exam", examId); + ZonedDateTime submissionTime = now(); + if (studentExam.getIndividualEndDateWithGracePeriod().isAfter(submissionTime)) { + throw new AccessForbiddenException("FORBIDDEN: You tried to toggle a student exam " + studentExamId + " to submitted before the individual end date " + + studentExam.getIndividualEndDateWithGracePeriod()); } - ZonedDateTime submissionTime = now(); studentExam.setSubmissionDate(submissionTime); studentExam.setSubmitted(true); @@ -809,7 +810,8 @@ public ResponseEntity unsubmitStudentExam(@PathVariable Long course throw new BadRequestException(); } if (studentExam.getIndividualEndDateWithGracePeriod().isAfter(now())) { - throw new AccessForbiddenException("Exam", examId); + throw new AccessForbiddenException("FORBIDDEN: You tried to toggle a student exam " + studentExamId + " to unsubmitted before the individual end date " + + studentExam.getIndividualEndDateWithGracePeriod()); } studentExam.setSubmissionDate(null); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java index dae6f829e55f..c59f592b73b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java @@ -53,10 +53,10 @@ public class AdminCourseResource { private final FileService fileService; - private final OnlineCourseConfigurationService onlineCourseConfigurationService; + private final Optional onlineCourseConfigurationService; public AdminCourseResource(UserRepository userRepository, CourseService courseService, CourseRepository courseRepository, AuditEventRepository auditEventRepository, - FileService fileService, OnlineCourseConfigurationService onlineCourseConfigurationService, ChannelService channelService) { + FileService fileService, Optional onlineCourseConfigurationService, ChannelService channelService) { this.courseService = courseService; this.courseRepository = courseRepository; this.auditEventRepository = auditEventRepository; @@ -117,8 +117,8 @@ public ResponseEntity createCourse(@RequestPart Course course, @RequestP course.validateAccuracyOfScores(); course.validateStartAndEndDate(); - if (course.isOnlineCourse()) { - onlineCourseConfigurationService.createOnlineCourseConfiguration(course); + if (course.isOnlineCourse() && onlineCourseConfigurationService.isPresent()) { + onlineCourseConfigurationService.get().createOnlineCourseConfiguration(course); } courseService.createOrValidateGroups(course); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisSessionResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisSessionResource.java index 6d80df7a6874..0d35f8481fd0 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisSessionResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/iris/IrisSessionResource.java @@ -145,9 +145,9 @@ public ResponseEntity isIrisActive(@PathVariable Long sessionId) var rateLimitInfo = irisRateLimitService.getRateLimitInformation(user); - return ResponseEntity.ok(new IrisHealthDTO(specificModelStatus, rateLimitInfo.currentMessageCount(), rateLimitInfo.rateLimit())); + return ResponseEntity.ok(new IrisHealthDTO(specificModelStatus, rateLimitInfo)); } - public record IrisHealthDTO(boolean active, int currentMessageCount, int rateLimit) { + public record IrisHealthDTO(boolean active, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo) { } } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/OpenBuildPlanResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicBuildPlanResource.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/OpenBuildPlanResource.java rename to src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicBuildPlanResource.java index 092952d1636a..7ac09c330947 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/OpenBuildPlanResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicBuildPlanResource.java @@ -16,13 +16,13 @@ @Profile("gitlabci | jenkins") @RestController @RequestMapping("api/public/") -public class OpenBuildPlanResource { +public class PublicBuildPlanResource { private final Logger log = LoggerFactory.getLogger(getClass()); private final BuildPlanRepository buildPlanRepository; - public OpenBuildPlanResource(BuildPlanRepository buildPlanRepository) { + public PublicBuildPlanResource(BuildPlanRepository buildPlanRepository) { this.buildPlanRepository = buildPlanRepository; } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/OAuth2JWKSResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java similarity index 81% rename from src/main/java/de/tum/in/www1/artemis/web/rest/OAuth2JWKSResource.java rename to src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java index 3c94e688b4d5..ae0437801c6a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/OAuth2JWKSResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicOAuth2JWKSResource.java @@ -1,5 +1,6 @@ -package de.tum.in.www1.artemis.web.rest; +package de.tum.in.www1.artemis.web.rest.open; +import org.springframework.context.annotation.Profile; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -15,11 +16,12 @@ * REST controller to serve the public JWKSet related to all OAuth2 clients. */ @RestController -public class OAuth2JWKSResource { +@Profile("lti") +public class PublicOAuth2JWKSResource { private final OAuth2JWKSService jwksService; - public OAuth2JWKSResource(OAuth2JWKSService jwksService) { + public PublicOAuth2JWKSResource(OAuth2JWKSService jwksService) { this.jwksService = jwksService; } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicProgrammingSubmissionResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicProgrammingSubmissionResource.java index dd51e9e63b9b..2a41f0202336 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicProgrammingSubmissionResource.java @@ -80,9 +80,10 @@ public ResponseEntity processNewProgrammingSubmission(@PathVariable("parti // Therefore, a mock auth object has to be created. SecurityUtils.setAuthorizationObject(); - Participation participation = participationRepository.findByIdWithLegalSubmissionsElseThrow(participationId); + Participation participation = participationRepository.findByIdWithSubmissionsElseThrow(participationId); if (!(participation instanceof ProgrammingExerciseParticipation programmingExerciseParticipation)) { - throw new EntityNotFoundException("Programming Exercise Participation", participationId); + throw new BadRequestAlertException("The referenced participation " + participationId + " is not of type ProgrammingExerciseParticipation", "ProgrammingSubmission", + "participationWrongType"); } ProgrammingSubmission newProgrammingSubmission = programmingSubmissionService.processNewProgrammingSubmission(programmingExerciseParticipation, requestBody); @@ -106,8 +107,11 @@ public ResponseEntity processNewProgrammingSubmission(@PathVariable("parti return ResponseEntity.status(HttpStatus.OK).build(); } catch (EntityNotFoundException ex) { - log.error("Participation with id {} is not a ProgrammingExerciseParticipation: processing submission for participation {} failed with request body {}", participationId, - participationId, requestBody, ex); + log.error("Participation with id {} not found: processing submission failed for request body {}", participationId, requestBody, ex); + throw ex; + } + catch (BadRequestAlertException ex) { + log.error("Participation with id {} is not a ProgrammingExerciseParticipation: processing submission failed for request body {}", participationId, requestBody, ex); throw ex; } catch (VersionControlException ex) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/TimeResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicTimeResource.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/TimeResource.java rename to src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicTimeResource.java index 6b364cdefca4..e4cf8fe7fa21 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/TimeResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicTimeResource.java @@ -11,7 +11,7 @@ @RestController @RequestMapping("api/public/") -public class TimeResource { +public class PublicTimeResource { /** * {@code GET /time}: diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/UserJwtResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicUserJwtResource.java similarity index 95% rename from src/main/java/de/tum/in/www1/artemis/web/rest/open/UserJwtResource.java rename to src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicUserJwtResource.java index d312d82b2dab..d194f9ff8755 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/UserJwtResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicUserJwtResource.java @@ -35,9 +35,9 @@ */ @RestController @RequestMapping("api/public/") -public class UserJwtResource { +public class PublicUserJwtResource { - private final Logger log = LoggerFactory.getLogger(UserJwtResource.class); + private final Logger log = LoggerFactory.getLogger(PublicUserJwtResource.class); private final JWTCookieService jwtCookieService; @@ -45,7 +45,7 @@ public class UserJwtResource { private final Optional saml2Service; - public UserJwtResource(JWTCookieService jwtCookieService, AuthenticationManagerBuilder authenticationManagerBuilder, Optional saml2Service) { + public PublicUserJwtResource(JWTCookieService jwtCookieService, AuthenticationManagerBuilder authenticationManagerBuilder, Optional saml2Service) { this.jwtCookieService = jwtCookieService; this.authenticationManagerBuilder = authenticationManagerBuilder; this.saml2Service = saml2Service; diff --git a/src/main/resources/config/liquibase/changelog/20230922222222_changelog.xml b/src/main/resources/config/liquibase/changelog/20230922222222_changelog.xml new file mode 100644 index 000000000000..fbc5184d957b --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20230922222222_changelog.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 2d7584cbf99f..a387a1af2d6f 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -61,6 +61,7 @@ + diff --git a/src/main/resources/templates/java/maven_blackbox/solution/src/${packageNameFolder}/Client.java b/src/main/resources/templates/java/maven_blackbox/solution/src/${packageNameFolder}/Client.java index d2bb7a3b8799..38c971afe5dd 100644 --- a/src/main/resources/templates/java/maven_blackbox/solution/src/${packageNameFolder}/Client.java +++ b/src/main/resources/templates/java/maven_blackbox/solution/src/${packageNameFolder}/Client.java @@ -38,11 +38,17 @@ public static void main(String[] args) throws IOException { private static CommandRunResult runCommand(final Command command) { switch (command) { - case Command.AddCommand addCommand -> CONTEXT.addDates(addCommand.dates()); + case Command.AddCommand addCommand -> { + CONTEXT.addDates(addCommand.dates()); + } case Command.SortCommand ignored -> CONTEXT.sort(); case Command.ClearCommand ignored -> CONTEXT.clearDates(); - case Command.HelpCommand helpCommand -> System.out.println(helpCommand.helpMessage()); - case Command.PrintCommand ignored -> System.out.println(CONTEXT.getDates()); + case Command.HelpCommand helpCommand -> { + System.out.println(helpCommand.helpMessage()); + } + case Command.PrintCommand ignored -> { + System.out.println(CONTEXT.getDates()); + } case Command.QuitCommand ignored -> { return CommandRunResult.QUIT; } diff --git a/src/main/webapp/app/core/auth/account.service.ts b/src/main/webapp/app/core/auth/account.service.ts index 810d930794ec..9c752ad9b211 100644 --- a/src/main/webapp/app/core/auth/account.service.ts +++ b/src/main/webapp/app/core/auth/account.service.ts @@ -59,9 +59,13 @@ export class AccountService implements IAccountService { // We only subscribe the feature toggle updates when the user is logged in, otherwise we unsubscribe them. if (user) { this.websocketService.enableReconnect(); + this.websocketService.connect(); this.featureToggleService.subscribeFeatureToggleUpdates(); } else { this.websocketService.disableReconnect(); + if (this.websocketService.isConnected()) { + this.websocketService.disconnect(); + } this.featureToggleService.unsubscribeFeatureToggleUpdates(); } } @@ -141,7 +145,6 @@ export class AccountService implements IAccountService { map((response: HttpResponse) => { const user = response.body!; if (user) { - this.websocketService.connect(); this.userIdentity = user; // improved error tracking in sentry @@ -157,10 +160,6 @@ export class AccountService implements IAccountService { return this.userIdentity; }), catchError(() => { - // this will be called during logout - if (this.websocketService.isConnected()) { - this.websocketService.disconnect(); - } this.userIdentity = undefined; return of(undefined); }), diff --git a/src/main/webapp/app/core/theme/theme.service.ts b/src/main/webapp/app/core/theme/theme.service.ts index 660877215912..a6fa87c0c01a 100644 --- a/src/main/webapp/app/core/theme/theme.service.ts +++ b/src/main/webapp/app/core/theme/theme.service.ts @@ -149,19 +149,28 @@ export class ThemeService { /** * Prints the current page. * Disables any theme override before doing that to ensure that we print in default theme. - * Resets the theme afterwards if needed + * Resets the theme afterward if needed */ - public print() { - const overrideTag: any = document.getElementById(THEME_OVERRIDE_ID); - if (overrideTag) { - overrideTag.rel = 'none-tmp'; - } - setTimeout(() => window.print(), 250); - setTimeout(() => { + public async print(): Promise { + return new Promise((resolve) => { + const overrideTag: any = document.getElementById(THEME_OVERRIDE_ID); if (overrideTag) { - overrideTag.rel = 'stylesheet'; + overrideTag.rel = 'none-tmp'; } - }, 500); + setTimeout(() => { + const notificationSidebarDisplayAttribute = this.hideNotificationSidebar(); + + window.print(); + + this.showNotificationSidebar(notificationSidebarDisplayAttribute); + }, 250); + setTimeout(() => { + if (overrideTag) { + overrideTag.rel = 'stylesheet'; + } + resolve(); + }, 500); + }); } /** @@ -235,4 +244,39 @@ export class ThemeService { this.preferenceSubject.next(theme); } } + + /** + * Hides the notification sidebar as there will be an overlay ove the whole page + * that covers details of the exam summary (=> exam summary cannot be read). + * + * @return displayAttribute of the notification sidebar before hiding it + */ + private hideNotificationSidebar(): string { + return this.modifyNotificationSidebarDisplayStyling(); + } + + /** + * After printing the notification sidebar shall be displayed again. + * + * @param displayAttributeBeforeHide to reset the notification sidebar to its previous state + * @return displayAttribute of the notification sidebar before hiding it + */ + private showNotificationSidebar(displayAttributeBeforeHide: string): string { + return this.modifyNotificationSidebarDisplayStyling(displayAttributeBeforeHide); + } + + /** + * @param newDisplayAttribute that is set for the {@link NotificationSidebarComponent} + * @return displayAttribute of the notification sidebar before hiding it + */ + private modifyNotificationSidebarDisplayStyling(newDisplayAttribute?: string): string { + const notificationSidebarElement: any = document.getElementById('notification-sidebar'); + let displayBefore = ''; + + if (notificationSidebarElement) { + displayBefore = notificationSidebarElement.style.display; + notificationSidebarElement.style.display = newDisplayAttribute !== undefined ? newDisplayAttribute : 'none'; + } + return displayBefore; + } } diff --git a/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.ts b/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.ts index b700b643d025..e3f890c4be1f 100644 --- a/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.ts +++ b/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.ts @@ -218,7 +218,7 @@ export class PlagiarismCaseInstructorDetailViewComponent implements OnInit, OnDe /** * Prints the whole page using the theme service */ - printPlagiarismCase(): void { - this.themeService.print(); + async printPlagiarismCase() { + return await this.themeService.print(); } } diff --git a/src/main/webapp/app/entities/exam-session.model.ts b/src/main/webapp/app/entities/exam-session.model.ts index a528a4b0a45d..feb4670ac5c9 100644 --- a/src/main/webapp/app/entities/exam-session.model.ts +++ b/src/main/webapp/app/entities/exam-session.model.ts @@ -3,8 +3,12 @@ import dayjs from 'dayjs/esm'; import { StudentExam } from './student-exam.model'; export enum SuspiciousSessionReason { - SAME_IP_ADDRESS = 'SAME_IP_ADDRESS', - SAME_BROWSER_FINGERPRINT = 'SAME_BROWSER_FINGERPRINT', + DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS = 'DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS', + DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT = 'DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT', + + SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES = 'SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES', + SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS = 'SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS', + IP_ADDRESS_OUTSIDE_OF_RANGE = 'IP_ADDRESS_OUTSIDE_OF_RANGE', } export class ExamSession implements BaseEntity { public id?: number; @@ -19,9 +23,32 @@ export class ExamSession implements BaseEntity { public lastModifiedBy?: string; public createdDate?: dayjs.Dayjs; public lastModifiedDate?: Date; - public suspiciousReasons: SuspiciousSessionReason[] = []; + public suspiciousReasons: SuspiciousSessionReason[]; } export class SuspiciousExamSessions { - examSessions: ExamSession[] = []; + examSessions: ExamSession[]; +} +export class SuspiciousSessionsAnalysisOptions { + constructor( + sameIpAddressDifferentStudentExams: boolean, + sameBrowserFingerprintDifferentStudentExams: boolean, + differentIpAddressesSameStudentExam: boolean, + differentBrowserFingerprintsSameStudentExam: boolean, + ipAddressOutsideOfRange: boolean, + subnet?: string, + ) { + this.sameIpAddressDifferentStudentExams = sameIpAddressDifferentStudentExams; + this.sameBrowserFingerprintDifferentStudentExams = sameBrowserFingerprintDifferentStudentExams; + this.differentIpAddressesSameStudentExam = differentIpAddressesSameStudentExam; + this.differentBrowserFingerprintsSameStudentExam = differentBrowserFingerprintsSameStudentExam; + this.ipAddressOutsideOfRange = ipAddressOutsideOfRange; + this.ipSubnet = subnet; + } + sameIpAddressDifferentStudentExams = false; + sameBrowserFingerprintDifferentStudentExams = false; + differentIpAddressesSameStudentExam = false; + differentBrowserFingerprintsSameStudentExam = false; + ipAddressOutsideOfRange = false; + ipSubnet?: string; } diff --git a/src/main/webapp/app/entities/iris/settings/iris-sub-settings.model.ts b/src/main/webapp/app/entities/iris/settings/iris-sub-settings.model.ts index e436e7b3427b..aa2981af0411 100644 --- a/src/main/webapp/app/entities/iris/settings/iris-sub-settings.model.ts +++ b/src/main/webapp/app/entities/iris/settings/iris-sub-settings.model.ts @@ -6,4 +6,6 @@ export class IrisSubSettings implements BaseEntity { enabled = false; template?: IrisTemplate; preferredModel?: string; + rateLimit?: number; + rateLimitTimeframeHours?: number; } diff --git a/src/main/webapp/app/entities/quiz/quiz-configuration.model.ts b/src/main/webapp/app/entities/quiz/quiz-configuration.model.ts new file mode 100644 index 000000000000..675374f7d56a --- /dev/null +++ b/src/main/webapp/app/entities/quiz/quiz-configuration.model.ts @@ -0,0 +1,13 @@ +import { QuizQuestion } from 'app/entities/quiz/quiz-question.model'; +import { IncludedInOverallScore } from 'app/entities/exercise.model'; +import { ExerciseGroup } from 'app/entities/exercise-group.model'; + +export interface QuizConfiguration { + id?: number; + exerciseGroup?: ExerciseGroup; + quizQuestions?: QuizQuestion[]; + randomizeQuestionOrder?: boolean; + title?: string; + maxPoints?: number; + includedInOverallScore?: IncludedInOverallScore; +} diff --git a/src/main/webapp/app/entities/quiz/quiz-exercise.model.ts b/src/main/webapp/app/entities/quiz/quiz-exercise.model.ts index b1cbb3261cf8..247aa6f9b11c 100644 --- a/src/main/webapp/app/entities/quiz/quiz-exercise.model.ts +++ b/src/main/webapp/app/entities/quiz/quiz-exercise.model.ts @@ -4,6 +4,8 @@ import { QuizPointStatistic } from 'app/entities/quiz/quiz-point-statistic.model import { QuizQuestion } from 'app/entities/quiz/quiz-question.model'; import { Course } from 'app/entities/course.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; +import { QuizConfiguration } from 'app/entities/quiz/quiz-configuration.model'; +import { QuizParticipation } from 'app/entities/quiz/quiz-participation.model'; export enum QuizStatus { CLOSED, @@ -31,7 +33,7 @@ export class QuizBatch { startTimeError?: boolean; } -export class QuizExercise extends Exercise { +export class QuizExercise extends Exercise implements QuizConfiguration, QuizParticipation { public visibleToStudents?: boolean; // (computed by server) public allowedNumberOfAttempts?: number; public remainingNumberOfAttempts?: number; diff --git a/src/main/webapp/app/entities/quiz/quiz-participation.model.ts b/src/main/webapp/app/entities/quiz/quiz-participation.model.ts new file mode 100644 index 000000000000..64540fc801b6 --- /dev/null +++ b/src/main/webapp/app/entities/quiz/quiz-participation.model.ts @@ -0,0 +1,7 @@ +import { QuizQuestion } from 'app/entities/quiz/quiz-question.model'; +import { StudentParticipation } from 'app/entities/participation/student-participation.model'; + +export interface QuizParticipation { + quizQuestions?: QuizQuestion[]; + studentParticipations?: StudentParticipation[]; +} diff --git a/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts b/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts index 0b35c150992e..49a8462bc98d 100644 --- a/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts +++ b/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts @@ -8,6 +8,27 @@ import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; import { Observable, filter, map, of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; +import { Course } from 'app/entities/course.model'; +import { CourseManagementService } from 'app/course/manage/course-management.service'; +import { catchError } from 'rxjs/operators'; + +@Injectable({ providedIn: 'root' }) +export class CourseResolve implements Resolve { + constructor(private courseManagementService: CourseManagementService) {} + + resolve(route: ActivatedRouteSnapshot): Observable { + const courseId = route.params['courseId']; + + if (courseId) { + return this.courseManagementService.find(courseId).pipe( + map((response) => response.body), + catchError(() => of(null)), + ); + } + + return of(null); + } +} @Injectable({ providedIn: 'root' }) export class ExamResolve implements Resolve { diff --git a/src/main/webapp/app/exam/manage/exam-management.route.ts b/src/main/webapp/app/exam/manage/exam-management.route.ts index cf7b396060f0..5d9b09e74882 100644 --- a/src/main/webapp/app/exam/manage/exam-management.route.ts +++ b/src/main/webapp/app/exam/manage/exam-management.route.ts @@ -53,7 +53,7 @@ import { OrionTutorAssessmentComponent } from 'app/orion/assessment/orion-tutor- import { isOrion } from 'app/shared/orion/orion'; import { FileUploadExerciseManagementResolve } from 'app/exercises/file-upload/manage/file-upload-exercise-management-resolve.service'; import { ModelingExerciseResolver } from 'app/exercises/modeling/manage/modeling-exercise-resolver.service'; -import { ExamResolve, ExerciseGroupResolve, StudentExamResolve } from 'app/exam/manage/exam-management-resolve.service'; +import { CourseResolve, ExamResolve, ExerciseGroupResolve, StudentExamResolve } from 'app/exam/manage/exam-management-resolve.service'; import { BonusComponent } from 'app/grading-system/bonus/bonus.component'; import { SuspiciousBehaviorComponent } from 'app/exam/manage/suspicious-behavior/suspicious-behavior.component'; import { SuspiciousSessionsOverviewComponent } from 'app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component'; @@ -73,6 +73,7 @@ export const examManagementRoute: Routes = [ component: ExamUpdateComponent, resolve: { exam: ExamResolve, + course: CourseResolve, }, data: { authorities: [Authority.INSTRUCTOR, Authority.ADMIN], @@ -85,6 +86,7 @@ export const examManagementRoute: Routes = [ component: ExamUpdateComponent, resolve: { exam: ExamResolve, + course: CourseResolve, }, data: { authorities: [Authority.INSTRUCTOR, Authority.ADMIN], @@ -113,6 +115,7 @@ export const examManagementRoute: Routes = [ component: ExamUpdateComponent, resolve: { exam: ExamResolve, + course: CourseResolve, }, data: { authorities: [Authority.INSTRUCTOR, Authority.ADMIN], diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.html index 36e7d8210cbb..f1847f493456 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.html @@ -11,16 +11,14 @@

name="workingTimeSeconds" durationLabelText="artemisApp.examManagement.editWorkingTime.label" [(ngModel)]="workingTimeSeconds" + [allowNegative]="true" [showRelative]="false" [disabled]="isLoading" /> + -

+
+
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts index c0f8a231564d..277be237f86d 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts @@ -1,12 +1,11 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; import { HttpResponse } from '@angular/common/http'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { faBan, faCheck, faSpinner } from '@fortawesome/free-solid-svg-icons'; import { Exam } from 'app/entities/exam.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { normalWorkingTime } from 'app/exam/participate/exam.utils'; -import dayjs from 'dayjs/esm'; +import { examWorkingTime } from 'app/exam/participate/exam.utils'; @Component({ selector: 'jhi-edit-working-time-dialog', @@ -27,11 +26,12 @@ export class ExamEditWorkingTimeDialogComponent { workingTimeSeconds = 0; - get absoluteWorkingTimeDuration() { - const currentWorkingTimeSeconds = normalWorkingTime(this.exam); - if (!currentWorkingTimeSeconds) return undefined; - const duration = dayjs.duration(currentWorkingTimeSeconds + this.workingTimeSeconds, 'seconds'); - return [duration.asHours() >= 1 ? `${Math.floor(duration.asHours())} h` : null, duration.format('m [min] s [s]')].filter(Boolean).join(' '); + get oldWorkingTime() { + return examWorkingTime(this.exam); + } + + get newWorkingTime() { + return this.oldWorkingTime ? this.oldWorkingTime + this.workingTimeSeconds : undefined; } constructor( diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts index ba39fe36298d..c64acade7caf 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts @@ -5,8 +5,8 @@ import dayjs from 'dayjs/esm'; import { Subscription, from } from 'rxjs'; import { Exam } from 'app/entities/exam.model'; -import { ExamEditWorkingTimeDialogComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component'; import { AlertService } from 'app/core/util/alert.service'; +import { ExamEditWorkingTimeDialogComponent } from './exam-edit-working-time-dialog.component'; @Component({ selector: 'jhi-exam-edit-working-time', diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.html b/src/main/webapp/app/exam/manage/exams/exam-update.component.html index fb31d85cb749..9317415ad0dd 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-update.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.html @@ -1,6 +1,6 @@
-
+

{{ 'artemisApp.examManagement.createExam' | artemisTranslate }}

{{ 'artemisApp.examManagement.importExam' | artemisTranslate }}

@@ -56,6 +56,19 @@
Exam Conduction
+
+ + + + Changing the times of an active exam will disrupt the workflow of the students! + + +
+ +
+ +
+
Ex labelTooltip="{{ 'artemisApp.examManagement.visibleDateTooltip' | artemisTranslate }}" [(ngModel)]="exam.visibleDate" [error]="!isValidVisibleDate" + [startAt]="exam.visibleDate" name="visibleDate" id="visibleDate" - > + />
+ />
+ />
- + Ex [customMin]="1" [customMax]="maxWorkingTimeInMinutes" [(ngModel)]="workingTimeInMinutes" - (change)="convertWorkingTimeFromMinutesToSeconds($event)" />
@@ -230,7 +245,7 @@
Exam Tex
-
diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts index 0997d8694461..55642d60eb60 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts @@ -1,42 +1,45 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import dayjs from 'dayjs/esm'; +import { omit } from 'lodash-es'; +import { combineLatest, takeWhile } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { faBan, faExclamationTriangle, faSave } from '@fortawesome/free-solid-svg-icons'; + import { Exam } from 'app/entities/exam.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { Observable } from 'rxjs'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { AlertService } from 'app/core/util/alert.service'; import { Course, isMessagingEnabled } from 'app/entities/course.model'; -import { CourseManagementService } from 'app/course/manage/course-management.service'; -import dayjs from 'dayjs/esm'; import { onError } from 'app/shared/util/global.utils'; import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils'; -import { faBan, faCheckDouble, faExclamationTriangle, faFont, faSave } from '@fortawesome/free-solid-svg-icons'; -import { tap } from 'rxjs/operators'; -import { ExerciseType } from 'app/entities/exercise.model'; import { ExamExerciseImportComponent } from 'app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component'; -import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; +import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; +import { examWorkingTime, normalWorkingTime } from 'app/exam/participate/exam.utils'; @Component({ selector: 'jhi-exam-update', templateUrl: './exam-update.component.html', }) -export class ExamUpdateComponent implements OnInit { +export class ExamUpdateComponent implements OnInit, OnDestroy { exam: Exam; course: Course; isSaving: boolean; - // The exam.workingTime is stored in seconds, but the working time should be displayed in minutes to the user - workingTimeInMinutes: number; - // The maximum working time in Minutes (used as a dynamic max-value for the working time Input) - maxWorkingTimeInMinutes: number; isImport = false; isImportInSameCourse = false; hideChannelNameInput = false; - // Expose enums to the template - exerciseType = ExerciseType; + private originalStartDate?: dayjs.Dayjs; + private originalEndDate?: dayjs.Dayjs; + + private componentActive = true; + // Link to the component enabling the selection of exercise groups and exercises for import @ViewChild(ExamExerciseImportComponent) examExerciseImportComponent: ExamExerciseImportComponent; + @ViewChild('workingTimeConfirmationContent') public workingTimeConfirmationContent: TemplateRef; documentationType = DocumentationType.Exams; @@ -44,99 +47,178 @@ export class ExamUpdateComponent implements OnInit { faSave = faSave; faBan = faBan; faExclamationTriangle = faExclamationTriangle; - faCheckDouble = faCheckDouble; - faFont = faFont; - - readonly FeatureToggle = FeatureToggle; constructor( private route: ActivatedRoute, private examManagementService: ExamManagementService, private alertService: AlertService, - private courseManagementService: CourseManagementService, private navigationUtilService: ArtemisNavigationUtilService, + private modalService: NgbModal, private router: Router, + private artemisTranslatePipe: ArtemisTranslatePipe, ) {} ngOnInit(): void { - this.route.data.subscribe(({ exam }) => { - this.exam = exam; + combineLatest([this.route.url, this.route.data]) + .pipe(takeWhile(() => this.componentActive)) + .subscribe(([segments, data]) => { + const isImport = segments.some(({ path }) => path === 'import'); + const exam: Exam = isImport ? prepareExamForImport(data.exam) : data.exam; + + if (!exam.gracePeriod) { + exam.gracePeriod = 180; + } - // Tap the URL to determine, if the Exam should be imported - this.route.url.pipe(tap((segments) => (this.isImport = segments.some((segment) => segment.path === 'import')))).subscribe(); + // test exam only feature automatic assessment + if (exam.testExam) { + exam.numberOfCorrectionRoundsInExam = 0; + } else if (!exam.numberOfCorrectionRoundsInExam) { + exam.numberOfCorrectionRoundsInExam = 1; + } - if (this.isImport) { - this.resetIdAndDatesForImport(); - this.isImportInSameCourse = this.exam.course?.id === Number(this.route.snapshot.paramMap.get('courseId')); - } + this.exam = exam; + this.isImport = isImport; + this.isImportInSameCourse = isImport && exam.course?.id === data.course.id; + this.originalStartDate = exam.startDate?.clone(); + this.originalEndDate = exam.endDate?.clone(); - this.courseManagementService.find(Number(this.route.snapshot.paramMap.get('courseId'))).subscribe({ - next: (response: HttpResponse) => { - this.exam.course = response.body!; - this.course = response.body!; - this.hideChannelNameInput = (exam.id !== undefined && exam.channelName === undefined) || !isMessagingEnabled(this.course); - }, - error: (err: HttpErrorResponse) => onError(this.alertService, err), + this.course = data.course; + this.exam.course = data.course; + this.hideChannelNameInput = (!!exam.id && !exam.channelName) || !isMessagingEnabled(this.course); }); + } - if (!this.exam.gracePeriod) { - this.exam.gracePeriod = 180; - } - // test exam only feature automatic assessment - if (this.exam.testExam) { - this.exam.numberOfCorrectionRoundsInExam = 0; - } else if (!this.exam.numberOfCorrectionRoundsInExam) { - this.exam.numberOfCorrectionRoundsInExam = 1; - } - }); - // Initialize helper attributes - this.workingTimeInMinutes = this.exam.workingTime! / 60; - this.calculateMaxWorkingTime(); + ngOnDestroy() { + this.componentActive = false; + } + + /** + * Sets the exam working time in minutes. + * @param minutes + */ + set workingTimeInMinutes(minutes: number) { + this.exam.workingTime = minutes * 60; + } + + /** + * Returns the exam working time in minutes. + */ + get workingTimeInMinutes(): number { + return this.exam.workingTime ? this.exam.workingTime / 60 : 0; + } + + get oldWorkingTime(): number | undefined { + return normalWorkingTime(this.originalStartDate, this.originalEndDate); + } + + get newWorkingTime(): number | undefined { + return this.exam.workingTime; } /** * Revert to the previous state, equivalent with pressing the back button on your browser - * Returns to the detail page if there is no previous state and we edited an existing exam - * Returns to the overview page if there is no previous state and we created a new exam + * Returns to the detail page if there is no previous state, and we edited an existing exam + * Returns to the overview page if there is no previous state, and we created a new exam */ - previousState() { + resetToPreviousState() { this.navigationUtilService.navigateBackWithOptional(['course-management', this.course.id!.toString(), 'exams'], this.exam.id?.toString()); } + /** + * Updates the working time for real exams based on the start and end dates. + */ + updateExamWorkingTime() { + if (this.exam.testExam) return; + + this.exam.workingTime = examWorkingTime(this.exam) ?? 0; + } + + /** + * Returns the maximum working time in minutes for test exams. + */ + get maxWorkingTimeInMinutes(): number { + if (!this.exam.testExam) return 0; + + if (this.exam.startDate && this.exam.endDate) { + return dayjs(this.exam.endDate).diff(this.exam.startDate, 'm'); + } else { + // In case of an import, the exam.workingTime is imported, but the start / end date are deleted -> no error should be shown to the user in this case + return this.isImport ? this.workingTimeInMinutes : 0; + } + } + + /** + * Saves the exam. If the dates have changed and the exam is ongoing, a confirmation modal is shown to the user. + * If either the user confirms the modal, the exam is not ongoing or the dates have not changed, the exam is saved. + */ + handleSubmit() { + const datesChanged = !(this.exam.startDate?.isSame(this.originalStartDate) && this.exam.endDate?.isSame(this.originalEndDate)); + + if (datesChanged && this.isOngoingExam) { + const modalRef = this.modalService.open(ConfirmAutofocusModalComponent, { keyboard: true, size: 'lg' }); + modalRef.componentInstance.title = 'artemisApp.examManagement.dateChange.title'; + modalRef.componentInstance.text = this.artemisTranslatePipe.transform('artemisApp.examManagement.dateChange.message'); + modalRef.componentInstance.contentRef = this.workingTimeConfirmationContent; + modalRef.result.then(this.save.bind(this)); + } else { + this.save(); + } + } + + /** + * Saves the exam and navigates to the detail page of the exam if the save was successful. + * If the save was not successful, an error is shown to the user. + */ save() { this.isSaving = true; - if (this.isImport) { + this.createOrUpdateOrImportExam() + ?.pipe( + map((response: HttpResponse) => response.body!), + takeWhile(() => this.componentActive), + ) + .subscribe({ + next: this.onSaveSuccess.bind(this), + error: this.onSaveError.bind(this), + }); + } + + /** + * Creates, updates or imports the exam depending on the current state of the component. + * @private + */ + private createOrUpdateOrImportExam() { + if (this.isImport && this.exam?.exerciseGroups) { // We validate the user input for the exercise group selection here, so it is only called once the user desires to import the exam - if (this.exam?.exerciseGroups) { - if (!this.examExerciseImportComponent.validateUserInput()) { - this.alertService.error('artemisApp.examManagement.exerciseGroup.importModal.invalidExerciseConfiguration'); - this.isSaving = false; - return; - } - this.exam.exerciseGroups = this.examExerciseImportComponent.mapSelectedExercisesToExerciseGroups(); + if (!this.examExerciseImportComponent.validateUserInput()) { + this.alertService.error('artemisApp.examManagement.exerciseGroup.importModal.invalidExerciseConfiguration'); + this.isSaving = false; + return; } - this.subscribeToSaveResponse(this.examManagementService.import(this.course.id!, this.exam)); - } else if (this.exam.id !== undefined) { - this.subscribeToSaveResponse(this.examManagementService.update(this.course.id!, this.exam)); + return this.examManagementService.import(this.course.id!, this.exam); + } else if (this.exam.id) { + return this.examManagementService.update(this.course.id!, this.exam); } else { - this.subscribeToSaveResponse(this.examManagementService.create(this.course.id!, this.exam)); + return this.examManagementService.create(this.course.id!, this.exam); } } - subscribeToSaveResponse(result: Observable>) { - result.subscribe({ - next: (response: HttpResponse) => this.onSaveSuccess(response.body!), - error: (err: HttpErrorResponse) => this.onSaveError(err), - }); - } - - private onSaveSuccess(exam: Exam) { + /** + * Navigates to the detail page of the exam if the save was successful. + * @param exam + * @private + */ + private async onSaveSuccess(exam: Exam) { this.isSaving = false; - this.router.navigate(['course-management', this.course.id, 'exams', exam.id]); + await this.router.navigate(['course-management', this.course.id, 'exams', exam.id]); window.scrollTo(0, 0); } + /** + * Shows an error to the user if the save was not successful. + * @param httpErrorResponse + * @private + */ private onSaveError(httpErrorResponse: HttpErrorResponse) { const errorKey = httpErrorResponse.error?.errorKey; if (errorKey === 'invalidKey') { @@ -159,6 +241,13 @@ export class ExamUpdateComponent implements OnInit { this.isSaving = false; } + /** + * Returns true if the original exam is currently ongoing before any changes, false otherwise. + */ + get isOngoingExam(): boolean { + return !!(this.exam.id && this.originalStartDate && this.originalEndDate && dayjs().isBetween(this.originalStartDate, this.originalEndDate)); + } + get isValidConfiguration(): boolean { const examConductionDatesValid = this.isValidVisibleDate && this.isValidStartDate && this.isValidEndDate; const examReviewDatesValid = this.isValidPublishResultsDate && this.isValidExamStudentReviewStart && this.isValidExamStudentReviewEnd; @@ -177,7 +266,7 @@ export class ExamUpdateComponent implements OnInit { } get isValidVisibleDate(): boolean { - return this.exam.visibleDate !== undefined; + return !!this.exam.visibleDate; } get isValidNumberOfCorrectionRounds(): boolean { @@ -190,7 +279,7 @@ export class ExamUpdateComponent implements OnInit { } get isValidMaxPoints(): boolean { - return this.exam?.examMaxPoints !== undefined && this.exam?.examMaxPoints > 0; + return !!this.exam?.examMaxPoints && this.exam?.examMaxPoints > 0; } /** @@ -199,9 +288,8 @@ export class ExamUpdateComponent implements OnInit { * For test exams, the visibleDate has to be prior or equal to the startDate. */ get isValidStartDate(): boolean { - if (this.exam.startDate === undefined) { - return false; - } + if (!this.exam.startDate) return false; + if (this.exam.testExam) { return dayjs(this.exam.startDate).isSameOrAfter(this.exam.visibleDate); } else { @@ -213,22 +301,7 @@ export class ExamUpdateComponent implements OnInit { * Validates the EndDate inputted by the user. */ get isValidEndDate(): boolean { - return this.exam.endDate !== undefined && dayjs(this.exam.endDate).isAfter(this.exam.startDate); - } - - /** - * Calculates the WorkingTime for real exams based on the start- and end-time. - */ - get calculateWorkingTime(): number { - if (!this.exam.testExam) { - if (this.exam.startDate && this.exam.endDate) { - this.exam.workingTime = dayjs(this.exam.endDate).diff(this.exam.startDate, 's'); - } else { - this.exam.workingTime = 0; - } - this.workingTimeInMinutes = this.exam.workingTime / 60; - } - return this.workingTimeInMinutes; + return !!this.exam.endDate && dayjs(this.exam.endDate).isAfter(this.exam.startDate); } /** @@ -252,38 +325,13 @@ export class ExamUpdateComponent implements OnInit { return false; } - /** - * Used to convert workingTimeInMinutes into exam.workingTime (in seconds) every time, the user inputs a new - * working time for a test exam - * @param event when the user inputs a new working time - */ - convertWorkingTimeFromMinutesToSeconds(event: any) { - this.workingTimeInMinutes = event.target.value; - this.exam.workingTime = this.workingTimeInMinutes * 60; - } - - /** - * Used to determine the maximum working time every time, the user changes the start- or endDate. - * Used to show a graphical warning at the working time input field - */ - calculateMaxWorkingTime() { - if (this.exam.testExam) { - if (this.exam.startDate && this.exam.endDate) { - this.maxWorkingTimeInMinutes = dayjs(this.exam.endDate).diff(this.exam.startDate, 's') / 60; - } else { - // In case of an import, the exam.workingTime is imported, but the start / end date are deleted -> no error should be shown to the user in this case - this.maxWorkingTimeInMinutes = this.isImport ? this.workingTimeInMinutes : 0; - } - } - } - get isValidPublishResultsDate(): boolean { // allow instructors to set publishResultsDate later if (!this.exam.publishResultsDate) { return true; } // check for undefined because undefined is otherwise treated as the now dayjs - return this.exam.endDate !== undefined && dayjs(this.exam.publishResultsDate).isAfter(this.exam.endDate); + return !!this.exam.endDate && dayjs(this.exam.publishResultsDate).isAfter(this.exam.endDate); } get isValidExamStudentReviewStart(): boolean { @@ -292,7 +340,7 @@ export class ExamUpdateComponent implements OnInit { return true; } // check for undefined because undefined is otherwise treated as the now dayjs - return this.exam.publishResultsDate !== undefined && dayjs(this.exam.examStudentReviewStart).isAfter(this.exam.publishResultsDate); + return !!this.exam.publishResultsDate && dayjs(this.exam.examStudentReviewStart).isAfter(this.exam.publishResultsDate); } get isValidExamStudentReviewEnd(): boolean { @@ -301,7 +349,7 @@ export class ExamUpdateComponent implements OnInit { return !this.exam.examStudentReviewStart || !this.exam.examStudentReviewStart.isValid(); } // check for undefined because undefined is otherwise treated as the now dayjs - return this.exam.examStudentReviewStart !== undefined && dayjs(this.exam.examStudentReviewEnd).isAfter(this.exam.examStudentReviewStart); + return !!this.exam.examStudentReviewStart && dayjs(this.exam.examStudentReviewEnd).isAfter(this.exam.examStudentReviewStart); } get isValidExampleSolutionPublicationDate(): boolean { @@ -315,19 +363,12 @@ export class ExamUpdateComponent implements OnInit { dayjs(this.exam.exampleSolutionPublicationDate).isBefore(this.exam.endDate || null) ); } - - /** - * Helper-Method to reset the Exam Id and Exam dates when importing the Exam - */ - private resetIdAndDatesForImport() { - this.exam.id = undefined; - this.exam.visibleDate = undefined; - this.exam.startDate = undefined; - this.exam.endDate = undefined; - this.exam.publishResultsDate = undefined; - this.exam.examStudentReviewStart = undefined; - this.exam.examStudentReviewEnd = undefined; - this.exam.examUsers = undefined; - this.exam.studentExams = undefined; - } } + +/** + * Prepares the exam for import by omitting all properties that should not be imported. + */ +export const prepareExamForImport = (exam: Exam): Exam => ({ + ...omit(exam, ['id', 'visibleDate', 'startDate', 'endDate', 'publishResultsDate', 'examStudentReviewStart', 'examStudentReviewEnd', 'examUsers', 'studentExams']), + workingTime: 0, +}); diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html index f2602904c424..94f470c8a2dc 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html +++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.html @@ -1,18 +1,25 @@
-

+

Student exam ({{ studentExam.exam!.title! }})

-

- Test Run ({{ studentExam.exam!.title! }}) -

+ +

+ Test Run ({{ studentExam.exam!.title! }}) +

+

Student
-
    +
    1. Name: {{ student.name }} @@ -34,13 +41,13 @@
      Student
      Working time
      - +
      Working time Working time Working time
      + +

      + {{ 'artemisApp.studentExamDetail.endOfIndividualWorkingTime' | artemisTranslate }} {{ individualEndDate | artemisDate: 'long-date' }} - + {{ individualEndDate | artemisDate: 'time' : true }} +

      + +

- Change Student Exam to Unsubmitted - Change Student Exam to Submitted + Change Student Exam to Unsubmitted + + Change Student Exam to Submitted +

Are you sure you want to change the submission state?

-

+

This will set the submission date of the exam to this moment, and set the submitted status to 'Yes'. Un-submitting the student exam later is possible.

-

- This will remove the submission date and set the submitted status to 'No'. -

-

Recovering those after the deletion is not possible!

+ +

This will remove the submission date and set the submitted status to 'No'.

+

Recovering those after the deletion is not possible!

+
-
Student Summary
- + Summary
@@ -221,7 +256,7 @@
Sessions
-
No sessions
+
No sessions
@@ -267,7 +302,7 @@
Exercises [course]="course" [examId]="examId" [exercise]="exercise" - [busy]="busy" + [busy]="isSaving" [isTestRun]="isTestRun" [studentExam]="studentExam" [achievedPointsPerExercise]="achievedPointsPerExercise" diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.scss b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.scss index 416884c8d935..48dea7427431 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.scss +++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.scss @@ -1,5 +1,6 @@ -.indented-list { +.list-without-numeration { list-style-type: none; + padding-left: 0; } .working-time-form { diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.ts index 20c289066a86..c841e01841d8 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.ts +++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-detail.component.ts @@ -12,10 +12,17 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model'; import { GradeType } from 'app/entities/grading-scale.model'; import { faSave } from '@fortawesome/free-solid-svg-icons'; -import { getRelativeWorkingTimeExtension, normalWorkingTime } from 'app/exam/participate/exam.utils'; +import { examWorkingTime, getRelativeWorkingTimeExtension } from 'app/exam/participate/exam.utils'; import { Exercise } from 'app/entities/exercise.model'; import { StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; +type WorkingTimeFormValues = { + hours: number; + minutes: number; + seconds: number; + percent: number; +}; + @Component({ selector: 'jhi-student-exam-detail', templateUrl: './student-exam-detail.component.html', @@ -34,7 +41,7 @@ export class StudentExamDetailComponent implements OnInit { maxTotalPoints = 0; achievedTotalPoints = 0; bonusTotalPoints = 0; - busy = false; + isSaving = false; examId: number; @@ -44,13 +51,22 @@ export class StudentExamDetailComponent implements OnInit { isBonus = false; passed = false; - workingTimeFormValues = { + workingTimeFormValues: WorkingTimeFormValues = { hours: 0, minutes: 0, seconds: 0, percent: 0, }; + lastSavedWorkingTime: WorkingTimeFormValues = { + hours: 0, + minutes: 0, + seconds: 0, + percent: 0, + }; + + individualEndDate: dayjs.Dayjs | undefined; + // Icons faSave = faSave; @@ -98,7 +114,7 @@ export class StudentExamDetailComponent implements OnInit { */ saveWorkingTime() { this.isSavingWorkingTime = true; - const seconds = this.getWorkingTimeSeconds(); + const seconds = this.getWorkingTimeSeconds(this.workingTimeFormValues); this.studentExamService.updateWorkingTime(this.courseId, this.studentExam.exam!.id!, this.studentExam.id!, seconds).subscribe({ next: (res) => { if (res.body) { @@ -190,14 +206,16 @@ export class StudentExamDetailComponent implements OnInit { */ private initWorkingTimeForm() { this.setWorkingTimeDuration(this.studentExam.workingTime!); - this.updateWorkingTimePercent(); + this.updateVariablesDependingOnWorkingTimeForm(); + + this.lastSavedWorkingTime = { ...this.workingTimeFormValues }; } /** * Updates the working time duration values of the form whenever the percent value has been changed by the user. */ updateWorkingTimeDuration() { - const regularWorkingTime = normalWorkingTime(this.studentExam.exam!)!; + const regularWorkingTime = examWorkingTime(this.studentExam.exam)!; const seconds = round(regularWorkingTime * (1.0 + this.workingTimeFormValues.percent / 100), 0); this.setWorkingTimeDuration(seconds); } @@ -211,24 +229,35 @@ export class StudentExamDetailComponent implements OnInit { this.workingTimeFormValues.hours = workingTime.days * 24 + workingTime.hours; this.workingTimeFormValues.minutes = workingTime.minutes; this.workingTimeFormValues.seconds = workingTime.seconds; + + this.updateIndividualEndDate(); + } + + updateVariablesDependingOnWorkingTimeForm() { + this.updateWorkingTimePercent(); + this.updateIndividualEndDate(); } /** * Uses the current durations saved in the form to update the extension percent value. */ updateWorkingTimePercent() { - this.workingTimeFormValues.percent = getRelativeWorkingTimeExtension(this.studentExam.exam!, this.getWorkingTimeSeconds()); + this.workingTimeFormValues.percent = getRelativeWorkingTimeExtension(this.studentExam.exam!, this.getWorkingTimeSeconds(this.workingTimeFormValues)); + } + + updateIndividualEndDate() { + this.individualEndDate = dayjs(this.studentExam.exam!.startDate).add(this.getWorkingTimeSeconds(this.workingTimeFormValues), 'seconds'); } /** * Calculates how many seconds the currently set working time has in total. */ - private getWorkingTimeSeconds(): number { + private getWorkingTimeSeconds(workingTimeFormValues: WorkingTimeFormValues): number { const duration = { days: 0, - hours: this.workingTimeFormValues.hours, - minutes: this.workingTimeFormValues.minutes, - seconds: this.workingTimeFormValues.seconds, + hours: workingTimeFormValues.hours, + minutes: workingTimeFormValues.minutes, + seconds: workingTimeFormValues.seconds, }; return this.artemisDurationFromSecondsPipe.durationToSeconds(duration); } @@ -240,20 +269,26 @@ export class StudentExamDetailComponent implements OnInit { return this.isSavingWorkingTime || (this.isTestRun && !!this.studentExam.submitted) || !this.studentExam.exam; } - examIsOver(): boolean { + /** + * Checks if the exam is over considering the individual working time of the student and the grace period + */ + isExamOver(): boolean { if (this.studentExam.exam) { - // only show the button when the exam is over - return dayjs(this.studentExam.exam.endDate).add(this.studentExam.exam.gracePeriod!, 'seconds').isBefore(dayjs()); - } else { - return false; + const individualExamEndDate = dayjs(this.studentExam.exam.startDate) + .add(this.getWorkingTimeSeconds(this.lastSavedWorkingTime), 'seconds') + .add(this.studentExam.exam.gracePeriod!, 'seconds'); + + return individualExamEndDate.isBefore(dayjs()); } + + return false; } /** * switch the 'submitted' state of the studentExam. */ toggle() { - this.busy = true; + this.isSaving = true; if (this.studentExam.exam && this.studentExam.exam.id) { this.studentExamService.toggleSubmittedState(this.courseId, this.studentExam.exam.id, this.studentExam.id!, this.studentExam.submitted!).subscribe({ next: (res) => { @@ -262,11 +297,11 @@ export class StudentExamDetailComponent implements OnInit { this.studentExam.submitted = res.body.submitted; } this.alertService.success('artemisApp.studentExamDetail.toggleSuccessful'); - this.busy = false; + this.isSaving = false; }, error: () => { this.alertService.error('artemisApp.studentExamDetail.togglefailed'); - this.busy = false; + this.isSaving = false; }, }); } diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts index 53123eb952bb..8ca3aed74f49 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts +++ b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts @@ -11,7 +11,7 @@ import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { AlertService } from 'app/core/util/alert.service'; import { HttpErrorResponse } from '@angular/common/http'; import { Exam } from 'app/entities/exam.model'; -import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import dayjs from 'dayjs/esm'; import { AccountService } from 'app/core/auth/account.service'; import { onError } from 'app/shared/util/global.utils'; diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html index c23fce1d8f53..f62f327f2d76 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html @@ -3,23 +3,67 @@
{{ 'artemisApp.examManagement.suspiciousBehavior.title' | artemisTranslate }

{{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionDescription' | artemisTranslate }}

+
+ + +
-
    -
  • - {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionIpAddress' | artemisTranslate }} -
    • -
  • - {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionBrowserFingerprint' | artemisTranslate }} -
    • -
+
+ + +
-

- {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.number' | artemisTranslate: { numberOfSuspiciousSessions: suspiciousSessions.length } }} -

+
+ + +
+ +
+ + +
+ +
+ + +
+
+
+ + +
+ +
+ +
+ + +
- +
+

+ +
= new Map(); plagiarismResultsPerExercise: Map = new Map(); @@ -19,6 +22,20 @@ export class SuspiciousBehaviorComponent implements OnInit { suspiciousSessions: SuspiciousExamSessions[] = []; examId: number; courseId: number; + checkboxCriterionDifferentStudentExamsSameIPAddressChecked = false; + checkboxCriterionDifferentStudentExamsSameBrowserFingerprintChecked = false; + checkboxCriterionSameStudentExamDifferentIPAddressesChecked = false; + checkboxCriterionSameStudentExamDifferentBrowserFingerprintsChecked = false; + checkboxCriterionIPOutsideOfASpecificRangeChecked = false; + ipSubnet?: string; + analyzing = false; + analyzed = false; + /** Regex to either match an IPv4 or IPv6 subnet + * Borrowed from https://www.regextester.com/93988 and https://www.regextester.com/93987 + * */ + readonly ipSubnetRegexPattern: RegExp = new RegExp( + '(^([0-9]{1,3}.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$)|(^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$)', + ); constructor( private suspiciousSessionsService: SuspiciousSessionsService, @@ -32,9 +49,6 @@ export class SuspiciousBehaviorComponent implements OnInit { ngOnInit(): void { this.examId = Number(this.activatedRoute.snapshot.paramMap.get('examId')); this.courseId = Number(this.activatedRoute.snapshot.paramMap.get('courseId')); - this.suspiciousSessionsService.getSuspiciousSessions(this.courseId, this.examId).subscribe((res) => { - this.suspiciousSessions = res; - }); this.examService.getExercisesWithPotentialPlagiarismForExam(this.courseId, this.examId).subscribe((res) => { this.exercises = res; this.retrievePlagiarismCases(); @@ -53,9 +67,43 @@ export class SuspiciousBehaviorComponent implements OnInit { }); }; + get analyzeButtonEnabled(): boolean { + return ( + (this.checkboxCriterionDifferentStudentExamsSameIPAddressChecked || + this.checkboxCriterionDifferentStudentExamsSameBrowserFingerprintChecked || + this.checkboxCriterionSameStudentExamDifferentIPAddressesChecked || + this.checkboxCriterionSameStudentExamDifferentBrowserFingerprintsChecked || + this.checkboxCriterionIPOutsideOfASpecificRangeChecked) && + (!this.checkboxCriterionIPOutsideOfASpecificRangeChecked || (this.checkboxCriterionIPOutsideOfASpecificRangeChecked && this.ipSubnetRegexPattern.test(this.ipSubnet!))) + ); + } + goToSuspiciousSessions() { this.router.navigate(['/course-management', this.courseId, 'exams', this.examId, 'suspicious-behavior', 'suspicious-sessions'], { - state: { suspiciousSessions: this.suspiciousSessions }, + state: { suspiciousSessions: this.suspiciousSessions, ipSubnet: this.ipSubnet }, + }); + } + + analyzeSessions() { + const options = new SuspiciousSessionsAnalysisOptions( + this.checkboxCriterionDifferentStudentExamsSameIPAddressChecked, + this.checkboxCriterionDifferentStudentExamsSameBrowserFingerprintChecked, + this.checkboxCriterionSameStudentExamDifferentIPAddressesChecked, + this.checkboxCriterionSameStudentExamDifferentBrowserFingerprintsChecked, + this.checkboxCriterionIPOutsideOfASpecificRangeChecked, + this.ipSubnet, + ); + this.analyzing = true; + this.suspiciousSessionsService.getSuspiciousSessions(this.courseId, this.examId, options).subscribe({ + next: (suspiciousSessions) => { + this.suspiciousSessions = suspiciousSessions; + this.analyzing = false; + this.analyzed = true; + }, + error: () => { + this.analyzing = false; + this.analyzed = true; + }, }); } } diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html index 6fa2b911883a..f9469edf3c59 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html @@ -5,5 +5,27 @@
{{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSess {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.case' | artemisTranslate }} {{ i + 1 }}

- +

+ {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.reasons' | artemisTranslate }} + + + + , + +

+
+ + + + + + + + + + + + +
{{ 'artemisApp.examSession.id' | artemisTranslate }}{{ 'artemisApp.examSession.browserFingerprintHash' | artemisTranslate }}{{ 'artemisApp.examSession.ipAddress' | artemisTranslate }}{{ 'artemisApp.examSession.createdDate' | artemisTranslate }}{{ 'artemisApp.examSession.studentExamId' | artemisTranslate }}{{ 'artemisApp.examSession.userLogin' | artemisTranslate }}
+
diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.scss b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.scss new file mode 100644 index 000000000000..380dfcc215ba --- /dev/null +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.scss @@ -0,0 +1,3 @@ +.table { + table-layout: fixed; +} diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts index e9d177ae2a7d..d24b473ec63c 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts @@ -1,15 +1,33 @@ import { Component, OnInit } from '@angular/core'; -import { SuspiciousExamSessions } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model'; import { cloneDeep } from 'lodash-es'; @Component({ selector: 'jhi-suspicious-sessions-overview', templateUrl: './suspicious-sessions-overview.component.html', + styleUrls: ['./suspicious-sessions-overview.component.scss'], }) export class SuspiciousSessionsOverviewComponent implements OnInit { suspiciousSessions: SuspiciousExamSessions[] = []; + ipSubnet?: string; + + mapEnumToTranslationString(reason: SuspiciousSessionReason) { + switch (reason) { + case SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS: + return 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.sameIpAddressDifferentStudentExams'; + case SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT: + return 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.sameBrowserFingerprintDifferentStudentExams'; + case SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES: + return 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.differentIpAddressesSameStudentExam'; + case SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS: + return 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.differentBrowserFingerprintsSameStudentExam'; + case SuspiciousSessionReason.IP_ADDRESS_OUTSIDE_OF_RANGE: + return 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.ipOutsideOfRange'; + } + } ngOnInit(): void { this.suspiciousSessions = cloneDeep(history.state.suspiciousSessions); + this.ipSubnet = history.state.ipSubnet; } } diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts index d80b20395eeb..4f104cb23de8 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts @@ -1,6 +1,6 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { SuspiciousExamSessions } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam-session.model'; import { Observable } from 'rxjs'; @Injectable({ @@ -9,7 +9,18 @@ import { Observable } from 'rxjs'; export class SuspiciousSessionsService { constructor(private http: HttpClient) {} - getSuspiciousSessions(courseId: number, examId: number): Observable { - return this.http.get(`api/courses/${courseId}/exams/${examId}/suspicious-sessions`); + getSuspiciousSessions(courseId: number, examId: number, options: SuspiciousSessionsAnalysisOptions): Observable { + let params = new HttpParams() + .set('differentStudentExamsSameIPAddress', options.sameIpAddressDifferentStudentExams.toString()) + .set('differentStudentExamsSameBrowserFingerprint', options.sameBrowserFingerprintDifferentStudentExams.toString()) + .set('sameStudentExamDifferentIPAddresses', options.differentIpAddressesSameStudentExam.toString()) + .set('sameStudentExamDifferentBrowserFingerprints', options.differentIpAddressesSameStudentExam.toString()) + .set('ipOutsideOfRange', options.ipAddressOutsideOfRange.toString()); + + // If subnet is provided, add it to the params + if (options.ipSubnet) { + params = params.set('ipSubnet', options.ipSubnet); + } + return this.http.get(`api/courses/${courseId}/exams/${examId}/suspicious-sessions`, { params }); } } diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.html b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.html index f233b06da2cd..c0b577bf9603 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.html +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.html @@ -1,39 +1,14 @@ -

- {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.reasons' | artemisTranslate }} - - - {{ mapEnumToTranslationString(reason) | artemisTranslate }} - , - -

- -
- - - - - - - - - - - - - - - - - - - - - - - -
{{ 'artemisApp.examSession.id' | artemisTranslate }}{{ 'artemisApp.examSession.browserFingerprintHash' | artemisTranslate }}{{ 'artemisApp.examSession.ipAddress' | artemisTranslate }}{{ 'artemisApp.examSession.createdDate' | artemisTranslate }}{{ 'artemisApp.examSession.studentExamId' | artemisTranslate }}{{ 'artemisApp.examSession.userLogin' | artemisTranslate }}
{{ session.id }}{{ session.browserFingerprintHash }}{{ session.ipAddress }}{{ session.createdDate | artemisDate }} - - {{ session.studentExam!.id }} - - {{ session.studentExam?.user?.login }}
-
+ + + {{ session.id }} + {{ session.browserFingerprintHash }} + {{ session.ipAddress }} + {{ session.createdDate | artemisDate }} + + + {{ session.studentExam!.id }} + + + {{ session.studentExam?.user?.login }} + + diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts index a901c0b65150..2516d603b5ce 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts @@ -3,7 +3,7 @@ import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/ex import { StudentExam } from 'app/entities/student-exam.model'; @Component({ - selector: 'jhi-suspicious-sessions', + selector: '[jhi-suspicious-sessions]', templateUrl: './suspicious-sessions.component.html', styleUrls: ['./suspicious-sessions.component.scss'], }) @@ -12,8 +12,13 @@ export class SuspiciousSessionsComponent implements OnInit { suspiciousFingerprint = false; suspiciousIpAddress = false; ngOnInit(): void { - this.suspiciousFingerprint = this.isSuspiciousFor(SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT); - this.suspiciousIpAddress = this.isSuspiciousFor(SuspiciousSessionReason.SAME_IP_ADDRESS); + this.suspiciousFingerprint = + this.isSuspiciousFor(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT) || + this.isSuspiciousFor(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS); + this.suspiciousIpAddress = + this.isSuspiciousFor(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS) || + this.isSuspiciousFor(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES) || + this.isSuspiciousFor(SuspiciousSessionReason.IP_ADDRESS_OUTSIDE_OF_RANGE); } getStudentExamLink(studentExam: StudentExam) { @@ -26,13 +31,4 @@ export class SuspiciousSessionsComponent implements OnInit { private isSuspiciousFor(reason: SuspiciousSessionReason) { return this.suspiciousSessions.examSessions.some((session) => session.suspiciousReasons.includes(reason)); } - - mapEnumToTranslationString(reason: SuspiciousSessionReason) { - switch (reason) { - case SuspiciousSessionReason.SAME_IP_ADDRESS: - return 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.sameIpAddress'; - case SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT: - return 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.sameBrowserFingerprint'; - } - } } diff --git a/src/main/webapp/app/exam/participate/exam-participation.component.html b/src/main/webapp/app/exam/participate/exam-participation.component.html index a5632f264ec6..1751278706b6 100644 --- a/src/main/webapp/app/exam/participate/exam-participation.component.html +++ b/src/main/webapp/app/exam/participate/exam-participation.component.html @@ -36,7 +36,7 @@
Show Summary
- + diff --git a/src/main/webapp/app/exam/participate/exam-participation.component.ts b/src/main/webapp/app/exam/participate/exam-participation.component.ts index 999a4c25f80f..2c07951a32e6 100644 --- a/src/main/webapp/app/exam/participate/exam-participation.component.ts +++ b/src/main/webapp/app/exam/participate/exam-participation.component.ts @@ -229,7 +229,7 @@ export class ExamParticipationComponent implements OnInit, OnDestroy, ComponentC get activePageComponent(): ExamPageComponent | undefined { // we have to find the current component based on the activeExercise because the queryList might not be full yet (e.g. only 2 of 5 components initialized) return this.currentPageComponents.find( - (submissionComponent) => !this.activeExamPage.isOverviewPage && (submissionComponent as ExamSubmissionComponent).getExercise().id === this.activeExamPage.exercise!.id, + (submissionComponent) => !this.activeExamPage.isOverviewPage && (submissionComponent as ExamSubmissionComponent).getExerciseId() === this.activeExamPage.exercise!.id, ); } @@ -698,11 +698,11 @@ export class ExamParticipationComponent implements OnInit, OnDestroy, ComponentC // in the case saving is forced, we mark the current exercise as not synced, so it will definitely be saved if ((activeComponent && forceSave) || (activeComponent as ExamSubmissionComponent)?.hasUnsavedChanges()) { const activeSubmission = (activeComponent as ExamSubmissionComponent)?.getSubmission(); - const activeExercise = (activeComponent as ExamSubmissionComponent)?.getExercise(); + const activeExerciseType = (activeComponent as ExamSubmissionComponent)?.exerciseType; if (activeSubmission) { // this will lead to a save below, because isSynced will be set to false // it only makes sense to set "isSynced" to false for quiz, text and modeling - if (activeExercise?.type !== ExerciseType.PROGRAMMING && activeExercise?.type !== ExerciseType.FILE_UPLOAD) { + if (activeExerciseType !== ExerciseType.PROGRAMMING && activeExerciseType !== ExerciseType.FILE_UPLOAD) { activeSubmission.isSynced = false; } } diff --git a/src/main/webapp/app/exam/participate/exam.utils.ts b/src/main/webapp/app/exam/participate/exam.utils.ts index c77c0ad3056e..d3038851c1b0 100644 --- a/src/main/webapp/app/exam/participate/exam.utils.ts +++ b/src/main/webapp/app/exam/participate/exam.utils.ts @@ -8,9 +8,9 @@ import { round } from 'app/shared/util/utils'; * * @param exam * @param studentExam - * @return {dayjs} + * @return {dayjs.Dayjs | undefined} */ -export const endTime = (exam: Exam, studentExam: StudentExam) => { +export const endTime = (exam: Exam, studentExam: StudentExam): dayjs.Dayjs | undefined => { if (!exam) { return undefined; } @@ -21,17 +21,24 @@ export const endTime = (exam: Exam, studentExam: StudentExam) => { }; /** - * Calculates the working time of the exam in seconds + * Calculates the working time of the exam in seconds. + * If either the exam or the exam dates are not set, undefined is returned. * * @param exam * @return {number | undefined} */ -export const normalWorkingTime = (exam: Exam): number | undefined => { - if (!exam || !exam.endDate || !exam.startDate) { - return undefined; - } - return dayjs(exam.endDate).diff(exam.startDate, 'seconds'); -}; +export const examWorkingTime = (exam?: Exam): number | undefined => normalWorkingTime(exam?.startDate, exam?.endDate); + +/** + * Calculates the time between start and end date in seconds. + * If either the start or end date is not set, undefined is returned. + * + * @param startDate + * @param endDate + * @return {number | undefined} + */ +export const normalWorkingTime = (startDate?: dayjs.Dayjs, endDate?: dayjs.Dayjs): number | undefined => + startDate && endDate ? dayjs(endDate).diff(startDate, 'seconds') : undefined; /** * Calculates the additional working time in seconds @@ -57,7 +64,7 @@ export const getAdditionalWorkingTime = (exam: Exam, studentExam: StudentExam): * @return The relative working time extension in percent points rounded to two digits after the decimal separator. */ export const getRelativeWorkingTimeExtension = (exam: Exam, studentExamWorkingTime: number): number => { - const regularExamDuration = normalWorkingTime(exam)!; + const regularExamDuration = examWorkingTime(exam)!; return round((studentExamWorkingTime / regularExamDuration - 1.0) * 100, 2); }; diff --git a/src/main/webapp/app/exam/participate/exercises/exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/exam-submission.component.ts index 682160f058b6..00ee2a7ad37d 100644 --- a/src/main/webapp/app/exam/participate/exercises/exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/exam-submission.component.ts @@ -1,8 +1,9 @@ import { Submission } from 'app/entities/submission.model'; -import { Exercise } from 'app/entities/exercise.model'; +import { ExerciseType } from 'app/entities/exercise.model'; import { ExamPageComponent } from 'app/exam/participate/exercises/exam-page.component'; export abstract class ExamSubmissionComponent extends ExamPageComponent { + abstract exerciseType: ExerciseType; /** * checks whether the component has unsaved changes. * It is called in the periodic update timer to determine, if the component needs an update @@ -23,5 +24,5 @@ export abstract class ExamSubmissionComponent extends ExamPageComponent { abstract updateViewFromSubmission(): void; abstract getSubmission(): Submission | undefined; - abstract getExercise(): Exercise; + abstract getExerciseId(): number | undefined; } diff --git a/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.ts index 4185d9aa010b..c6267b471967 100644 --- a/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.ts @@ -15,7 +15,7 @@ import { FileUploadSubmission } from 'app/entities/file-upload-submission.model' import { ButtonType } from 'app/shared/components/button.component'; import { Result } from 'app/entities/result.model'; import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component'; -import { Exercise, IncludedInOverallScore } from 'app/entities/exercise.model'; +import { ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; import { Submission } from 'app/entities/submission.model'; import { faListAlt } from '@fortawesome/free-regular-svg-icons'; @@ -26,6 +26,8 @@ import { faListAlt } from '@fortawesome/free-regular-svg-icons'; // change deactivation must be triggered manually }) export class FileUploadExamSubmissionComponent extends ExamSubmissionComponent implements OnInit { + exerciseType = ExerciseType.FILE_UPLOAD; + @ViewChild('fileInput', { static: false }) fileInput: ElementRef; @Input() @@ -110,8 +112,8 @@ export class FileUploadExamSubmissionComponent extends ExamSubmissionComponent i return this.exercise && (!this.exercise.dueDate || dayjs(this.exercise.dueDate).isSameOrAfter(dayjs())); } - getExercise(): Exercise { - return this.exercise; + getExerciseId(): number | undefined { + return this.exercise.id; } public hasUnsavedChanges(): boolean { diff --git a/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.ts index a9d4a2633182..fca27aaf209b 100644 --- a/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.ts @@ -6,7 +6,7 @@ import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component'; import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component'; import { Submission } from 'app/entities/submission.model'; -import { Exercise, IncludedInOverallScore } from 'app/entities/exercise.model'; +import { ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; import { faListAlt } from '@fortawesome/free-regular-svg-icons'; @Component({ @@ -18,6 +18,8 @@ import { faListAlt } from '@fortawesome/free-regular-svg-icons'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class ModelingExamSubmissionComponent extends ExamSubmissionComponent implements OnInit { + exerciseType = ExerciseType.MODELING; + @ViewChild(ModelingEditorComponent, { static: false }) modelingEditor: ModelingEditorComponent; @@ -58,8 +60,8 @@ export class ModelingExamSubmissionComponent extends ExamSubmissionComponent imp return this.studentSubmission; } - getExercise(): Exercise { - return this.exercise; + getExerciseId(): number | undefined { + return this.exercise.id; } updateViewFromSubmission(): void { diff --git a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts index 4ac469effa65..9d8532264d89 100644 --- a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts @@ -5,7 +5,7 @@ import { ProgrammingExerciseStudentParticipation } from 'app/entities/participat import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; import { CommitState, DomainType, EditorState } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; -import { Exercise, IncludedInOverallScore, getCourseFromExercise } from 'app/entities/exercise.model'; +import { ExerciseType, IncludedInOverallScore, getCourseFromExercise } from 'app/entities/exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { DomainService } from 'app/exercises/programming/shared/code-editor/service/code-editor-domain.service'; import { CodeEditorContainerComponent } from 'app/exercises/programming/shared/code-editor/container/code-editor-container.component'; @@ -33,6 +33,8 @@ import { styleUrls: ['./programming-exam-submission.component.scss'], }) export class ProgrammingExamSubmissionComponent extends ExamSubmissionComponent implements OnChanges, OnInit { + exerciseType = ExerciseType.PROGRAMMING; + @ViewChild(CodeEditorContainerComponent, { static: false }) codeEditorContainer: CodeEditorContainerComponent; @ViewChild(ProgrammingExerciseInstructionComponent, { static: false }) instructions: ProgrammingExerciseInstructionComponent; @@ -60,8 +62,8 @@ export class ProgrammingExamSubmissionComponent extends ExamSubmissionComponent return undefined; } - getExercise(): Exercise { - return this.exercise; + getExerciseId(): number | undefined { + return this.exercise.id; } isSaving: boolean; diff --git a/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.html index c7d7ff590925..9d1cd121f4a5 100644 --- a/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.html +++ b/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.html @@ -1,8 +1,8 @@
-
+
-
+
-
+

- {{ exercise?.exerciseGroup?.title ?? '-' }} + {{ quizConfiguration?.exerciseGroup?.title ?? '-' }} [{{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}] + >[{{ quizConfiguration.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}]

-
+
[selectedAnswerOptions]="selectedAnswerOptions.get(question.id!)!" (selectedAnswerOptionsChange)="selectedAnswerOptions.set(question.id!, $event)" [fnOnSelection]="onSelectionChanged.bind(this)" - [submittedQuizExercise]="exercise" + [quizQuestions]="quizConfiguration.quizQuestions" [questionIndex]="i + 1" > diff --git a/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.ts index d27a560e550e..c5a49204aad7 100644 --- a/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.ts @@ -4,7 +4,6 @@ import { MultipleChoiceQuestionComponent } from 'app/exercises/quiz/shared/quest import { DragAndDropQuestionComponent } from 'app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component'; import { ShortAnswerQuestionComponent } from 'app/exercises/quiz/shared/questions/short-answer-question/short-answer-question.component'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; -import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import * as smoothscroll from 'smoothscroll-polyfill'; import { AnswerOption } from 'app/entities/quiz/answer-option.model'; import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.model'; @@ -17,7 +16,8 @@ import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-sub import { cloneDeep } from 'lodash-es'; import { ArtemisQuizService } from 'app/shared/quiz/quiz.service'; import { Submission } from 'app/entities/submission.model'; -import { Exercise, IncludedInOverallScore } from 'app/entities/exercise.model'; +import { ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; +import { QuizConfiguration } from 'app/entities/quiz/quiz-configuration.model'; @Component({ selector: 'jhi-quiz-submission-exam', @@ -26,6 +26,8 @@ import { Exercise, IncludedInOverallScore } from 'app/entities/exercise.model'; styleUrls: ['./quiz-exam-submission.component.scss'], }) export class QuizExamSubmissionComponent extends ExamSubmissionComponent implements OnInit { + exerciseType = ExerciseType.QUIZ; + // make constants available to html for comparison readonly DRAG_AND_DROP = QuizQuestionType.DRAG_AND_DROP; readonly MULTIPLE_CHOICE = QuizQuestionType.MULTIPLE_CHOICE; @@ -47,7 +49,8 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme @Input() studentSubmission: AbstractQuizSubmission; - @Input() exercise: QuizExercise; + @Input() quizConfiguration: QuizConfiguration; + selectedAnswerOptions = new Map(); dragAndDropMappings = new Map(); shortAnswerSubmittedTexts = new Map(); @@ -69,8 +72,8 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme return this.studentSubmission; } - getExercise(): Exercise { - return this.exercise; + getExerciseId(): number | undefined { + return this.quizConfiguration.id; } /** @@ -78,14 +81,14 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme */ initQuiz() { // randomize order - this.quizService.randomizeOrder(this.exercise); + this.quizService.randomizeOrder(this.quizConfiguration.quizQuestions, this.quizConfiguration.randomizeQuestionOrder); // prepare selection arrays for each question this.selectedAnswerOptions = new Map(); this.dragAndDropMappings = new Map(); this.shortAnswerSubmittedTexts = new Map(); - if (this.exercise.quizQuestions) { - this.exercise.quizQuestions.forEach((question) => { + if (this.quizConfiguration.quizQuestions) { + this.quizConfiguration.quizQuestions.forEach((question) => { if (question.type === QuizQuestionType.MULTIPLE_CHOICE) { // add the array of selected options to the dictionary (add an empty array, if there is no submittedAnswer for this question) this.selectedAnswerOptions.set(question.id!, []); @@ -134,9 +137,9 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme this.dragAndDropMappings = new Map(); this.shortAnswerSubmittedTexts = new Map(); - if (this.exercise.quizQuestions) { + if (this.quizConfiguration.quizQuestions?.length) { // iterate through all questions of this quiz - this.exercise.quizQuestions.forEach((question) => { + this.quizConfiguration.quizQuestions.forEach((question) => { // find the submitted answer that belongs to this question, only when submitted answers already exist const submittedAnswer = this.studentSubmission?.submittedAnswers?.find((answer) => { return answer.quizQuestion?.id === question.id; @@ -209,7 +212,7 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme // for multiple-choice questions this.selectedAnswerOptions.forEach((answerOptions, questionID) => { // find the question object for the given question id - const question = this.exercise?.quizQuestions?.find(function (selectedQuestion) { + const question = this.quizConfiguration.quizQuestions?.find(function (selectedQuestion) { return selectedQuestion.id === Number(questionID); }); if (!question) { @@ -226,7 +229,7 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme // for drag-and-drop questions this.dragAndDropMappings.forEach((mappings, questionID) => { // find the question object for the given question id - const question = this.exercise.quizQuestions?.find(function (localQuestion) { + const question = this.quizConfiguration.quizQuestions?.find(function (localQuestion) { return localQuestion.id === Number(questionID); }); if (!question) { @@ -242,7 +245,7 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme // for short-answer questions this.shortAnswerSubmittedTexts.forEach((submittedTexts, questionID) => { // find the question object for the given question id - const question = this.exercise.quizQuestions?.find(function (localQuestion) { + const question = this.quizConfiguration.quizQuestions?.find(function (localQuestion) { return localQuestion.id === Number(questionID); }); if (!question) { diff --git a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts index 3cd55856a89b..e52cf8bcd9d5 100644 --- a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts @@ -3,7 +3,7 @@ import { TextEditorService } from 'app/exercises/text/participate/text-editor.se import { Subject } from 'rxjs'; import { TextSubmission } from 'app/entities/text-submission.model'; import { StringCountService } from 'app/exercises/text/participate/string-count.service'; -import { Exercise, IncludedInOverallScore } from 'app/entities/exercise.model'; +import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component'; import { Submission } from 'app/entities/submission.model'; import { faListAlt } from '@fortawesome/free-regular-svg-icons'; @@ -16,6 +16,8 @@ import { MAX_SUBMISSION_TEXT_LENGTH } from 'app/shared/constants/input.constants styleUrls: ['./text-exam-submission.component.scss'], }) export class TextExamSubmissionComponent extends ExamSubmissionComponent implements OnInit { + exerciseType = ExerciseType.TEXT; + // IMPORTANT: this reference must be contained in this.studentParticipation.submissions[0] otherwise the parent component will not be able to react to changes @Input() studentSubmission: TextSubmission; @@ -45,8 +47,8 @@ export class TextExamSubmissionComponent extends ExamSubmissionComponent impleme this.updateViewFromSubmission(); } - getExercise(): Exercise { - return this.exercise; + getExerciseId(): number | undefined { + return this.exercise.id; } updateProblemStatement(newProblemStatement: string): void { diff --git a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts index 7fe2a58cc4ff..fb79c9e8ffab 100644 --- a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts +++ b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnChanges } from '@angular/core'; import { StudentExam } from 'app/entities/student-exam.model'; import { Exam } from 'app/entities/exam.model'; -import { endTime, getAdditionalWorkingTime, isExamOverMultipleDays, normalWorkingTime } from 'app/exam/participate/exam.utils'; +import { endTime, examWorkingTime, getAdditionalWorkingTime, isExamOverMultipleDays } from 'app/exam/participate/exam.utils'; import dayjs from 'dayjs/esm'; @Component({ @@ -14,8 +14,10 @@ export class ExamGeneralInformationComponent implements OnChanges { @Input() studentExam: StudentExam; @Input() reviewIsOpen?: boolean = false; - /** The exam cover will contain e.g. the number of exercises which is hidden in the exam summary as - * the information is shown in the {@link ExamResultOverviewComponent} */ + /** + * The exam cover will contain e.g. the number of exercises which is hidden in the exam summary as + * the information is shown in the {@link ExamResultOverviewComponent} + */ @Input() displayOnExamCover?: boolean = false; examEndDate?: dayjs.Dayjs; @@ -27,7 +29,7 @@ export class ExamGeneralInformationComponent implements OnChanges { ngOnChanges(): void { this.examEndDate = endTime(this.exam, this.studentExam); - this.normalWorkingTime = normalWorkingTime(this.exam); + this.normalWorkingTime = examWorkingTime(this.exam); this.additionalWorkingTime = getAdditionalWorkingTime(this.exam, this.studentExam); this.isExamOverMultipleDays = isExamOverMultipleDays(this.exam, this.studentExam); this.isTestExam = this.exam?.testExam; diff --git a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html index 78e46160b7a0..b400dd5a7d72 100644 --- a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html +++ b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html @@ -13,51 +13,31 @@

*ngIf="studentExam?.exam" [exam]="studentExam.exam!" [studentExam]="studentExam" - [reviewIsOpen]="studentExam?.exam && isBeforeStudentReviewEnd() && isAfterStudentReviewStart() && !isTestRun" + [reviewIsOpen]="studentExam?.exam && isBeforeStudentReviewEnd && isAfterStudentReviewStart && !isTestRun" /> -
+
-
+
{{ 'artemisApp.exam.resultInformation' | artemisTranslate }}
+ +

+ {{ 'artemisApp.exam.exercises' | artemisTranslate }} +

-
-
-    - Exercise {{ i + 1 }} -
-
- Warning: You are viewing an illegal submission. -
-
- -
- -
-
+ + +
- 'artemisApp.plagiarism.plagiarismCases.' + (plagiarismCaseInfos[exercise.id!]!.verdict === PlagiarismVerdict.NO_PLAGIARISM ? 'resolvedPlagiarismCase' : 'plagiarismCase') " - >Plagiarism Case + Plagiarism Case + - - View Example Solution - + You are viewing the example solution. + + + + [displayedOnExamSummary]="true" + /> - -
{{ exercise?.exerciseGroup?.title ?? '-' }} - [{{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}] - -
-
- -
- - + +
+ +
+ - - - - - - - - - - - - + + + + + + + + + + + + - - - - + [participation]="exerciseInfos[exercise.id!]!.participation!" + [result]="exerciseInfos[exercise.id!]!.participation!.results?.[0]" + [exam]="examWithOnlyIdAndStudentReviewPeriod" + [testRun]="isTestRun" + > + - - - + - - + + [participation]="exerciseInfos[exercise.id!]!.participation!" + [submission]="exerciseInfos[exercise.id!]!.submission!" + [isTestRun]="isTestRun" + [exam]="examWithOnlyIdAndStudentReviewPeriod" + [isAfterStudentReviewStart]="isAfterStudentReviewStart" + [resultsPublished]="resultsArePublished" + [isPrinting]="isPrinting" + [isAfterResultsArePublished]="resultsArePublished" + /> - - {{ 'artemisApp.exam.examSummary.noSubmissionFound' | artemisTranslate }} @@ -174,3 +163,8 @@
+ +   {{ 'artemisApp.exam.examSummary.backToOverview' | artemisTranslate }}  + diff --git a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts index b8d9b2a2826c..95184a3aca69 100644 --- a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts +++ b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts @@ -6,15 +6,41 @@ import { ActivatedRoute } from '@angular/router'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; import { Exam } from 'app/entities/exam.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; -import { SubmissionType } from 'app/entities/submission.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { faAngleDown, faAngleRight, faFolderOpen, faInfoCircle, faPrint } from '@fortawesome/free-solid-svg-icons'; import { ThemeService } from 'app/core/theme/theme.service'; -import { StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; +import { ExerciseResult, StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; import { PlagiarismCaseInfo } from 'app/exercises/shared/plagiarism/types/PlagiarismCaseInfo'; import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/PlagiarismVerdict'; +import { IconProp } from '@fortawesome/fontawesome-svg-core'; +import { roundScorePercentSpecifiedByCourseSettings } from 'app/shared/util/utils'; +import { getLatestResultOfStudentParticipation } from 'app/exercises/shared/participation/participation.utils'; +import { evaluateTemplateStatus, getResultIconClass, getTextColorClass } from 'app/exercises/shared/result/result.utils'; +import { Submission } from 'app/entities/submission.model'; +import { Participation } from 'app/entities/participation/participation.model'; +import { faArrowUp, faEye, faEyeSlash, faFolderOpen, faInfoCircle, faPrint } from '@fortawesome/free-solid-svg-icons'; +import { cloneDeep } from 'lodash-es'; +import { captureException } from '@sentry/angular-ivy'; +import { AlertService } from 'app/core/util/alert.service'; + +export type ResultSummaryExerciseInfo = { + icon: IconProp; + isCollapsed: boolean; + achievedPoints?: number; + achievedPercentage?: number; + colorClass?: string; + resultIconClass?: IconProp; + + submission?: Submission; + participation?: Participation; + displayExampleSolution: boolean; +}; + +type StateBeforeResetting = { + exerciseInfos: Record; + isGradingKeyCollapsed: boolean; + isBonusGradingKeyCollapsed: boolean; +}; @Component({ selector: 'jhi-exam-participation-summary', @@ -30,13 +56,20 @@ export class ExamResultSummaryComponent implements OnInit { readonly FILE_UPLOAD = ExerciseType.FILE_UPLOAD; readonly AssessmentType = AssessmentType; readonly IncludedInOverallScore = IncludedInOverallScore; - readonly SUBMISSION_TYPE_ILLEGAL = SubmissionType.ILLEGAL; readonly PlagiarismVerdict = PlagiarismVerdict; + faFolderOpen = faFolderOpen; + faInfoCircle = faInfoCircle; + faPrint = faPrint; + faEye = faEye; + faEyeSlash = faEyeSlash; + faArrowUp = faArrowUp; + /** * Current student's exam. */ private _studentExam: StudentExam; + plagiarismCaseInfos: { [exerciseId: number]: PlagiarismCaseInfo } = {}; exampleSolutionPublished = false; @@ -64,8 +97,6 @@ export class ExamResultSummaryComponent implements OnInit { @Input() instructorView = false; - collapsedExerciseIds: number[] = []; - courseId: number; isTestRun = false; @@ -76,12 +107,26 @@ export class ExamResultSummaryComponent implements OnInit { examWithOnlyIdAndStudentReviewPeriod: Exam; - // Icons - faFolderOpen = faFolderOpen; - faInfoCircle = faInfoCircle; - faPrint = faPrint; - faAngleRight = faAngleRight; - faAngleDown = faAngleDown; + isBeforeStudentReviewEnd = false; + /** + * Used to decide whether to instantiate the ComplaintInteractionComponent. We always instantiate the component if + * the review dates are set and the review start date has passed. + */ + isAfterStudentReviewStart = false; + + exerciseInfos: Record; + + /** + * Passed to components with overlapping elements to ensure that the overlapping + * elements are displayed in a different order for printing. + */ + isPrinting = false; + + /** + * Passed to components where the problem statement might be expanded or collapsed to ensure that + * the problem statement is expanded while printing + */ + expandProblemStatement = false; constructor( private route: ActivatedRoute, @@ -89,6 +134,7 @@ export class ExamResultSummaryComponent implements OnInit { private themeService: ThemeService, private examParticipationService: ExamParticipationService, private plagiarismCasesService: PlagiarismCasesService, + private alertService: AlertService, ) {} /** @@ -114,12 +160,34 @@ export class ExamResultSummaryComponent implements OnInit { .subscribe((studentExamWithGrade: StudentExamWithGradeDTO) => { studentExamWithGrade.studentExam = this.studentExam; this.studentExamGradeInfoDTO = studentExamWithGrade; + this.exerciseInfos = this.getExerciseInfos(studentExamWithGrade); }); } this.exampleSolutionPublished = !!this.studentExam.exam?.exampleSolutionPublicationDate && dayjs().isAfter(this.studentExam.exam.exampleSolutionPublicationDate); + this.exerciseInfos = this.getExerciseInfos(); + this.setExamWithOnlyIdAndStudentReviewPeriod(); + + this.isBeforeStudentReviewEnd = this.getIsBeforeStudentReviewEnd(); + this.isAfterStudentReviewStart = this.getIsAfterStudentReviewStart(); + } + + get resultsArePublished(): boolean | any { + if (this.isTestRun || this.isTestExam) { + return true; + } + + if (this.testRunConduction || this.testExamConduction) { + return false; + } + + if (this.studentExam?.exam?.publishResultsDate) { + return dayjs(this.studentExam.exam.publishResultsDate).isBefore(dayjs()); + } + + return false; } private tryLoadPlagiarismCaseInfosForStudent() { @@ -145,31 +213,67 @@ export class ExamResultSummaryComponent implements OnInit { return exam?.publishResultsDate && dayjs(exam.publishResultsDate).isBefore(this.serverDateService.now()); } - asProgrammingExercise(exercise: Exercise): ProgrammingExercise { - return exercise as ProgrammingExercise; + /** + * called for exportPDF Button + */ + async printPDF() { + const stateBeforeResetting = this.expandExercisesAndGradingKeysBeforePrinting(); + + this.isPrinting = true; + this.expandProblemStatement = true; + + await this.themeService.print(); + + this.isPrinting = false; + this.expandProblemStatement = false; + + this.resetExpandingExercisesAndGradingKeys(stateBeforeResetting); } - get resultsPublished() { - if (this.testRunConduction || this.testExamConduction) { - return false; - } else if (this.isTestRun || this.isTestExam) { - return true; - } - return this.studentExam?.exam?.publishResultsDate && dayjs(this.studentExam.exam.publishResultsDate).isBefore(dayjs()); + private scrollToTop() { + window.scrollTo(0, 0); } - /** - * called for exportPDF Button - */ - printPDF() { - this.expandExercisesAndGradingKeysBeforePrinting(); - setTimeout(() => this.themeService.print()); + scrollToOverviewOrTop() { + const searchedId = 'exam-summary-result-overview'; + const targetElement = document.getElementById(searchedId); + + if (targetElement) { + targetElement.scrollIntoView({ + behavior: 'smooth', + block: 'start', + inline: 'nearest', + }); + } else { + this.scrollToTop(); + } } private expandExercisesAndGradingKeysBeforePrinting() { - this.collapsedExerciseIds = []; + const stateBeforeResetting = { + exerciseInfos: cloneDeep(this.exerciseInfos), + isGradingKeyCollapsed: cloneDeep(this.isGradingKeyCollapsed), + isBonusGradingKeyCollapsed: cloneDeep(this.isBonusGradingKeyCollapsed), + }; + + this.expandExercises(); + this.isGradingKeyCollapsed = false; this.isBonusGradingKeyCollapsed = false; + + return stateBeforeResetting; + } + + private resetExpandingExercisesAndGradingKeys(stateBeforeResetting: StateBeforeResetting) { + this.exerciseInfos = stateBeforeResetting.exerciseInfos; + this.isGradingKeyCollapsed = stateBeforeResetting.isGradingKeyCollapsed; + this.isBonusGradingKeyCollapsed = stateBeforeResetting.isBonusGradingKeyCollapsed; + } + + private expandExercises() { + Object.entries(this.exerciseInfos).forEach((exerciseInfo: [string, ResultSummaryExerciseInfo]) => { + exerciseInfo[1].isCollapsed = false; + }); } public generateLink(exercise: Exercise) { @@ -195,28 +299,6 @@ export class ExamResultSummaryComponent implements OnInit { return exercise.studentParticipations?.[0] || undefined; } - /** - * @param exerciseId - * checks collapse control of exercise cards depending on exerciseId - */ - isCollapsed(exerciseId: number): boolean { - return this.collapsedExerciseIds.includes(exerciseId); - } - - /** - * @param exerciseId - * adds collapse control of exercise cards depending on exerciseId - * @param exerciseId the exercise for which the submission should be collapsed - */ - toggleCollapseExercise(exerciseId: number): void { - const collapsed = this.isCollapsed(exerciseId); - if (collapsed) { - this.collapsedExerciseIds = this.collapsedExerciseIds.filter((id) => id !== exerciseId); - } else { - this.collapsedExerciseIds.push(exerciseId); - } - } - /** * We only need to pass these values to the ComplaintInteractionComponent */ @@ -229,11 +311,7 @@ export class ExamResultSummaryComponent implements OnInit { this.examWithOnlyIdAndStudentReviewPeriod = exam; } - /** - * Used to decide whether to instantiate the ComplaintInteractionComponent. We always instantiate the component if - * the review dates are set and the review start date has passed. - */ - isAfterStudentReviewStart() { + private getIsAfterStudentReviewStart() { if (this.isTestRun || this.isTestExam) { return true; } @@ -243,7 +321,7 @@ export class ExamResultSummaryComponent implements OnInit { return false; } - isBeforeStudentReviewEnd() { + private getIsBeforeStudentReviewEnd() { if (this.isTestRun || this.isTestExam) { return true; } @@ -253,5 +331,118 @@ export class ExamResultSummaryComponent implements OnInit { return false; } + private getExerciseInfos(studentExamWithGrade?: StudentExamWithGradeDTO): Record { + const exerciseInfos: Record = {}; + for (const exercise of this.studentExam?.exercises ?? []) { + if (exercise.id === undefined) { + this.alertService.error('artemisApp.exam.error.cannotDisplayExerciseDetails', { exerciseGroupTitle: exercise.exerciseGroup?.title }); + const errorMessage = 'Cannot getExerciseInfos as exerciseId is undefined'; + captureException(new Error(errorMessage), { + extra: { + exercise, + }, + }); + continue; + } + + const { textColorClass, resultIconClass } = this.getTextColorAndIconClassByExercise(exercise); + + exerciseInfos[exercise.id] = { + icon: getIcon(exercise.type), + isCollapsed: false, + achievedPoints: this.getPointsByExerciseIdFromExam(exercise.id, studentExamWithGrade), + achievedPercentage: this.getAchievedPercentageByExerciseId(exercise.id), + colorClass: textColorClass, + resultIconClass: resultIconClass, + + submission: this.getSubmissionForExercise(exercise), + participation: this.getParticipationForExercise(exercise), + displayExampleSolution: false, + }; + } + return exerciseInfos; + } + + private getPointsByExerciseIdFromExam(exerciseId: number, studentExamWithGrade?: StudentExamWithGradeDTO): number | undefined { + if (!studentExamWithGrade) { + return undefined; + } + + for (const achievedPointsPerExerciseKey in this.studentExamGradeInfoDTO?.achievedPointsPerExercise) { + if (Number(achievedPointsPerExerciseKey) === exerciseId) { + return this.studentExamGradeInfoDTO.achievedPointsPerExercise[achievedPointsPerExerciseKey]; + } + } + + return undefined; + } + + private getExerciseResultByExerciseId(exerciseId?: number): ExerciseResult | undefined { + if (exerciseId === undefined) { + return undefined; + } + + const exerciseGroupResultMapping = this.studentExamGradeInfoDTO?.studentResult?.exerciseGroupIdToExerciseResult; + let exerciseResult = undefined; + + for (const key in exerciseGroupResultMapping) { + if (key in exerciseGroupResultMapping && exerciseGroupResultMapping[key].exerciseId === exerciseId) { + exerciseResult = exerciseGroupResultMapping[key]; + break; + } + } + + return exerciseResult; + } + + toggleShowSampleSolution(exerciseId?: number) { + if (exerciseId === undefined) { + this.alertService.error('artemisApp.exam.error.cannotShowExampleSolution'); + const errorMessage = 'Cannot show sample solution because exercise id is undefined'; + captureException(new Error(errorMessage), { + extra: { + exerciseId, + }, + }); + + return; + } + + this.exerciseInfos[exerciseId].displayExampleSolution = !this.exerciseInfos[exerciseId].displayExampleSolution; + } + + getAchievedPercentageByExerciseId(exerciseId?: number): number | undefined { + const result = this.getExerciseResultByExerciseId(exerciseId); + if (result === undefined) { + return undefined; + } + + const course = this.studentExamGradeInfoDTO.studentExam?.exam?.course; + if (result.achievedScore !== undefined) { + return roundScorePercentSpecifiedByCourseSettings(result.achievedScore / 100, course); + } + + const canCalculatePercentage = result.maxScore && result.achievedPoints !== undefined; + if (canCalculatePercentage) { + return roundScorePercentSpecifiedByCourseSettings(result.achievedPoints! / result.maxScore, course); + } + + return undefined; + } + + getTextColorAndIconClassByExercise(exercise: Exercise) { + const participation = exercise.studentParticipations![0]; + const showUngradedResults = false; + const result = getLatestResultOfStudentParticipation(participation, showUngradedResults); + + const isBuilding = false; + const templateStatus = evaluateTemplateStatus(exercise, participation, result, isBuilding); + + return { + textColorClass: getTextColorClass(result, templateStatus), + resultIconClass: getResultIconClass(result, templateStatus), + }; + } + protected readonly getIcon = getIcon; } diff --git a/src/main/webapp/app/exam/participate/summary/exam-result-summary.module.ts b/src/main/webapp/app/exam/participate/summary/exam-result-summary.module.ts index 9cf61c27e9df..4e3016fbc298 100644 --- a/src/main/webapp/app/exam/participate/summary/exam-result-summary.module.ts +++ b/src/main/webapp/app/exam/participate/summary/exam-result-summary.module.ts @@ -26,6 +26,11 @@ import { ExampleSolutionComponent } from 'app/exercises/shared/example-solution/ import { ArtemisProgrammingExerciseManagementModule } from 'app/exercises/programming/manage/programming-exercise-management.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { GradingKeyOverviewModule } from 'app/grading-system/grading-key-overview/grading-key-overview.module'; +import { ExamResultSummaryExerciseCardHeaderComponent } from 'app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component'; +import { ArtemisModelingParticipationModule } from 'app/exercises/modeling/participate/modeling-participation.module'; +import { ArtemisTextParticipationModule } from 'app/exercises/text/participate/text-participation.module'; +import { ArtemisFileUploadParticipationModule } from 'app/exercises/file-upload/participate/file-upload-participation.module'; +import { ArtemisFeedbackModule } from 'app/exercises/shared/feedback/feedback.module'; @NgModule({ imports: [ @@ -47,6 +52,10 @@ import { GradingKeyOverviewModule } from 'app/grading-system/grading-key-overvie ArtemisExamSharedModule, ArtemisSharedComponentModule, GradingKeyOverviewModule, + ArtemisModelingParticipationModule, + ArtemisTextParticipationModule, + ArtemisFileUploadParticipationModule, + ArtemisFeedbackModule, ], declarations: [ ExamResultSummaryComponent, @@ -57,6 +66,7 @@ import { GradingKeyOverviewModule } from 'app/grading-system/grading-key-overvie QuizExamSummaryComponent, ExamGeneralInformationComponent, ExamResultOverviewComponent, + ExamResultSummaryExerciseCardHeaderComponent, TestRunRibbonComponent, ExampleSolutionComponent, ], diff --git a/src/main/webapp/app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component.html b/src/main/webapp/app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component.html index 126748a64765..3969bdb473e5 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component.html +++ b/src/main/webapp/app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component.html @@ -1,9 +1,15 @@ -
- {{ 'artemisApp.fileUploadAssessment.submissionFile' | artemisTranslate }} - - {{ attachmentExtension(submission.filePath!) | uppercase }} - +
+ + +
No submission
+
- -
No submission
- diff --git a/src/main/webapp/app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component.ts index a8e1b717e56d..0137462b144c 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component.ts +++ b/src/main/webapp/app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component.ts @@ -1,34 +1,17 @@ import { Component, Input } from '@angular/core'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; -import { FileService } from 'app/shared/http/file.service'; +import { Exercise } from 'app/entities/exercise.model'; @Component({ selector: 'jhi-file-upload-exam-summary', templateUrl: './file-upload-exam-summary.component.html', }) export class FileUploadExamSummaryComponent { - @Input() - submission: FileUploadSubmission; + @Input() submission: FileUploadSubmission; - constructor(private fileService: FileService) {} + @Input() exercise: Exercise; - /** - * - * @param filePath - * File Upload Exercise - */ - downloadFile(filePath: string | undefined) { - if (!filePath) { - return; - } - this.fileService.downloadFile(filePath); - } + @Input() expandProblemStatement?: boolean = false; - attachmentExtension(filePath: string): string { - if (!filePath) { - return 'N/A'; - } - - return filePath.split('.').pop()!; - } + @Input() isAfterResultsArePublished?: boolean = false; } diff --git a/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.html b/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.html new file mode 100644 index 000000000000..0e09280ef5ef --- /dev/null +++ b/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.html @@ -0,0 +1,34 @@ +
+
+
+ #{{ index + 1 }}    + {{ exercise.exerciseGroup?.title }} +
+ +
+
+ [{{ exerciseInfo?.achievedPoints }} / {{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}] + +
+ + {{ exerciseInfo!.achievedPercentage }}% +
+
+ [{{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}] +
+
+ +
+ Warning: You are viewing an illegal submission. +
+ +
diff --git a/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.scss b/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.scss new file mode 100644 index 000000000000..8439109a11dc --- /dev/null +++ b/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.scss @@ -0,0 +1,7 @@ +.rotate-icon { + transition: transform 0.3s ease; +} + +.rotate-icon.rotated { + transform: rotate(90deg); +} diff --git a/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.ts new file mode 100644 index 000000000000..bca57b16e669 --- /dev/null +++ b/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.ts @@ -0,0 +1,25 @@ +import { Component, Input } from '@angular/core'; +import { Exercise } from 'app/entities/exercise.model'; +import { faAngleRight } from '@fortawesome/free-solid-svg-icons'; +import { ResultSummaryExerciseInfo } from 'app/exam/participate/summary/exam-result-summary.component'; +import { SubmissionType } from 'app/entities/submission.model'; + +@Component({ + selector: 'jhi-result-summary-exercise-card-header', + templateUrl: './exam-result-summary-exercise-card-header.component.html', + styleUrls: ['./exam-result-summary-exercise-card-header.component.scss'], +}) +export class ExamResultSummaryExerciseCardHeaderComponent { + @Input() index: number; + @Input() exercise: Exercise; + @Input() exerciseInfo?: ResultSummaryExerciseInfo; + @Input() resultsPublished: boolean; + + faAngleRight = faAngleRight; + + toggleCollapseExercise() { + this.exerciseInfo!.isCollapsed = !this.exerciseInfo!.isCollapsed; + } + + readonly SUBMISSION_TYPE_ILLEGAL = SubmissionType.ILLEGAL; +} diff --git a/src/main/webapp/app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component.html b/src/main/webapp/app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component.html index b694ad605a0a..e3b4e1121bc2 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component.html +++ b/src/main/webapp/app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component.html @@ -1,12 +1,16 @@ -
- +
+ + + +
No submission
+
- -
No submission
- diff --git a/src/main/webapp/app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component.ts index 5101d09a3e0d..b8cafb1dda8b 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component.ts +++ b/src/main/webapp/app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component.ts @@ -1,32 +1,15 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { UMLModel } from '@ls1intum/apollon'; @Component({ selector: 'jhi-modeling-exam-summary', templateUrl: './modeling-exam-summary.component.html', }) -export class ModelingExamSummaryComponent implements OnInit { - @Input() - exercise: ModelingExercise; - - @Input() - submission: ModelingSubmission; - - umlModel: UMLModel; - explanation: string; - - constructor() {} - - ngOnInit() { - if (this.submission) { - if (this.submission.model) { - this.umlModel = JSON.parse(this.submission.model); - } - if (this.submission.explanationText) { - this.explanation = this.submission.explanationText; - } - } - } +export class ModelingExamSummaryComponent { + @Input() exercise: ModelingExercise; + @Input() submission: ModelingSubmission; + @Input() isPrinting?: boolean = false; + @Input() expandProblemStatement?: boolean = false; + @Input() isAfterResultsArePublished?: boolean = false; } diff --git a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html index e365f906a0c0..244d4e044ee9 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html +++ b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.html @@ -1,6 +1,56 @@ -
- -
- {{ 'artemisApp.exam.examSummary.lastCommitHash' | artemisTranslate }}: - {{ (submission?.commitHash | slice: 0 : 7) || ('artemisApp.exam.examSummary.noCommitHash' | artemisTranslate) }} -
+ +
+
+
+
+
{{ 'artemisApp.exam.examSummary.yourSubmission' | artemisTranslate }}
+ + +
+ + + {{ 'artemisApp.exam.examSummary.submissionLinkedToCommit' | artemisTranslate }} + + {{ commitHash || ('artemisApp.exam.examSummary.noCommitHash' | artemisTranslate) }} + + + {{ commitHash || ('artemisApp.exam.examSummary.noCommitHash' | artemisTranslate) }} + + +
+ + +
{{ 'artemisApp.exam.examSummary.assessment' | artemisTranslate }}
+ + + +
+ +
+
{{ 'artemisApp.exam.examSummary.problemStatement' | artemisTranslate }}
+ +
+
+
+ + + diff --git a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts index e63c68b8165d..3c2a2cd3f9cf 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts +++ b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts @@ -1,21 +1,88 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, OnInit, Optional } from '@angular/core'; import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { AssessmentType } from 'app/entities/assessment-type.model'; +import { Exam } from 'app/entities/exam.model'; +import { ExerciseType } from 'app/entities/exercise.model'; +import { MissingResultInformation, evaluateTemplateStatus } from 'app/exercises/shared/result/result.utils'; +import { FeedbackComponentPreparedParams, prepareFeedbackComponentParameters } from 'app/exercises/shared/feedback/feedback.utils'; +import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; +import { ExerciseCacheService } from 'app/exercises/shared/exercise/exercise-cache.service'; +import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; +import { Result } from 'app/entities/result.model'; +import { createCommitUrl } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; @Component({ selector: 'jhi-programming-exam-summary', templateUrl: './programming-exam-summary.component.html', }) -export class ProgrammingExamSummaryComponent { - @Input() - exercise: ProgrammingExercise; +export class ProgrammingExamSummaryComponent implements OnInit { + @Input() exercise: ProgrammingExercise; - @Input() - participation: ProgrammingExerciseStudentParticipation; + @Input() participation: ProgrammingExerciseStudentParticipation; - @Input() - submission: ProgrammingSubmission; + @Input() submission: ProgrammingSubmission; - constructor() {} + @Input() isTestRun?: boolean = false; + + @Input() exam: Exam; + + @Input() isAfterStudentReviewStart?: boolean = false; + + @Input() resultsPublished?: boolean = false; + + @Input() isPrinting?: boolean = false; + + @Input() isAfterResultsArePublished?: boolean = false; + + readonly PROGRAMMING: ExerciseType = ExerciseType.PROGRAMMING; + + protected readonly AssessmentType = AssessmentType; + protected readonly ProgrammingExercise = ProgrammingExercise; + protected readonly ExerciseType = ExerciseType; + + result: Result | undefined; + + feedbackComponentParameters: FeedbackComponentPreparedParams; + + commitUrl: string | undefined; + commitHash: string | undefined; + + constructor( + private exerciseService: ExerciseService, + @Optional() private exerciseCacheService: ExerciseCacheService, + private profileService: ProfileService, + ) {} + + ngOnInit() { + this.result = this.participation.results?.[0]; + this.commitHash = this.submission?.commitHash?.slice(0, 11); + + const isBuilding = false; + const missingResultInfo = MissingResultInformation.NONE; + + const templateStatus = evaluateTemplateStatus(this.exercise, this.participation, this.participation.results?.[0], isBuilding, missingResultInfo); + + if (this.result) { + this.feedbackComponentParameters = prepareFeedbackComponentParameters( + this.exercise, + this.result, + this.participation, + templateStatus, + this.exam.latestIndividualEndDate, + this.exerciseCacheService ?? this.exerciseService, + ); + } + + this.updateCommitUrl(); + } + + private updateCommitUrl() { + // Get active profiles, to distinguish between Bitbucket and GitLab for the commit link of the result + this.profileService.getProfileInfo().subscribe((profileInfo) => { + const commitHashURLTemplate = profileInfo?.commitHashURLTemplate; + this.commitUrl = createCommitUrl(commitHashURLTemplate, this.exercise.projectKey, this.participation, this.submission); + }); + } } diff --git a/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.html b/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.html index 6b9a48c8d8ae..21f9a8dadc1a 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.html +++ b/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.html @@ -1,8 +1,8 @@ -
+
{{ 'artemisApp.exam.examSummary.missingResultNotice' | artemisTranslate }}
-
+
(); @Input() - exercise: QuizExercise; + quizParticipation: QuizParticipation; @Input() submission: QuizSubmission; @@ -47,15 +47,16 @@ export class QuizExamSummaryComponent implements OnInit { private serverDateService: ArtemisServerDateService, ) {} - ngOnInit(): void { + ngOnChanges(): void { this.updateViewFromSubmission(); - this.result = - this.exercise.studentParticipations && - this.exercise.studentParticipations.length > 0 && - this.exercise.studentParticipations[0].results && - this.exercise.studentParticipations[0].results.length > 0 - ? this.exercise.studentParticipations[0].results[0] - : undefined; + if (this.quizParticipation.studentParticipations) { + this.result = + this.quizParticipation.studentParticipations.length > 0 && this.quizParticipation.studentParticipations[0].results?.length + ? this.quizParticipation.studentParticipations[0].results[0] + : undefined; + } else { + this.result = this.submission.results?.length ? this.submission.results[0] : undefined; + } } /** @@ -71,9 +72,9 @@ export class QuizExamSummaryComponent implements OnInit { this.dragAndDropMappings = new Map(); this.shortAnswerSubmittedTexts = new Map(); - if (this.exercise && this.exercise.quizQuestions && this.submission) { + if (this.quizParticipation.quizQuestions && this.submission) { // iterate through all questions of this quiz - this.exercise.quizQuestions.forEach((question) => { + this.quizParticipation.quizQuestions.forEach((question) => { // find the submitted answer that belongs to this question, only when submitted answers already exist const submittedAnswer = this.submission.submittedAnswers ? this.submission.submittedAnswers.find((answer) => { @@ -131,11 +132,8 @@ export class QuizExamSummaryComponent implements OnInit { * We only show the notice when there is a publishResultsDate that has already passed by now and the result is missing */ get showMissingResultsNotice(): boolean { - if (this.exam && this.exam.publishResultsDate && this.exercise && this.exercise.studentParticipations && this.exercise.studentParticipations.length > 0) { - return ( - dayjs(this.exam.publishResultsDate).isBefore(this.serverDateService.now()) && - (!this.exercise.studentParticipations[0].results || this.exercise.studentParticipations[0].results.length <= 0) - ); + if (this.exam && this.exam.publishResultsDate && this.quizParticipation.studentParticipations && this.quizParticipation.studentParticipations.length > 0) { + return dayjs(this.exam.publishResultsDate).isBefore(this.serverDateService.now()) && !this.result; } return false; } diff --git a/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.html b/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.html index f478cbcb7882..d4931b385e00 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.html +++ b/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.html @@ -1,4 +1,14 @@ -
{{ submission.text }}
- -
No submission
- +
+ + +
No submission
+ +
diff --git a/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts index dd9c4ce34f23..5ea1bf223f68 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts +++ b/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts @@ -1,19 +1,14 @@ import { Component, Input } from '@angular/core'; import { TextSubmission } from 'app/entities/text-submission.model'; +import { Exercise } from 'app/entities/exercise.model'; @Component({ selector: 'jhi-text-exam-summary', templateUrl: './text-exam-summary.component.html', - styles: [ - ` - :host { - white-space: pre-wrap; - display: block; - background-color: var(--exam-text-exam-summary-background); - } - `, - ], }) export class TextExamSummaryComponent { + @Input() exercise: Exercise; @Input() submission: TextSubmission; + @Input() expandProblemStatement?: boolean = false; + @Input() isAfterResultsArePublished?: boolean = false; } diff --git a/src/main/webapp/app/exam/participate/summary/result-overview/exam-result-overview.component.scss b/src/main/webapp/app/exam/participate/summary/result-overview/exam-result-overview.component.scss index 251508ae9922..f053df75c6b5 100644 --- a/src/main/webapp/app/exam/participate/summary/result-overview/exam-result-overview.component.scss +++ b/src/main/webapp/app/exam/participate/summary/result-overview/exam-result-overview.component.scss @@ -46,7 +46,6 @@ .icon-container { display: inline-block; vertical-align: middle; - horiz-align: center; } .icon { diff --git a/src/main/webapp/app/exam/participate/summary/result-overview/exam-result-overview.component.ts b/src/main/webapp/app/exam/participate/summary/result-overview/exam-result-overview.component.ts index 35e68a698083..b110664baa8b 100644 --- a/src/main/webapp/app/exam/participate/summary/result-overview/exam-result-overview.component.ts +++ b/src/main/webapp/app/exam/participate/summary/result-overview/exam-result-overview.component.ts @@ -1,17 +1,16 @@ import { ChangeDetectorRef, Component, Input, OnChanges, OnInit } from '@angular/core'; import dayjs from 'dayjs/esm'; -import { Exercise, IncludedInOverallScore, getIcon } from 'app/entities/exercise.model'; +import { IncludedInOverallScore } from 'app/entities/exercise.model'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { GradeType } from 'app/entities/grading-scale.model'; import { faAward, faClipboard } from '@fortawesome/free-solid-svg-icons'; -import { ExerciseResult, StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; +import { StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; import { BonusStrategy } from 'app/entities/bonus.model'; -import { evaluateTemplateStatus, getTextColorClass } from 'app/exercises/shared/result/result.utils'; import { faChevronRight } from '@fortawesome/free-solid-svg-icons'; import { roundScorePercentSpecifiedByCourseSettings } from 'app/shared/util/utils'; -import { getLatestResultOfStudentParticipation } from 'app/exercises/shared/participation/participation.utils'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; +import { captureException } from '@sentry/angular-ivy'; type ExerciseInfo = { icon: IconProp; @@ -31,6 +30,7 @@ export class ExamResultOverviewComponent implements OnInit, OnChanges { @Input() studentExamWithGrade: StudentExamWithGradeDTO; @Input() isGradingKeyCollapsed: boolean = true; @Input() isBonusGradingKeyCollapsed: boolean = true; + @Input() exerciseInfos: Record; gradingScaleExists = false; isBonus = false; @@ -51,8 +51,6 @@ export class ExamResultOverviewComponent implements OnInit, OnChanges { overallAchievedPercentageRoundedByCourseSettings = 0; isBonusGradingKeyDisplayed = false; - exerciseInfos: Record; - /** * The points summary table will only be shown if: * - exam.publishResultsDate is set @@ -90,24 +88,6 @@ export class ExamResultOverviewComponent implements OnInit, OnChanges { (this.studentExamWithGrade.studentResult.overallScoreAchieved ?? 0) / 100, this.studentExamWithGrade.studentExam?.exam?.course, ); - - this.exerciseInfos = this.getExerciseInfos(); - } - - private getExerciseInfos() { - const exerciseInfos: Record = {}; - for (const exercise of this.studentExamWithGrade?.studentExam?.exercises ?? []) { - if (exercise.id === undefined) { - console.error('Exercise id is undefined', exercise); - continue; - } - exerciseInfos[exercise.id] = { - icon: getIcon(exercise.type), - achievedPercentage: this.getAchievedPercentageByExerciseId(exercise.id), - colorClass: this.getTextColorClassByExercise(exercise), - }; - } - return exerciseInfos; } /** @@ -150,43 +130,6 @@ export class ExamResultOverviewComponent implements OnInit, OnChanges { return this.maxPoints + maxAchievableBonusPoints; } - private getExerciseResultByExerciseId(exerciseId?: number): ExerciseResult | undefined { - if (exerciseId === undefined) { - return undefined; - } - - const exerciseGroupResultMapping = this.studentExamWithGrade?.studentResult?.exerciseGroupIdToExerciseResult; - let exerciseResult = undefined; - - for (const key in exerciseGroupResultMapping) { - if (key in exerciseGroupResultMapping && exerciseGroupResultMapping[key].exerciseId === exerciseId) { - exerciseResult = exerciseGroupResultMapping[key]; - break; - } - } - - return exerciseResult; - } - - getAchievedPercentageByExerciseId(exerciseId?: number): number | undefined { - const result = this.getExerciseResultByExerciseId(exerciseId); - if (result === undefined) { - return undefined; - } - - const course = this.studentExamWithGrade.studentExam?.exam?.course; - if (result.achievedScore !== undefined) { - return roundScorePercentSpecifiedByCourseSettings(result.achievedScore / 100, course); - } - - const canCalculatePercentage = result.maxScore && result.achievedPoints !== undefined; - if (canCalculatePercentage) { - return roundScorePercentSpecifiedByCourseSettings(result.achievedPoints! / result.maxScore, course); - } - - return undefined; - } - scrollToExercise(exerciseId?: number) { if (exerciseId === undefined) { return; @@ -202,7 +145,15 @@ export class ExamResultOverviewComponent implements OnInit, OnChanges { inline: 'nearest', }); } else { - console.error(`Could not find corresponding exercise with id "${searchedId}"`); + const errorMessage = 'Cannot scroll to exercise, could not find exercise with corresponding id'; + console.error(errorMessage); + captureException(new Error(errorMessage), { + extra: { + exerciseId, + searchedId, + targetElement, + }, + }); } } @@ -216,17 +167,6 @@ export class ExamResultOverviewComponent implements OnInit, OnChanges { return false; } - getTextColorClassByExercise(exercise: Exercise) { - const participation = exercise.studentParticipations![0]; - const showUngradedResults = false; - const result = getLatestResultOfStudentParticipation(participation, showUngradedResults); - - const isBuilding = false; - const templateStatus = evaluateTemplateStatus(exercise, participation, result, isBuilding); - - return getTextColorClass(result, templateStatus); - } - toggleGradingKey(): void { this.isGradingKeyCollapsed = !this.isGradingKeyCollapsed; } @@ -234,8 +174,4 @@ export class ExamResultOverviewComponent implements OnInit, OnChanges { toggleBonusGradingKey(): void { this.isBonusGradingKeyCollapsed = !this.isBonusGradingKeyCollapsed; } - - protected readonly getIcon = getIcon; - protected readonly getTextColorClass = getTextColorClass; - protected readonly evaluateTemplateStatus = evaluateTemplateStatus; } diff --git a/src/main/webapp/app/exam/shared/events/exam-live-event.component.html b/src/main/webapp/app/exam/shared/events/exam-live-event.component.html index bc16073f1426..b8e3844b6db3 100644 --- a/src/main/webapp/app/exam/shared/events/exam-live-event.component.html +++ b/src/main/webapp/app/exam/shared/events/exam-live-event.component.html @@ -13,24 +13,15 @@ | {{ event.acknowledgeTimestamps!.user! | artemisDate: 'time' }}
-
+
-
+
The working time of the exam has been changed.
-
+
The working time of your exam has been changed.
-
- -
-
New working time
-
{{ eventAsWorkingTimeUpdateEvent().newWorkingTime | artemisDurationFromSeconds }}
-
-
+
+ + {{ submittedFileExtension | uppercase }} + +

diff --git a/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.ts b/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.ts index 27ad6505a4e1..ebd49234be13 100644 --- a/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.ts +++ b/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { Location } from '@angular/common'; import { TranslateService } from '@ngx-translate/core'; import { ActivatedRoute } from '@angular/router'; @@ -28,13 +28,25 @@ import { onError } from 'app/shared/util/global.utils'; import { getCourseFromExercise } from 'app/entities/exercise.model'; import { Course } from 'app/entities/course.model'; import { faListAlt } from '@fortawesome/free-regular-svg-icons'; +import { faDownload } from '@fortawesome/free-solid-svg-icons'; @Component({ + selector: 'jhi-file-upload-submission', templateUrl: './file-upload-submission.component.html', }) export class FileUploadSubmissionComponent implements OnInit, ComponentCanDeactivate { readonly addParticipationToResult = addParticipationToResult; @ViewChild('fileInput', { static: false }) fileInput: ElementRef; + + @Input() participationId?: number; + @Input() displayHeader: boolean = true; + @Input() expandProblemStatement?: boolean = true; + @Input() displayedInExamSummary?: boolean = false; + + @Input() inputExercise?: FileUploadExercise; + @Input() inputSubmission?: FileUploadSubmission; + @Input() inputParticipation?: StudentParticipation; + submission?: FileUploadSubmission; submittedFileName: string; submittedFileExtension: string; @@ -54,6 +66,7 @@ export class FileUploadSubmissionComponent implements OnInit, ComponentCanDeacti isLate: boolean; // indicates if the submission is late + faDownload = faDownload; readonly ButtonType = ButtonType; private submissionConfirmationText: string; @@ -81,55 +94,86 @@ export class FileUploadSubmissionComponent implements OnInit, ComponentCanDeacti * Initializes data for file upload editor */ ngOnInit() { - const participationId = Number(this.route.snapshot.paramMap.get('participationId')); - if (Number.isNaN(participationId)) { - return this.alertService.error('artemisApp.fileUploadExercise.error'); - } - this.fileUploadSubmissionService.getDataForFileUploadEditor(participationId).subscribe({ - next: (submission: FileUploadSubmission) => { - // reconnect participation <--> result - const tmpResult = getLatestSubmissionResult(submission); - if (tmpResult) { - submission.participation!.results = [tmpResult!]; - } - this.participation = submission.participation; + if (this.inputValuesArePresent()) { + this.setupComponentWithInputValues(); + } else { + const participationId = this.participationId ?? Number(this.route.snapshot.paramMap.get('participationId')); + if (Number.isNaN(participationId)) { + return this.alertService.error('artemisApp.fileUploadExercise.error'); + } + this.fileUploadSubmissionService.getDataForFileUploadEditor(participationId).subscribe({ + next: (submission: FileUploadSubmission) => { + // reconnect participation <--> result + const tmpResult = getLatestSubmissionResult(submission); + if (tmpResult) { + submission.participation!.results = [tmpResult!]; + } + this.participation = submission.participation; - // reconnect participation <--> submission - this.participation.submissions = [omit(submission, 'participation')]; + // reconnect participation <--> submission + this.participation.submissions = [omit(submission, 'participation')]; - this.submission = submission; - this.result = tmpResult!; - this.resultWithComplaint = getFirstResultWithComplaint(submission); - this.fileUploadExercise = this.participation.exercise as FileUploadExercise; - this.examMode = !!this.fileUploadExercise.exerciseGroup; - this.fileUploadExercise.studentParticipations = [this.participation]; - this.course = getCourseFromExercise(this.fileUploadExercise); + this.submission = submission; + this.result = tmpResult!; + this.resultWithComplaint = getFirstResultWithComplaint(submission); + this.fileUploadExercise = this.participation.exercise as FileUploadExercise; + this.examMode = !!this.fileUploadExercise.exerciseGroup; + this.fileUploadExercise.studentParticipations = [this.participation]; + this.course = getCourseFromExercise(this.fileUploadExercise); - // checks if the student started the exercise after the due date - this.isLate = - this.fileUploadExercise && - !!this.fileUploadExercise.dueDate && - !!this.participation.initializationDate && - dayjs(this.participation.initializationDate).isAfter(getExerciseDueDate(this.fileUploadExercise, this.participation)); + // checks if the student started the exercise after the due date + this.isLate = + this.fileUploadExercise && + !!this.fileUploadExercise.dueDate && + !!this.participation.initializationDate && + dayjs(this.participation.initializationDate).isAfter(getExerciseDueDate(this.fileUploadExercise, this.participation)); - this.acceptedFileExtensions = this.fileUploadExercise - .filePattern!.split(',') - .map((extension) => `.${extension}`) - .join(','); - this.isAfterAssessmentDueDate = !this.fileUploadExercise.assessmentDueDate || dayjs().isAfter(this.fileUploadExercise.assessmentDueDate); + this.acceptedFileExtensions = this.fileUploadExercise + .filePattern!.split(',') + .map((extension) => `.${extension}`) + .join(','); + this.isAfterAssessmentDueDate = !this.fileUploadExercise.assessmentDueDate || dayjs().isAfter(this.fileUploadExercise.assessmentDueDate); - if (this.submission?.submitted) { - this.setSubmittedFile(); - } - if (this.submission?.submitted && this.result?.completionDate) { - this.fileUploadAssessmentService.getAssessment(this.submission.id!).subscribe((assessmentResult: Result) => { - this.result = assessmentResult; - }); - } - this.isOwnerOfParticipation = this.accountService.isOwnerOfParticipation(this.participation); - }, - error: (error: HttpErrorResponse) => onError(this.alertService, error), - }); + if (this.submission?.submitted) { + this.setSubmittedFile(); + } + if (this.submission?.submitted && this.result?.completionDate) { + this.fileUploadAssessmentService.getAssessment(this.submission.id!).subscribe((assessmentResult: Result) => { + this.result = assessmentResult; + }); + } + this.isOwnerOfParticipation = this.accountService.isOwnerOfParticipation(this.participation); + }, + error: (error: HttpErrorResponse) => onError(this.alertService, error), + }); + } + } + + private inputValuesArePresent(): boolean { + return !!(this.inputExercise || this.inputSubmission || this.inputParticipation); + } + + /** + * Uses values directly passed to this component instead of subscribing to a participation to save resources + * + * e.g. used within {@link ExamResultSummaryComponent} and the respective {@link ModelingExamSummaryComponent} + * as directly after the exam no grading is present and only the student solution shall be displayed + * @private + */ + private setupComponentWithInputValues() { + if (this.inputExercise) { + this.fileUploadExercise = this.inputExercise; + } + if (this.inputSubmission) { + this.submission = this.inputSubmission; + } + if (this.inputParticipation) { + this.participation = this.inputParticipation; + } + + if (this.submission?.submitted) { + this.setSubmittedFile(); + } } /** diff --git a/src/main/webapp/app/exercises/modeling/participate/modeling-participation.module.ts b/src/main/webapp/app/exercises/modeling/participate/modeling-participation.module.ts index 267bc4d2d365..ac46c46cb406 100644 --- a/src/main/webapp/app/exercises/modeling/participate/modeling-participation.module.ts +++ b/src/main/webapp/app/exercises/modeling/participate/modeling-participation.module.ts @@ -31,5 +31,6 @@ import { ArtemisTeamParticipeModule } from 'app/exercises/shared/team/team-parti ArtemisTeamParticipeModule, ], declarations: [ModelingSubmissionComponent], + exports: [ModelingSubmissionComponent], }) export class ArtemisModelingParticipationModule {} diff --git a/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.html b/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.html index 358aa96607c0..bb9eb96f3adc 100644 --- a/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.html +++ b/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.html @@ -1,5 +1,5 @@
- + {{ 'artemisApp.modelingSubmission.modelingEditor' | artemisTranslate }}: {{ examMode ? modelingExercise?.exerciseGroup?.title : modelingExercise?.title }} @@ -18,7 +18,7 @@ > - +
diff --git a/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.ts b/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.ts index 29a0931f2c48..2fb1f7921db4 100644 --- a/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.ts +++ b/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.ts @@ -1,6 +1,6 @@ import { HttpErrorResponse } from '@angular/common/http'; -import { Component, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, HostListener, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Selection, UMLElementType, UMLModel, UMLRelationshipType } from '@ls1intum/apollon'; import { TranslateService } from '@ngx-translate/core'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; @@ -33,6 +33,7 @@ import { Course } from 'app/entities/course.model'; import { getNamesForAssessments } from '../assess/modeling-assessment.util'; import { faExclamationTriangle, faGripLines } from '@fortawesome/free-solid-svg-icons'; import { faListAlt } from '@fortawesome/free-regular-svg-icons'; +import { onError } from 'app/shared/util/global.utils'; @Component({ selector: 'jhi-modeling-submission', @@ -47,6 +48,15 @@ export class ModelingSubmissionComponent implements OnInit, OnDestroy, Component modelingEditor: ModelingEditorComponent; ButtonType = ButtonType; + @Input() participationId?: number; + @Input() displayHeader: boolean = true; + @Input() isPrinting?: boolean = false; + @Input() expandProblemStatement?: boolean = false; + + @Input() inputExercise?: ModelingExercise; + @Input() inputSubmission?: ModelingSubmission; + @Input() inputParticipation?: StudentParticipation; + private subscription: Subscription; private resultUpdateListener: Subscription; @@ -105,7 +115,6 @@ export class ModelingSubmissionComponent implements OnInit, OnDestroy, Component private alertService: AlertService, private route: ActivatedRoute, private translateService: TranslateService, - private router: Router, private participationWebsocketService: ParticipationWebsocketService, private guidedTourService: GuidedTourService, private accountService: AccountService, @@ -116,29 +125,66 @@ export class ModelingSubmissionComponent implements OnInit, OnDestroy, Component } ngOnInit(): void { - this.subscription = this.route.params.subscribe((params) => { - if (params['participationId']) { - this.modelingSubmissionService.getLatestSubmissionForModelingEditor(params['participationId']).subscribe({ - next: (modelingSubmission) => { - this.updateModelingSubmission(modelingSubmission); - if (this.modelingExercise.teamMode) { - this.setupSubmissionStreamForTeam(); - } else { - this.setAutoSaveTimer(); - } - }, - error: (error) => { - if (error.status === 403) { - this.router.navigate(['accessdenied']); - } - }, - }); - } - }); - window.scroll(0, 0); + if (this.inputValuesArePresent()) { + this.setupComponentWithInputValues(); + } else { + this.subscription = this.route.params.subscribe((params) => { + const participationId = params['participationId'] ?? this.participationId; + + if (participationId) { + this.modelingSubmissionService.getLatestSubmissionForModelingEditor(participationId).subscribe({ + next: (modelingSubmission) => { + this.updateModelingSubmission(modelingSubmission); + if (this.modelingExercise.teamMode) { + this.setupSubmissionStreamForTeam(); + } else { + this.setAutoSaveTimer(); + } + }, + error: (error: HttpErrorResponse) => onError(this.alertService, error), + }); + } + }); + } + + const isDisplayedOnExamSummaryPage = !this.displayHeader && this.participationId !== undefined; + if (!isDisplayedOnExamSummaryPage) { + window.scroll(0, 0); + } + } + + private inputValuesArePresent(): boolean { + return !!(this.inputExercise || this.inputSubmission || this.inputParticipation); + } + + /** + * Uses values directly passed to this component instead of subscribing to a participation to save resources + * + * e.g. used within {@link ExamResultSummaryComponent} and the respective {@link ModelingExamSummaryComponent} + * as directly after the exam no grading is present and only the student solution shall be displayed + * @private + */ + private setupComponentWithInputValues() { + if (this.inputExercise) { + this.modelingExercise = this.inputExercise; + } + if (this.inputSubmission) { + this.submission = this.inputSubmission; + } + if (this.inputParticipation) { + this.participation = this.inputParticipation; + } + + if (this.submission.model) { + this.umlModel = JSON.parse(this.submission.model); + this.hasElements = this.umlModel.elements && this.umlModel.elements.length !== 0; + } + this.explanation = this.submission.explanationText ?? ''; } - // Updates component with the given modeling submission + /** + * Updates the modeling submission with the given modeling submission. + */ private updateModelingSubmission(modelingSubmission: ModelingSubmission) { if (!modelingSubmission) { this.alertService.error('artemisApp.apollonDiagram.submission.noSubmission'); @@ -419,7 +465,7 @@ export class ModelingSubmissionComponent implements OnInit, OnDestroy, Component } /** - * Check whether or not a assessmentResult exists and if, returns the unreferenced feedback of it + * Check whether a assessmentResult exists and if, returns the unreferenced feedback of it */ get unreferencedFeedback(): Feedback[] | undefined { if (this.assessmentResult?.feedbacks) { diff --git a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.ts b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.ts index 6413146e65d0..b3b744d6b8d3 100644 --- a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.ts +++ b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.ts @@ -1,6 +1,5 @@ -import { AfterViewInit, Component, EventEmitter, Input, OnChanges, OnDestroy, Output, Renderer2, SimpleChanges } from '@angular/core'; +import { AfterViewInit, Component, EventEmitter, Input, OnChanges, OnDestroy, Output, SimpleChanges } from '@angular/core'; import { ApollonEditor, ApollonMode, UMLDiagramType, UMLElementType, UMLModel, UMLRelationship, UMLRelationshipType } from '@ls1intum/apollon'; -import { AlertService } from 'app/core/util/alert.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { associationUML, personUML, studentUML } from 'app/guided-tour/guided-tour-task.model'; import { GuidedTourService } from 'app/guided-tour/guided-tour.service'; @@ -36,8 +35,6 @@ export class ModelingEditorComponent extends ModelingComponent implements AfterV scrollListener: ((this: Document, ev: Event) => any) | undefined; constructor( - private alertService: AlertService, - private renderer: Renderer2, private modalService: NgbModal, private guidedTourService: GuidedTourService, ) { diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts index e06fceb30460..13a0b57ec028 100644 --- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts +++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts @@ -12,7 +12,7 @@ import { CodeHintService } from 'app/exercises/shared/exercise-hint/services/cod import { ManualSolutionEntryCreationModalComponent } from 'app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component'; import { SortingOrder } from 'app/shared/table/pageable-table'; import { ProgrammingExerciseSolutionEntryService } from 'app/exercises/shared/exercise-hint/services/programming-exercise-solution-entry.service'; -import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @Component({ @@ -70,14 +70,20 @@ export class SolutionEntryGenerationStepComponent implements OnInit, OnDestroy { } openSolutionEntryModal(solutionEntry: ProgrammingExerciseSolutionEntry, isEditable: boolean) { - const modalRef: NgbModalRef = this.modalService.open(SolutionEntryDetailsModalComponent as Component, { size: 'lg', backdrop: 'static' }); + const modalRef: NgbModalRef = this.modalService.open(SolutionEntryDetailsModalComponent as Component, { + size: 'lg', + backdrop: 'static', + }); modalRef.componentInstance.exerciseId = this.exercise.id; modalRef.componentInstance.solutionEntry = solutionEntry; modalRef.componentInstance.isEditable = isEditable; } openManualEntryCreationModal() { - const modalRef: NgbModalRef = this.modalService.open(ManualSolutionEntryCreationModalComponent as Component, { size: 'lg', backdrop: 'static' }); + const modalRef: NgbModalRef = this.modalService.open(ManualSolutionEntryCreationModalComponent as Component, { + size: 'lg', + backdrop: 'static', + }); modalRef.componentInstance.exerciseId = this.exercise.id; modalRef.componentInstance.onEntryCreated.subscribe((createdEntry: ProgrammingExerciseSolutionEntry) => { this.solutionEntries.push(createdEntry); diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts index a8a577224673..ad6707e520f0 100644 --- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts @@ -13,7 +13,7 @@ import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service' import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { ExerciseType } from 'app/entities/exercise.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { TranslateService } from '@ngx-translate/core'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { ExerciseManagementStatisticsDto } from 'app/exercises/shared/statistics/exercise-management-statistics-dto'; @@ -191,7 +191,7 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy { this.supportsAuxiliaryRepositories = this.programmingLanguageFeatureService.getProgrammingLanguageFeature(programmingExercise.programmingLanguage).auxiliaryRepositoriesSupported ?? false; this.localVCEnabled = profileInfo.activeProfiles.includes(PROFILE_LOCALVC); - this.irisEnabled = profileInfo.activeProfiles.includes('iris'); + this.irisEnabled = profileInfo.activeProfiles.includes('iris') && !this.programmingExercise.exerciseGroup; } }); diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-example-solution-repo-download.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-example-solution-repo-download.component.ts index 237db5201818..493688bff21a 100644 --- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-example-solution-repo-download.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-example-solution-repo-download.component.ts @@ -6,18 +6,20 @@ import { ProgrammingExerciseInstructorRepoDownloadComponent } from 'app/exercise selector: 'jhi-programming-exercise-example-solution-repo-download', template: ``, + />`, }) export class ProgrammingExerciseExampleSolutionRepoDownloadComponent extends ProgrammingExerciseInstructorRepoDownloadComponent { @Input() includeTests?: boolean; + @Input() displayedOnExamSummary: boolean = false; + exportRepository() { if (this.exerciseId) { this.programmingExerciseService.exportStudentRequestedRepository(this.exerciseId, this.includeTests ?? false).subscribe((response) => { diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-trigger-build-button.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-trigger-build-button.component.ts index dbb8693adec5..91ced7a711aa 100644 --- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-trigger-build-button.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-trigger-build-button.component.ts @@ -6,7 +6,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { AlertService } from 'app/core/util/alert.service'; import { SubmissionType } from 'app/entities/submission.model'; -import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { faRedo } from '@fortawesome/free-solid-svg-icons'; @Component({ diff --git a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.html b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.html index f2718b6a0e0f..3605f0d5d40d 100644 --- a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.html +++ b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.html @@ -9,7 +9,7 @@ class="test-schedule-date px-1" label="artemisApp.exercise.releaseDate" tooltipText="artemisApp.programmingExercise.timeline.releaseDateTooltip" - > + /> + />
@@ -44,8 +44,8 @@ class="test-schedule-date px-1" label="artemisApp.exercise.dueDate" tooltipText="artemisApp.programmingExercise.timeline.dueDateTooltip" - > - + id="programming-exercise-due-date-picker" + /> - + />
@@ -94,7 +93,7 @@ [readOnly]="readOnly" label="artemisApp.programmingExercise.timeline.assessmentDueDate" tooltipText="artemisApp.programmingExercise.timeline.assessmentDueDateTooltip" - > + />
@@ -106,8 +105,7 @@ class="test-schedule-date px-1" label="artemisApp.exercise.exampleSolutionPublicationDate" tooltipText="artemisApp.programmingExercise.timeline.exampleSolutionPublicationDateTooltip" - > - + />
diff --git a/src/main/webapp/app/exercises/quiz/participate/quiz-participation.component.html b/src/main/webapp/app/exercises/quiz/participate/quiz-participation.component.html index c67a2dec57fc..6731c945b863 100644 --- a/src/main/webapp/app/exercises/quiz/participate/quiz-participation.component.html +++ b/src/main/webapp/app/exercises/quiz/participate/quiz-participation.component.html @@ -31,7 +31,7 @@

[clickDisabled]="submission.submitted || remainingTimeSeconds < 0" [showResult]="showingResult" [submittedResult]="result" - [submittedQuizExercise]="quizExercise" + [quizQuestions]="quizExercise.quizQuestions" [forceSampleSolution]="mode === 'solution'" [questionIndex]="i + 1" [score]="questionScores[question.id!]" diff --git a/src/main/webapp/app/exercises/quiz/participate/quiz-participation.component.ts b/src/main/webapp/app/exercises/quiz/participate/quiz-participation.component.ts index fc449a093c29..e4eaac5f880a 100644 --- a/src/main/webapp/app/exercises/quiz/participate/quiz-participation.component.ts +++ b/src/main/webapp/app/exercises/quiz/participate/quiz-participation.component.ts @@ -286,7 +286,7 @@ export class QuizParticipationComponent implements OnInit, OnDestroy { this.initQuiz(); // randomize order - this.quizService.randomizeOrder(this.quizExercise); + this.quizService.randomizeOrder(this.quizExercise.quizQuestions, this.quizExercise.randomizeQuestionOrder); // init empty submission this.submission = new QuizSubmission(); @@ -649,7 +649,7 @@ export class QuizParticipationComponent implements OnInit, OnDestroy { this.jhiWebsocketService.enableReconnect(); // apply randomized order where necessary - this.quizService.randomizeOrder(this.quizExercise); + this.quizService.randomizeOrder(this.quizExercise.quizQuestions, this.quizExercise.randomizeQuestionOrder); } } } diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html index 36cb9b86cc88..c41aa51b4faa 100644 --- a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html +++ b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html @@ -40,7 +40,7 @@

{{ 'artemisApp.quizQuestion.singleOption' | artemisTr [multipleChoiceMapping]="selectedAnswerOptions" [questionIndex]="questionIndex" [multipleChoiceSubmittedResult]="submittedResult" - [submittedQuizExercise]="submittedQuizExercise" + [quizQuestions]="quizQuestions" >
diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.ts b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.ts index 5a5658de4bd9..183d2f78a897 100644 --- a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.ts +++ b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.ts @@ -2,9 +2,8 @@ import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angu import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { AnswerOption } from 'app/entities/quiz/answer-option.model'; import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model'; -import { RenderedQuizQuestionMarkDownElement } from 'app/entities/quiz/quiz-question.model'; +import { QuizQuestion, RenderedQuizQuestionMarkDownElement } from 'app/entities/quiz/quiz-question.model'; import { Result } from 'app/entities/result.model'; -import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { faExclamationCircle, faExclamationTriangle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; import { faCheckSquare, faCircle, faDotCircle, faSquare } from '@fortawesome/free-regular-svg-icons'; @@ -43,7 +42,7 @@ export class MultipleChoiceQuestionComponent { @Input() submittedResult: Result; @Input() - submittedQuizExercise: QuizExercise; + quizQuestions: QuizQuestion[] | undefined; @Output() selectedAnswerOptionsChange = new EventEmitter(); diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/quiz-scoring-infostudent-modal/quiz-scoring-info-student-modal.component.ts b/src/main/webapp/app/exercises/quiz/shared/questions/quiz-scoring-infostudent-modal/quiz-scoring-info-student-modal.component.ts index 7fba53293c6a..5ac7d0af0c23 100644 --- a/src/main/webapp/app/exercises/quiz/shared/questions/quiz-scoring-infostudent-modal/quiz-scoring-info-student-modal.component.ts +++ b/src/main/webapp/app/exercises/quiz/shared/questions/quiz-scoring-infostudent-modal/quiz-scoring-info-student-modal.component.ts @@ -10,7 +10,6 @@ import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.mode import { AnswerOption } from 'app/entities/quiz/answer-option.model'; import { ShortAnswerSubmittedText } from 'app/entities/quiz/short-answer-submitted-text.model'; import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model'; -import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { faQuestionCircle } from '@fortawesome/free-regular-svg-icons'; @Component({ @@ -32,7 +31,7 @@ export class QuizScoringInfoStudentModalComponent implements AfterViewInit { @Input() shortAnswerText = new Array(); @Input() correctlyMappedDragAndDropItems: number; // Amount of correctly mapped drag and drop items @Input() multipleChoiceSubmittedResult: Result; - @Input() submittedQuizExercise: QuizExercise; + @Input() quizQuestions: QuizQuestion[] | undefined; /* Multiple Choice Counting Variables*/ multipleChoiceCorrectAnswerCorrectlyChosen: number; // Amount of right options chosen by the student @@ -104,7 +103,7 @@ export class QuizScoringInfoStudentModalComponent implements AfterViewInit { */ private submittedAnswerCorrectValues() { let answerOptionsOfQuestion = new Array(); - for (const question of this.submittedQuizExercise.quizQuestions || []) { + for (const question of this.quizQuestions || []) { const mcQuizQuestion = question as MultipleChoiceQuestion; if (mcQuizQuestion.id === this.question.id) { answerOptionsOfQuestion = mcQuizQuestion.answerOptions!; diff --git a/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.html b/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.html index a74312f82e3b..c6fdb1cdcf67 100644 --- a/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.html +++ b/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.html @@ -1,5 +1,5 @@
- + {{ exercise?.exerciseGroup ? exercise.exerciseGroup!.title : exercise!.title }}
diff --git a/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.ts b/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.ts index 537908392eeb..803dc8b97127 100644 --- a/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.ts +++ b/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { HttpResponse } from '@angular/common/http'; import { ActivatedRoute } from '@angular/router'; import { Exercise } from 'app/entities/exercise.model'; @@ -10,10 +10,13 @@ import { ArtemisMarkdownService } from 'app/shared/markdown.service'; templateUrl: './example-solution.component.html', }) export class ExampleSolutionComponent implements OnInit { - private exerciseId: number; + private displayedExerciseId: number; public exercise?: Exercise; public exampleSolutionInfo?: ExampleSolutionInfo; + @Input() exerciseId?: number; + @Input() displayHeader?: boolean = true; + constructor( private exerciseService: ExerciseService, private route: ActivatedRoute, @@ -22,8 +25,10 @@ export class ExampleSolutionComponent implements OnInit { ngOnInit() { this.route.params.subscribe((params) => { - const didExerciseChange = this.exerciseId !== parseInt(params['exerciseId'], 10); - this.exerciseId = parseInt(params['exerciseId'], 10); + const exerciseId = this.exerciseId || parseInt(params['exerciseId'], 10); + + const didExerciseChange = this.displayedExerciseId !== exerciseId; + this.displayedExerciseId = exerciseId; if (didExerciseChange) { this.loadExercise(); } @@ -32,7 +37,7 @@ export class ExampleSolutionComponent implements OnInit { loadExercise() { this.exercise = undefined; - this.exerciseService.getExerciseForExampleSolution(this.exerciseId).subscribe((exerciseResponse: HttpResponse) => { + this.exerciseService.getExerciseForExampleSolution(this.displayedExerciseId).subscribe((exerciseResponse: HttpResponse) => { const newExercise = exerciseResponse.body!; this.exercise = newExercise; this.exampleSolutionInfo = ExerciseService.extractExampleSolutionInfo(newExercise, this.artemisMarkdown); diff --git a/src/main/webapp/app/exercises/shared/feedback/feedback.component.html b/src/main/webapp/app/exercises/shared/feedback/feedback.component.html index 4825a7b056c9..aa950493300a 100644 --- a/src/main/webapp/app/exercises/shared/feedback/feedback.component.html +++ b/src/main/webapp/app/exercises/shared/feedback/feedback.component.html @@ -1,4 +1,4 @@ -
- +
diff --git a/src/main/webapp/app/exercises/shared/feedback/standalone-feedback/standalone-feedback.component.html b/src/main/webapp/app/exercises/shared/feedback/standalone-feedback/standalone-feedback.component.html index 1d2ad2a8369a..77c9e0b9c2ed 100644 --- a/src/main/webapp/app/exercises/shared/feedback/standalone-feedback/standalone-feedback.component.html +++ b/src/main/webapp/app/exercises/shared/feedback/standalone-feedback/standalone-feedback.component.html @@ -8,4 +8,4 @@ [messageKey]="messageKey" [showMissingAutomaticFeedbackInformation]="showMissingAutomaticFeedbackInformation" class="modal-padding" -> +/> diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-header/plagiarism-header.component.ts b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-header/plagiarism-header.component.ts index f0d1016906e0..22705770daae 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-header/plagiarism-header.component.ts +++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-header/plagiarism-header.component.ts @@ -5,7 +5,7 @@ import { PlagiarismComparison } from 'app/exercises/shared/plagiarism/types/Plag import { TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement'; import { ModelingSubmissionElement } from 'app/exercises/shared/plagiarism/types/modeling/ModelingSubmissionElement'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; -import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Exercise, getCourseId } from 'app/entities/exercise.model'; diff --git a/src/main/webapp/app/exercises/shared/result/result.component.ts b/src/main/webapp/app/exercises/shared/result/result.component.ts index 38ec6b36586f..cc2cd33b6973 100644 --- a/src/main/webapp/app/exercises/shared/result/result.component.ts +++ b/src/main/webapp/app/exercises/shared/result/result.component.ts @@ -18,13 +18,13 @@ import { AssessmentType } from 'app/entities/assessment-type.model'; import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { captureException } from '@sentry/angular-ivy'; -import { hasExerciseDueDatePassed } from 'app/exercises/shared/exercise/exercise.utils'; import { faCircleNotch, faExclamationCircle, faExclamationTriangle, faFile } from '@fortawesome/free-solid-svg-icons'; import { faCircle } from '@fortawesome/free-regular-svg-icons'; import { Badge, ResultService } from 'app/exercises/shared/result/result.service'; import { ExerciseCacheService } from 'app/exercises/shared/exercise/exercise-cache.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { isPracticeMode } from 'app/entities/participation/student-participation.model'; +import { prepareFeedbackComponentParameters } from 'app/exercises/shared/feedback/feedback.utils'; @Component({ selector: 'jhi-result', @@ -211,34 +211,35 @@ export class ResultComponent implements OnInit, OnChanges { * @param result Result object whose details will be displayed. */ showDetails(result: Result) { - if (!result.participation) { - result.participation = this.participation; - } + const exerciseService = this.exerciseCacheService ?? this.exerciseService; + const feedbackComponentParameters = prepareFeedbackComponentParameters(this.exercise, result, this.participation, this.templateStatus, this.latestDueDate, exerciseService); if (this.exercise?.type === ExerciseType.QUIZ) { // There is no feedback for quiz exercises. // Instead, the scoring is showed next to the different questions - return; + return undefined; } const modalRef = this.modalService.open(FeedbackComponent, { keyboard: true, size: 'xl' }); - const componentInstance: FeedbackComponent = modalRef.componentInstance; - componentInstance.exercise = this.exercise; - componentInstance.result = result; - if (this.exercise) { - componentInstance.exerciseType = this.exercise.type!; - componentInstance.showScoreChart = true; + const modalComponentInstance: FeedbackComponent = modalRef.componentInstance; + + modalComponentInstance.exercise = this.exercise; + modalComponentInstance.result = result; + if (feedbackComponentParameters.exerciseType) { + modalComponentInstance.exerciseType = feedbackComponentParameters.exerciseType; } - if (this.templateStatus === ResultTemplateStatus.MISSING) { - componentInstance.messageKey = 'artemisApp.result.notLatestSubmission'; + if (feedbackComponentParameters.showScoreChart) { + modalComponentInstance.showScoreChart = feedbackComponentParameters.showScoreChart; } - - if ( - this.result?.assessmentType === AssessmentType.AUTOMATIC && - this.exercise?.type === ExerciseType.PROGRAMMING && - hasExerciseDueDatePassed(this.exercise, this.participation) - ) { - this.determineShowMissingAutomaticFeedbackInformation(componentInstance); + if (feedbackComponentParameters.messageKey) { + modalComponentInstance.messageKey = feedbackComponentParameters.messageKey; + } + if (feedbackComponentParameters.latestDueDate) { + this.latestDueDate = feedbackComponentParameters.latestDueDate; + modalComponentInstance.latestDueDate = feedbackComponentParameters.latestDueDate; + } + if (feedbackComponentParameters.showMissingAutomaticFeedbackInformation) { + modalComponentInstance.showMissingAutomaticFeedbackInformation = feedbackComponentParameters.showMissingAutomaticFeedbackInformation; } } @@ -270,27 +271,4 @@ export class ResultComponent implements OnInit, OnChanges { }); } } - - /** - * Determines if some information about testcases could still be hidden because of later individual due dates - * @param componentInstance the detailed result view - */ - private determineShowMissingAutomaticFeedbackInformation(componentInstance: FeedbackComponent) { - if (this.latestDueDate) { - this.setShowMissingAutomaticFeedbackInformation(componentInstance, this.latestDueDate); - } else { - const service = this.exerciseCacheService ?? this.exerciseService; - service.getLatestDueDate(this.exercise!.id!).subscribe((latestDueDate) => { - if (latestDueDate) { - this.setShowMissingAutomaticFeedbackInformation(componentInstance, latestDueDate); - } - }); - } - } - - private setShowMissingAutomaticFeedbackInformation(componentInstance: FeedbackComponent, latestDueDate: dayjs.Dayjs) { - this.latestDueDate = latestDueDate; - componentInstance.showMissingAutomaticFeedbackInformation = dayjs().isBefore(latestDueDate); - componentInstance.latestDueDate = this.latestDueDate; - } } diff --git a/src/main/webapp/app/exercises/shared/result/updating-result.component.html b/src/main/webapp/app/exercises/shared/result/updating-result.component.html index cbe44d7d52bd..a9fce837e0cb 100644 --- a/src/main/webapp/app/exercises/shared/result/updating-result.component.html +++ b/src/main/webapp/app/exercises/shared/result/updating-result.component.html @@ -9,4 +9,4 @@ [showBadge]="showBadge" [showIcon]="showIcon" [missingResultInfo]="missingResultInfo" -> +/> diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.html b/src/main/webapp/app/exercises/text/participate/text-editor.component.html index 788fa02449b2..83dba66c2b22 100644 --- a/src/main/webapp/app/exercises/text/participate/text-editor.component.html +++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.html @@ -1,5 +1,5 @@
- + {{ 'artemisApp.textSubmission.textEditor' | artemisTranslate }}: {{ examMode ? textExercise.exerciseGroup?.title : textExercise?.title }} @@ -19,7 +19,7 @@ - +
diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts index a137c29c87af..75739504fd75 100644 --- a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts +++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts @@ -1,4 +1,4 @@ -import { Component, HostListener, OnDestroy, OnInit } from '@angular/core'; +import { Component, HostListener, Input, OnDestroy, OnInit } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { ActivatedRoute } from '@angular/router'; import { HttpErrorResponse } from '@angular/common/http'; @@ -29,6 +29,7 @@ import { faListAlt } from '@fortawesome/free-regular-svg-icons'; import { MAX_SUBMISSION_TEXT_LENGTH } from 'app/shared/constants/input.constants'; @Component({ + selector: 'jhi-text-editor', templateUrl: './text-editor.component.html', providers: [ParticipationService], styleUrls: ['./text-editor.component.scss'], @@ -36,6 +37,15 @@ import { MAX_SUBMISSION_TEXT_LENGTH } from 'app/shared/constants/input.constants export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeactivate { readonly ButtonType = ButtonType; readonly maxCharacterCount = MAX_SUBMISSION_TEXT_LENGTH; + + @Input() participationId?: number; + @Input() displayHeader: boolean = true; + @Input() expandProblemStatement?: boolean = true; + + @Input() inputExercise?: TextExercise; + @Input() inputSubmission?: TextSubmission; + @Input() inputParticipation?: StudentParticipation; + textExercise: TextExercise; participation: StudentParticipation; result: Result; @@ -77,15 +87,46 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact } ngOnInit() { - const participationId = Number(this.route.snapshot.paramMap.get('participationId')); - if (Number.isNaN(participationId)) { - return this.alertService.error('artemisApp.textExercise.error'); + if (this.inputValuesArePresent()) { + this.setupComponentWithInputValues(); + } else { + const participationId = this.participationId !== undefined ? this.participationId : Number(this.route.snapshot.paramMap.get('participationId')); + if (Number.isNaN(participationId)) { + return this.alertService.error('artemisApp.textExercise.error'); + } + + this.textService.get(participationId).subscribe({ + next: (data: StudentParticipation) => this.updateParticipation(data), + error: (error: HttpErrorResponse) => onError(this.alertService, error), + }); } + } - this.textService.get(participationId).subscribe({ - next: (data: StudentParticipation) => this.updateParticipation(data), - error: (error: HttpErrorResponse) => onError(this.alertService, error), - }); + private inputValuesArePresent(): boolean { + return !!(this.inputExercise || this.inputSubmission || this.inputParticipation); + } + + /** + * Uses values directly passed to this component instead of subscribing to a participation to save resources + * + * e.g. used within {@link ExamResultSummaryComponent} and the respective {@link ModelingExamSummaryComponent} + * as directly after the exam no grading is present and only the student solution shall be displayed + * @private + */ + private setupComponentWithInputValues() { + if (this.inputExercise) { + this.textExercise = this.inputExercise; + } + if (this.inputSubmission) { + this.submission = this.inputSubmission; + } + if (this.inputParticipation) { + this.participation = this.inputParticipation; + } + + if (this.submission?.text) { + this.answer = this.submission.text; + } } private updateParticipation(participation: StudentParticipation) { diff --git a/src/main/webapp/app/exercises/text/participate/text-participation.module.ts b/src/main/webapp/app/exercises/text/participate/text-participation.module.ts index 7e407cb6b61d..21e16e27b898 100644 --- a/src/main/webapp/app/exercises/text/participate/text-participation.module.ts +++ b/src/main/webapp/app/exercises/text/participate/text-participation.module.ts @@ -27,5 +27,6 @@ import { ArtemisTeamParticipeModule } from 'app/exercises/shared/team/team-parti ArtemisTeamParticipeModule, ], declarations: [TextEditorComponent, TextResultComponent], + exports: [TextEditorComponent], }) export class ArtemisTextParticipationModule {} diff --git a/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.ts b/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.ts index 37f9e5ecd13d..baa6d137e54e 100644 --- a/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.ts +++ b/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.ts @@ -63,7 +63,7 @@ export class GradingKeyOverviewComponent implements OnInit { /** * Exports page as PDF */ - printPDF() { - setTimeout(() => this.themeService.print()); + async printPDF() { + await this.themeService.print(); } } diff --git a/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.html b/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.html index e6b5e8c55eab..def1139a1aac 100644 --- a/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.html +++ b/src/main/webapp/app/iris/exercise-chatbot/exercise-chatwidget/exercise-chat-widget.component.html @@ -13,7 +13,10 @@

- {{ currentMessageCount }}/{{ rateLimit }}
diff --git a/src/main/webapp/app/iris/settings/iris-settings-update/iris-sub-settings-update/iris-sub-settings-update.component.html b/src/main/webapp/app/iris/settings/iris-settings-update/iris-sub-settings-update/iris-sub-settings-update.component.html index 0bd30edbc642..ca9a800ee168 100644 --- a/src/main/webapp/app/iris/settings/iris-settings-update/iris-sub-settings-update/iris-sub-settings-update.component.html +++ b/src/main/webapp/app/iris/settings/iris-settings-update/iris-sub-settings-update/iris-sub-settings-update.component.html @@ -1,10 +1,10 @@
- +
Preferred Model:
-
@@ -17,6 +17,26 @@
+
+ + + +
+ +
+ + + +
+
diff --git a/src/main/webapp/app/iris/settings/iris-settings-update/iris-sub-settings-update/iris-sub-settings-update.component.ts b/src/main/webapp/app/iris/settings/iris-settings-update/iris-sub-settings-update/iris-sub-settings-update.component.ts index b78a05e52eed..dde988881ba9 100644 --- a/src/main/webapp/app/iris/settings/iris-settings-update/iris-sub-settings-update/iris-sub-settings-update.component.ts +++ b/src/main/webapp/app/iris/settings/iris-settings-update/iris-sub-settings-update/iris-sub-settings-update.component.ts @@ -2,6 +2,7 @@ import { Component, Input } from '@angular/core'; import { IrisSubSettings } from 'app/entities/iris/settings/iris-sub-settings.model'; import { IrisTemplate } from 'app/entities/iris/settings/iris-template'; import { IrisModel } from 'app/entities/iris/settings/iris-model'; +import { AccountService } from 'app/core/auth/account.service'; @Component({ selector: 'jhi-iris-sub-settings-update', @@ -20,8 +21,17 @@ export class IrisSubSettingsUpdateComponent { @Input() templateOptional = false; + @Input() + rateLimitSettable = false; + previousTemplate?: IrisTemplate; + isAdmin: boolean; + + constructor(accountService: AccountService) { + this.isAdmin = accountService.isAdmin(); + } + onInheritTemplateChanged() { if (this.subSettings.template) { this.previousTemplate = this.subSettings.template; diff --git a/src/main/webapp/app/iris/state-store.model.ts b/src/main/webapp/app/iris/state-store.model.ts index 0137ae10141c..21fa6a058e68 100644 --- a/src/main/webapp/app/iris/state-store.model.ts +++ b/src/main/webapp/app/iris/state-store.model.ts @@ -1,5 +1,6 @@ import { IrisClientMessage, IrisMessage, IrisServerMessage } from 'app/entities/iris/iris-message.model'; import { IrisErrorMessageKey, IrisErrorType, errorMessages } from 'app/entities/iris/iris-errors.model'; +import { IrisRateLimitInformation } from 'app/iris/websocket.service'; export enum ActionType { NUM_NEW_MESSAGES_RESET = 'num-new-messages-reset', @@ -93,10 +94,7 @@ export class RateMessageSuccessAction implements MessageStoreAction { export class RateLimitUpdatedAction implements MessageStoreAction { readonly type: ActionType; - public constructor( - public readonly currentMessageCount: number, - public readonly rateLimit: number, - ) { + public constructor(public readonly rateLimitInfo: IrisRateLimitInformation) { this.type = ActionType.RATE_LIMIT_UPDATED; } } @@ -143,5 +141,6 @@ export class MessageStoreState { public serverResponseTimeout: ReturnType | null, public currentMessageCount: number, public rateLimit: number, + public rateLimitTimeframeHours: number, ) {} } diff --git a/src/main/webapp/app/iris/state-store.service.ts b/src/main/webapp/app/iris/state-store.service.ts index 53b7342a6b51..6de15af42aff 100644 --- a/src/main/webapp/app/iris/state-store.service.ts +++ b/src/main/webapp/app/iris/state-store.service.ts @@ -39,6 +39,7 @@ export class IrisStateStore implements OnDestroy { serverResponseTimeout: null, currentMessageCount: -1, rateLimit: -1, + rateLimitTimeframeHours: -1, }; private readonly action = new Subject(); @@ -157,6 +158,7 @@ export class IrisStateStore implements OnDestroy { serverResponseTimeout: null, currentMessageCount: state.currentMessageCount, rateLimit: state.rateLimit, + rateLimitTimeframeHours: state.rateLimitTimeframeHours, }; } if (isConversationErrorOccurredAction(action)) { @@ -227,11 +229,19 @@ export class IrisStateStore implements OnDestroy { } if (isRateLimitUpdatedAction(action)) { const castedAction = action as RateLimitUpdatedAction; + const rateLimitInfo = castedAction.rateLimitInfo; + let errorMessage: IrisErrorType | null = null; + if (rateLimitInfo.rateLimit >= 0 && rateLimitInfo.currentMessageCount >= rateLimitInfo.rateLimit) { + errorMessage = errorMessages[IrisErrorMessageKey.RATE_LIMIT_EXCEEDED]; + errorMessage.paramsMap = new Map(); + errorMessage.paramsMap.set('hours', rateLimitInfo.rateLimitTimeframeHours); + } return { ...state, - error: castedAction.rateLimit >= 0 && castedAction.currentMessageCount >= castedAction.rateLimit ? errorMessages[IrisErrorMessageKey.RATE_LIMIT_EXCEEDED] : null, - currentMessageCount: castedAction.currentMessageCount, - rateLimit: castedAction.rateLimit, + error: errorMessage, + currentMessageCount: rateLimitInfo.currentMessageCount, + rateLimit: rateLimitInfo.rateLimit, + rateLimitTimeframeHours: rateLimitInfo.rateLimitTimeframeHours, }; } diff --git a/src/main/webapp/app/iris/websocket.service.ts b/src/main/webapp/app/iris/websocket.service.ts index 0b0ffd81dcc8..51141dacb980 100644 --- a/src/main/webapp/app/iris/websocket.service.ts +++ b/src/main/webapp/app/iris/websocket.service.ts @@ -21,9 +21,16 @@ export enum IrisWebsocketMessageType { ERROR = 'ERROR', } -class IrisRateLimitInformation { +export class IrisRateLimitInformation { currentMessageCount: number; rateLimit: number; + rateLimitTimeframeHours: number; + + constructor(currentMessageCount: number, rateLimit: number, rateLimitTimeframeHours: number) { + this.currentMessageCount = currentMessageCount; + this.rateLimit = rateLimit; + this.rateLimitTimeframeHours = rateLimitTimeframeHours; + } } /** @@ -95,7 +102,7 @@ export class IrisWebsocketService implements OnDestroy { this.jhiWebsocketService.subscribe(this.subscriptionChannel); this.jhiWebsocketService.receive(this.subscriptionChannel).subscribe((websocketResponse: IrisWebsocketDTO) => { if (websocketResponse.rateLimitInfo) { - this.stateStore.dispatch(new RateLimitUpdatedAction(websocketResponse.rateLimitInfo.currentMessageCount, websocketResponse.rateLimitInfo.rateLimit)); + this.stateStore.dispatch(new RateLimitUpdatedAction(websocketResponse.rateLimitInfo)); } if (websocketResponse.type === IrisWebsocketMessageType.ERROR) { diff --git a/src/main/webapp/app/overview/course-exercises/course-exercise-row.module.ts b/src/main/webapp/app/overview/course-exercises/course-exercise-row.module.ts index 75cb891ff01a..24d2c08d157c 100644 --- a/src/main/webapp/app/overview/course-exercises/course-exercise-row.module.ts +++ b/src/main/webapp/app/overview/course-exercises/course-exercise-row.module.ts @@ -10,6 +10,8 @@ import { OrionModule } from 'app/shared/orion/orion.module'; import { GradingKeyOverviewModule } from 'app/grading-system/grading-key-overview/grading-key-overview.module'; import { SubmissionResultStatusModule } from 'app/overview/submission-result-status.module'; import { ExerciseCategoriesModule } from 'app/shared/exercise-categories/exercise-categories.module'; +import { CourseExercisesGroupedByWeekComponent } from 'app/overview/course-exercises/course-exercises-grouped-by-week.component'; +import { CourseExercisesGroupedByCategoryComponent } from 'app/overview/course-exercises/course-exercises-grouped-by-category.component'; @NgModule({ imports: [ @@ -24,7 +26,7 @@ import { ExerciseCategoriesModule } from 'app/shared/exercise-categories/exercis SubmissionResultStatusModule, ExerciseCategoriesModule, ], - declarations: [CourseExerciseRowComponent], - exports: [CourseExerciseRowComponent], + declarations: [CourseExerciseRowComponent, CourseExercisesGroupedByWeekComponent, CourseExercisesGroupedByCategoryComponent], + exports: [CourseExerciseRowComponent, CourseExercisesGroupedByWeekComponent, CourseExercisesGroupedByCategoryComponent], }) export class ArtemisCourseExerciseRowModule {} diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-category.component.html b/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-category.component.html new file mode 100644 index 000000000000..303b3d09904b --- /dev/null +++ b/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-category.component.html @@ -0,0 +1,38 @@ +
+ {{ 'artemisApp.courseOverview.exerciseList.noExerciseMatchesSearchAndFilters' | artemisTranslate }} +
+ +
+ +
+
+ +
+ + +

{{ 'artemisApp.courseOverview.exerciseList.past' | artemisTranslate }}

+

{{ 'artemisApp.courseOverview.exerciseList.current' | artemisTranslate }}

+

{{ 'artemisApp.courseOverview.exerciseList.future' | artemisTranslate }}

+

{{ 'artemisApp.courseOverview.exerciseList.noDueDate' | artemisTranslate }}

+ +
+ +
+ +
+ + + +
+ diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-category.component.ts b/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-category.component.ts new file mode 100644 index 000000000000..46efea17fe2e --- /dev/null +++ b/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-category.component.ts @@ -0,0 +1,167 @@ +import { Component, Input, OnChanges } from '@angular/core'; +import { Exercise } from 'app/entities/exercise.model'; +import { Course } from 'app/entities/course.model'; +import dayjs from 'dayjs/esm/'; +import { faAngleDown, faAngleUp, faChevronRight } from '@fortawesome/free-solid-svg-icons'; +import { cloneDeep } from 'lodash-es'; + +type ExerciseGroupCategory = 'past' | 'current' | 'future' | 'noDueDate'; + +/** + * {@link ExerciseGroupCategory#past} is always collapsed by default + */ +const DEFAULT_EXPAND_ORDER: ExerciseGroupCategory[] = ['current', 'future', 'noDueDate']; + +type ExerciseGroups = Record; + +const DEFAULT_EXERCISE_GROUPS = { + past: { exercises: [], isCollapsed: true }, + current: { exercises: [], isCollapsed: false }, + future: { exercises: [], isCollapsed: false }, + noDueDate: { exercises: [], isCollapsed: true }, +}; + +@Component({ + selector: 'jhi-course-exercises-grouped-by-category', + templateUrl: './course-exercises-grouped-by-category.component.html', + styleUrls: ['../course-overview.scss'], +}) +export class CourseExercisesGroupedByCategoryComponent implements OnChanges { + protected readonly Object = Object; + + @Input() filteredExercises?: Exercise[]; + @Input() course?: Course; + @Input() exerciseForGuidedTour?: Exercise; + @Input() appliedSearchString?: string; + + exerciseGroups: ExerciseGroups; + + searchWasActive: boolean = false; + exerciseGroupsBeforeSearch: ExerciseGroups = cloneDeep(DEFAULT_EXERCISE_GROUPS); + + faAngleUp = faAngleUp; + faAngleDown = faAngleDown; + faChevronRight = faChevronRight; + + ngOnChanges() { + this.exerciseGroups = this.groupExercisesByDueDate(); + } + + toggleGroupCategoryCollapse(exerciseGroupCategoryKey: string) { + this.exerciseGroups[exerciseGroupCategoryKey].isCollapsed = !this.exerciseGroups[exerciseGroupCategoryKey].isCollapsed; + } + + private groupExercisesByDueDate(): ExerciseGroups { + const updatedExerciseGroups: ExerciseGroups = cloneDeep(DEFAULT_EXERCISE_GROUPS); + + if (!this.filteredExercises) { + return updatedExerciseGroups; + } + + for (const exercise of this.filteredExercises) { + const exerciseGroup = this.getExerciseGroup(exercise); + updatedExerciseGroups[exerciseGroup].exercises.push(exercise); + } + + this.adjustExpandedOrCollapsedStateOfExerciseGroups(updatedExerciseGroups); + + return updatedExerciseGroups; + } + + private expandAllExercisesAndSaveStateBeforeSearch(exerciseGroups: ExerciseGroups) { + const isAConsecutiveSearchWithAllGroupsExpanded = this.searchWasActive; + if (!isAConsecutiveSearchWithAllGroupsExpanded) { + this.exerciseGroupsBeforeSearch = cloneDeep(this.exerciseGroups); + this.searchWasActive = true; + } + + Object.entries(exerciseGroups).forEach(([, exerciseGroup]) => { + exerciseGroup.isCollapsed = false; + }); + } + + private restoreStateBeforeSearch(exerciseGroups: ExerciseGroups) { + this.searchWasActive = false; + + Object.entries(exerciseGroups).forEach(([exerciseGroupKey, exerciseGroup]) => { + exerciseGroup.isCollapsed = this.exerciseGroupsBeforeSearch[exerciseGroupKey].isCollapsed; + }); + } + + private keepCurrentCollapsedOrExpandedStateOfExerciseGroups(exerciseGroups: ExerciseGroups) { + Object.entries(exerciseGroups).forEach(([exerciseGroupKey, exerciseGroup]) => { + exerciseGroup.isCollapsed = this.exerciseGroups[exerciseGroupKey].isCollapsed; + }); + } + + /** + * Expand at least one exercise group, considering that {@link ExerciseGroupCategory#past} shall never be expanded by default + * + * Expanded by the order {@link ExerciseGroupCategory#current}, {@link ExerciseGroupCategory#future}, {@link ExerciseGroupCategory#noDueDate} + */ + private makeSureAtLeastOneExerciseGroupIsExpanded(exerciseGroups: ExerciseGroups) { + const exerciseGroupsWithExercises = Object.entries(exerciseGroups).filter(([, exerciseGroup]) => exerciseGroup.exercises.length > 0); + const expandedExerciseGroups = exerciseGroupsWithExercises.filter(([exerciseGroupKey, exerciseGroup]) => !exerciseGroup.isCollapsed && exerciseGroupKey !== 'past'); + + const atLeastOneExerciseIsExpanded = expandedExerciseGroups.length > 0; + const expandableGroupsExist = !atLeastOneExerciseIsExpanded && exerciseGroupsWithExercises.length > 0; + + if (!expandableGroupsExist) { + return; + } + + for (const exerciseGroupKey of DEFAULT_EXPAND_ORDER) { + const groupToExpand = exerciseGroupsWithExercises.find(([key]) => key === exerciseGroupKey); + if (groupToExpand) { + groupToExpand![1].isCollapsed = false; + break; + } + } + } + + /** + * 1. Expand all sections with matches on search + * 2. Keep the expanded or collapsed state of the exercise groups when a filter is applied + * 3. Make sure at least one displayed section is expanded by default + * + * @param exerciseGroups updated and grouped exercises that are to be displayed + */ + private adjustExpandedOrCollapsedStateOfExerciseGroups(exerciseGroups: ExerciseGroups) { + const isSearchingExercise = this.appliedSearchString; + if (isSearchingExercise) { + return this.expandAllExercisesAndSaveStateBeforeSearch(exerciseGroups); + } + + if (this.searchWasActive) { + return this.restoreStateBeforeSearch(exerciseGroups); + } + + const filterIsApplied = this.exerciseGroups; + if (filterIsApplied) { + this.keepCurrentCollapsedOrExpandedStateOfExerciseGroups(exerciseGroups); + } + + this.makeSureAtLeastOneExerciseGroupIsExpanded(exerciseGroups); + } + + private getExerciseGroup(exercise: Exercise): ExerciseGroupCategory { + if (!exercise.dueDate) { + return 'noDueDate'; + } + + const dueDate = dayjs(exercise.dueDate); + const now = dayjs(); + + const dueDateIsInThePast = dueDate.isBefore(now); + if (dueDateIsInThePast) { + return 'past'; + } + + const dueDateIsWithinNextWeek = dueDate.isBefore(now.add(1, 'week')); + if (dueDateIsWithinNextWeek) { + return 'current'; + } + + return 'future'; + } +} diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-week.component.html b/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-week.component.html new file mode 100644 index 000000000000..4a40ce76f8e4 --- /dev/null +++ b/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-week.component.html @@ -0,0 +1,53 @@ +
+

+ + {{ 'artemisApp.courseOverview.exerciseList.currentExerciseGroupHeader' | artemisTranslate: { date: nextRelevantExercise.dueDate | artemisDate } }} + + + {{ 'artemisApp.courseOverview.exerciseList.currentExerciseGroupHeaderWithoutDueDate' | artemisTranslate }} + +

+ + +
+ +
+
+ + + {{ immutableWeeklyExercisesGrouped[weekKey].start | artemisDate: 'short-date' }} - + {{ immutableWeeklyExercisesGrouped[weekKey].end | artemisDate: 'short-date' }} + + + {{ 'artemisApp.courseOverview.exerciseList.noDateAssociated' | artemisTranslate }} + + + (Exercises: {{ immutableWeeklyExercisesGrouped[weekKey].exercises.length }}) + +
+
+ +
+ +
diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-week.component.ts b/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-week.component.ts new file mode 100644 index 000000000000..384eb996e01e --- /dev/null +++ b/src/main/webapp/app/overview/course-exercises/course-exercises-grouped-by-week.component.ts @@ -0,0 +1,42 @@ +import { Component, Input, OnChanges, OnInit } from '@angular/core'; +import { Exercise } from 'app/entities/exercise.model'; +import { ExerciseFilter, ExerciseWithDueDate } from 'app/overview/course-exercises/course-exercises.component'; +import { Course } from 'app/entities/course.model'; +import { faAngleDown, faAngleUp } from '@fortawesome/free-solid-svg-icons'; +import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; +import { getAsMutableObject } from 'app/shared/util/utils'; + +@Component({ + selector: 'jhi-course-exercises-grouped-by-week', + templateUrl: './course-exercises-grouped-by-week.component.html', + styleUrls: ['../course-overview.scss'], +}) +export class CourseExercisesGroupedByWeekComponent implements OnInit, OnChanges { + @Input() nextRelevantExercise?: ExerciseWithDueDate; + @Input() course: Course; + @Input() exerciseForGuidedTour?: Exercise; + @Input() weeklyIndexKeys: string[]; + @Input() immutableWeeklyExercisesGrouped: object; + @Input() activeFilters: Set; + + weeklyExercisesGrouped: object; + + faAngleUp = faAngleUp; + faAngleDown = faAngleDown; + + ngOnInit() { + this.weeklyExercisesGrouped = getAsMutableObject(this.immutableWeeklyExercisesGrouped); + } + + ngOnChanges() { + this.weeklyExercisesGrouped = getAsMutableObject(this.immutableWeeklyExercisesGrouped); + } + + /** + * Checks whether an exercise is visible to students or not + * @param exercise The exercise which should be checked + */ + isVisibleToStudents(exercise: Exercise): boolean | undefined { + return !this.activeFilters.has(ExerciseFilter.UNRELEASED) || (exercise as QuizExercise)?.visibleToStudents; + } +} diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises.component.html b/src/main/webapp/app/overview/course-exercises/course-exercises.component.html index 55424d73443d..53ce0c9646ba 100644 --- a/src/main/webapp/app/overview/course-exercises/course-exercises.component.html +++ b/src/main/webapp/app/overview/course-exercises/course-exercises.component.html @@ -1,6 +1,20 @@
+
+ +
+ + {{ 'artemisApp.courseOverview.exerciseList.timeframeView' | artemisTranslate }} + + + {{ 'artemisApp.courseOverview.exerciseList.weeklyView' | artemisTranslate }} + +
+
+
-
-

- - {{ 'artemisApp.courseOverview.exerciseList.currentExerciseGroupHeader' | artemisTranslate: { date: nextRelevantExercise.dueDate | artemisDate } }} - - - {{ 'artemisApp.courseOverview.exerciseList.currentExerciseGroupHeaderWithoutDueDate' | artemisTranslate }} - -

- + - -
-
-
- - - {{ weeklyExercisesGrouped[weekKey].start | artemisDate: 'short-date' }} - - {{ weeklyExercisesGrouped[weekKey].end | artemisDate: 'short-date' }} - - - {{ 'artemisApp.courseOverview.exerciseList.noDateAssociated' | artemisTranslate }} - - - (Exercises: {{ weeklyExercisesGrouped[weekKey].exercises.length }}) - -
-
- -
- -
-
+ [exerciseForGuidedTour]="exerciseForGuidedTour" + [appliedSearchString]="lastAppliedSearchString" + /> + + + + +
{{ 'artemisApp.courseOverview.exerciseList.noExercises' | artemisTranslate }}
-
+
diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises.component.ts b/src/main/webapp/app/overview/course-exercises/course-exercises.component.ts index c4fd548dec85..364eab48f11b 100644 --- a/src/main/webapp/app/overview/course-exercises/course-exercises.component.ts +++ b/src/main/webapp/app/overview/course-exercises/course-exercises.component.ts @@ -47,7 +47,7 @@ export enum SortingAttribute { RELEASE_DATE = 1, } -interface ExerciseWithDueDate { +export interface ExerciseWithDueDate { exercise: Exercise; dueDate?: dayjs.Dayjs; } @@ -83,6 +83,10 @@ export class CourseExercisesComponent implements OnInit, OnChanges, OnDestroy, A searchExercisesInput: string; exerciseFilter: ExerciseFilterModel; + filteredExercises: Exercise[] | undefined; + showExercisesGroupedByDueDateCategory: boolean = true; + lastAppliedSearchString: string | undefined; + // Icons faPlayCircle = faPlayCircle; faFilter = faFilter; @@ -204,6 +208,10 @@ export class CourseExercisesComponent implements OnInit, OnChanges, OnDestroy, A this.applyFiltersAndOrder(); } + toggleExerciseView() { + this.showExercisesGroupedByDueDateCategory = !this.showExercisesGroupedByDueDateCategory; + } + /** * Filters all displayed exercises by applying the selected activeFilters * @param filters The filters which should be applied @@ -223,6 +231,10 @@ export class CourseExercisesComponent implements OnInit, OnChanges, OnDestroy, A return !this.activeFilters.has(ExerciseFilter.UNRELEASED) || (exercise as QuizExercise)?.visibleToStudents; } + setShowExercisesGroupedByDueDateCategory(updatedShowExercisesGroupedByDueDateCategory: boolean) { + this.showExercisesGroupedByDueDateCategory = updatedShowExercisesGroupedByDueDateCategory; + } + /** * Method is called when enter key is pressed on search input or search button is clicked */ @@ -230,6 +242,7 @@ export class CourseExercisesComponent implements OnInit, OnChanges, OnDestroy, A this.searchExercisesInput = this.searchExercisesInput.trim(); this.exerciseFilter = new ExerciseFilterModel(this.searchExercisesInput); this.applyFiltersAndOrder(); + this.lastAppliedSearchString = this.exerciseFilter.exerciseNameSearch; } get canUnenroll(): boolean { @@ -259,6 +272,7 @@ export class CourseExercisesComponent implements OnInit, OnChanges, OnDestroy, A private applyFiltersAndOrder() { let filtered = this.course?.exercises?.filter(this.fulfillsCurrentFilter.bind(this)); filtered = filtered?.filter((exercise) => this.exerciseFilter.matchesExercise(exercise)); + this.filteredExercises = filtered; this.groupExercises(filtered); } diff --git a/src/main/webapp/app/overview/course-overview.scss b/src/main/webapp/app/overview/course-overview.scss index aac56b719f75..bbf53aac2730 100644 --- a/src/main/webapp/app/overview/course-overview.scss +++ b/src/main/webapp/app/overview/course-overview.scss @@ -94,6 +94,25 @@ Course Info Bar } } +.chevron-position { + display: inline-block; + vertical-align: middle; +} + +.rotate-icon { + transition: transform 0.3s ease; +} + +.rotated { + transform: rotate(90deg); +} + +.icon-container { + display: inline-block; + vertical-align: middle; + horiz-align: center; +} + .course-information { padding-top: 29px; diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html index 32ee470a8974..70954ea7434a 100644 --- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html +++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html @@ -253,5 +253,5 @@

{{ 'artemisApp.courseOverview.exerciseDetails.allResults' | artemisTranslate

- +
diff --git a/src/main/webapp/app/shared/components/button.component.ts b/src/main/webapp/app/shared/components/button.component.ts index c9bcdce9bf8c..8038de9290a7 100644 --- a/src/main/webapp/app/shared/components/button.component.ts +++ b/src/main/webapp/app/shared/components/button.component.ts @@ -15,6 +15,8 @@ export enum ButtonType { WARNING = 'btn-warning', ERROR = 'btn-danger', INFO = 'btn-info', + + PRIMARY_OUTLINE = 'btn-outline-primary', } /** diff --git a/src/main/webapp/app/shared/components/clone-repo-button/clone-repo-button.component.ts b/src/main/webapp/app/shared/components/clone-repo-button/clone-repo-button.component.ts index fe9f00995b97..49a625df25a7 100644 --- a/src/main/webapp/app/shared/components/clone-repo-button/clone-repo-button.component.ts +++ b/src/main/webapp/app/shared/components/clone-repo-button/clone-repo-button.component.ts @@ -6,12 +6,12 @@ import { AccountService } from 'app/core/auth/account.service'; import { User } from 'app/core/user/user.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { LocalStorageService } from 'ngx-webstorage'; -import { faDownload, faExternalLink } from '@fortawesome/free-solid-svg-icons'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { ParticipationService } from 'app/exercises/shared/participation/participation.service'; import { Exercise } from 'app/entities/exercise.model'; import { PROFILE_LOCALVC } from 'app/app.constants'; import { isPracticeMode } from 'app/entities/participation/student-participation.model'; +import { faDownload, faExternalLink } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'jhi-clone-repo-button', diff --git a/src/main/webapp/app/shared/components/confirm-autofocus-button.component.html b/src/main/webapp/app/shared/components/confirm-autofocus-button.component.html new file mode 100644 index 000000000000..74820d032ac4 --- /dev/null +++ b/src/main/webapp/app/shared/components/confirm-autofocus-button.component.html @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/webapp/app/shared/components/confirm-autofocus-button.component.ts b/src/main/webapp/app/shared/components/confirm-autofocus-button.component.ts index c30f456fd773..035dd5a1516e 100644 --- a/src/main/webapp/app/shared/components/confirm-autofocus-button.component.ts +++ b/src/main/webapp/app/shared/components/confirm-autofocus-button.component.ts @@ -1,23 +1,12 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output, TemplateRef, ViewChild } from '@angular/core'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; -import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { htmlForMarkdown } from 'app/shared/util/markdown.conversion.util'; - -@Component({ - templateUrl: './confirm-autofocus-modal.component.html', -}) -export class ConfirmAutofocusModalComponent { - title: string; - text: string; - translateText: boolean; - textIsMarkdown: boolean; - - constructor(public modal: NgbActiveModal) {} -} +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; @Component({ selector: 'jhi-confirm-button', - template: ` `, + templateUrl: './confirm-autofocus-button.component.html', }) export class ConfirmAutofocusButtonComponent { @Input() icon: IconProp; @@ -33,13 +22,18 @@ export class ConfirmAutofocusButtonComponent { @Output() onConfirm = new EventEmitter(); @Output() onCancel = new EventEmitter(); + @ViewChild('content') content?: TemplateRef; + constructor(private modalService: NgbModal) {} /** * open confirmation modal with text and title */ onOpenConfirmationModal() { - const modalRef: NgbModalRef = this.modalService.open(ConfirmAutofocusModalComponent as Component, { size: 'lg', backdrop: 'static' }); + const modalRef: NgbModalRef = this.modalService.open(ConfirmAutofocusModalComponent, { + size: 'lg', + backdrop: 'static', + }); if (this.textIsMarkdown === true) { modalRef.componentInstance.text = htmlForMarkdown(this.confirmationText); modalRef.componentInstance.textIsMarkdown = true; @@ -53,6 +47,7 @@ export class ConfirmAutofocusButtonComponent { } else { modalRef.componentInstance.translateText = false; } + modalRef.componentInstance.contentRef = this.content; modalRef.result.then( () => { this.onConfirm.emit(); diff --git a/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.html b/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.html index 641ee07db38d..81b6dae4157f 100644 --- a/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.html +++ b/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.html @@ -2,11 +2,15 @@

{{ title | artemisTranslate }}

-
-
-

{{ text | artemisTranslate }}

-

{{ text }}

+
+
+ +

{{ text | artemisTranslate }}

+

{{ text }}

+ +
+
diff --git a/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.ts b/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.ts new file mode 100644 index 000000000000..58a946bf7673 --- /dev/null +++ b/src/main/webapp/app/shared/components/confirm-autofocus-modal.component.ts @@ -0,0 +1,16 @@ +import { Component, Input, TemplateRef } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'jhi-confirm-modal', + templateUrl: './confirm-autofocus-modal.component.html', +}) +export class ConfirmAutofocusModalComponent { + @Input() title: string; + @Input() text: string; + @Input() translateText: boolean; + @Input() textIsMarkdown: boolean; + @Input() contentRef?: TemplateRef; + + constructor(public modal: NgbActiveModal) {} +} diff --git a/src/main/webapp/app/shared/components/shared-component.module.ts b/src/main/webapp/app/shared/components/shared-component.module.ts index c570c8b10386..9f02b47fedde 100644 --- a/src/main/webapp/app/shared/components/shared-component.module.ts +++ b/src/main/webapp/app/shared/components/shared-component.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { ChecklistCheckComponent } from 'app/shared/components/checklist-check.component'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { FeatureToggleModule } from 'app/shared/feature-toggle/feature-toggle.module'; -import { ConfirmAutofocusButtonComponent, ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { ButtonComponent } from 'app/shared/components/button.component'; import { CloneRepoButtonComponent } from 'app/shared/components/clone-repo-button/clone-repo-button.component'; @@ -23,6 +23,7 @@ import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-hea import { ExerciseImportTabsComponent } from 'app/exercises/shared/import/exercise-import-tabs.component'; import { ExerciseImportFromFileComponent } from 'app/exercises/shared/import/from-file/exercise-import-from-file.component'; import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component'; +import { ConfirmAutofocusButtonComponent } from 'app/shared/components/confirm-autofocus-button.component'; @NgModule({ imports: [ArtemisSharedModule, ArtemisCoursesRoutingModule, FeatureToggleModule, ClipboardModule], @@ -70,6 +71,7 @@ import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exer ExerciseImportTabsComponent, ExerciseImportFromFileComponent, ExerciseImportWrapperComponent, + ConfirmAutofocusModalComponent, ], }) export class ArtemisSharedComponentModule {} diff --git a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html index e04e178dd6e7..438f3ed1cf3d 100644 --- a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html +++ b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html @@ -16,8 +16,8 @@ [ngClass]="{ 'is-invalid': error }" [ngModel]="value" [disabled]="disabled" - [min]="convert(min)" - [max]="convert(max)" + [min]="minDate" + [max]="maxDate" (ngModelChange)="updateField($event)" [owlDateTime]="dt" name="datePicker" @@ -25,5 +25,5 @@ - +
diff --git a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts index b143f95ab9dd..67e7edd553cb 100644 --- a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts +++ b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts @@ -22,7 +22,7 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { @Input() value: any; @Input() disabled: boolean; @Input() error: boolean; - @Input() startAt: dayjs.Dayjs = dayjs().startOf('minutes'); // Default selected date. By default this sets it to the current time without seconds or milliseconds; + @Input() startAt?: dayjs.Dayjs; // Default selected date. By default this sets it to the current time without seconds or milliseconds; @Input() min: dayjs.Dayjs; // Dates before this date are not selectable. @Input() max: dayjs.Dayjs; // Dates after this date are not selectable. @Input() shouldDisplayTimeZoneWarning = true; // Displays a warning that the current time zone might differ from the participants'. @@ -34,8 +34,7 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { faClock = faClock; faQuestionCircle = faQuestionCircle; - // eslint-disable-next-line @typescript-eslint/no-unused-vars - _onChange = (val: dayjs.Dayjs) => {}; + private onChange?: (val?: dayjs.Dayjs) => void; /** * Emits the value change from component. @@ -44,15 +43,6 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { this.valueChange.emit(); } - /** - * Function that converts a possibly undefined dayjs value to a date or null. - * - * @param value as dayjs - */ - convert(value?: dayjs.Dayjs) { - return value != undefined && value.isValid() ? value.toDate() : null; - } - /** * Function that writes the value safely. * @param value as dayjs or date @@ -78,7 +68,7 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { * @param fn */ registerOnChange(fn: any) { - this._onChange = fn; + this.onChange = fn; } /** @@ -87,7 +77,7 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { */ updateField(newValue: dayjs.Dayjs) { this.value = newValue; - this._onChange(dayjs(this.value)); + this.onChange?.(dayjs(this.value)); this.valueChanged(); } @@ -97,4 +87,25 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { get currentTimeZone(): string { return Intl.DateTimeFormat().resolvedOptions().timeZone; } + + get startDate(): Date | null { + return this.convertToDate(this.startAt ?? dayjs().startOf('minutes')); + } + + get minDate(): Date | null { + return this.convertToDate(this.min); + } + + get maxDate(): Date | null { + return this.convertToDate(this.max); + } + + /** + * Function that converts a possibly undefined dayjs value to a date or null. + * + * @param value as dayjs + */ + convertToDate(value?: dayjs.Dayjs) { + return value != undefined && value.isValid() ? value.toDate() : null; + } } diff --git a/src/main/webapp/app/shared/notification/notification-sidebar/notification-sidebar.component.html b/src/main/webapp/app/shared/notification/notification-sidebar/notification-sidebar.component.html index dfaf4a3272e1..0c660f62f366 100644 --- a/src/main/webapp/app/shared/notification/notification-sidebar/notification-sidebar.component.html +++ b/src/main/webapp/app/shared/notification/notification-sidebar/notification-sidebar.component.html @@ -9,7 +9,7 @@
-
+
diff --git a/src/main/webapp/app/shared/quiz/quiz.service.ts b/src/main/webapp/app/shared/quiz/quiz.service.ts index 04dcbf373311..76da6dca29ad 100644 --- a/src/main/webapp/app/shared/quiz/quiz.service.ts +++ b/src/main/webapp/app/shared/quiz/quiz.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { InitializationState } from 'app/entities/participation/participation.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; -import { QuizQuestionType } from 'app/entities/quiz/quiz-question.model'; +import { QuizQuestion, QuizQuestionType } from 'app/entities/quiz/quiz-question.model'; import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model'; import { DragAndDropQuestion } from 'app/entities/quiz/drag-and-drop-question.model'; import { captureException } from '@sentry/angular-ivy'; @@ -13,17 +13,18 @@ export class ArtemisQuizService { * (and answerOptions or dragItems within each question) * if randomizeOrder is true * - * @param quizExercise {object} the quizExercise to randomize elements in + * @param quizQuestions {object} the quizQuestions to be randomized + * @param randomizeQuestionOrder {object} the flag whether or not to randomize the quiz questions */ - randomizeOrder(quizExercise: QuizExercise) { - if (quizExercise.quizQuestions) { + randomizeOrder(quizQuestions: QuizQuestion[] | undefined, randomizeQuestionOrder: boolean | undefined) { + if (quizQuestions) { // shuffle questions - if (quizExercise.randomizeQuestionOrder) { - quizExercise.quizQuestions?.shuffle(); + if (randomizeQuestionOrder) { + quizQuestions?.shuffle(); } // shuffle answerOptions / dragItems within questions - quizExercise.quizQuestions.forEach((question) => { + quizQuestions.forEach((question) => { if (question.randomizeOrder) { if (question.type === QuizQuestionType.MULTIPLE_CHOICE) { (question as MultipleChoiceQuestion).answerOptions?.shuffle(); diff --git a/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.html b/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.html index 0d33906e8777..b9f16b7260ef 100644 --- a/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.html +++ b/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.html @@ -1,57 +1,59 @@ - -
-
- - - -
-
- +
+ +
+
+ + + +
+
+ +
-
- + - - + + - -
-
- -
-
-
-

-
- -
- - -

- + +
+
+
-
- +
+
+

+ + + + + +

+ +
+
+ +
-
- + - - diff --git a/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.scss b/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.scss index 6f5db423951d..b49eef95708a 100644 --- a/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.scss +++ b/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.scss @@ -1,5 +1,4 @@ -:host { - display: flex; +.resizable-container { width: 100%; height: 100%; overflow: hidden; diff --git a/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.ts b/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.ts index 779de41b6b3a..02400ff7ba3c 100644 --- a/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.ts +++ b/src/main/webapp/app/shared/resizeable-container/resizeable-container.component.ts @@ -23,6 +23,20 @@ export class ResizeableContainerComponent implements AfterViewInit { @Input() collapsed = false; @Input() isExerciseParticipation = false; + /** + * Expected to be set to true while the component is printed as PDF. + * + * e.g. the case for printing the exam summary + */ + @Input() isBeingPrinted?: boolean = false; + + /** + * Forces the problem statement to be expanded when the component is printed as PDF + * + * e.g. the case for printing the exam summary + */ + @Input() expandProblemStatement?: boolean = false; + // Icons faChevronRight = faChevronRight; faChevronLeft = faChevronLeft; diff --git a/src/main/webapp/app/shared/util/utils.ts b/src/main/webapp/app/shared/util/utils.ts index 1471b15bf318..c1317b62ddb1 100644 --- a/src/main/webapp/app/shared/util/utils.ts +++ b/src/main/webapp/app/shared/util/utils.ts @@ -142,3 +142,7 @@ export class Range { return '[' + this.lowerBound + '%, ' + this.upperBound + '%' + (this.upperBound === 100 ? ']' : ')'); } } + +export function getAsMutableObject(object: any) { + return { ...object }; +} diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json index adb9582608fe..73ef51b079b7 100644 --- a/src/main/webapp/i18n/de/exam.json +++ b/src/main/webapp/i18n/de/exam.json @@ -62,15 +62,20 @@ } }, "examSummary": { + "backToOverview": "Zurück zur Übersicht", "examResults": "Prüfungsergebnisse", "generalInformation": "Allgemeine Informationen", "exportPDF": "Als PDF exportieren", "noSubmissionFound": "Du hast keine Lösung für diese Aufgabe abgegeben.", - "lastCommitHash": "Hash des letzten Commits", + "submissionLinkedToCommit": "Die abgegebene Lösung ist mit folgendem Commit verknüpft: ", "noCommitHash": "Es hat kein Commit stattgefunden", "studentSubmissionTo": "{{studentName}}s Abgabe für {{examTitle}}", - "viewResult": " Ergebnis ansehen", - "viewExampleSolution": "Beispiellösung anzeigen", + "showExampleSolution": "Beispiellösung anzeigen", + "hideExampleSolution": "Beispiellösung ausblenden", + "yourSubmission": "Deine Abgabe", + "problemStatement": "Problemstellung", + "assessment": "Bewertung", + "youAreViewingTheExampleSolution": "Du betrachtest die Beispiellösung", "missingResultNotice": "Es gibt derzeit kein Ergebnis für diese Quiz Aufgabe, obwohl die Ergebnisse schon veröffentlicht wurden. Bitte informiere die entsprechende Lehrkraft.", "points": { "exercise": "Aufgabe", @@ -126,7 +131,6 @@ "updated": "Klausur bearbeitet", "imported": "Klausur importiert", "deleted": "Klausur \"{{ param }}\" gelöscht", - "exercise": "Aufgabe {{nr}}", "startConsentText": "Hiermit bestätige ich mit meinem vollen Namen stellvertretend für meine Unterschrift, dass ich die Teilnahmebedingungen gelesen habe und diese für die Dauer der Klausur einhalten werde.", "endConsentText": "Hiermit bestätige ich mit meinem vollen Namen stellvertretend für meine Unterschrift, dass ich die Klausur eigenständig und nur mithilfe der angegebenen Hilfsmittel bearbeitet habe.", "notConfirmed": "Bitte setze einen Haken in das Kästchen, um fortzufahren.", @@ -151,7 +155,9 @@ "maxPointsNotSet": "Die maximale Punktzahl in der Klausur ist nicht gesetzt." }, "error": { - "cannotRegisterInstructor": "Du kannst keine Personen aus der Lehr- oder Administrationsgruppe zu Klausuren anmelden." + "cannotRegisterInstructor": "Du kannst keine Personen aus der Lehr- oder Administrationsgruppe zu Klausuren anmelden.", + "cannotShowExampleSolution": "Beispiellösung wurde nicht gefunden", + "cannotDisplayExerciseDetails": "Aufgabe {{ exerciseGroupTitle }} kann nicht angezeigt werden" }, "problemStatementUpdate": { "showDiff": "Zeige Unterschiede", @@ -667,17 +673,26 @@ "suspiciousBehavior": { "title": "Verdächtiges Verhalten", "examSessionDescription": "Bei jedem Eintritt in eine Klausur wird für den Studierenden eine Sitzung erstellt. Diese Sitzung ist die Kombination aus IP-Adresse, Sitzungsschlüssel, User Agent, Browser-Fingerabdruck, Browserinstanz-ID und einem dazugehörigen Zeitstempel.", - "suspiciousSessionDescription": "Eine Sitzung wird als verdächtig eingestuft, wenn sie eine der folgenden Kriterien erfüllt:", + "suspiciousSessionDescription": "Wähle mindestens eines der nachfolgenden Kriterien aus, nach dem die Sitzungen dieser Klausur untersucht werden sollen:", "suspiciousSessionCriterionIpAddress": "Es gibt mehrere Sitzungen mit derselben IP-Adresse, die nicht derselben Studierendenklausur zugeordnet sind", "suspiciousSessionCriterionBrowserFingerprint": "Es gibt mehrere Sitzungen mit demselben Browser-Fingerabdruck, die nicht derselben Studierendenklausur zugeordnet sind", + "suspiciousSessionCriterionDifferentIpAddress": "Es gibt mehrere Sitzungen für dieselbe Studierendenklausur, die nicht dieselbe IP-Adresse haben", + "suspiciousSessionCriterionDifferentBrowserFingerprint": "Es gibt mehrere Sitzungen für dieselbe Studierendenklausur, die nicht denselben Browser-Fingerabdruck haben", + "suspiciousSessionCriterionIpOutsideOfRange": "Die IP-Adresse der Sitzung liegt nicht innerhalb des spezifizierten IP-Adressbereichs", + "subnet": "Subnetz in CIDR-Notation", + "subnetHelp": "IP-Subnetz in CIDR-Notation, z.B. 127.0.0.1/24. Wenn man ein IPv4 Subnetz angibt, werden nur IPv4 Adressen überprüft. Wenn man ein IPv6 Subnetz angibt, werden nur IPv6 Adressen überprüft.", + "analyzeSessions": "Analysiere Sitzungen", "suspiciousSessions": { "title": "Verdächtige Sitzungen", "view": "Verdächtige Sitzungen anzeigen", - "number": "Diese Klausur hat {{ numberOfSuspiciousSessions }} verdächtige Fälle.", + "number": "Diese Klausur hat {{ numberOfSuspiciousSessions }} verdächtige Fälle.", "reasons": "Verdächtig aufgrund von:", "case": "Fall", - "sameIpAddress": "Gleiche IP-Adresse", - "sameBrowserFingerprint": "Gleicher Browser-Fingerabdruck" + "sameBrowserFingerprintDifferentStudentExams": "Verschiedene Studierendenklausuren mit demselben Browser-Fingerabdruck", + "sameIpAddressDifferentStudentExams": "Verschiedene Studierendenklausuren mit derselben IP-Adresse", + "differentIpAddressesSameStudentExam": "Verschiedene IP-Adressen für dieselbe Studierendenklausur", + "differentBrowserFingerprintsSameStudentExam": "Verschiedene Browser-Fingerabdrücke für dieselbe Studierendenklausur", + "ipOutsideOfRange": "IP-Adresse außerhalb des spezifizierten Bereichs {{ range }}" } }, "plagiarismCasesOverview": { @@ -688,6 +703,11 @@ "actions": "Aktionen", "viewResultsOrRunDetection": "Ergebnisse anzeigen oder Plagiatsprüfung starten", "viewCases": "Fälle anzeigen" + }, + "dateChange": { + "title": "Bestätige Änderung der Prüfungszeit", + "message": "Die Prüfung wird gerade abgehalten. Wenn du die Zeiten einer aktiven Prüfung änderst, werden alle aktiven Studenten über die Änderung der Dauer informiert!", + "label": "Die Prüfung wird gerade abgehalten" } }, "studentExamDetail": { @@ -711,6 +731,8 @@ "cancelAssessment": " Bewertung abbrechen", "workingTimeCouldNotBeSaved": "Die Bearbeitungszeit konnte nicht gespeichert werden.", "saveWorkingTimeSuccessful": "Die Bearbeitungszeit wurde erfolgreich gespeichert.", + "endOfIndividualWorkingTime": "Ende der individuellen Bearbeitungszeit:", + "disabledChangeSubmissionStateButtonExplanation": "Der Abgabestatus kann erst nach Ende der Bearbeitungszeit und Ablauf der Karenzzeit geändert werden.", "toggleSuccessful": "Der Abgabestatus wurde erfolgreich geändert.", "togglefailed": "Der Abgabestatus konnte nicht geändert werden!", "hasComplaint": "Beschwerde existiert", diff --git a/src/main/webapp/i18n/de/exerciseChatbot.json b/src/main/webapp/i18n/de/exerciseChatbot.json index a85f1f53a8ed..5a4cf2e2d391 100644 --- a/src/main/webapp/i18n/de/exerciseChatbot.json +++ b/src/main/webapp/i18n/de/exerciseChatbot.json @@ -52,10 +52,10 @@ "parseResponse": "Ein Fehler ist beim Parsen der Antwort von Iris aufgetreten. Ursache: {{ cause }}", "technicalError": "Es ist ein technischer Fehler aufgetreten. Bitte wende dich an Artemis Administratoren sollte der Fehler weiterhin zu sehen sein.", "irisNotAvailable": "Iris antwortet nicht. Bitte versuche es später!", - "rateLimitExceeded": "Du hast die maximale Anzahl von Nachrichten, die du in einem 24-Stunden-Zeitfenster an Iris senden kannst, erreicht. Bitte versuche es später erneut!" + "rateLimitExceeded": "Du hast die maximale Anzahl von Nachrichten, die du in einem {{ hours }}-Stunden-Zeitfenster an Iris senden kannst, erreicht. Bitte versuche es später erneut!" }, "firstMessage": "Hallo, ich bin Iris! Ich kann dir bei deiner Programmieraufgabe helfen. Du kannst hier mehr über mich erfahren.", - "rateLimitTooltip": "Dies ist die maximale Anzahl von Nachrichten, die du in einem 24-Stunden-Zeitfenster an Iris senden kannst." + "rateLimitTooltip": "Dies ist die maximale Anzahl von Nachrichten, die du in einem {{ hours }}-Stunden-Zeitfenster an Iris senden kannst." } } } diff --git a/src/main/webapp/i18n/de/iris.json b/src/main/webapp/i18n/de/iris.json index a43220623fb0..19c996e4af7c 100644 --- a/src/main/webapp/i18n/de/iris.json +++ b/src/main/webapp/i18n/de/iris.json @@ -28,7 +28,7 @@ "preferredModel": "Präferiertes Modell", "inheritModel": "Vererbe Modell", "rateLimit": "Rate Limit", - "rateLimitTooltip": "Die maximale Anzahl an Antworten, die ein Benutzer vom LLM in einem bestimmten Zeitraum erhalten kann. Der Zeitraum beträgt derzeit 3h.", + "rateLimitTooltip": "Die maximale Anzahl an Antworten, die ein Benutzer vom LLM in einem bestimmten Zeitraum erhalten kann.", "template": { "title": "Template", "inherit": "Inherit Template" diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json index bc34950a6fe6..734e8589a0bd 100644 --- a/src/main/webapp/i18n/de/student-dashboard.json +++ b/src/main/webapp/i18n/de/student-dashboard.json @@ -56,12 +56,19 @@ "sortExercises": "Aufgaben sortieren", "newFirst": "Neueste", "oldFirst": "Älteste", + "past": "Vorangegangen", + "current": "Aktuell", + "future": "Zukünftig", + "noDueDate": "Unbefristet", + "view": "Ansicht", + "timeframeView": "Zeitliche Ansicht", + "weeklyView": "Wochenansicht", "noExercises": "Es gibt keine Aufgaben für diesen Kurs.", + "noExerciseMatchesSearchAndFilters": "Es wurden keine Aufgaben gefunden die mit den aktuellen Such- und Filtereinstellungen übereinstimmen.", "notReleasedTooltip": "Nicht sichtbar für Studierende. Veröffentlichungsdatum: ", "notReleased": "Nicht freigegeben", "live": "Live", "shortDueDate": "Bis", - "noDueDate": "Keine Einreichungsfrist", "userNotStartedExercise": "Du hast mit der Aufgabe noch nicht angefangen.", "exerciseSubmitted": "Bereits abgegeben, Änderungen sind noch möglich.", "exerciseSubmittedWaitingForGrading": "Bereits abgegeben, noch keine Bewertung.", diff --git a/src/main/webapp/i18n/en/exam.json b/src/main/webapp/i18n/en/exam.json index 941100e03f9a..0d0ad9daac6d 100644 --- a/src/main/webapp/i18n/en/exam.json +++ b/src/main/webapp/i18n/en/exam.json @@ -62,15 +62,20 @@ } }, "examSummary": { + "backToOverview": "Back to overview", "examResults": "Exam Results", "generalInformation": "General Information", "exportPDF": "Export PDF", "noSubmissionFound": "You didn't submit any solution for this exercise.", - "lastCommitHash": "Last Commit Hash", + "submissionLinkedToCommit": "The submission is linked to commit", "noCommitHash": "No commit was made", "studentSubmissionTo": "{{studentName}}'s submission to {{examTitle}}", - "viewResult": " View Result", - "viewExampleSolution": " View Example Solution", + "showExampleSolution": "Show Example Solution", + "hideExampleSolution": "Hide Example Solution", + "yourSubmission": "Your Submission", + "problemStatement": "Problem Statement", + "assessment": "Assessment", + "youAreViewingTheExampleSolution": "You are viewing the example solution", "missingResultNotice": "There is currently no result for this quiz exercise, although the results have already been published. Please inform your instructor.", "points": { "exercise": "Exercise", @@ -126,7 +131,6 @@ "updated": "Exam updated", "imported": "Exam imported", "deleted": "Deleted exam \"{{ param }}\"", - "exercise": "Exercise {{nr}}", "startConsentText": "I hereby confirm with my full name, representing my signature, that I have read the conditions of participation and will adhere to them for the duration of the exam.", "endConsentText": "I hereby confirm with my full name, representing my signature, that this exam is my own work and I have only used the indicated aids.", "notConfirmed": "Please tick the checkbox to continue.", @@ -151,7 +155,9 @@ "maxPointsNotSet": "The exam max points are not set." }, "error": { - "cannotRegisterInstructor": "You cannot register instructors or administrators for exams." + "cannotRegisterInstructor": "You cannot register instructors or administrators for exams.", + "cannotShowExampleSolution": "Example solution could not be found", + "cannotDisplayExerciseDetails": "Exercise {{ exerciseGroupTitle }} cannot be displayed properly" }, "problemStatementUpdate": { "showDiff": "Show Difference", @@ -651,7 +657,7 @@ }, "editWorkingTime": { "title": "Edit Exam Duration", - "label": "Exam duration change", + "label": "Change exam duration", "duration": "The new duration of the exam will be {{ duration }}.", "question": "This will change the working time for all students. Do you really want to edit the duration of the exam {{ title }}?", "typeNameToConfirm": "Please type in the name of the exam to confirm." @@ -671,14 +677,23 @@ "suspiciousSessionDescription": "A session will be flagged as suspicious if it fulfills one of the following criteria:", "suspiciousSessionCriterionIpAddress": "Multiple sessions with the same IP address belong to different students' exams", "suspiciousSessionCriterionBrowserFingerprint": "Multiple sessions with the same browser fingerprint belong to different students' exams", + "suspiciousSessionCriterionDifferentIpAddress": "Sessions for the same student exam, that do not have the same IP address", + "suspiciousSessionCriterionDifferentBrowserFingerprint": "Sessions for the same student exam, that do not have the same browser fingerprint", + "suspiciousSessionCriterionIpOutsideOfRange": "The IP address of a session is outside of the specified IP range", + "subnet": "Subnet in CIDR notation", + "subnetHelp": "The subnet in CIDR notation, e.g. 127.0.0.1/24. If you enter a IPv4 subnet, only IPv4 addresses will be compared. If you enter a IPv6 subnet, only IPv6 addresses will be compared.", + "analyzeSessions": "Analyze Sessions", "suspiciousSessions": { "title": "Suspicious Sessions", "view": "View Suspicious Sessions", - "number": "This exam has {{ numberOfSuspiciousSessions }} cases.", + "number": "This exam has {{ numberOfSuspiciousSessions }} cases.", "reasons": "Suspicious because of:", "case": "Case", - "sameIpAddress": "Same IP address", - "sameBrowserFingerprint": "Same browser fingerprint" + "sameBrowserFingerprintDifferentStudentExams": "Different student exams with the same browser fingerprint", + "sameIpAddressDifferentStudentExams": "Different student exams with the same IP address", + "differentIpAddressesSameStudentExam": "Different IP addresses for the same student exam", + "differentBrowserFingerprintsSameStudentExam": "Different browser fingerprints for the same student exam", + "ipOutsideOfRange": "IP address outside of range {{ range }}" } }, "plagiarismCasesOverview": { @@ -689,6 +704,11 @@ "actions": "Actions", "viewResultsOrRunDetection": "View Results or Run Detection", "viewCases": "View Cases" + }, + "dateChange": { + "title": "Confirm working time change", + "message": "The exam conduction is currently in progress. Changing the times of an active exam will notify all active students about the duration change!", + "label": "The exam conduction is currently in progress" } }, "studentExamDetail": { @@ -712,6 +732,8 @@ "cancelAssessment": " Cancel Assessment", "workingTimeCouldNotBeSaved": "The working time could not be saved.", "saveWorkingTimeSuccessful": "The working time was saved successfully.", + "endOfIndividualWorkingTime": "End of individual working time:", + "disabledChangeSubmissionStateButtonExplanation": "Cannot be changed before the end of the working time and the respective grace period.", "toggleSuccessful": "The submitted status was changed successfully.", "togglefailed": "The submitted status could not be changed!", "hasComplaint": "Has Complaint", diff --git a/src/main/webapp/i18n/en/exerciseChatbot.json b/src/main/webapp/i18n/en/exerciseChatbot.json index d433f97403f2..63a4f6a31ff1 100644 --- a/src/main/webapp/i18n/en/exerciseChatbot.json +++ b/src/main/webapp/i18n/en/exerciseChatbot.json @@ -52,10 +52,10 @@ "parseResponse": "An error occurred while parsing the response from Iris. Cause: {{ cause }}", "technicalError": "There has been a technical error. Please contact Artemis Administrators if this error message persists.", "irisNotAvailable": "Iris is not available. Please try again later!", - "rateLimitExceeded": "You have reached the maximum number of messages you can send to Iris in a 24 hour window. Please try again later!" + "rateLimitExceeded": "You have reached the maximum number of messages you can send to Iris in a {{ hours }} hour window. Please try again later!" }, "firstMessage": "Hi, I'm Iris! I can help you with your programming exercise. You can learn more about me here.", - "rateLimitTooltip": "This is the maximum number of messages you can send to Iris in a 24 hour window." + "rateLimitTooltip": "This is the maximum number of messages you can send to Iris in a {{ hours }} hour window." } } } diff --git a/src/main/webapp/i18n/en/iris.json b/src/main/webapp/i18n/en/iris.json index fb5cb28308ff..9b7f9cdced0c 100644 --- a/src/main/webapp/i18n/en/iris.json +++ b/src/main/webapp/i18n/en/iris.json @@ -28,7 +28,9 @@ "preferredModel": "Preferred Model", "inheritModel": "Inherit Model", "rateLimit": "Rate Limit", - "rateLimitTooltip": "The maximum number of answers a user can receive from the LLM in a given time period. The time period is currently 3h.", + "rateLimitTooltip": "The maximum number of answers a user can receive from the LLM in a given time period.", + "rateLimitTimeframeHours": "Rate Limit Timeframe (Hours)", + "rateLimitTimeframeHoursTooltip": "The time period in which the rate limit applies in hours.", "template": { "title": "Template", "inherit": "Inherit Template" diff --git a/src/main/webapp/i18n/en/student-dashboard.json b/src/main/webapp/i18n/en/student-dashboard.json index b0212682ffba..5197dd337770 100644 --- a/src/main/webapp/i18n/en/student-dashboard.json +++ b/src/main/webapp/i18n/en/student-dashboard.json @@ -56,12 +56,19 @@ "sortExercises": "Sort exercises", "newFirst": "Newest", "oldFirst": "Oldest", + "past": "Past", + "current": "Current", + "future": "Future", + "noDueDate": "No due date", + "view": "View", + "timeframeView": "Timeframe view", + "weeklyView": "Weekly view", "noExercises": "No exercises available for the course.", + "noExerciseMatchesSearchAndFilters": "No exercises found with the current search and filter settings.", "notReleasedTooltip": "Only visible to teaching assistants and instructors. Release Date: ", "notReleased": "Not released", "live": "Live", "shortDueDate": "Due", - "noDueDate": "No due date", "userNotAssignedToTeam": "You have not been assigned to a team yet.", "userNotStartedExercise": "You have not started this exercise yet.", "exerciseSubmitted": "Submitted, you can still submit updates.", diff --git a/src/test/cypress/e2e/exercises/ExerciseImport.cy.ts b/src/test/cypress/e2e/exercises/ExerciseImport.cy.ts index 2754e69f5b97..fa9987bc8a43 100644 --- a/src/test/cypress/e2e/exercises/ExerciseImport.cy.ts +++ b/src/test/cypress/e2e/exercises/ExerciseImport.cy.ts @@ -59,6 +59,40 @@ describe('Import exercises', () => { }); }); + after('Delete Courses', () => { + courseManagementAPIRequest.deleteCourse(course, admin); + courseManagementAPIRequest.deleteCourse(secondCourse, admin); + }); + + /** + * Needs to be executed first as the exercise has no due date => would be collapsed in overview if exercises with current due date are displayed + * + * FIXME + * a) fix the setDueDate method + * b) switch to the week view to display the exercise + */ + it('Imports programming exercise', () => { + cy.login(instructor, `/course-management/${secondCourse.id}/exercises`); + courseManagementExercises.importProgrammingExercise(); + courseManagementExercises.clickImportExercise(programmingExercise.id!); + + checkField('#field_points', programmingExercise.maxPoints!); + + programmingExerciseCreation.setTitle('Import Test'); + programmingExerciseCreation.setShortName('importtest' + generateUUID()); + // programmingExerciseCreation.setDueDate(dayjs().add(3, 'days')); // FIXME does not work yet + + programmingExerciseCreation.import().then((request: Interception) => { + const exercise = request.response!.body; + cy.login(studentOne, `/courses/${secondCourse.id}`); + courseOverview.startExercise(exercise.id!); + courseOverview.openRunningExercise(exercise.id!); + programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, javaPartiallySuccessfulSubmission, () => { + programmingExerciseEditor.getResultScore().contains(javaPartiallySuccessfulSubmission.expectedResult).and('be.visible'); + }); + }); + }); + it('Imports text exercise', () => { cy.login(instructor, `/course-management/${secondCourse.id}/exercises`); courseManagementExercises.importTextExercise(); @@ -143,30 +177,4 @@ describe('Import exercises', () => { }); }); }); - - it('Imports programming exercise', () => { - cy.login(instructor, `/course-management/${secondCourse.id}/exercises`); - courseManagementExercises.importProgrammingExercise(); - courseManagementExercises.clickImportExercise(programmingExercise.id!); - - checkField('#field_points', programmingExercise.maxPoints!); - - programmingExerciseCreation.setTitle('Import Test'); - programmingExerciseCreation.setShortName('importtest' + generateUUID()); - - programmingExerciseCreation.import().then((request: Interception) => { - const exercise = request.response!.body; - cy.login(studentOne, `/courses/${secondCourse.id}`); - courseOverview.startExercise(exercise.id!); - courseOverview.openRunningExercise(exercise.id!); - programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, javaPartiallySuccessfulSubmission, () => { - programmingExerciseEditor.getResultScore().contains(javaPartiallySuccessfulSubmission.expectedResult).and('be.visible'); - }); - }); - }); - - after('Delete Courses', () => { - courseManagementAPIRequest.deleteCourse(course, admin); - courseManagementAPIRequest.deleteCourse(secondCourse, admin); - }); }); diff --git a/src/test/cypress/support/pageobjects/exam/ExamManagementPage.ts b/src/test/cypress/support/pageobjects/exam/ExamManagementPage.ts index cfecaea87102..96ec66c7cb27 100644 --- a/src/test/cypress/support/pageobjects/exam/ExamManagementPage.ts +++ b/src/test/cypress/support/pageobjects/exam/ExamManagementPage.ts @@ -80,7 +80,7 @@ export class ExamManagementPage { cy.visit(`/course-management/${courseID}/exams/${examID}/student-exams`); cy.get('#student-exam').find('.datatable-body-row').filter(`:contains("${username}")`).find('.view-submission').click(); cy.get('.summery').click(); - cy.get('#result-score').contains(score); + cy.get('#exercise-result-score').contains(score); } clickEdit() { diff --git a/src/test/cypress/support/pageobjects/exam/ExamParticipation.ts b/src/test/cypress/support/pageobjects/exam/ExamParticipation.ts index c1216510c934..28473ef75a9c 100644 --- a/src/test/cypress/support/pageobjects/exam/ExamParticipation.ts +++ b/src/test/cypress/support/pageobjects/exam/ExamParticipation.ts @@ -104,8 +104,8 @@ export class ExamParticipation { } getResultScore() { - cy.reloadUntilFound('#result-score'); - return cy.get('#result-score'); + cy.reloadUntilFound('#exercise-result-score'); + return cy.get('#exercise-result-score'); } checkExamFinishedTitle(title: string) { @@ -128,12 +128,12 @@ export class ExamParticipation { } verifyExerciseTitleOnFinalPage(exerciseID: number, exerciseTitle: string) { - getExercise(exerciseID).find('.exercise-title').contains(exerciseTitle).should('be.visible'); + getExercise(exerciseID).find(`#exercise-group-title-${exerciseID}`).contains(exerciseTitle).should('be.visible'); } verifyTextExerciseOnFinalPage(textFixture: string) { cy.fixture(textFixture).then((submissionText) => { - cy.contains(submissionText).should('be.visible'); + cy.get('textarea').should('have.value', submissionText); }); } } diff --git a/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts b/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts index dc07db838548..4ac3dc83bdcd 100644 --- a/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts +++ b/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts @@ -1,4 +1,7 @@ import { BASE_API, POST, PROGRAMMING_EXERCISE_BASE, ProgrammingLanguage } from '../../../constants'; +import { Dayjs } from 'dayjs/esm'; + +const OWL_DATEPICKER_ARIA_LABEL_DATE_FORMAT = 'MMMM D, YYYY'; /** * A class which encapsulates UI selectors and actions for the programming exercise creation page. @@ -53,14 +56,30 @@ export class ProgrammingExerciseCreationPage { generate() { cy.intercept(POST, PROGRAMMING_EXERCISE_BASE + 'setup').as('createProgrammingExercise'); cy.get('#save-entity').click(); - // Creating a programming exercise can take quite a while so we increase the default timeout here + // Creating a programming exercise can take quite a while, so we increase the default timeout here return cy.wait('@createProgrammingExercise', { timeout: 60000 }); } import() { cy.intercept(POST, BASE_API + 'programming-exercises/import/*').as('programmingExerciseImport'); cy.get('#save-entity').click(); - // Creating a programming exercise can take quite a while so we increase the default timeout here + // Creating a programming exercise can take quite a while, so we increase the default timeout here return cy.wait('@programmingExerciseImport', { timeout: 60000 }); } + + /** + * Sets the Due Date field + * @param date + * */ + setDueDate(date: Dayjs) { + cy.get('#programming-exercise-due-date-picker').click(); + + const ariaLabelDate = date.format(OWL_DATEPICKER_ARIA_LABEL_DATE_FORMAT); + cy.get(`td[aria-label="${ariaLabelDate}"]`).click(); + + cy.get('.owl-dt-control-content.owl-dt-control-button-content').contains('Set').should('exist').click(); + + // FIXME for an yet unknown reason the set button appears to be clicked, the due date is set, + // but the owl datepicker overlay seems to persist, did not find a way to close it => import button cannot be clicked + } } diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/UserSaml2IntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/authentication/UserSaml2IntegrationTest.java index 145a9ab9d58d..106e6c1283e7 100644 --- a/src/test/java/de/tum/in/www1/artemis/authentication/UserSaml2IntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/authentication/UserSaml2IntegrationTest.java @@ -25,11 +25,11 @@ import de.tum.in.www1.artemis.service.connectors.SAML2Service; import de.tum.in.www1.artemis.service.user.PasswordService; import de.tum.in.www1.artemis.user.UserUtilService; -import de.tum.in.www1.artemis.web.rest.open.UserJwtResource; +import de.tum.in.www1.artemis.web.rest.open.PublicUserJwtResource; import de.tum.in.www1.artemis.web.rest.vm.LoginVM; /** - * Tests for {@link UserJwtResource} and {@link SAML2Service}. + * Tests for {@link PublicUserJwtResource} and {@link SAML2Service}. */ class UserSaml2IntegrationTest extends AbstractSpringIntegrationGitlabCIGitlabSamlTest { diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamFactory.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamFactory.java index 35ec60736223..483c1c4243c5 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamFactory.java +++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamFactory.java @@ -205,7 +205,7 @@ public static Exam generateExamWithExerciseGroup(Course course, boolean mandator /** * creates exam session DTOs * - * @param session1 firts exam session + * @param session1 first exam session * @param session2 second exam session * @return set of exam session DTOs */ diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java index 2a6f1a534da5..44caea638c64 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamIntegrationTest.java @@ -13,16 +13,20 @@ import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; import java.util.*; +import java.util.stream.Stream; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; import de.tum.in.www1.artemis.AbstractSpringIntegrationBambooBitbucketJiraTest; import de.tum.in.www1.artemis.course.CourseUtilService; @@ -133,7 +137,7 @@ class ExamIntegrationTest extends AbstractSpringIntegrationBambooBitbucketJiraTe private Exam exam2; - private static final int NUMBER_OF_STUDENTS = 2; + private static final int NUMBER_OF_STUDENTS = 4; private static final int NUMBER_OF_TUTORS = 1; @@ -1459,7 +1463,13 @@ void testGetExercisesWithPotentialPlagiarismAsTutor_forbidden() throws Exception @Test @WithMockUser(username = TEST_PREFIX + "tutor1", roles = "TA") void testGetSuspiciousSessionsAsTutor_forbidden() throws Exception { - request.get("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.FORBIDDEN, Set.class); + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("differentStudentExamsSameIPAddress", "true"); + params.add("differentStudentExamsSameBrowserFingerprint", "true"); + params.add("sameStudentExamDifferentIPAddresses", "false"); + params.add("sameStudentExamDifferentBrowserFingerprints", "false"); + params.add("ipOutsideOfRange", "false"); + request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.FORBIDDEN, SuspiciousExamSessionsDTO.class, params); } @Test @@ -1474,7 +1484,13 @@ void testGetExercisesWithPotentialPlagiarismAsInstructorNotInCourse_forbidden() @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testGetSuspiciousSessionsAsInstructorNotInCourse_forbidden() throws Exception { courseUtilService.updateCourseGroups("abc", course1, ""); - request.get("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.FORBIDDEN, Set.class); + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("differentStudentExamsSameIPAddress", "true"); + params.add("differentStudentExamsSameBrowserFingerprint", "true"); + params.add("sameStudentExamDifferentIPAddresses", "false"); + params.add("sameStudentExamDifferentBrowserFingerprints", "false"); + params.add("ipOutsideOfRange", "false"); + request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.FORBIDDEN, SuspiciousExamSessionsDTO.class, params); courseUtilService.updateCourseGroups(TEST_PREFIX, course1, ""); } @@ -1499,32 +1515,254 @@ void testGetExercisesWithPotentialPlagiarismAsInstructor() throws Exception { assertThat(exercises).containsExactlyInAnyOrderElementsOf(expectedExercises); } - @Test + @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") + @MethodSource("provideAnalysisOptions") @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testGetSuspiciousSessionsAsInstructor() throws Exception { - final String userAgent1 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.2 Safari/605.1.15"; + void testGetSuspiciousSessionsDifferentAsInstructor(boolean sameIpDifferentExams, boolean sameFingerprintDifferentExams, boolean differentIpSameExam, + boolean differentFingerprintSameExam) throws Exception { + prepareExamSessionsForTestCase(sameIpDifferentExams, sameFingerprintDifferentExams, differentIpSameExam, differentFingerprintSameExam); + Set suspiciousReasons = getSuspiciousReasons(sameIpDifferentExams, sameFingerprintDifferentExams, differentIpSameExam, + differentFingerprintSameExam); + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("differentStudentExamsSameIPAddress", sameIpDifferentExams ? "true" : "false"); + params.add("differentStudentExamsSameBrowserFingerprint", sameFingerprintDifferentExams ? "true" : "false"); + params.add("sameStudentExamDifferentIPAddresses", differentIpSameExam ? "true" : "false"); + params.add("sameStudentExamDifferentBrowserFingerprints", differentFingerprintSameExam ? "true" : "false"); + params.add("ipOutsideOfRange", "false"); + Set suspiciousSessionTuples = request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", + HttpStatus.OK, SuspiciousExamSessionsDTO.class, params); + assertThat(suspiciousSessionTuples).hasSize(1); + var suspiciousSessions = suspiciousSessionTuples.stream().findFirst().get(); + assertThat(suspiciousSessions.examSessions()).hasSize(2); + var examSessions = suspiciousSessions.examSessions(); + assertThat(examSessions.stream().findFirst().orElseThrow().suspiciousReasons()).containsExactlyInAnyOrderElementsOf(suspiciousReasons); + } + + private static Stream provideAnalysisOptions() { + return Stream.of(Arguments.of(true, true, false, false), Arguments.of(false, true, false, false), Arguments.of(true, false, false, false), + Arguments.of(false, false, true, false), Arguments.of(false, false, false, true), Arguments.of(false, false, true, true)); + } + + private Set getSuspiciousReasons(boolean sameIpDifferentExam, boolean sameFingerprintDifferentExams, boolean differentIpSameExam, + boolean differentFingerprintSameExam) { + Set suspiciousReasons = new HashSet<>(); + if (sameIpDifferentExam) { + suspiciousReasons.add(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS); + } + if (sameFingerprintDifferentExams) { + suspiciousReasons.add(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT); + } + if (differentIpSameExam) { + suspiciousReasons.add(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES); + } + if (differentFingerprintSameExam) { + suspiciousReasons.add(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS); + } + return suspiciousReasons; + } + + private void prepareExamSessionsForTestCase(boolean sameIpDifferentExams, boolean sameFingerprintDifferentExams, boolean differentIpSameExam, + boolean differentFingerprintSameExam) { final String ipAddress1 = "192.0.2.235"; final String browserFingerprint1 = "5b2cc274f6eaf3a71647e1f85358ce32"; - final String sessionToken1 = "abc"; - final String userAgent2 = "Mozilla/5.0 (Linux; Android 10; SM-G960F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Mobile Safari/537.36"; + final String ipAddress2 = "172.168.0.0"; final String browserFingerprint2 = "5b2cc274f6eaf3a71647e1f85358ce31"; - final String sessionToken2 = "def"; - Exam exam = examUtilService.addExam(course1); - StudentExam studentExam = examUtilService.addStudentExamWithUser(exam, userUtilService.getUserByLogin(TEST_PREFIX + "student1")); - StudentExam studentExam2 = examUtilService.addStudentExamWithUser(exam, userUtilService.getUserByLogin(TEST_PREFIX + "student2")); - ExamSession firstExamSessionStudent1 = examUtilService.addExamSessionToStudentExam(studentExam, sessionToken1, ipAddress1, browserFingerprint1, "instanceId", userAgent1); - examUtilService.addExamSessionToStudentExam(studentExam2, sessionToken2, ipAddress2, browserFingerprint2, "instance2Id", userAgent2); - ExamSession secondExamSessionStudent1 = examUtilService.addExamSessionToStudentExam(studentExam2, sessionToken1, ipAddress1, browserFingerprint1, "instanceId", userAgent1); - Set suspiciousReasons = Set.of(SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT, SuspiciousSessionReason.SAME_IP_ADDRESS); - firstExamSessionStudent1.setSuspiciousReasons(suspiciousReasons); - secondExamSessionStudent1.setSuspiciousReasons(suspiciousReasons); - Set suspiciousSessionTuples = request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam.getId() + "/suspicious-sessions", - HttpStatus.OK, SuspiciousExamSessionsDTO.class); - assertThat(suspiciousSessionTuples).hasSize(1); - var suspiciousSessions = suspiciousSessionTuples.stream().findFirst().get(); - assertThat(suspiciousSessions.examSessions()).hasSize(2); - assertThat(suspiciousSessions.examSessions()).usingRecursiveFieldByFieldElementComparatorIgnoringFields("createdDate") - .containsExactlyInAnyOrderElementsOf(ExamFactory.createExpectedExamSessionDTOs(firstExamSessionStudent1, secondExamSessionStudent1)); + + StudentExam studentExam = examUtilService.addStudentExamWithUser(exam1, userUtilService.getUserByLogin(TEST_PREFIX + "student1")); + StudentExam studentExam2 = examUtilService.addStudentExamWithUser(exam1, userUtilService.getUserByLogin(TEST_PREFIX + "student2")); + StudentExam studentExam3 = examUtilService.addStudentExamWithUser(exam1, userUtilService.getUserByLogin(TEST_PREFIX + "student3")); + StudentExam studentExam4 = examUtilService.addStudentExamWithUser(exam1, userUtilService.getUserByLogin(TEST_PREFIX + "student4")); + if (sameIpDifferentExams && sameFingerprintDifferentExams) { + examUtilService.addExamSessionToStudentExam(studentExam, "abc", ipAddress1, browserFingerprint1, "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam, "def", ipAddress1, browserFingerprint1, "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam2, "abc", ipAddress1, browserFingerprint1, "instanceId", "user-agent"); + } + else { + if (sameFingerprintDifferentExams) { + examUtilService.addExamSessionToStudentExam(studentExam, "abc", ipAddress2, browserFingerprint1, "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam2, "abc", ipAddress1, browserFingerprint1, "instanceId", "user-agent"); + } + if (sameIpDifferentExams) { + examUtilService.addExamSessionToStudentExam(studentExam, "abc", ipAddress1, browserFingerprint1, "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam2, "def", ipAddress1, browserFingerprint2, "instanceId", "user-agent"); + } + } + if (differentIpSameExam && differentFingerprintSameExam) { + examUtilService.addExamSessionToStudentExam(studentExam, "abc", ipAddress1, browserFingerprint1, "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam, "abc", ipAddress2, browserFingerprint2, "instanceId", "user-agent"); + } + else { + if (differentIpSameExam) { + examUtilService.addExamSessionToStudentExam(studentExam, "abc", ipAddress1, browserFingerprint1, "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam, "abc", ipAddress2, browserFingerprint1, "instanceId", "user-agent"); + } + if (differentFingerprintSameExam) { + examUtilService.addExamSessionToStudentExam(studentExam, "abc", ipAddress1, browserFingerprint1, "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam, "abc", ipAddress1, browserFingerprint2, "instanceId", "user-agent"); + } + } + + // add other unrelated exam sessions + + examUtilService.addExamSessionToStudentExam(studentExam3, "abc", "192.168.1.1", "5b2cc274f6eaf3a71647e1f85358ce34", "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam3, "abc", "192.168.1.1", "5b2cc274f6eaf3a71647e1f85358ce34", "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam4, "abc", "203.0.113.0", "5b2cc274f6eaf3a71647e1f85358ce35", "instanceId", "user-agent"); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetSuspiciousSessionsIpOutsideOfRangeNoSubnetGivenBadRequest() throws Exception { + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("differentStudentExamsSameIPAddress", "false"); + params.add("differentStudentExamsSameBrowserFingerprint", "false"); + params.add("sameStudentExamDifferentIPAddresses", "false"); + params.add("sameStudentExamDifferentBrowserFingerprints", "false"); + params.add("ipOutsideOfRange", "true"); + request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.BAD_REQUEST, SuspiciousExamSessionsDTO.class, params); + } + + @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + @MethodSource("provideIpAddressesAndSubnets") + void testGetSuspiciousSessionsIpOutsideOfRange(String ipAddress1, String ipAddress2, String subnetIncludingFirstAddress, String subnetIncludingNeitherAddress, + String subnetIncludingBothAddresses) throws Exception { + var studentExam1 = examUtilService.addStudentExamWithUser(exam1, userUtilService.getUserByLogin(TEST_PREFIX + "student1")); + var studentExam2 = examUtilService.addStudentExamWithUser(exam1, userUtilService.getUserByLogin(TEST_PREFIX + "student2")); + examUtilService.addExamSessionToStudentExam(studentExam1, "abc", ipAddress1, "5b2cc274f6eaf3a71647e1f85358ce32", "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam2, "abc", ipAddress2, "5b2cc274f6eaf3a71647e1f85358ce32", "instanceId", "user-agent"); + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("differentStudentExamsSameIPAddress", "false"); + params.add("differentStudentExamsSameBrowserFingerprint", "false"); + params.add("sameStudentExamDifferentIPAddresses", "false"); + params.add("sameStudentExamDifferentBrowserFingerprints", "false"); + params.add("ipOutsideOfRange", "true"); + params.add("ipSubnet", subnetIncludingFirstAddress); + // test with a subnet that includes the first but not the second ip + var suspiciousSessions = request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.OK, + SuspiciousExamSessionsDTO.class, params); + assertThat(suspiciousSessions).hasSize(1); + SuspiciousExamSessionsDTO suspiciousExamSessionsDTO = suspiciousSessions.stream().findFirst().orElseThrow(); + assertThat(suspiciousExamSessionsDTO.examSessions()).hasSize(1); + var examSessions = suspiciousExamSessionsDTO.examSessions(); + var suspiciousSession = examSessions.stream().findFirst().orElseThrow(); + assertThat(suspiciousSession.ipAddress()).isEqualTo(ipAddress2); + assertThat(suspiciousSession.suspiciousReasons()).containsExactlyInAnyOrder(SuspiciousSessionReason.IP_ADDRESS_OUTSIDE_OF_RANGE); + + // test with a subnet that includes neither ips + params.remove("ipSubnet"); + params.add("ipSubnet", subnetIncludingNeitherAddress); + suspiciousSessions = request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.OK, SuspiciousExamSessionsDTO.class, + params); + assertThat(suspiciousSessions).hasSize(1); + var suspiciousSessionTuple = suspiciousSessions.stream().findFirst().orElseThrow(); + assertThat(suspiciousSessionTuple.examSessions()).hasSize(2); + suspiciousSessionTuple.examSessions().forEach( + suspiciousSessionDTO -> assertThat(suspiciousSessionDTO.suspiciousReasons()).containsExactlyInAnyOrder(SuspiciousSessionReason.IP_ADDRESS_OUTSIDE_OF_RANGE)); + + // test with subnet that contains both ips + params.remove("ipSubnet"); + params.add("ipSubnet", subnetIncludingBothAddresses); + suspiciousSessions = request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.OK, SuspiciousExamSessionsDTO.class, + params); + assertThat(suspiciousSessions).hasSize(0); + } + + private static Stream provideIpAddressesAndSubnets() { + return Stream.of(Arguments.of("192.168.1.10", "192.168.1.20", "192.168.1.0/28", "192.168.1.128/25", "192.168.1.0/24"), + Arguments.of("2001:0db8:85a3:0000:0000:8a2e:0370:7330", "2001:0db8:85a3:0000:0000:8a2e:0370:7331", "2001:0db8:85a3:0000:0000:8a2e:0370:7330/128", + "2001:0db8:85a3:0000:0000:8a2e:0370:7000/128", "2001:0db8:85a3:0000:0000:8a2e:0370:7330/64")); + } + + @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + @MethodSource("provideMixedIpAddressesAndSubnets") + void testIpOutsideOfRangeMixedIPv4AndIPv6(String ipAddress1, String ipAddress2, String subnet) throws Exception { + var studentExam1 = examUtilService.addStudentExamWithUser(exam1, userUtilService.getUserByLogin(TEST_PREFIX + "student1")); + var studentExam2 = examUtilService.addStudentExamWithUser(exam1, userUtilService.getUserByLogin(TEST_PREFIX + "student2")); + examUtilService.addExamSessionToStudentExam(studentExam1, "abc", ipAddress1, "5b2cc274f6eaf3a71647e1f85358ce32", "instanceId", "user-agent"); + examUtilService.addExamSessionToStudentExam(studentExam2, "abc", ipAddress2, "5b2cc274f6eaf3a71647e1f85358ce32", "instanceId", "user-agent"); + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("differentStudentExamsSameIPAddress", "false"); + params.add("differentStudentExamsSameBrowserFingerprint", "false"); + params.add("sameStudentExamDifferentIPAddresses", "false"); + params.add("sameStudentExamDifferentBrowserFingerprints", "false"); + params.add("ipOutsideOfRange", "true"); + params.add("ipSubnet", subnet); + // the IP address matching IP address type (IPv4 or IPv6) is included in the subnet and the IP address in the other format is ignored --> 0 + assertThat(request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.OK, SuspiciousExamSessionsDTO.class, params)) + .hasSize(0); + + } + + private static Stream provideMixedIpAddressesAndSubnets() { + return Stream.of(Arguments.of("192.168.1.10", "2001:0db8:85a3:0000:0000:8a2e:0370:7331", "192.168.1.0/28"), + Arguments.of("192.168.1.10", "2001:0db8:85a3:0000:0000:8a2e:0370:7330", "2001:0db8:85a3:0000:0000:8a2e:0370:7330/128")); + } + + @ParameterizedTest(name = "{displayName} [{index}] {argumentsWithNames}") + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + @MethodSource("provideAnalysisOptions") + void testComparingForOtherCriterionThanGivenNoFalsePositives(boolean sameIpDifferentExams, boolean sameFingerprintDifferentExams, boolean differentIpSameExam, + boolean differentFingerprintSameExam) throws Exception { + prepareExamSessionsForTestCase(!sameIpDifferentExams, !sameFingerprintDifferentExams, !differentIpSameExam, !differentFingerprintSameExam); + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("differentStudentExamsSameIPAddress", sameIpDifferentExams ? "true" : "false"); + params.add("differentStudentExamsSameBrowserFingerprint", sameFingerprintDifferentExams ? "true" : "false"); + params.add("sameStudentExamDifferentIPAddresses", differentIpSameExam ? "true" : "false"); + params.add("sameStudentExamDifferentBrowserFingerprints", differentFingerprintSameExam ? "true" : "false"); + params.add("ipOutsideOfRange", "false"); + Set suspiciousSessionTuples = request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", + HttpStatus.OK, SuspiciousExamSessionsDTO.class, params); + if (!sameIpDifferentExams && sameFingerprintDifferentExams && !differentIpSameExam && !differentFingerprintSameExam) { + assertThat(suspiciousSessionTuples).hasSize(1); + var suspiciousSessions = suspiciousSessionTuples.stream().findFirst().get(); + assertThat(suspiciousSessions.examSessions()).hasSize(2); + var examSessions = suspiciousSessions.examSessions(); + assertThat(examSessions.stream().findFirst().orElseThrow().suspiciousReasons()) + .containsExactlyInAnyOrderElementsOf(Set.of(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT)); + } + else if (sameIpDifferentExams && !sameFingerprintDifferentExams && !differentIpSameExam && !differentFingerprintSameExam) { + assertThat(suspiciousSessionTuples).hasSize(1); + var suspiciousSessions = suspiciousSessionTuples.stream().findFirst().get(); + assertThat(suspiciousSessions.examSessions()).hasSize(2); + var examSessions = suspiciousSessions.examSessions(); + assertThat(examSessions.stream().findFirst().orElseThrow().suspiciousReasons()) + .containsExactlyInAnyOrderElementsOf(Set.of(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS)); + } + else { + assertThat(suspiciousSessionTuples).hasSize(0); + } + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testSuspiciousSessionsAllOptionsCombined() throws Exception { + prepareExamSessionsForTestCase(true, true, true, true); + MultiValueMap params = new LinkedMultiValueMap<>(); + params.add("differentStudentExamsSameIPAddress", "true"); + params.add("differentStudentExamsSameBrowserFingerprint", "true"); + params.add("sameStudentExamDifferentIPAddresses", "true"); + params.add("sameStudentExamDifferentBrowserFingerprints", "true"); + params.add("ipOutsideOfRange", "true"); + params.add("ipSubnet", "192.168.1.0/28"); + var suspiciousSessions = request.getSet("/api/courses/" + course1.getId() + "/exams/" + exam1.getId() + "/suspicious-sessions", HttpStatus.OK, + SuspiciousExamSessionsDTO.class, params); + assertThat(suspiciousSessions).hasSize(3); + List outsideOfRangeSessions = suspiciousSessions.stream().flatMap(suspiciousExamSessionsDTO -> suspiciousExamSessionsDTO.examSessions().stream()) + .filter(suspiciousSessionDTO -> suspiciousSessionDTO.suspiciousReasons().contains(SuspiciousSessionReason.IP_ADDRESS_OUTSIDE_OF_RANGE)).toList(); + assertThat(outsideOfRangeSessions).hasSize(4); + List sameIpAndFingerprintDifferentExams = suspiciousSessions.stream() + .flatMap(suspiciousExamSessionsDTO -> suspiciousExamSessionsDTO.examSessions().stream()) + .filter(suspiciousSessionDTO -> suspiciousSessionDTO.suspiciousReasons().contains(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS) + && suspiciousSessionDTO.suspiciousReasons().contains(SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT)) + .toList(); + assertThat(sameIpAndFingerprintDifferentExams).hasSize(2); + List sameStudentExamDifferentIpAndFingerprint = suspiciousSessions.stream() + .flatMap(suspiciousExamSessionsDTO -> suspiciousExamSessionsDTO.examSessions().stream()) + .filter(suspiciousSessionDTO -> suspiciousSessionDTO.suspiciousReasons().contains(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES) + && suspiciousSessionDTO.suspiciousReasons().contains(SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS)) + .toList(); + assertThat(sameStudentExamDifferentIpAndFingerprint).hasSize(2); } } diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java index e3cfcb57bc23..f82818bb01a7 100644 --- a/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/exam/ProgrammingExamIntegrationTest.java @@ -2,7 +2,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -36,7 +40,10 @@ import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseTestService; import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService; import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.*; +import de.tum.in.www1.artemis.repository.ExamRepository; +import de.tum.in.www1.artemis.repository.ExerciseRepository; +import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; +import de.tum.in.www1.artemis.repository.StudentExamRepository; import de.tum.in.www1.artemis.service.scheduled.ParticipantScoreScheduleService; import de.tum.in.www1.artemis.user.UserUtilService; import de.tum.in.www1.artemis.util.ExamPrepareExercisesTestUtil; @@ -155,6 +162,39 @@ void testUpdateExam_rescheduleProgramming_startDateChanged() throws Exception { verify(instanceMessageSendService).sendProgrammingExerciseSchedule(programmingEx.getId()); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testUpdateExam_rescheduleProgramming_endDateChanged() throws Exception { + var programmingEx = programmingExerciseUtilService.addCourseExamExerciseGroupWithOneProgrammingExerciseAndTestCases(); + var examWithProgrammingEx = programmingEx.getExerciseGroup().getExam(); + + ZonedDateTime visibleDate = examWithProgrammingEx.getVisibleDate(); + ZonedDateTime startDate = examWithProgrammingEx.getStartDate(); + ZonedDateTime endDate = examWithProgrammingEx.getEndDate(); + examUtilService.setVisibleStartAndEndDateOfExam(examWithProgrammingEx, visibleDate, startDate, endDate.plusMinutes(1)); + + request.put("/api/courses/" + examWithProgrammingEx.getCourse().getId() + "/exams", examWithProgrammingEx, HttpStatus.OK); + verify(instanceMessageSendService).sendRescheduleAllStudentExams(examWithProgrammingEx.getId()); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testUpdateExamWorkingTime_rescheduleProgramming_endDateChanged() throws Exception { + var programmingEx = programmingExerciseUtilService.addCourseExamExerciseGroupWithOneProgrammingExerciseAndTestCases(); + var examWithProgrammingEx = programmingEx.getExerciseGroup().getExam(); + + var workingTimeExtensionSeconds = 60; + + ZonedDateTime visibleDate = examWithProgrammingEx.getVisibleDate(); + ZonedDateTime startDate = examWithProgrammingEx.getStartDate(); + ZonedDateTime endDate = examWithProgrammingEx.getEndDate(); + examUtilService.setVisibleStartAndEndDateOfExam(examWithProgrammingEx, visibleDate, startDate, endDate); + + request.patch("/api/courses/" + examWithProgrammingEx.getCourse().getId() + "/exams/" + examWithProgrammingEx.getId() + "/working-time", workingTimeExtensionSeconds, + HttpStatus.OK); + verify(instanceMessageSendService).sendRescheduleAllStudentExams(examWithProgrammingEx.getId()); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void lockAllRepositories() throws Exception { diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java index 6b546e374c79..c74de5e5e648 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java @@ -1,7 +1,15 @@ package de.tum.in.www1.artemis.exercise.programmingexercise; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.after; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.timeout; +import static org.mockito.Mockito.verify; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; @@ -25,7 +33,10 @@ import de.tum.in.www1.artemis.domain.ProgrammingExercise; import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.VcsRepositoryUrl; -import de.tum.in.www1.artemis.domain.enumeration.*; +import de.tum.in.www1.artemis.domain.enumeration.AssessmentType; +import de.tum.in.www1.artemis.domain.enumeration.ExerciseLifecycle; +import de.tum.in.www1.artemis.domain.enumeration.ParticipationLifecycle; +import de.tum.in.www1.artemis.domain.enumeration.Visibility; import de.tum.in.www1.artemis.domain.exam.Exam; import de.tum.in.www1.artemis.domain.exam.StudentExam; import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation; @@ -34,7 +45,11 @@ import de.tum.in.www1.artemis.exam.ExamUtilService; import de.tum.in.www1.artemis.exercise.ExerciseUtilService; import de.tum.in.www1.artemis.participation.ParticipationUtilService; -import de.tum.in.www1.artemis.repository.*; +import de.tum.in.www1.artemis.repository.ExamRepository; +import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; +import de.tum.in.www1.artemis.repository.ProgrammingExerciseStudentParticipationRepository; +import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository; +import de.tum.in.www1.artemis.repository.StudentExamRepository; import de.tum.in.www1.artemis.service.messaging.InstanceMessageReceiveService; import de.tum.in.www1.artemis.user.UserUtilService; import de.tum.in.www1.artemis.util.LocalRepository; @@ -600,7 +615,7 @@ void shouldCancelAllTasksIfSchedulingNoLongerNeeded() throws Exception { @Test @WithMockUser(username = "admin", roles = "ADMIN") - void testExamWorkingTimeChangeDuringConduction() { + void testStudentExamIndividualWorkingTimeChangeDuringConduction() { ProgrammingExercise examExercise = programmingExerciseUtilService.addCourseExamExerciseGroupWithOneProgrammingExercise(); Exam exam = examExercise.getExamViaExerciseGroupOrCourseMember(); exam.setStartDate(ZonedDateTime.now().minusMinutes(1)); @@ -619,6 +634,28 @@ void testExamWorkingTimeChangeDuringConduction() { participation.getStudents()); } + @Test + @WithMockUser(username = "admin", roles = "ADMIN") + void testRescheduleExamDuringConduction() { + ProgrammingExercise examExercise = programmingExerciseUtilService.addCourseExamExerciseGroupWithOneProgrammingExercise(); + Exam exam = examExercise.getExamViaExerciseGroupOrCourseMember(); + exam.setStartDate(ZonedDateTime.now().minusMinutes(1)); + exam = examRepository.saveAndFlush(exam); + User user = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); + StudentExam studentExam = examUtilService.addStudentExamWithUser(exam, user); + ProgrammingExerciseStudentParticipation participation = (ProgrammingExerciseStudentParticipation) participationUtilService + .addProgrammingParticipationWithResultForExercise(examExercise, TEST_PREFIX + "student1").getParticipation(); + studentExam.setExercises(List.of(examExercise)); + studentExam.setWorkingTime(1); + studentExamRepository.saveAndFlush(studentExam); + + instanceMessageReceiveService.processRescheduleExamDuringConduction(exam.getId()); + + verify(versionControlService, timeout(TIMEOUT_MS)).setRepositoryPermissionsToReadOnly(participation.getVcsRepositoryUrl(), examExercise.getProjectKey(), + participation.getStudents()); + verify(programmingExerciseParticipationService, timeout(TIMEOUT_MS)).lockStudentRepositoryAndParticipation(examExercise, participation); + } + /** * Sets the due date and build and test after due date for the {@code programmingExercise} to NOW + the delay. * diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionIntegrationTest.java index f10f2d9f4682..2206d2c1ac79 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingSubmissionIntegrationTest.java @@ -471,7 +471,7 @@ void testNotifyPush_invalidParticipation() throws Exception { studentParticipation = studentParticipationRepository.save(studentParticipation); String url = "/api/public/programming-submissions/" + studentParticipation.getId(); - request.post(url, "test", HttpStatus.NOT_FOUND); + request.post(url, "test", HttpStatus.BAD_REQUEST); } @Test diff --git a/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java index 2acdb177fc3a..92bfc7737093 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java @@ -3,6 +3,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; import java.util.Objects; import java.util.stream.Collectors; @@ -142,4 +143,14 @@ protected void verifyErrorWasSentOverWebsocket(String user, Long sessionId) { ArgumentMatchers.argThat(object -> object instanceof IrisWebsocketService.IrisWebsocketDTO websocketDTO && websocketDTO.getType() == IrisWebsocketService.IrisWebsocketDTO.IrisWebsocketMessageType.ERROR)); } + + /** + * Verify that nothing else was sent through the websocket. + * + * @param user the user + * @param sessionId the session id + */ + protected void verifyNothingElseWasSentOverWebsocket(String user, Long sessionId) { + verifyNoMoreInteractions(websocketMessagingService); + } } diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisMessageIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisMessageIntegrationTest.java index b2017f7ebef9..3f26ddb6170e 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisMessageIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisMessageIntegrationTest.java @@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.util.ReflectionTestUtils; import de.tum.in.www1.artemis.domain.Course; import de.tum.in.www1.artemis.domain.ProgrammingExercise; @@ -280,10 +279,12 @@ void resendMessage() throws Exception { request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/resend", null, IrisMessage.class, HttpStatus.OK); await().until(() -> irisSessionRepository.findByIdWithMessagesElseThrow(irisSession.getId()).getMessages().size() == 2); verifyMessageWasSentOverWebsocket(TEST_PREFIX + "student1", irisSession.getId(), "Hello World"); + verifyNothingElseWasSentOverWebsocket(TEST_PREFIX + "student1", irisSession.getId()); } + // User needs to be Admin to change settings @Test - @WithMockUser(username = TEST_PREFIX + "student2", roles = "USER") + @WithMockUser(username = TEST_PREFIX + "student2", roles = "ADMIN") void sendMessageRateLimitReached() throws Exception { var irisSession = irisSessionService.createChatSessionForProgrammingExercise(exercise, userUtilService.getUserByLogin(TEST_PREFIX + "student2")); var messageToSend1 = createDefaultMockMessage(irisSession); @@ -292,22 +293,25 @@ void sendMessageRateLimitReached() throws Exception { irisRequestMockProvider.mockMessageResponse("Hello World"); setupExercise(); - var previousRateLimit = ReflectionTestUtils.getField(irisRateLimitService, "rateLimit"); - ReflectionTestUtils.setField(irisRateLimitService, "rateLimit", 1); - - try { - request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend1, IrisMessage.class, HttpStatus.CREATED); - await().until(() -> irisSessionRepository.findByIdWithMessagesElseThrow(irisSession.getId()).getMessages().size() == 2); - request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend2, IrisMessage.class, HttpStatus.TOO_MANY_REQUESTS); - var irisMessage = irisMessageService.saveMessage(messageToSend2, irisSession, IrisMessageSender.USER); - request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/resend", null, IrisMessage.class, - HttpStatus.TOO_MANY_REQUESTS); - verifyMessageWasSentOverWebsocket(TEST_PREFIX + "student2", irisSession.getId(), messageToSend1); - verifyMessageWasSentOverWebsocket(TEST_PREFIX + "student2", irisSession.getId(), "Hello World"); - } - finally { - ReflectionTestUtils.setField(irisRateLimitService, "rateLimit", previousRateLimit); - } + var globalSettings = irisSettingsService.getGlobalSettings(); + globalSettings.getIrisChatSettings().setRateLimit(1); + globalSettings.getIrisChatSettings().setRateLimitTimeframeHours(10); + irisSettingsService.saveGlobalIrisSettings(globalSettings); + + request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend1, IrisMessage.class, HttpStatus.CREATED); + await().until(() -> irisSessionRepository.findByIdWithMessagesElseThrow(irisSession.getId()).getMessages().size() == 2); + request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend2, IrisMessage.class, HttpStatus.TOO_MANY_REQUESTS); + var irisMessage = irisMessageService.saveMessage(messageToSend2, irisSession, IrisMessageSender.USER); + request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/resend", null, IrisMessage.class, + HttpStatus.TOO_MANY_REQUESTS); + verifyMessageWasSentOverWebsocket(TEST_PREFIX + "student2", irisSession.getId(), messageToSend1); + verifyMessageWasSentOverWebsocket(TEST_PREFIX + "student2", irisSession.getId(), "Hello World"); + verifyNothingElseWasSentOverWebsocket(TEST_PREFIX + "student2", irisSession.getId()); + + // Reset to not interfere with other tests + globalSettings.getIrisChatSettings().setRateLimit(null); + globalSettings.getIrisChatSettings().setRateLimitTimeframeHours(null); + irisSettingsService.saveGlobalIrisSettings(globalSettings); } private void setupExercise() throws Exception { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisSessionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisSessionIntegrationTest.java index 4e5a824f4023..a84fd55b6d17 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisSessionIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisSessionIntegrationTest.java @@ -67,7 +67,7 @@ void getCurrentSession_notFound() throws Exception { } @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + @WithMockUser(username = TEST_PREFIX + "student1", roles = "ADMIN") void isActive() throws Exception { var irisSession = request.postWithResponseBody("/api/iris/programming-exercises/" + exercise.getId() + "/sessions", null, IrisSession.class, HttpStatus.CREATED); var settings = irisSettingsService.getGlobalSettings(); @@ -75,6 +75,7 @@ void isActive() throws Exception { irisRequestMockProvider.mockStatusResponse(); irisRequestMockProvider.mockStatusResponse(); + var previousPreferredModel = settings.getIrisChatSettings().getPreferredModel(); settings.getIrisChatSettings().setPreferredModel("TEST_MODEL_UP"); irisSettingsService.saveGlobalIrisSettings(settings); assertThat(request.get("/api/iris/sessions/" + irisSession.getId() + "/active", HttpStatus.OK, IrisHealthDTO.class).active()).isTrue(); @@ -84,5 +85,8 @@ void isActive() throws Exception { settings.getIrisChatSettings().setPreferredModel("TEST_MODEL_NA"); irisSettingsService.saveGlobalIrisSettings(settings); assertThat(request.get("/api/iris/sessions/" + irisSession.getId() + "/active", HttpStatus.OK, IrisHealthDTO.class).active()).isFalse(); + + settings.getIrisChatSettings().setPreferredModel(previousPreferredModel); + irisSettingsService.saveGlobalIrisSettings(settings); } } diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java index 39c7bad09090..c9b93a0fcb51 100644 --- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java @@ -98,9 +98,10 @@ void initTestCase() throws Exception { this.attachmentOfAttachmentUnit = attachmentUnit.getAttachment(); VideoUnit videoUnit = lectureUtilService.createVideoUnit(); TextUnit textUnit = lectureUtilService.createTextUnit(); + OnlineUnit onlineUnit = lectureUtilService.createOnlineUnit(); addAttachmentToLecture(); - this.lecture1 = lectureUtilService.addLectureUnitsToLecture(this.lecture1, List.of(exerciseUnit, attachmentUnit, videoUnit, textUnit)); + this.lecture1 = lectureUtilService.addLectureUnitsToLecture(this.lecture1, List.of(exerciseUnit, attachmentUnit, videoUnit, textUnit, onlineUnit)); } private void addAttachmentToLecture() { @@ -256,7 +257,7 @@ void getLectureForCourse_withLectureUnits_shouldGetLecturesWithLectureUnits() th List returnedLectures = request.getList("/api/courses/" + course1.getId() + "/lectures?withLectureUnits=true", HttpStatus.OK, Lecture.class); assertThat(returnedLectures).hasSize(2); Lecture lecture = returnedLectures.stream().filter(l -> l.getId().equals(lecture1.getId())).findFirst().orElseThrow(); - assertThat(lecture.getLectureUnits()).hasSize(4); + assertThat(lecture.getLectureUnits()).hasSize(5); } @Test @@ -271,7 +272,7 @@ void getLecture_asStudentNotInCourse_shouldReturnForbidden() throws Exception { void getLecture_ExerciseAndAttachmentReleased_shouldGetLectureWithAllLectureUnits() throws Exception { Lecture receivedLectureWithDetails = request.get("/api/lectures/" + lecture1.getId() + "/details", HttpStatus.OK, Lecture.class); assertThat(receivedLectureWithDetails.getId()).isEqualTo(lecture1.getId()); - assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(4); + assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(5); assertThat(receivedLectureWithDetails.getAttachments()).hasSize(2); testGetLecture(lecture1.getId()); @@ -294,14 +295,14 @@ void getLecture_ExerciseNotReleased_shouldGetLectureWithoutExerciseUnit() throws Lecture receivedLectureWithDetails = request.get("/api/lectures/" + lecture1.getId() + "/details", HttpStatus.OK, Lecture.class); assertThat(receivedLectureWithDetails.getId()).isEqualTo(lecture1.getId()); - assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(3); + assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(4); assertThat(receivedLectureWithDetails.getLectureUnits().stream().filter(lectureUnit -> lectureUnit instanceof ExerciseUnit).toList()).isEmpty(); // now we test that it is included when the user is at least a teaching assistant userUtilService.changeUser(TEST_PREFIX + "tutor1"); receivedLectureWithDetails = request.get("/api/lectures/" + lecture1.getId() + "/details", HttpStatus.OK, Lecture.class); assertThat(receivedLectureWithDetails.getId()).isEqualTo(lecture1.getId()); - assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(4); + assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(5); assertThat(receivedLectureWithDetails.getLectureUnits().stream().filter(lectureUnit -> lectureUnit instanceof ExerciseUnit).toList()).isNotEmpty(); testGetLecture(lecture1.getId()); @@ -319,7 +320,7 @@ void getLecture_AttachmentNotReleased_shouldGetLectureWithoutAttachmentUnitAndAt Lecture receivedLectureWithDetails = request.get("/api/lectures/" + lecture1.getId() + "/details", HttpStatus.OK, Lecture.class); assertThat(receivedLectureWithDetails.getId()).isEqualTo(lecture1.getId()); assertThat(receivedLectureWithDetails.getAttachments().stream().filter(attachment -> attachment.getId().equals(lectureAttachment.getId())).findFirst()).isEmpty(); - assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(3); + assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(4); assertThat(receivedLectureWithDetails.getLectureUnits().stream().filter(lectureUnit -> lectureUnit instanceof AttachmentUnit).toList()).isEmpty(); // now we test that it is included when the user is at least a teaching assistant @@ -327,7 +328,7 @@ void getLecture_AttachmentNotReleased_shouldGetLectureWithoutAttachmentUnitAndAt receivedLectureWithDetails = request.get("/api/lectures/" + lecture1.getId() + "/details", HttpStatus.OK, Lecture.class); assertThat(receivedLectureWithDetails.getId()).isEqualTo(lecture1.getId()); assertThat(receivedLectureWithDetails.getAttachments()).anyMatch(attachment -> attachment.getId().equals(lectureAttachment.getId())); - assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(4).anyMatch(lectureUnit -> lectureUnit instanceof AttachmentUnit); + assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(5).anyMatch(lectureUnit -> lectureUnit instanceof AttachmentUnit); testGetLecture(lecture1.getId()); } @@ -361,7 +362,7 @@ void deleteLectureWithChannel() throws Exception { void deleteLecture_NullInListOfLectureUnits_shouldDeleteLecture() throws Exception { Lecture lecture = lectureRepository.findByIdWithLectureUnitsAndCompetenciesElseThrow(lecture1.getId()); List lectureUnits = lecture.getLectureUnits(); - assertThat(lectureUnits).hasSize(4); + assertThat(lectureUnits).hasSize(5); ArrayList lectureUnitsWithNulls = new ArrayList<>(); for (LectureUnit lectureUnit : lectureUnits) { lectureUnitsWithNulls.add(null); @@ -372,7 +373,7 @@ void deleteLecture_NullInListOfLectureUnits_shouldDeleteLecture() throws Excepti lectureRepository.saveAndFlush(lecture); lecture = lectureRepository.findByIdWithLectureUnitsAndCompetenciesElseThrow(lecture1.getId()); lectureUnits = lecture.getLectureUnits(); - assertThat(lectureUnits).hasSize(8); + assertThat(lectureUnits).hasSize(10); request.delete("/api/lectures/" + lecture1.getId(), HttpStatus.OK); Optional lectureOptional = lectureRepository.findById(lecture1.getId()); assertThat(lectureOptional).isEmpty(); diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java index e01d29baa7aa..dbe43310b515 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalCIIntegrationTest.java @@ -52,7 +52,8 @@ void initRepositories() throws Exception { commitHash = localVCLocalCITestService.commitFile(studentAssignmentRepository.localRepoFile.toPath(), studentAssignmentRepository.localGit); studentAssignmentRepository.localGit.push().call(); // Mock dockerClient.copyArchiveFromContainerCmd() such that it returns the XMLs containing the test results. - localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH); + localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH, "/repositories/test-repository/build/test-results/test"); + localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH, "/repositories/test-repository/target/surefire-reports"); // Mock dockerClient.copyArchiveFromContainerCmd() such that it returns a dummy commit hash for the tests repository. localVCLocalCITestService.mockInputStreamReturnedFromContainer(dockerClient, "/repositories/test-repository/.git/refs/heads/[^/]+", Map.of("testCommitHash", DUMMY_COMMIT_HASH), Map.of("testCommitHash", DUMMY_COMMIT_HASH)); @@ -176,35 +177,12 @@ void testNoExceptionWhenResolvingWrongCommitHash() { @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void testProjectTypeIsNull() { - localVCLocalCITestService.createParticipation(programmingExercise, student1Login); - - programmingExercise.setProgrammingLanguage(ProgrammingLanguage.JAVA); - programmingExercise.setProjectType(null); - programmingExerciseRepository.save(programmingExercise); - - // Should throw an exception - assertThatExceptionOfType(LocalCIException.class) - .isThrownBy(() -> localCIConnectorService.processNewPush(commitHash, studentAssignmentRepository.originGit.getRepository())) - .withMessageContaining("The project type " + programmingExercise.getProjectType() + " is not supported by the local CI."); - - } - - @Test - void testProjectTypeIsNullForTestsRepository() throws Exception { - programmingExercise.setProgrammingLanguage(ProgrammingLanguage.JAVA); + ProgrammingExerciseStudentParticipation participation = localVCLocalCITestService.createParticipation(programmingExercise, student1Login); programmingExercise.setProjectType(null); programmingExerciseRepository.save(programmingExercise); - String testsRepositorySlug = projectKey1.toLowerCase() + "-" + "tests"; - LocalRepository testsRepository = localVCLocalCITestService.createAndConfigureLocalRepository(projectKey1, testsRepositorySlug); - String testsCommitHash = localVCLocalCITestService.commitFile(testsRepository.localRepoFile.toPath(), testsRepository.localGit); - testsRepository.localGit.push().call(); - - // Should throw an exception. - assertThatExceptionOfType(LocalCIException.class).isThrownBy(() -> localCIConnectorService.processNewPush(testsCommitHash, testsRepository.originGit.getRepository())) - .withMessageContaining("The project type " + programmingExercise.getProjectType() + " is not supported by the local CI."); - - testsRepository.resetLocalRepo(); + localCIConnectorService.processNewPush(commitHash, studentAssignmentRepository.originGit.getRepository()); + localVCLocalCITestService.testLatestSubmission(participation.getId(), commitHash, 1, false); } @Test @@ -274,7 +252,7 @@ public int read() throws IOException { void testFaultyResultFiles() throws IOException { ProgrammingExerciseStudentParticipation studentParticipation = localVCLocalCITestService.createParticipation(programmingExercise, student1Login); - localVCLocalCITestService.mockTestResults(dockerClient, FAULTY_FILES_TEST_RESULTS_PATH); + localVCLocalCITestService.mockTestResults(dockerClient, FAULTY_FILES_TEST_RESULTS_PATH, "/repositories/test-repository/build/test-results/test"); localCIConnectorService.processNewPush(commitHash, studentAssignmentRepository.originGit.getRepository()); // Should notify the user. verifyUserNotification(studentParticipation); diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java index 059efcea2e4b..ad8ee941e42b 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java @@ -163,7 +163,7 @@ void testFetchPush_solutionRepository() throws Exception { localVCLocalCITestService.testFetchSuccessful(solutionRepository.localGit, instructor1Login, projectKey1, solutionRepositorySlug); String commitHash = localVCLocalCITestService.commitFile(solutionRepository.localRepoFile.toPath(), solutionRepository.localGit); - localVCLocalCITestService.mockTestResults(dockerClient, ALL_SUCCEED_TEST_RESULTS_PATH); + localVCLocalCITestService.mockTestResults(dockerClient, ALL_SUCCEED_TEST_RESULTS_PATH, "/repositories/test-repository/build/test-results/test"); doReturn(gitService.getExistingCheckedOutRepositoryByLocalPath(solutionRepository.localRepoFile.toPath(), null)).when(gitService) .getOrCheckoutRepository(solutionParticipation); @@ -187,7 +187,7 @@ void testFetchPush_templateRepository() throws Exception { localVCLocalCITestService.testFetchSuccessful(templateRepository.localGit, instructor1Login, projectKey1, templateRepositorySlug); String commitHash = localVCLocalCITestService.commitFile(templateRepository.localRepoFile.toPath(), templateRepository.localGit); - localVCLocalCITestService.mockTestResults(dockerClient, ALL_FAIL_TEST_RESULTS_PATH); + localVCLocalCITestService.mockTestResults(dockerClient, ALL_FAIL_TEST_RESULTS_PATH, "/repositories/test-repository/build/test-results/test"); doReturn(gitService.getExistingCheckedOutRepositoryByLocalPath(templateRepository.localRepoFile.toPath(), null)).when(gitService) .getOrCheckoutRepository(templateParticipation); @@ -210,7 +210,7 @@ void testFetchPush_studentAssignmentRepository_beforeAfterStartDate() throws Exc localVCLocalCITestService.testFetchSuccessful(assignmentRepository.localGit, student1Login, projectKey1, assignmentRepositorySlug); String commitHash = localVCLocalCITestService.commitFile(assignmentRepository.localRepoFile.toPath(), assignmentRepository.localGit); // Mock dockerClient.copyArchiveFromContainerCmd() such that it returns the XMLs containing the test results. - localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH); + localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH, "/repositories/test-repository/build/test-results/test"); localVCLocalCITestService.testPushSuccessful(assignmentRepository.localGit, student1Login, projectKey1, assignmentRepositorySlug); localVCLocalCITestService.testLatestSubmission(studentParticipation.getId(), commitHash, 1, false); @@ -284,7 +284,7 @@ void testPush_studentAssignmentRepository_tooManySubmissions() throws Exception // First push should go through. localVCLocalCITestService.commitFile(assignmentRepository.localRepoFile.toPath(), assignmentRepository.localGit); - localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH); + localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH, "/repositories/test-repository/build/test-results/test"); localVCLocalCITestService.testPushSuccessful(assignmentRepository.localGit, student1Login, projectKey1, assignmentRepositorySlug); // Second push should fail. localVCLocalCITestService.testPushReturnsError(assignmentRepository.localGit, student1Login, projectKey1, assignmentRepositorySlug, FORBIDDEN); @@ -524,7 +524,7 @@ void testFetchPush_assignmentRepository_examMode() throws Exception { // student1 should be able to fetch and push. localVCLocalCITestService.testFetchSuccessful(assignmentRepository.localGit, student1Login, projectKey1, assignmentRepositorySlug); String commitHash = localVCLocalCITestService.commitFile(assignmentRepository.localRepoFile.toPath(), assignmentRepository.localGit); - localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH); + localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH, "/repositories/test-repository/build/test-results/test"); localVCLocalCITestService.testPushSuccessful(assignmentRepository.localGit, student1Login, projectKey1, assignmentRepositorySlug); localVCLocalCITestService.testLatestSubmission(studentParticipation.getId(), commitHash, 1, false); // tutor1 should be able to fetch but not push. @@ -587,7 +587,7 @@ void testFetchPush_instructorExamTestRun() throws Exception { // Instructor should be able to fetch and push. localVCLocalCITestService.testFetchSuccessful(instructorExamTestRunRepository.localGit, instructor1Login, projectKey1, repositorySlug); String commitHash = localVCLocalCITestService.commitFile(instructorExamTestRunRepository.localRepoFile.toPath(), instructorExamTestRunRepository.localGit); - localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH); + localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH, "/repositories/test-repository/build/test-results/test"); localVCLocalCITestService.testPushSuccessful(instructorExamTestRunRepository.localGit, instructor1Login, projectKey1, repositorySlug); localVCLocalCITestService.testLatestSubmission(instructorTestRunParticipation.getId(), commitHash, 1, false); @@ -646,7 +646,7 @@ void testFetchPush_studentPracticeRepository() throws Exception { // Student1 localVCLocalCITestService.testFetchSuccessful(practiceRepository.localGit, student1Login, projectKey1, practiceRepositorySlug); String commitHash = localVCLocalCITestService.commitFile(practiceRepository.localRepoFile.toPath(), practiceRepository.localGit); - localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH); + localVCLocalCITestService.mockTestResults(dockerClient, PARTLY_SUCCESSFUL_TEST_RESULTS_PATH, "/repositories/test-repository/build/test-results/test"); localVCLocalCITestService.testPushSuccessful(practiceRepository.localGit, student1Login, projectKey1, practiceRepositorySlug); localVCLocalCITestService.testLatestSubmission(practiceParticipation.getId(), commitHash, 1, false); diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCITestService.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCITestService.java index f49a93105a29..dd21221e48db 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCITestService.java @@ -114,11 +114,12 @@ public ProgrammingExerciseStudentParticipation createParticipation(ProgrammingEx /** * Mock dockerClient.copyArchiveFromContainerCmd() such that it returns the XMLs containing the test results. * - * @param dockerClient the DockerClient to mock. - * @param testResultsPath the path to the directory containing the test results in the resources folder. + * @param dockerClient the DockerClient to mock. + * @param mockedTestResultsPath the path to the directory containing the test results in the resources folder. + * @param testResultsPath the path to the directory containing the test results inside the container. */ - public void mockTestResults(DockerClient dockerClient, Path testResultsPath) throws IOException { - mockInputStreamReturnedFromContainer(dockerClient, "/repositories/test-repository/build/test-results/test", createMapFromTestResultsFolder(testResultsPath)); + public void mockTestResults(DockerClient dockerClient, Path mockedTestResultsPath, String testResultsPath) throws IOException { + mockInputStreamReturnedFromContainer(dockerClient, testResultsPath, createMapFromTestResultsFolder(mockedTestResultsPath)); } /** diff --git a/src/test/java/de/tum/in/www1/artemis/metis/AnswerMessageIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/metis/AnswerMessageIntegrationTest.java index bde542d6b7ec..39f87c5035a9 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/AnswerMessageIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/metis/AnswerMessageIntegrationTest.java @@ -17,9 +17,11 @@ import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest; import de.tum.in.www1.artemis.course.CourseUtilService; import de.tum.in.www1.artemis.domain.Course; +import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.in.www1.artemis.domain.metis.AnswerPost; import de.tum.in.www1.artemis.domain.metis.Post; +import de.tum.in.www1.artemis.domain.notification.SingleUserNotification; import de.tum.in.www1.artemis.post.ConversationUtilService; import de.tum.in.www1.artemis.repository.CourseRepository; import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; @@ -128,6 +130,26 @@ void testCreateConversationAnswerPostWithUserMention(String userMention, boolean verify(websocketMessagingService, timeout(2000).times(2)).sendMessageToUser(anyString(), anyString(), any(PostDTO.class)); } + @Test + @WithMockUser(username = TEST_PREFIX + "tutor1", roles = "USER") + void testCreateConversationAnswerPostWithUserMentionOfUserNotInConversation() throws Exception { + AnswerPost answerPostToSave = createAnswerPost(existingConversationPostsWithAnswers.get(0)); + User mentionedUser = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); + answerPostToSave.setContent("[user]" + mentionedUser.getName() + "(" + mentionedUser.getLogin() + ")[/user]"); + + var countBefore = answerPostRepository.count(); + + AnswerPost createdAnswerPost = request.postWithResponseBody("/api/courses/" + courseId + "/answer-messages", answerPostToSave, AnswerPost.class, HttpStatus.CREATED); + conversationUtilService.assertSensitiveInformationHidden(createdAnswerPost); + // should not be automatically post resolving + assertThat(createdAnswerPost.doesResolvePost()).isFalse(); + checkCreatedAnswerPost(answerPostToSave, createdAnswerPost); + assertThat(answerPostRepository.count()).isEqualTo(countBefore + 1); + + // mentioned user is not a member of the conversation and should not be notified + verify(websocketMessagingService, never()).sendMessage(eq("/topic/user/" + mentionedUser.getId() + "/notifications"), any(SingleUserNotification.class)); + } + @Test @WithMockUser(username = TEST_PREFIX + "tutor1", roles = "USER") void testMessagingNotAllowedIfCommunicationOnlySetting() throws Exception { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/MessageIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/metis/MessageIntegrationTest.java index 29b510e232e8..a2aeaad6ecc0 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/MessageIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/metis/MessageIntegrationTest.java @@ -12,7 +12,10 @@ import java.util.Objects; import java.util.Set; -import javax.validation.*; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -45,6 +48,7 @@ import de.tum.in.www1.artemis.domain.metis.Post; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat; +import de.tum.in.www1.artemis.domain.notification.ConversationNotification; import de.tum.in.www1.artemis.domain.notification.Notification; import de.tum.in.www1.artemis.post.ConversationUtilService; import de.tum.in.www1.artemis.repository.CourseRepository; @@ -213,6 +217,31 @@ void testCreateConversationPostWithUserMention(String userMention, boolean isUse verify(websocketMessagingService, timeout(2000).times(1)).sendMessage(eq("/topic/metis/courses/" + courseId + "/conversations/" + channel.getId()), any(PostDTO.class)); } + @ParameterizedTest + @ValueSource(booleans = { true, false }) + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void testCreateConversationPostWithUserMention_MentionedUserHasChannelHidden(boolean isConversationHidden) throws Exception { + Channel channel = conversationUtilService.createPublicChannel(course, "test"); + ConversationParticipant author = conversationUtilService.addParticipantToConversation(channel, TEST_PREFIX + "student1"); + ConversationParticipant mentionedUserParticipant = conversationUtilService.addParticipantToConversation(channel, TEST_PREFIX + "student2", isConversationHidden); + + Post postToSave = new Post(); + postToSave.setAuthor(author.getUser()); + postToSave.setConversation(channel); + String userMention = "[user]" + mentionedUserParticipant.getUser().getName() + "(" + mentionedUserParticipant.getUser().getLogin() + ")[/user]"; + String authorMention = "[user]" + author.getUser().getName() + "(" + author.getUser().getLogin() + ")[/user]"; + postToSave.setContent(userMention + authorMention); + + Post createdPost = request.postWithResponseBody("/api/courses/" + courseId + "/messages", postToSave, Post.class, HttpStatus.CREATED); + checkCreatedMessagePost(postToSave, createdPost); + + // author should not get a notification + verify(websocketMessagingService, never()).sendMessage(eq("/topic/user/" + author.getUser().getId() + "/notifications/conversations"), any(ConversationNotification.class)); + // mentioned user should get a notification + verify(websocketMessagingService, timeout(2000).times(1)).sendMessage(eq("/topic/user/" + mentionedUserParticipant.getUser().getId() + "/notifications/conversations"), + any(ConversationNotification.class)); + } + @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void testNoNotificationIfConversationHidden() throws Exception { diff --git a/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java b/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java index 6073936ea62a..ac5f2ee7559d 100644 --- a/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java +++ b/src/test/java/de/tum/in/www1/artemis/metis/PostingServiceUnitTest.java @@ -7,7 +7,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.List; import java.util.Set; import org.junit.jupiter.api.BeforeEach; @@ -72,7 +71,7 @@ void testParseUserMentionsNoUserMentioned() throws InvocationTargetException, Il void testParseUserMentionsWithValidUsers() throws InvocationTargetException, IllegalAccessException { Course course = new Course(); String content = "[user]Test User 1(test_user_1)[/user] [user]Test User 2(test_user_2)[/user]"; - List users = List.of(this.createUser("Test User 1", "test_user_1"), this.createUser("Test User 2", "test_user_2")); + Set users = Set.of(this.createUser("Test User 1", "test_user_1"), this.createUser("Test User 2", "test_user_2")); setupUserRepository(Set.of("test_user_1", "test_user_2"), users); when(authorizationCheckService.isAtLeastStudentInCourse(eq(course), any(User.class))).thenReturn(true); @@ -87,7 +86,7 @@ void testParseUserMentionsWithValidUsers() throws InvocationTargetException, Ill void testParseUserMentionsWithNonExistentUser() { Course course = new Course(); String content = "[user]Test User 1(test_user_1)[/user] [user]Test User 2(test_user_2)[/user]"; - List users = List.of(this.createUser("Test User 1", "test_user_1")); // Return only one user from database + Set users = Set.of(this.createUser("Test User 1", "test_user_1")); // Return only one user from database setupUserRepository(Set.of("test_user_1", "test_user_2"), users); @@ -100,7 +99,7 @@ void testParseUserMentionsWithInvalidName() { String content = "[user]Test User 2(test_user_1)[/user]"; User user = this.createUser("Test User 1", "test_user_1"); // Different name than mentioned - setupUserRepository(Set.of("test_user_1"), List.of(user)); + setupUserRepository(Set.of("test_user_1"), Set.of(user)); when(authorizationCheckService.isAtLeastStudentInCourse(eq(course), any(User.class))).thenReturn(true); actAndAssertInvalidUserMention(course, content); @@ -112,7 +111,7 @@ void testParseUserMentionsWithUserNotInCourse() { String content = "[user]Test User 1(test_user_1)[/user]"; User user = this.createUser("Test User 1", "test_user_1"); - setupUserRepository(Set.of("test_user_1"), List.of(user)); + setupUserRepository(Set.of("test_user_1"), Set.of(user)); when(authorizationCheckService.isAtLeastStudentInCourse(eq(course), any(User.class))).thenReturn(false); actAndAssertInvalidUserMention(course, content); @@ -131,7 +130,7 @@ void testParseUserMentionsWithExtraSpaces() throws InvocationTargetException, Il Course course = new Course(); String content = "[user] Test User 2 (test_user_1) [/user]"; - setupUserRepository(Set.of(), List.of()); + setupUserRepository(Set.of(), Set.of()); // Should not be recognized as user mention and therefore should throw now exception parseUserMentions.invoke(postingService, course, content); @@ -142,7 +141,7 @@ void testParseUserMentionsMissingOpeningTag() throws InvocationTargetException, Course course = new Course(); String content = "Test User 2(test_user_1)[/user]"; - setupUserRepository(Set.of(), List.of()); + setupUserRepository(Set.of(), Set.of()); // Should not be recognized as user mention and therefore should throw now exception parseUserMentions.invoke(postingService, course, content); @@ -153,7 +152,7 @@ void testParseUserMentionsMissingClosingTag() throws InvocationTargetException, Course course = new Course(); String content = "[user]Test User 2(test_user_1)"; - setupUserRepository(Set.of(), List.of()); + setupUserRepository(Set.of(), Set.of()); // Should not be recognized as user mention and therefore should throw now exception parseUserMentions.invoke(postingService, course, content); @@ -180,7 +179,7 @@ private User createUser(String name, String login) { * @param expectedUserLogins expected set of user logins found in the message content * @param usersInDatabase the mocked return value of UserRepository.findAllByLogins */ - private void setupUserRepository(Set expectedUserLogins, List usersInDatabase) { + private void setupUserRepository(Set expectedUserLogins, Set usersInDatabase) { when(userRepository.findAllByLogins(anySet())).thenAnswer(invocation -> { Set logins = invocation.getArgument(0); assertThat(logins).isEqualTo(expectedUserLogins); diff --git a/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java b/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java index 97fc28c4a978..ab12fb23eadc 100644 --- a/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java +++ b/src/test/java/de/tum/in/www1/artemis/post/ConversationUtilService.java @@ -3,7 +3,10 @@ import static org.assertj.core.api.Assertions.assertThat; import java.time.ZonedDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import javax.validation.constraints.NotNull; @@ -16,14 +19,20 @@ import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration; import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; import de.tum.in.www1.artemis.domain.metis.*; -import de.tum.in.www1.artemis.domain.metis.conversation.*; +import de.tum.in.www1.artemis.domain.metis.conversation.Channel; +import de.tum.in.www1.artemis.domain.metis.conversation.Conversation; +import de.tum.in.www1.artemis.domain.metis.conversation.GroupChat; +import de.tum.in.www1.artemis.domain.metis.conversation.OneToOneChat; import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseFactory; import de.tum.in.www1.artemis.lecture.LectureFactory; import de.tum.in.www1.artemis.repository.CourseRepository; import de.tum.in.www1.artemis.repository.ExerciseRepository; import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.metis.*; +import de.tum.in.www1.artemis.repository.metis.AnswerPostRepository; +import de.tum.in.www1.artemis.repository.metis.ConversationParticipantRepository; +import de.tum.in.www1.artemis.repository.metis.PostRepository; +import de.tum.in.www1.artemis.repository.metis.ReactionRepository; import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository; import de.tum.in.www1.artemis.repository.metis.conversation.OneToOneChatRepository; import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; @@ -320,8 +329,8 @@ public Conversation createOneToOneChat(Course course, String userPrefix) { conversation = conversationRepository.save(conversation); List conversationParticipants = new ArrayList<>(); - conversationParticipants.add(createConversationParticipant(conversation, userPrefix + "tutor1")); - conversationParticipants.add(createConversationParticipant(conversation, userPrefix + "tutor2")); + conversationParticipants.add(createConversationParticipant(conversation, userPrefix + "tutor1", false)); + conversationParticipants.add(createConversationParticipant(conversation, userPrefix + "tutor2", false)); conversation.setConversationParticipants(new HashSet<>(conversationParticipants)); return conversationRepository.save(conversation); @@ -332,16 +341,25 @@ public Channel createCourseWideChannel(Course course, String channelName) { return conversationRepository.save(channel); } + public Channel createPublicChannel(Course course, String channelName) { + Channel channel = ConversationFactory.generatePublicChannel(course, channelName, false); + return conversationRepository.save(channel); + } + public ConversationParticipant addParticipantToConversation(Conversation conversation, String userName) { - return createConversationParticipant(conversation, userName); + return createConversationParticipant(conversation, userName, false); + } + + public ConversationParticipant addParticipantToConversation(Conversation conversation, String userName, boolean isConversationHidden) { + return createConversationParticipant(conversation, userName, isConversationHidden); } - private ConversationParticipant createConversationParticipant(Conversation conversation, String userName) { + private ConversationParticipant createConversationParticipant(Conversation conversation, String userName, boolean isConversationHidden) { ConversationParticipant conversationParticipant = new ConversationParticipant(); conversationParticipant.setConversation(conversation); conversationParticipant.setLastRead(conversation.getLastMessageDate()); conversationParticipant.setUser(userUtilService.getUserByLogin(userName)); - conversationParticipant.setIsHidden(false); + conversationParticipant.setIsHidden(isConversationHidden); return conversationParticipantRepository.save(conversationParticipant); } diff --git a/src/test/javascript/spec/component/course/course-exercises.component.spec.ts b/src/test/javascript/spec/component/course/course-exercises.component.spec.ts index 0d8e35338edb..076a24c7170a 100644 --- a/src/test/javascript/spec/component/course/course-exercises.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-exercises.component.spec.ts @@ -33,6 +33,8 @@ import { CourseStorageService } from 'app/course/manage/course-storage.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { CourseUnenrollmentModalComponent } from 'app/overview/course-unenrollment-modal.component'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; +import { CourseExercisesGroupedByWeekComponent } from 'app/overview/course-exercises/course-exercises-grouped-by-week.component'; +import { CourseExercisesGroupedByCategoryComponent } from 'app/overview/course-exercises/course-exercises-grouped-by-category.component'; describe('CourseExercisesComponent', () => { let fixture: ComponentFixture; @@ -59,6 +61,8 @@ describe('CourseExercisesComponent', () => { MockDirective(OrionFilterDirective), MockComponent(CourseExerciseRowComponent), MockComponent(SidePanelComponent), + MockComponent(CourseExercisesGroupedByWeekComponent), + MockComponent(CourseExercisesGroupedByCategoryComponent), MockDirective(MockHasAnyAuthorityDirective), MockDirective(SortByDirective), TranslatePipeMock, diff --git a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts index a5e668ad7e97..ebcd1cfb24b2 100644 --- a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts +++ b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts @@ -1,30 +1,32 @@ -import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { ExamUpdateComponent } from 'app/exam/manage/exams/exam-update.component'; +import dayjs from 'dayjs/esm'; +import { of, throwError } from 'rxjs'; +import { Component } from '@angular/core'; +import cloneDeep from 'lodash-es/cloneDeep'; +import { FormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; +import { RouterTestingModule } from '@angular/router/testing'; +import { ActivatedRoute, Router, UrlSegment } from '@angular/router'; +import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { HttpClientModule, HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; + +import { ExamUpdateComponent, prepareExamForImport } from 'app/exam/manage/exams/exam-update.component'; import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { Exam } from 'app/entities/exam.model'; -import { HttpClientModule, HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; -import { of, throwError } from 'rxjs'; -import { RouterTestingModule } from '@angular/router/testing'; -import { FormsModule } from '@angular/forms'; import { FontAwesomeTestingModule } from '@fortawesome/angular-fontawesome/testing'; import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { CourseManagementService } from 'app/course/manage/course-management.service'; -import dayjs from 'dayjs/esm'; -import { Component } from '@angular/core'; + import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { GradingSystemService } from 'app/grading-system/grading-system.service'; import { GradingScale } from 'app/entities/grading-scale.model'; import { DataTableComponent } from 'app/shared/data-table/data-table.component'; import { AlertService } from 'app/core/util/alert.service'; -import { ActivatedRoute, Params, Router, UrlSegment, convertToParamMap } from '@angular/router'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { ArtemisExamModePickerModule } from 'app/exam/manage/exams/exam-mode-picker/exam-mode-picker.module'; @@ -35,7 +37,6 @@ import { User } from 'app/core/user/user.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ModelingExercise, UMLDiagramType } from 'app/entities/modeling-exercise.model'; -import cloneDeep from 'lodash-es/cloneDeep'; import { ExamExerciseImportComponent } from 'app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component'; import { ButtonComponent } from 'app/shared/components/button.component'; import { DifficultyBadgeComponent } from 'app/exercises/shared/exercise-headers/difficulty-badge.component'; @@ -47,7 +48,7 @@ import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/ti }) class DummyComponent {} -describe('Exam Update Component', () => { +describe('ExamUpdateComponent', () => { let component: ExamUpdateComponent; let fixture: ComponentFixture; let examManagementService: ExamManagementService; @@ -101,31 +102,12 @@ describe('Exam Update Component', () => { { provide: ActivatedRoute, useValue: { - data: { - subscribe: (fn: (value: Params) => void) => - fn({ - exam: examWithoutExercises, - }), - }, - snapshot: { - paramMap: convertToParamMap({ - courseId: '1', - }), - }, - url: of([{ path: '' } as UrlSegment]), + data: of({ exam: examWithoutExercises, course }), + params: of({ courseId: '1' }), + url: of([{ path: '' }] as UrlSegment[]), }, }, MockProvider(AlertService), - MockProvider(CourseManagementService, { - find: () => { - return of( - new HttpResponse({ - body: course, - status: 200, - }), - ); - }, - }), MockProvider(GradingSystemService, { findGradingScaleForExam: () => { return of( @@ -244,7 +226,16 @@ describe('Exam Update Component', () => { const navigateSpy = jest.spyOn(router, 'navigate'); fixture.detectChanges(); - const updateSpy = jest.spyOn(examManagementService, 'update').mockReturnValue(of(new HttpResponse({ body: { ...examWithoutExercises, id: 1 } }))); + const updateSpy = jest.spyOn(examManagementService, 'update').mockReturnValue( + of( + new HttpResponse({ + body: { + ...examWithoutExercises, + id: 1, + }, + }), + ), + ); // trigger save component.save(); @@ -255,39 +246,42 @@ describe('Exam Update Component', () => { })); it('should calculate the working time for real exams correctly', () => { + fixture.detectChanges(); + examWithoutExercises.testExam = false; examWithoutExercises.startDate = undefined; examWithoutExercises.endDate = dayjs().add(2, 'hours'); - fixture.detectChanges(); + component.updateExamWorkingTime(); // Without a valid startDate, the workingTime should be 0 // examWithoutExercises.workingTime is stored in seconds expect(examWithoutExercises.workingTime).toBe(0); // the component returns the workingTime in Minutes - expect(component.calculateWorkingTime).toBe(0); + expect(component.workingTimeInMinutes).toBe(0); examWithoutExercises.startDate = dayjs().add(0, 'hours'); examWithoutExercises.endDate = dayjs().add(2, 'hours'); - fixture.detectChanges(); + component.updateExamWorkingTime(); expect(examWithoutExercises.workingTime).toBe(7200); - expect(component.calculateWorkingTime).toBe(120); + expect(component.workingTimeInMinutes).toBe(120); examWithoutExercises.startDate = dayjs().add(0, 'hours'); examWithoutExercises.endDate = undefined; - fixture.detectChanges(); + component.updateExamWorkingTime(); // Without an endDate, the working time should be 0; expect(examWithoutExercises.workingTime).toBe(0); - expect(component.calculateWorkingTime).toBe(0); + expect(component.workingTimeInMinutes).toBe(0); }); it('should not calculate the working time for test exams', () => { + fixture.detectChanges(); examWithoutExercises.testExam = true; examWithoutExercises.workingTime = 3600; examWithoutExercises.startDate = dayjs().add(0, 'hours'); examWithoutExercises.endDate = dayjs().add(12, 'hours'); - fixture.detectChanges(); + component.updateExamWorkingTime(); expect(examWithoutExercises.workingTime).toBe(3600); - expect(component.calculateWorkingTime).toBe(60); + expect(component.workingTimeInMinutes).toBe(60); }); it('validates the working time for test exams correctly', () => { @@ -356,7 +350,16 @@ describe('Exam Update Component', () => { examWithoutExercises.id = undefined; fixture.detectChanges(); - const createSpy = jest.spyOn(examManagementService, 'create').mockReturnValue(of(new HttpResponse({ body: { ...examWithoutExercises, id: 1 } }))); + const createSpy = jest.spyOn(examManagementService, 'create').mockReturnValue( + of( + new HttpResponse({ + body: { + ...examWithoutExercises, + id: 1, + }, + }), + ), + ); // trigger save component.save(); @@ -389,7 +392,7 @@ describe('Exam Update Component', () => { component.course = course; component.exam = examWithoutExercises; examWithoutExercises.id = 1; - component.previousState(); + component.resetToPreviousState(); expect(spy).toHaveBeenCalledOnce(); expect(spy).toHaveBeenCalledWith(['course-management', course.id!.toString(), 'exams'], examWithoutExercises.id!.toString()); }); @@ -476,7 +479,15 @@ describe('Exam Update Component', () => { examForImport.course = course2; examForImport.numberOfExamUsers = 1; examForImport.exerciseGroups = [exerciseGroup1]; - examForImport.examUsers = [{ didCheckImage: false, didCheckLogin: false, didCheckName: false, didCheckRegistrationNumber: false, ...new User(5) }]; + examForImport.examUsers = [ + { + didCheckImage: false, + didCheckLogin: false, + didCheckName: false, + didCheckRegistrationNumber: false, + ...new User(5), + }, + ]; examForImport.studentExams = [new StudentExam()]; beforeEach(() => { @@ -515,32 +526,12 @@ describe('Exam Update Component', () => { { provide: ActivatedRoute, useValue: { - data: { - subscribe: (fn: (value: Params) => void) => - fn({ - exam: examForImport, - }), - }, - snapshot: { - paramMap: convertToParamMap({ - courseId: '1', - examId: '3', - }), - }, - url: of([{ path: 'import' } as UrlSegment]), + data: of({ exam: examForImport, course }), + params: of({ examId: '3', courseId: '1' }), + url: of([{ path: 'import' }] as UrlSegment[]), }, }, MockProvider(AlertService), - MockProvider(CourseManagementService, { - find: () => { - return of( - new HttpResponse({ - body: course, - status: 200, - }), - ); - }, - }), MockProvider(GradingSystemService, { findGradingScaleForExam: () => { return of( @@ -554,6 +545,7 @@ describe('Exam Update Component', () => { ], }).compileComponents(); + router = TestBed.inject(Router); fixture = TestBed.createComponent(ExamUpdateComponent); component = fixture.componentInstance; examManagementService = fixture.debugElement.injector.get(ExamManagementService); @@ -594,7 +586,11 @@ describe('Exam Update Component', () => { expect(component.exam.studentExams).toBeUndefined(); }); - it('should perform input of an examWithoutExercises with exercises successfully', () => { + it('should perform import of an examWithoutExercises with exercises successfully', () => { + const expectedExam = prepareExamForImport(examForImport); + expectedExam.course = course; + const alertSpy = jest.spyOn(alertService, 'error'); + const navigateSpy = jest.spyOn(router, 'navigate'); const importSpy = jest.spyOn(examManagementService, 'import').mockReturnValue( of( new HttpResponse({ @@ -603,11 +599,14 @@ describe('Exam Update Component', () => { }), ), ); - const alertSpy = jest.spyOn(alertService, 'error'); + fixture.detectChanges(); component.save(); + expect(importSpy).toHaveBeenCalledOnce(); - expect(importSpy).toHaveBeenCalledWith(1, examForImport); + expect(importSpy).toHaveBeenCalledWith(1, expectedExam); + expect(navigateSpy).toHaveBeenCalledOnce(); + expect(navigateSpy).toHaveBeenCalledWith(['course-management', course.id, 'exams', examForImport.id]); expect(alertSpy).not.toHaveBeenCalled(); }); @@ -646,8 +645,15 @@ describe('Exam Update Component', () => { it.each(['duplicatedProgrammingExerciseShortName', 'duplicatedProgrammingExerciseTitle', 'invalidKey'])( 'should perform import of examWithoutExercises AND correctly process conflict exception from server', (errorKey) => { + const expectedExam = prepareExamForImport(examForImport); + expectedExam.course = course; + const preCheckError = new HttpErrorResponse({ - error: { errorKey: errorKey, numberOfInvalidProgrammingExercises: 2, params: { exerciseGroups: [exerciseGroup1] } }, + error: { + errorKey: errorKey, + numberOfInvalidProgrammingExercises: 2, + params: { exerciseGroups: [exerciseGroup1] }, + }, status: 400, }); const importSpy = jest.spyOn(examManagementService, 'import').mockReturnValue(throwError(() => preCheckError)); @@ -656,7 +662,7 @@ describe('Exam Update Component', () => { fixture.detectChanges(); component.save(); - expect(importSpy).toHaveBeenCalledWith(1, examForImport); + expect(importSpy).toHaveBeenCalledWith(1, expectedExam); if (errorKey == 'invalidKey') { expect(alertSpy).toHaveBeenCalledWith('artemisApp.examManagement.exerciseGroup.importModal.invalidKey', { number: 2 }); } else { @@ -666,6 +672,9 @@ describe('Exam Update Component', () => { ); it('should perform input of exercise groups AND correctly process arbitrary exception from server', () => { + const expectedExam = prepareExamForImport(examForImport); + expectedExam.course = course; + const error = new HttpErrorResponse({ status: 400, }); @@ -675,7 +684,7 @@ describe('Exam Update Component', () => { fixture.detectChanges(); component.save(); expect(importSpy).toHaveBeenCalledOnce(); - expect(importSpy).toHaveBeenCalledWith(1, examForImport); + expect(importSpy).toHaveBeenCalledWith(1, expectedExam); expect(alertSpy).toHaveBeenCalledOnce(); }); }); diff --git a/src/test/javascript/spec/component/exam/feedback.utils.spec.ts b/src/test/javascript/spec/component/exam/feedback.utils.spec.ts new file mode 100644 index 000000000000..adf848356db6 --- /dev/null +++ b/src/test/javascript/spec/component/exam/feedback.utils.spec.ts @@ -0,0 +1,53 @@ +import { prepareFeedbackComponentParameters } from 'app/exercises/shared/feedback/feedback.utils'; +import { ResultTemplateStatus } from 'app/exercises/shared/result/result.utils'; +import { AssessmentType } from 'app/entities/assessment-type.model'; +import { ExerciseType } from 'app/entities/exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import dayjs from 'dayjs/esm'; +import { of } from 'rxjs'; +import { MockProvider } from 'ng-mocks'; +import { TestBed } from '@angular/core/testing'; +import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; + +describe('FeedbackUtils', () => { + let exerciseService: ExerciseService; + + beforeEach(() => { + return TestBed.configureTestingModule({ + providers: [MockProvider(ExerciseService)], + }) + .compileComponents() + .then(() => { + exerciseService = TestBed.inject(ExerciseService); + }); + }); + + describe('prepareFeedbackComponentParameters', () => { + const exercise = { id: 42, type: ExerciseType.PROGRAMMING, dueDate: dayjs().subtract(4, 'hours') } as ProgrammingExercise; + const result = { assessmentType: AssessmentType.AUTOMATIC }; + const participation = {}; + const templateStatus = ResultTemplateStatus.MISSING; + const latestDueDate = dayjs().subtract(4, 'hours'); + + it('should determine automatic feedback information with latestDueDate being passed', () => { + const preparedParameters = prepareFeedbackComponentParameters(exercise, result, participation, templateStatus, latestDueDate, exerciseService); + + expect(preparedParameters.showScoreChart).toBeTrue(); + expect(preparedParameters.messageKey).toBe('artemisApp.result.notLatestSubmission'); + expect(preparedParameters.showMissingAutomaticFeedbackInformation).toBeFalse(); + }); + + it('should determine automatic feedback information if latestDueDate is passed as undefined', () => { + const exerciseServiceLatestDueDate = dayjs().add(4, 'hours'); + const getLatestDueDateSpy = jest.spyOn(exerciseService, 'getLatestDueDate').mockReturnValue(of(exerciseServiceLatestDueDate)); + + const preparedParameters = prepareFeedbackComponentParameters(exercise, result, participation, ResultTemplateStatus.HAS_RESULT, undefined, exerciseService); + + expect(getLatestDueDateSpy).toHaveBeenCalledOnce(); + expect(preparedParameters.showScoreChart).toBeTrue(); + expect(preparedParameters.messageKey).not.toBeTruthy(); + expect(preparedParameters.latestDueDate).toEqual(exerciseServiceLatestDueDate); + expect(preparedParameters.showMissingAutomaticFeedbackInformation).toBeTrue(); + }); + }); +}); diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts index 945b2f6a70e2..f42565d14d79 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts @@ -261,13 +261,13 @@ describe('StudentExamDetailComponent', () => { it('should get examIsOver', () => { studentExamDetailComponent.studentExam = studentExam; studentExam.exam!.gracePeriod = 100; - expect(studentExamDetailComponent.examIsOver()).toBeFalse(); - studentExam.exam!.endDate = dayjs().add(-20, 'seconds'); - expect(studentExamDetailComponent.examIsOver()).toBeFalse(); - studentExam.exam!.endDate = dayjs().add(-200, 'seconds'); - expect(studentExamDetailComponent.examIsOver()).toBeTrue(); + expect(studentExamDetailComponent.isExamOver()).toBeFalse(); + studentExam.exam!.startDate = dayjs().add(-20, 'seconds'); + expect(studentExamDetailComponent.isExamOver()).toBeFalse(); + studentExam.exam!.startDate = dayjs().add(-200, 'seconds'); + expect(studentExamDetailComponent.isExamOver()).toBeTrue(); studentExam.exam = undefined; - expect(studentExamDetailComponent.examIsOver()).toBeFalse(); + expect(studentExamDetailComponent.isExamOver()).toBeFalse(); }); it('should toggle to unsubmitted', () => { @@ -373,4 +373,45 @@ describe('StudentExamDetailComponent', () => { expect(studentExamDetailComponent.grade).toBe(studentExamWithGradeFromServer.studentResult.overallGrade); expect(studentExamDetailComponent.gradeAfterBonus).toBe(studentExamWithGradeFromServer.studentResult.gradeWithBonus.finalGrade.toString()); }); + + describe('change student exam to submitted button', () => { + beforeEach(() => { + setupComponentToDisplayExamSubmittedButton(); + }); + + const ADJUST_SUBMITTED_STATE_BUTTON_ID = '#adjust-submitted-state-button'; + + it('should NOT be disabled when individual working time is over', () => { + const examIsOverSpy = jest.spyOn(studentExamDetailComponent, 'isExamOver').mockReturnValue(true); + + studentExamDetailComponentFixture.detectChanges(); + + const buttonElement = studentExamDetailComponentFixture.nativeElement.querySelector(ADJUST_SUBMITTED_STATE_BUTTON_ID); + expect(buttonElement).toBeTruthy(); + expect(examIsOverSpy).toHaveBeenCalled(); + expect(buttonElement.disabled).toBeFalse(); + }); + + it('should be disabled when individual working time is NOT over', () => { + const examIsOverSpy = jest.spyOn(studentExamDetailComponent, 'isExamOver').mockReturnValue(false); + + studentExamDetailComponentFixture.detectChanges(); + + const buttonElement = studentExamDetailComponentFixture.nativeElement.querySelector(ADJUST_SUBMITTED_STATE_BUTTON_ID); + expect(buttonElement).toBeTruthy(); + expect(examIsOverSpy).toHaveBeenCalled(); + expect(buttonElement.disabled).toBeTrue(); + }); + }); + + /** + * Sets up the component to be in a state where the button should be displayed when not considering {@link StudentExamDetailComponent#isExamOver} + */ + function setupComponentToDisplayExamSubmittedButton() { + studentExamDetailComponent.student = student; + studentExamDetailComponent.studentExam = studentExam; + studentExamDetailComponent.course = course; + studentExamDetailComponent.course.isAtLeastInstructor = true; + studentExamDetailComponent.isTestExam = false; + } }); diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts index 7ec62ecec775..3f89513c2ddd 100644 --- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts @@ -5,9 +5,9 @@ import { SuspiciousBehaviorComponent } from 'app/exam/manage/suspicious-behavior import { SuspiciousSessionsService } from 'app/exam/manage/suspicious-behavior/suspicious-sessions.service'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; import { PlagiarismResultsService } from 'app/course/plagiarism-cases/shared/plagiarism-results.service'; -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; import { ArtemisTestModule } from '../../../../test.module'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockModule, MockPipe } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { PlagiarismCasesOverviewComponent } from 'app/exam/manage/suspicious-behavior/plagiarism-cases-overview/plagiarism-cases-overview.component'; import { ButtonComponent } from 'app/shared/components/button.component'; @@ -16,6 +16,7 @@ import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { Exercise } from 'app/entities/exercise.model'; import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model'; import { MockRouter } from '../../../../helpers/mocks/mock-router'; +import { FormsModule } from '@angular/forms'; describe('SuspiciousBehaviorComponent', () => { let component: SuspiciousBehaviorComponent; @@ -57,11 +58,11 @@ describe('SuspiciousBehaviorComponent', () => { id: 1, ipAddress: '192.168.0.0', browserFingerprintHash: 'abc', - suspiciousReasons: [SuspiciousSessionReason.SAME_IP_ADDRESS, SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT], + suspiciousReasons: [SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS, SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT], }, { id: 2, - suspiciousReasons: [SuspiciousSessionReason.SAME_IP_ADDRESS, SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT], + suspiciousReasons: [SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS, SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT], ipAddress: '192.168.0.0', browserFingerprintHash: 'abc', }, @@ -70,7 +71,7 @@ describe('SuspiciousBehaviorComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MockRouterLinkDirective], + imports: [ArtemisTestModule, MockRouterLinkDirective, MockModule(FormsModule)], declarations: [SuspiciousBehaviorComponent, MockPipe(ArtemisTranslatePipe), MockComponent(PlagiarismCasesOverviewComponent), MockComponent(ButtonComponent)], providers: [ { provide: ActivatedRoute, useValue: route }, @@ -94,14 +95,37 @@ describe('SuspiciousBehaviorComponent', () => { expect(component.examId).toBe(2); }); - it('should retrieve suspicious sessions onInit', () => { + it('should not make a request onInit', () => { const suspiciousSessionsServiceSpy = jest.spyOn(suspiciousSessionService, 'getSuspiciousSessions').mockReturnValue(of([suspiciousSessions])); component.ngOnInit(); + expect(suspiciousSessionsServiceSpy).not.toHaveBeenCalledOnce(); + }); + + it('should make a request on click', () => { + const suspiciousSessionsServiceSpy = jest.spyOn(suspiciousSessionService, 'getSuspiciousSessions').mockReturnValue(of([suspiciousSessions])); + component.checkboxCriterionDifferentStudentExamsSameIPAddressChecked = true; + component.checkboxCriterionDifferentStudentExamsSameBrowserFingerprintChecked = true; + component.analyzeSessions(); expect(suspiciousSessionsServiceSpy).toHaveBeenCalledOnce(); - expect(suspiciousSessionsServiceSpy).toHaveBeenCalledWith(1, 2); + expect(suspiciousSessionsServiceSpy).toHaveBeenCalledWith(1, 2, { + sameIpAddressDifferentStudentExams: true, + sameBrowserFingerprintDifferentStudentExams: true, + differentIpAddressesSameStudentExam: false, + differentBrowserFingerprintsSameStudentExam: false, + ipAddressOutsideOfRange: false, + }); expect(component.suspiciousSessions).toEqual([suspiciousSessions]); }); + it('should set analyzed to true and analyzing to false if the request fails', () => { + jest.spyOn(suspiciousSessionService, 'getSuspiciousSessions').mockReturnValue(throwError({ status: 500 })); + component.checkboxCriterionDifferentStudentExamsSameIPAddressChecked = true; + component.checkboxCriterionDifferentStudentExamsSameBrowserFingerprintChecked = true; + component.analyzeSessions(); + expect(component.analyzed).toBeTrue(); + expect(component.analyzing).toBeFalse(); + }); + it('should navigate to suspicious sessions on click', () => { const routerSpy = jest.spyOn(router, 'navigate'); component.suspiciousSessions = [suspiciousSessions]; diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts index d5d774737079..3676e637591f 100644 --- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts @@ -2,19 +2,52 @@ import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; import { SuspiciousSessionsOverviewComponent } from 'app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component'; import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model'; import { ArtemisTestModule } from '../../../../test.module'; -import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { SuspiciousSessionsComponent } from 'app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -describe('SuspiciousSessionsComponent', () => { +describe('SuspiciousSessionsOverviewComponent', () => { const suspiciousSessions = { examSessions: [ { id: 1, ipAddress: '192.168.0.0', - suspiciousReasons: [SuspiciousSessionReason.SAME_IP_ADDRESS, SuspiciousSessionReason], + suspiciousReasons: [SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS, SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT], + }, + { + id: 2, + suspiciousReasons: [SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS, SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT], + ipAddress: '192.168.0.0', + }, + ], + } as SuspiciousExamSessions; + + const suspiciousSessions2 = { + examSessions: [ + { + id: 1, + ipAddress: '127.0.0.1', + browserFingerprintHash: 'abc', + suspiciousReasons: [SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES, SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS], + }, + { + id: 2, + ipAddress: '127.0.0.2', + browserFingerprintHash: 'def', + suspiciousReasons: [SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES, SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS], + }, + ], + } as SuspiciousExamSessions; + + const suspiciousSessions3 = { + examSessions: [ + { + id: 1, + ipAddress: '127.0.0.1', + browserFingerprintHash: 'abc', + suspiciousReasons: [SuspiciousSessionReason.IP_ADDRESS_OUTSIDE_OF_RANGE], }, - { id: 2, suspiciousReasons: [SuspiciousSessionReason, SuspiciousSessionReason.SAME_IP_ADDRESS], ipAddress: '192.168.0.0' }, ], } as SuspiciousExamSessions; let component: SuspiciousSessionsOverviewComponent; @@ -23,9 +56,9 @@ describe('SuspiciousSessionsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule], - declarations: [SuspiciousSessionsOverviewComponent, MockPipe(ArtemisTranslatePipe), MockComponent(SuspiciousSessionsComponent)], + declarations: [SuspiciousSessionsOverviewComponent, MockComponent(SuspiciousSessionsComponent), MockDirective(TranslateDirective), MockPipe(ArtemisTranslatePipe)], }); - history.pushState({ suspiciousSessions: [suspiciousSessions] }, ''); + history.pushState({ suspiciousSessions: [suspiciousSessions, suspiciousSessions2, suspiciousSessions3] }, ''); fixture = TestBed.createComponent(SuspiciousSessionsOverviewComponent); component = fixture.componentInstance; @@ -34,6 +67,6 @@ describe('SuspiciousSessionsComponent', () => { it('should retrieve suspicious sessions onInit', fakeAsync(() => { component.ngOnInit(); - expect(component.suspiciousSessions).toEqual([suspiciousSessions]); + expect(component.suspiciousSessions).toEqual([suspiciousSessions, suspiciousSessions2, suspiciousSessions3]); })); }); diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts index d839ccb2e3d1..68d38513ba77 100644 --- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts @@ -15,7 +15,7 @@ describe('SuspiciousSessionsComponent', () => { const suspiciousSessions1 = { examSessions: [ { - suspiciousReasons: [SuspiciousSessionReason.SAME_IP_ADDRESS, SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT], + suspiciousReasons: [SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_IP_ADDRESSES, SuspiciousSessionReason.SAME_STUDENT_EXAM_DIFFERENT_BROWSER_FINGERPRINTS], }, ], } as SuspiciousExamSessions; @@ -28,6 +28,14 @@ describe('SuspiciousSessionsComponent', () => { ], } as SuspiciousExamSessions; + const suspiciousSessions3 = { + examSessions: [ + { + suspiciousReasons: [SuspiciousSessionReason.IP_ADDRESS_OUTSIDE_OF_RANGE], + }, + ], + }; + beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule], @@ -52,5 +60,9 @@ describe('SuspiciousSessionsComponent', () => { component.ngOnInit(); expect(component.suspiciousFingerprint).toBeFalse(); expect(component.suspiciousIpAddress).toBeFalse(); + component.suspiciousSessions = suspiciousSessions3; + component.ngOnInit(); + expect(component.suspiciousFingerprint).toBeFalse(); + expect(component.suspiciousIpAddress).toBeTrue(); }); }); diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts index 58f565c32542..bc1e1522f292 100644 --- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { SuspiciousSessionsService } from 'app/exam/manage/suspicious-behavior/suspicious-sessions.service'; -import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionReason, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam-session.model'; describe('SuspiciousSessionsService', () => { let service: SuspiciousSessionsService; @@ -13,11 +13,19 @@ describe('SuspiciousSessionsService', () => { id: 1, ipAddress: '192.168.0.0', browserFingerprintHash: 'abc', - suspiciousReasons: [SuspiciousSessionReason.SAME_IP_ADDRESS, SuspiciousSessionReason, SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT], + suspiciousReasons: [ + SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS, + SuspiciousSessionReason, + SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT, + ], }, { id: 2, - suspiciousReasons: [SuspiciousSessionReason, SuspiciousSessionReason.SAME_IP_ADDRESS, SuspiciousSessionReason.SAME_BROWSER_FINGERPRINT], + suspiciousReasons: [ + SuspiciousSessionReason, + SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS, + SuspiciousSessionReason.DIFFERENT_STUDENT_EXAMS_SAME_BROWSER_FINGERPRINT, + ], ipAddress: '192.168.0.0', browserFingerprintHash: 'abc', }, @@ -31,9 +39,25 @@ describe('SuspiciousSessionsService', () => { service = TestBed.inject(SuspiciousSessionsService); httpMock = TestBed.inject(HttpTestingController); }); - it('should make GET request to retrieve suspicious submissions', fakeAsync(() => { - service.getSuspiciousSessions(1, 2).subscribe((resp) => expect(resp).toEqual(suspiciousSessions)); - const req = httpMock.expectOne({ method: 'GET', url: 'api/courses/1/exams/2/suspicious-sessions' }); + + it('should make GET request to retrieve suspicious sessions', fakeAsync(() => { + const options = new SuspiciousSessionsAnalysisOptions(true, true, true, true, false); + service.getSuspiciousSessions(1, 2, options).subscribe((resp) => expect(resp).toEqual(suspiciousSessions)); + const req = httpMock.expectOne({ + method: 'GET', + url: 'api/courses/1/exams/2/suspicious-sessions?differentStudentExamsSameIPAddress=true&differentStudentExamsSameBrowserFingerprint=true&sameStudentExamDifferentIPAddresses=true&sameStudentExamDifferentBrowserFingerprints=true&ipOutsideOfRange=false', + }); + req.flush(suspiciousSessions); + tick(); + })); + + it('should make GET request to retrieve suspicious sessions with subnet', fakeAsync(() => { + const options = new SuspiciousSessionsAnalysisOptions(true, true, true, true, true, '127.0.0.1/28'); + service.getSuspiciousSessions(1, 2, options).subscribe((resp) => expect(resp).toEqual(suspiciousSessions)); + const req = httpMock.expectOne({ + method: 'GET', + url: 'api/courses/1/exams/2/suspicious-sessions?differentStudentExamsSameIPAddress=true&differentStudentExamsSameBrowserFingerprint=true&sameStudentExamDifferentIPAddresses=true&sameStudentExamDifferentBrowserFingerprints=true&ipOutsideOfRange=true&ipSubnet=127.0.0.1/28', + }); req.flush(suspiciousSessions); tick(); })); diff --git a/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts index 16d352c4b407..0fc3b7a77626 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts @@ -51,6 +51,8 @@ import { CourseManagementService } from 'app/course/manage/course-management.ser import { CourseStorageService } from 'app/course/manage/course-storage.service'; import { ExamLiveEvent, ExamParticipationLiveEventsService } from 'app/exam/participate/exam-participation-live-events.service'; import { MockExamParticipationLiveEventsService } from '../../../helpers/mocks/service/mock-exam-participation-live-events.service'; +import { ExamPage } from 'app/entities/exam-page.model'; +import { InitializationState } from 'app/entities/participation/participation.model'; describe('ExamParticipationComponent', () => { let fixture: ComponentFixture; @@ -63,6 +65,7 @@ describe('ExamParticipationComponent', () => { let alertService: AlertService; let artemisServerDateService: ArtemisServerDateService; let examParticipationLiveEventsService: ExamParticipationLiveEventsService; + let translateService: TranslateService; let courseService: CourseManagementService; let courseStorageService: CourseStorageService; @@ -120,6 +123,7 @@ describe('ExamParticipationComponent', () => { alertService = TestBed.inject(AlertService); artemisServerDateService = TestBed.inject(ArtemisServerDateService); examParticipationLiveEventsService = TestBed.inject(ExamParticipationLiveEventsService); + translateService = TestBed.inject(TranslateService); courseService = TestBed.inject(CourseManagementService); courseStorageService = TestBed.inject(CourseStorageService); fixture.detectChanges(); @@ -612,7 +616,67 @@ describe('ExamParticipationComponent', () => { expect(comp.studentExam?.submitted).toBeTrue(); }); - it('should show error', () => { + it('should show error when already submitted for test run and successfully loading student exam', () => { + const httpError = new Error(); + httpError.message = 'artemisApp.studentExam.alreadySubmitted'; + const submitSpy = jest.spyOn(examParticipationService, 'submitStudentExam').mockReturnValue(throwError(() => httpError)); + const studentExam = new StudentExam(); + const loadTestRunWithExercisesForConductionSpy = jest.spyOn(examParticipationService, 'loadTestRunWithExercisesForConduction').mockReturnValue(of(studentExam)); + const alertErrorSpy = jest.spyOn(alertService, 'error'); + comp.exam = new Exam(); + comp.onExamEndConfirmed(); + expect(submitSpy).toHaveBeenCalledOnce(); + expect(loadTestRunWithExercisesForConductionSpy).toHaveBeenCalledOnce(); + expect(alertErrorSpy).not.toHaveBeenCalled(); + expect(comp.studentExam).toEqual(studentExam); + }); + + it('should show error when already submitted for test run and failed to load student exam', () => { + const httpError = new Error(); + httpError.message = 'artemisApp.studentExam.alreadySubmitted'; + const submitSpy = jest.spyOn(examParticipationService, 'submitStudentExam').mockReturnValue(throwError(() => httpError)); + const loadTestRunWithExercisesForConductionSpy = jest + .spyOn(examParticipationService, 'loadTestRunWithExercisesForConduction') + .mockReturnValue(throwError(() => new Error())); + const alertErrorSpy = jest.spyOn(alertService, 'error'); + comp.exam = new Exam(); + comp.onExamEndConfirmed(); + expect(submitSpy).toHaveBeenCalledOnce(); + expect(loadTestRunWithExercisesForConductionSpy).toHaveBeenCalledOnce(); + expect(alertErrorSpy).toHaveBeenCalledOnce(); + }); + + it('should show error when already submitted and successfully loading student exam', () => { + const httpError = new Error(); + httpError.message = 'artemisApp.studentExam.alreadySubmitted'; + const submitSpy = jest.spyOn(examParticipationService, 'submitStudentExam').mockReturnValue(throwError(() => httpError)); + const studentExam = new StudentExam(); + const getOwnStudentExamSpy = jest.spyOn(examParticipationService, 'getOwnStudentExam').mockReturnValue(of(studentExam)); + const alertErrorSpy = jest.spyOn(alertService, 'error'); + comp.exam = new Exam(); + comp.testRunId = 0; + comp.onExamEndConfirmed(); + expect(submitSpy).toHaveBeenCalledOnce(); + expect(getOwnStudentExamSpy).toHaveBeenCalledOnce(); + expect(alertErrorSpy).not.toHaveBeenCalled(); + expect(comp.studentExam).toEqual(studentExam); + }); + + it('should show error when already submitted and failed to load student exam', () => { + const httpError = new Error(); + httpError.message = 'artemisApp.studentExam.alreadySubmitted'; + const submitSpy = jest.spyOn(examParticipationService, 'submitStudentExam').mockReturnValue(throwError(() => httpError)); + const getOwnStudentExamSpy = jest.spyOn(examParticipationService, 'getOwnStudentExam').mockReturnValue(throwError(() => new Error())); + const alertErrorSpy = jest.spyOn(alertService, 'error'); + comp.exam = new Exam(); + comp.testRunId = 0; + comp.onExamEndConfirmed(); + expect(submitSpy).toHaveBeenCalledOnce(); + expect(getOwnStudentExamSpy).toHaveBeenCalledOnce(); + expect(alertErrorSpy).toHaveBeenCalledOnce(); + }); + + it('should show error when not submitted', () => { const httpError = new HttpErrorResponse({ error: 'Forbidden', status: 403 }); const submitSpy = jest.spyOn(examParticipationService, 'submitStudentExam').mockReturnValue(throwError(() => httpError)); const alertErrorSpy = jest.spyOn(alertService, 'error'); @@ -622,6 +686,29 @@ describe('ExamParticipationComponent', () => { expect(alertErrorSpy).toHaveBeenCalledOnce(); }); + describe('canDeactivate', () => { + it('should return true if logout is true', () => { + comp.loggedOut = true; + expect(comp.canDeactivate()).toBeTrue(); + }); + + it('should call translateService', () => { + const translateServiceSpy = jest.spyOn(translateService, 'instant'); + comp.canDeactivateWarning; + expect(translateServiceSpy).toHaveBeenCalledOnce(); + }); + }); + + describe('unloadNotification', () => { + it('should set event return value', () => { + jest.spyOn(comp, 'canDeactivate').mockReturnValue(false); + jest.spyOn(comp, 'canDeactivateWarning', 'get').mockReturnValue('warning'); + const event = { returnValue: undefined }; + comp.unloadNotification(event); + expect(event.returnValue).toBe('warning'); + }); + }); + describe('isOver', () => { it('should return true if exam has ended', () => { const studentExam = new StudentExam(); @@ -728,22 +815,51 @@ describe('ExamParticipationComponent', () => { expect(clearIntervalSpy).toHaveBeenCalledWith(comp.autoSaveInterval); }); - it('should trigger save and initialize exercise when exercise changed', () => { - comp.exerciseIndex = 0; - const exercise1 = new TextExercise(new Course(), undefined); - exercise1.id = 15; - const exercise2 = new ProgrammingExercise(new Course(), undefined); - exercise2.id = 42; - comp.studentExam = new StudentExam(); - comp.studentExam.exercises = [exercise1, exercise2]; - const triggerSpy = jest.spyOn(comp, 'triggerSave'); - const exerciseChange = { overViewChange: false, exercise: exercise2, forceSave: true }; - const createParticipationForExerciseSpy = jest.spyOn(comp, 'createParticipationForExercise').mockReturnValue(of(new StudentParticipation())); - comp.exam = new Exam(); - comp.onPageChange(exerciseChange); - expect(triggerSpy).toHaveBeenCalledWith(true); - expect(comp.exerciseIndex).toBe(1); - expect(createParticipationForExerciseSpy).toHaveBeenCalledWith(exercise2); + describe('onPageChange', () => { + it('should trigger save and initialize exercise when exercise changed', () => { + comp.exerciseIndex = 0; + const exercise1 = new TextExercise(new Course(), undefined); + exercise1.id = 15; + const exercise2 = new ProgrammingExercise(new Course(), undefined); + exercise2.id = 42; + comp.studentExam = new StudentExam(); + comp.studentExam.exercises = [exercise1, exercise2]; + const triggerSpy = jest.spyOn(comp, 'triggerSave'); + const exerciseChange = { overViewChange: false, exercise: exercise2, forceSave: true }; + const createParticipationForExerciseSpy = jest.spyOn(comp, 'createParticipationForExercise').mockReturnValue(of(new StudentParticipation())); + comp.exam = new Exam(); + comp.onPageChange(exerciseChange); + expect(triggerSpy).toHaveBeenCalledWith(true); + expect(comp.exerciseIndex).toBe(1); + expect(createParticipationForExerciseSpy).toHaveBeenCalledWith(exercise2); + }); + + it('should trigger save and initialize exercise when exercise changed and participation is valid', () => { + const exercise = new QuizExercise(new Course(), undefined); + exercise.id = 42; + const participation = new StudentParticipation(); + participation.initializationState = InitializationState.INITIALIZED; + const submission = new QuizSubmission(); + participation.submissions = [submission]; + exercise.studentParticipations = [participation]; + const triggerSpy = jest.spyOn(comp, 'triggerSave'); + const exerciseChange = { overViewChange: false, exercise: exercise, forceSave: true }; + comp.exam = new Exam(); + comp.activeExamPage = new ExamPage(); + comp.activeExamPage.exercise = exercise; + comp.studentExam = new StudentExam(); + comp.studentExam.exercises = [exercise]; + comp.pageComponentVisited = [true]; + comp.examStartConfirmed = true; + fixture.detectChanges(); + + const pageComponent = comp.currentPageComponents.get(0); + jest.spyOn(pageComponent, 'getExerciseId').mockReturnValue(exercise.id); + comp.onPageChange(exerciseChange); + + expect(triggerSpy).toHaveBeenCalledWith(true); + expect(comp.exerciseIndex).toBe(0); + }); }); describe('toggleHandInEarly', () => { @@ -784,5 +900,36 @@ describe('ExamParticipationComponent', () => { expect(comp.pageComponentVisited).toEqual([false, true, false]); expect(comp.exerciseIndex).toBe(1); }); + + it('should trigger save', () => { + const triggerSaveSpy = jest.spyOn(comp, 'triggerSave').mockImplementation(() => {}); + comp.handInEarly = false; + comp.toggleHandInEarly(); + + expect(triggerSaveSpy).toHaveBeenCalledOnce(); + }); + }); + + describe('activePageIndex', () => { + it('should return -1 if active page is overview page', () => { + comp.activeExamPage = new ExamPage(); + comp.activeExamPage.isOverviewPage = true; + expect(comp.activePageIndex).toBe(-1); + }); + + it('should return the index of the active page', () => { + const exercise0 = new QuizExercise(undefined, undefined); + exercise0.id = 5; + const exercise1 = new ProgrammingExercise(undefined, undefined); + exercise1.id = 6; + + comp.activeExamPage = new ExamPage(); + comp.activeExamPage.exercise = exercise1; + + comp.studentExam = new StudentExam(); + comp.studentExam.exercises = [exercise0, exercise1]; + + expect(comp.activePageIndex).toBe(1); + }); }); }); diff --git a/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts index 8c665619bc8b..cabce320ebef 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts @@ -138,7 +138,7 @@ describe('FileUploadExamSubmissionComponent', () => { resetComponent(); }); it('should return exercise', () => { - expect(comp.getExercise()).toEqual(mockExercise); + expect(comp.getExerciseId()).toEqual(mockExercise.id); }); }); @@ -149,7 +149,7 @@ describe('FileUploadExamSubmissionComponent', () => { it('should update problem statement', () => { const newProblemStatement = 'new problem statement'; comp.updateProblemStatement(newProblemStatement); - expect(comp.getExercise().problemStatement).toEqual(newProblemStatement); + expect(comp.exercise.problemStatement).toEqual(newProblemStatement); }); }); diff --git a/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts index e9ca3c74b8dc..fda13e4a84ef 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts @@ -157,7 +157,7 @@ describe('ModelingExamSubmissionComponent', () => { resetComponent(); }); it('should return exercise', () => { - expect(comp.getExercise()).toEqual(mockExercise); + expect(comp.getExerciseId()).toEqual(mockExercise.id); }); }); @@ -168,7 +168,7 @@ describe('ModelingExamSubmissionComponent', () => { it('should update problem statement', () => { const newProblemStatement = 'new problem statement'; comp.updateProblemStatement(newProblemStatement); - expect(comp.getExercise().problemStatement).toEqual(newProblemStatement); + expect(comp.exercise.problemStatement).toEqual(newProblemStatement); }); }); diff --git a/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts index 97761cb86ff1..28adace63ef4 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts @@ -1,7 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { Course } from 'app/entities/course.model'; -import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { AnswerOption } from 'app/entities/quiz/answer-option.model'; import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.model'; import { DragAndDropQuestion } from 'app/entities/quiz/drag-and-drop-question.model'; @@ -10,7 +8,6 @@ import { DragItem } from 'app/entities/quiz/drag-item.model'; import { DropLocation } from 'app/entities/quiz/drop-location.model'; import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model'; import { MultipleChoiceSubmittedAnswer } from 'app/entities/quiz/multiple-choice-submitted-answer.model'; -import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model'; import { ShortAnswerQuestion } from 'app/entities/quiz/short-answer-question.model'; import { ShortAnswerSubmittedAnswer } from 'app/entities/quiz/short-answer-submitted-answer.model'; @@ -30,7 +27,6 @@ describe('QuizExamSubmissionComponent', () => { let component: QuizExamSubmissionComponent; let quizSubmission: QuizSubmission; - let exercise: QuizExercise; let multipleChoiceQuestion: MultipleChoiceQuestion; let dragAndDropQuestion: DragAndDropQuestion; let shortAnswerQuestion: ShortAnswerQuestion; @@ -39,7 +35,6 @@ describe('QuizExamSubmissionComponent', () => { beforeEach(() => { quizSubmission = new QuizSubmission(); - exercise = new QuizExercise(new Course(), new ExerciseGroup()); multipleChoiceQuestion = new MultipleChoiceQuestion(); multipleChoiceQuestion.id = 1; dragAndDropQuestion = new DragAndDropQuestion(); @@ -73,8 +68,7 @@ describe('QuizExamSubmissionComponent', () => { it('should initialize', () => { const quizServiceSpy = jest.spyOn(quizService, 'randomizeOrder'); - exercise.quizQuestions = [multipleChoiceQuestion, dragAndDropQuestion]; - component.exercise = exercise; + component.quizConfiguration = { quizQuestions: [multipleChoiceQuestion, dragAndDropQuestion] }; fixture.detectChanges(); expect(fixture).toBeDefined(); @@ -87,8 +81,7 @@ describe('QuizExamSubmissionComponent', () => { }); it('should update view from submission and fill the dictionary accordingly when submitted answer', () => { - exercise.quizQuestions = [multipleChoiceQuestion, dragAndDropQuestion]; - component.exercise = exercise; + component.quizConfiguration = { quizQuestions: [multipleChoiceQuestion, dragAndDropQuestion] }; const multipleChoiceSubmittedAnswer = new MultipleChoiceSubmittedAnswer(); const multipleChoiceSelectedOptions = new AnswerOption(); @@ -117,7 +110,6 @@ describe('QuizExamSubmissionComponent', () => { * Test the return value of the getSubmission and getExercise */ expect(component.getSubmission()).toEqual(quizSubmission); - expect(component.getExercise()).toEqual(exercise); /** * Change the isSynced value of studentSubmission to false when selection changed @@ -131,8 +123,7 @@ describe('QuizExamSubmissionComponent', () => { }); it('should set answerOptions/mappings/submitted texts to empty array when not submitted answer', () => { - exercise.quizQuestions = [multipleChoiceQuestion, dragAndDropQuestion, shortAnswerQuestion]; - component.exercise = exercise; + component.quizConfiguration = { quizQuestions: [multipleChoiceQuestion, dragAndDropQuestion, shortAnswerQuestion] }; component.updateViewFromSubmission(); fixture.detectChanges(); @@ -155,8 +146,8 @@ describe('QuizExamSubmissionComponent', () => { const windowSpy = jest.spyOn(window, 'scrollTo'); + component.quizConfiguration = {}; component.navigateToQuestion(1); - component.exercise = exercise; fixture.detectChanges(); expect(getNavigationStub).toHaveBeenCalledTimes(2); expect(yOffsetStub).toHaveBeenCalledOnce(); @@ -164,9 +155,8 @@ describe('QuizExamSubmissionComponent', () => { }); it('should create multiple choice submission from users selection', () => { - exercise.quizQuestions = [multipleChoiceQuestion, dragAndDropQuestion, shortAnswerQuestion]; + component.quizConfiguration = { quizQuestions: [multipleChoiceQuestion, dragAndDropQuestion, shortAnswerQuestion] }; component.studentSubmission = new QuizSubmission(); - component.exercise = exercise; const multipleChoiceSelectedOptions = new AnswerOption(); multipleChoiceSelectedOptions.id = 1; diff --git a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts index e27058946278..3a8ce9372608 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts @@ -63,7 +63,7 @@ describe('TextExamSubmissionComponent', () => { expect(component.answer).toBe('Hello World'); expect(component.wordCount).toBe(2); expect(component.characterCount).toBe(11); - expect(component.getExercise()).toEqual(exercise); + expect(component.getExerciseId()).toEqual(exercise.id); expect(component.getSubmission()).toEqual(textSubmission); }); diff --git a/src/test/javascript/spec/component/exam/participate/summary/exam-participation-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts similarity index 70% rename from src/test/javascript/spec/component/exam/participate/summary/exam-participation-summary.component.spec.ts rename to src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts index 56c40745a6c5..c4ac93c7be55 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exam-participation-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts @@ -21,14 +21,13 @@ import { ProgrammingSubmission } from 'app/entities/programming-submission.model import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model'; import { StudentExam } from 'app/entities/student-exam.model'; -import { SubmissionType } from 'app/entities/submission.model'; import { TextExercise } from 'app/entities/text-exercise.model'; import { TextSubmission } from 'app/entities/text-submission.model'; -import { StudentExamWithGradeDTO, StudentResult } from 'app/exam/exam-scores/exam-score-dtos.model'; +import { ExerciseResult, StudentExamWithGradeDTO, StudentResult } from 'app/exam/exam-scores/exam-score-dtos.model'; import { TestRunRibbonComponent } from 'app/exam/manage/test-runs/test-run-ribbon.component'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; import { ExamGeneralInformationComponent } from 'app/exam/participate/general-information/exam-general-information.component'; -import { ExamResultSummaryComponent } from 'app/exam/participate/summary/exam-result-summary.component'; +import { ExamResultSummaryComponent, ResultSummaryExerciseInfo } from 'app/exam/participate/summary/exam-result-summary.component'; import { FileUploadExamSummaryComponent } from 'app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component'; import { ModelingExamSummaryComponent } from 'app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component'; import { ProgrammingExamSummaryComponent } from 'app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component'; @@ -51,6 +50,10 @@ import { NgbCollapseMocksModule } from '../../../../helpers/mocks/directive/ngbC import { MockExamParticipationService } from '../../../../helpers/mocks/service/mock-exam-participation.service'; import { MockLocalStorageService } from '../../../../helpers/mocks/service/mock-local-storage.service'; import { MockArtemisServerDateService } from '../../../../helpers/mocks/service/mock-server-date.service'; +import { ExamResultSummaryExerciseCardHeaderComponent } from 'app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component'; +import { Course } from 'app/entities/course.model'; +import { AlertService } from 'app/core/util/alert.service'; +import { ProgrammingExerciseExampleSolutionRepoDownloadComponent } from 'app/exercises/programming/shared/actions/programming-exercise-example-solution-repo-download.component'; let fixture: ComponentFixture; let component: ExamResultSummaryComponent; @@ -65,6 +68,8 @@ const publishResultsDate = dayjs().subtract(3, 'hours'); const examStudentReviewStart = dayjs().subtract(2, 'hours'); const examStudentReviewEnd = dayjs().add(1, 'hours'); +const course = { id: 1, accuracyOfScores: 2 } as Course; + const exam = { id: 1, title: 'ExamForTesting', @@ -75,6 +80,7 @@ const exam = { examStudentReviewStart, examStudentReviewEnd, testExam: false, + course, } as Exam; const testExam = { @@ -84,6 +90,7 @@ const testExam = { startDate, endDate, testExam: true, + course, } as Exam; const exerciseGroup = { @@ -120,6 +127,9 @@ const studentExamForTestExam = { user, exercises, } as StudentExam; + +const textExerciseResult = { exerciseId: textExercise.id, achievedScore: 60, achievedPoints: 6, maxScore: textExercise.maxPoints } as ExerciseResult; + const gradeInfo: StudentExamWithGradeDTO = { maxPoints: 100, maxBonusPoints: 10, @@ -150,10 +160,12 @@ function sharedSetup(url: string[]) { MockComponent(FileUploadExamSummaryComponent), MockComponent(ComplaintsStudentViewComponent), MockComponent(FaIconComponent), + MockComponent(ExamResultSummaryExerciseCardHeaderComponent), MockDirective(TranslateDirective), MockPipe(ArtemisTranslatePipe), MockPipe(HtmlForMarkdownPipe), MockComponent(IncludedInScoreBadgeComponent), + MockComponent(ProgrammingExerciseExampleSolutionRepoDownloadComponent), ], providers: [ { @@ -175,6 +187,7 @@ function sharedSetup(url: string[]) { { provide: LocalStorageService, useClass: MockLocalStorageService }, { provide: ArtemisServerDateService, useClass: MockArtemisServerDateService }, { provide: ExamParticipationService, useClass: MockExamParticipationService }, + MockProvider(AlertService), ], }) .compileComponents() @@ -195,27 +208,24 @@ describe('ExamResultSummaryComponent', () => { sharedSetup(['', '']); it('should expand all exercises and call print when Export PDF is clicked', fakeAsync(() => { - const printStub = jest.spyOn(TestBed.inject(ThemeService), 'print').mockReturnValue(); + const printStub = jest.spyOn(TestBed.inject(ThemeService), 'print').mockResolvedValue(undefined); fixture.detectChanges(); const exportToPDFButton = fixture.debugElement.query(By.css('#exportToPDFButton')); - const toggleCollapseExerciseButtonOne = fixture.debugElement.query(By.css('#toggleCollapseExerciseButton-0')); - const toggleCollapseExerciseButtonTwo = fixture.debugElement.query(By.css('#toggleCollapseExerciseButton-1')); - const toggleCollapseExerciseButtonThree = fixture.debugElement.query(By.css('#toggleCollapseExerciseButton-2')); - const toggleCollapseExerciseButtonFour = fixture.debugElement.query(By.css('#toggleCollapseExerciseButton-3')); + expect(exportToPDFButton).not.toBeNull(); - expect(toggleCollapseExerciseButtonOne).not.toBeNull(); - expect(toggleCollapseExerciseButtonTwo).not.toBeNull(); - expect(toggleCollapseExerciseButtonThree).not.toBeNull(); - expect(toggleCollapseExerciseButtonFour).not.toBeNull(); - toggleCollapseExerciseButtonOne.nativeElement.click(); - toggleCollapseExerciseButtonTwo.nativeElement.click(); - toggleCollapseExerciseButtonThree.nativeElement.click(); - toggleCollapseExerciseButtonFour.nativeElement.click(); - expect(component.collapsedExerciseIds).toHaveLength(4); + component.exerciseInfos[1].isCollapsed = true; + component.exerciseInfos[2].isCollapsed = true; + component.exerciseInfos[3].isCollapsed = true; + component.exerciseInfos[4].isCollapsed = true; exportToPDFButton.nativeElement.click(); - expect(component.collapsedExerciseIds).toBeEmpty(); + + expect(component.exerciseInfos[1].isCollapsed).toBeFalse(); + expect(component.exerciseInfos[2].isCollapsed).toBeFalse(); + expect(component.exerciseInfos[3].isCollapsed).toBeFalse(); + expect(component.exerciseInfos[4].isCollapsed).toBeFalse(); + tick(); expect(printStub).toHaveBeenCalledOnce(); printStub.mockRestore(); @@ -277,27 +287,6 @@ describe('ExamResultSummaryComponent', () => { expect(submission).toEqual(expectedResult); }); - it.each([ - [{}, false], - [{ studentParticipations: null }, false], - [{ studentParticipations: undefined }, false], - [{ studentParticipations: [] }, false], - [{ studentParticipations: [{}] }, false], - [{ studentParticipations: [{ submissions: null }] }, false], - [{ studentParticipations: [{ submissions: undefined }] }, false], - [{ studentParticipations: [{ submissions: [{ type: SubmissionType.MANUAL }] }] }, false], - [{ studentParticipations: [{ submissions: [{ type: SubmissionType.ILLEGAL }] }] }, true], - ])('should handle missing/empty fields correctly for %o when displaying illegal submission badge', (exercise, shouldBeNonNull) => { - component.studentExam = { id: 1, exam, user, exercises: [exercise as Exercise], numberOfExamSessions: 0 }; - fixture.detectChanges(); - const span = fixture.debugElement.query(By.css('.badge.bg-danger')); - if (shouldBeNonNull) { - expect(span).not.toBeNull(); - } else { - expect(span).toBeNull(); - } - }); - it('should update student exam correctly', () => { const plagiarismService = fixture.debugElement.injector.get(PlagiarismCasesService); const plagiarismServiceSpy = jest.spyOn(plagiarismService, 'getPlagiarismCaseInfosForStudent'); @@ -360,26 +349,26 @@ describe('ExamResultSummaryComponent', () => { it('should correctly determine if the results are published', () => { component.studentExam = studentExam; component.testRunConduction = true; - expect(component.resultsPublished).toBeFalse(); + expect(component.resultsArePublished).toBeFalse(); component.testExamConduction = true; component.testRunConduction = false; - expect(component.resultsPublished).toBeFalse(); + expect(component.resultsArePublished).toBeFalse(); component.isTestRun = true; component.testExamConduction = false; - expect(component.resultsPublished).toBeTrue(); + expect(component.resultsArePublished).toBeTrue(); component.isTestExam = true; component.isTestRun = false; - expect(component.resultsPublished).toBeTrue(); + expect(component.resultsArePublished).toBeTrue(); component.isTestExam = false; // const publishResultsDate is in the past - expect(component.resultsPublished).toBeTrue(); + expect(component.resultsArePublished).toBeTrue(); component.studentExam.exam!.publishResultsDate = dayjs().add(2, 'hours'); - expect(component.resultsPublished).toBeFalse(); + expect(component.resultsArePublished).toBeFalse(); }); it('should correctly determine if it is after student review start', () => { @@ -387,21 +376,25 @@ describe('ExamResultSummaryComponent', () => { const dateSpy = jest.spyOn(artemisServerDateService, 'now').mockReturnValue(now); component.isTestExam = true; - expect(component.isAfterStudentReviewStart()).toBeTrue(); + component.ngOnInit(); + expect(component.isAfterStudentReviewStart).toBeTrue(); component.isTestExam = false; component.isTestRun = true; - expect(component.isAfterStudentReviewStart()).toBeTrue(); + component.ngOnInit(); + expect(component.isAfterStudentReviewStart).toBeTrue(); component.isTestRun = false; component.studentExam.exam!.examStudentReviewStart = examStudentReviewStart; component.studentExam.exam!.examStudentReviewEnd = examStudentReviewEnd; - expect(component.isAfterStudentReviewStart()).toBeTrue(); + component.ngOnInit(); + expect(component.isAfterStudentReviewStart).toBeTrue(); component.studentExam.exam!.examStudentReviewStart = dayjs().add(30, 'minutes'); - expect(component.isAfterStudentReviewStart()).toBeFalse(); + component.ngOnInit(); + expect(component.isAfterStudentReviewStart).toBeFalse(); - expect(dateSpy).toHaveBeenCalledTimes(2); + expect(dateSpy).toHaveBeenCalled(); }); it('should correctly determine if it is before student review end', () => { @@ -409,25 +402,129 @@ describe('ExamResultSummaryComponent', () => { const dateSpy = jest.spyOn(artemisServerDateService, 'now').mockReturnValue(now); component.isTestExam = true; - expect(component.isBeforeStudentReviewEnd()).toBeTrue(); + component.ngOnInit(); + expect(component.isBeforeStudentReviewEnd).toBeTrue(); component.isTestExam = false; component.isTestRun = true; - expect(component.isBeforeStudentReviewEnd()).toBeTrue(); + component.ngOnInit(); + expect(component.isBeforeStudentReviewEnd).toBeTrue(); component.isTestRun = false; component.studentExam.exam!.examStudentReviewEnd = examStudentReviewEnd; - expect(component.isBeforeStudentReviewEnd()).toBeTrue(); + component.ngOnInit(); + expect(component.isBeforeStudentReviewEnd).toBeTrue(); component.studentExam.exam!.examStudentReviewEnd = dayjs().subtract(30, 'minutes'); - expect(component.isBeforeStudentReviewEnd()).toBeFalse(); + component.ngOnInit(); + expect(component.isBeforeStudentReviewEnd).toBeFalse(); - expect(dateSpy).toHaveBeenCalledTimes(2); + expect(dateSpy).toHaveBeenCalled(); }); - it('should show exercise group title', () => { - fixture.detectChanges(); - const exerciseTitleElement: HTMLElement = fixture.nativeElement.querySelector('.exercise-title'); - expect(exerciseTitleElement.textContent).toContain('exercise group'); + describe('getAchievedPercentageByExerciseId', () => { + beforeEach(() => { + const studentExam = { + exam: { + course, + }, + } as StudentExam; + + const studentResult = { + exerciseGroupIdToExerciseResult: { + [textExercise.id!]: textExerciseResult, + }, + } as StudentResult; + + component.studentExamGradeInfoDTO = { ...gradeInfo, studentExam, studentResult }; + }); + + it('should return undefined if exercise result is undefined', () => { + component.studentExamGradeInfoDTO.studentResult.exerciseGroupIdToExerciseResult = {}; + const scoreAsPercentage = component.getAchievedPercentageByExerciseId(textExercise.id); + + expect(scoreAsPercentage).toBeUndefined(); + }); + + it('should calculate percentage based on achievedScore considering course settings', () => { + textExerciseResult.achievedScore = 60.6666; + + const scoreAsPercentage = component.getAchievedPercentageByExerciseId(textExercise.id); + + expect(scoreAsPercentage).toBe(60.67); + }); + + it('should calculate percentage based on maxScore and achievedPoints', () => { + textExerciseResult.achievedScore = undefined; + textExerciseResult.maxScore = 10; + textExerciseResult.achievedPoints = 6.066666; + component.studentExamGradeInfoDTO.studentExam!.exam!.course!.accuracyOfScores = 3; + + const scoreAsPercentage = component.getAchievedPercentageByExerciseId(textExercise.id); + + expect(scoreAsPercentage).toBe(60.667); + }); + + it('should return undefined if not set and not calculable', () => { + textExerciseResult.achievedScore = undefined; + textExerciseResult.achievedPoints = undefined; + + const scoreAsPercentage = component.getAchievedPercentageByExerciseId(textExercise.id); + + expect(scoreAsPercentage).toBeUndefined(); + }); + }); + + describe('scrollToOverviewOrTop', () => { + const BACK_TO_OVERVIEW_BUTTON_ID = 'back-to-overview-button'; + const EXAM_SUMMARY_RESULT_OVERVIEW_ID = 'exam-summary-result-overview'; + + it('should scroll to top when overview is not displayed', () => { + const scrollToSpy = jest.spyOn(window, 'scrollTo'); + + const button = fixture.debugElement.nativeElement.querySelector('#' + BACK_TO_OVERVIEW_BUTTON_ID); + button.click(); + + expect(scrollToSpy).toHaveBeenCalledWith(0, 0); + }); + + it('should scroll to overview when it is displayed', () => { + const scrollToSpy = jest.spyOn(window, 'scrollTo'); + const scrollIntoViewSpy = jest.fn(); + + const getElementByIdMock = jest.spyOn(document, 'getElementById').mockReturnValue({ + scrollIntoView: scrollIntoViewSpy, + } as unknown as HTMLElement); + + component.studentExam = studentExam; + component.studentExamGradeInfoDTO = { ...gradeInfo, studentExam }; + + fixture.detectChanges(); + + const button = fixture.debugElement.nativeElement.querySelector('#' + BACK_TO_OVERVIEW_BUTTON_ID); + button.click(); + + expect(getElementByIdMock).toHaveBeenCalledWith(EXAM_SUMMARY_RESULT_OVERVIEW_ID); + expect(scrollIntoViewSpy).toHaveBeenCalled(); + expect(scrollToSpy).not.toHaveBeenCalled(); + }); + }); + + describe('toggleShowSampleSolution', () => { + it('should be called on button click', () => { + component.exerciseInfos = { + 1: { isCollapsed: false, displayExampleSolution: true } as ResultSummaryExerciseInfo, + }; + exam.exampleSolutionPublicationDate = dayjs().subtract(1, 'hour'); + const toggleShowSampleSolutionSpy = jest.spyOn(component, 'toggleShowSampleSolution'); + + fixture.detectChanges(); + + const button = fixture.debugElement.nativeElement.querySelector(`#show-sample-solution-button-${textExercise.id}`); + expect(button).toBeTruthy(); + + button.click(); + expect(toggleShowSampleSolutionSpy).toHaveBeenCalled(); + }); }); }); diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-exam-summary.component.spec.ts similarity index 53% rename from src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-summary.component.spec.ts rename to src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-exam-summary.component.spec.ts index 0126e44f83ed..37611dc202f5 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/file-upload-exam-summary.component.spec.ts @@ -1,48 +1,53 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FileUploadExamSummaryComponent } from 'app/exam/participate/summary/exercises/file-upload-exam-summary/file-upload-exam-summary.component'; -import { MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockPipe } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { FileService } from 'app/shared/http/file.service'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; import { By } from '@angular/platform-browser'; +import { FileUploadSubmissionComponent } from 'app/exercises/file-upload/participate/file-upload-submission.component'; +import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; describe('FileUploadExamSummaryComponent', () => { let fixture: ComponentFixture; let component: FileUploadExamSummaryComponent; - let fileService: FileService; const fileUploadSubmission = { id: 1 } as FileUploadSubmission; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule], - declarations: [FileUploadExamSummaryComponent, MockPipe(ArtemisTranslatePipe)], - providers: [MockProvider(FileService)], + declarations: [FileUploadExamSummaryComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FileUploadSubmissionComponent)], }) .compileComponents() .then(() => { fixture = TestBed.createComponent(FileUploadExamSummaryComponent); component = fixture.componentInstance; component.submission = fileUploadSubmission; - fileService = TestBed.inject(FileService); }); }); it('should initialize', () => { fixture.detectChanges(); expect(component).not.toBeNull(); - expect(component.attachmentExtension(component.submission.filePath!)).toBe('N/A'); }); - it('should correctly display the filepath', () => { - component.submission.filePath = 'filePath.pdf'; - const downloadFileSpy = jest.spyOn(fileService, 'downloadFile'); + it('should render submission when exercise and submisssion is set', () => { + const exercise = { id: 1234, studentParticipations: [{ id: 1 }] } as FileUploadExercise; + const submission = { submitted: true, filePath: 'filePath.pdf' } as FileUploadSubmission; + component.submission = submission; + component.exercise = exercise; + + fixture.detectChanges(); + + const fileUploadSubmissionComponent = fixture.debugElement.query(By.directive(FileUploadSubmissionComponent)).componentInstance; + expect(fileUploadSubmissionComponent).toBeTruthy(); + }); + + it('should not render submission if exercise and submission are not set', () => { fixture.detectChanges(); - expect(component.attachmentExtension(component.submission.filePath!)).toBe('pdf'); - const downloadFile = fixture.debugElement.query(By.css('#downloadFileButton')); - expect(downloadFile).not.toBeNull(); - downloadFile.nativeElement.click(); - expect(downloadFileSpy).toHaveBeenCalledOnce(); + + const fileUploadSubmissionComponent = fixture.debugElement.query(By.directive(FileUploadSubmissionComponent))?.componentInstance; + expect(fileUploadSubmissionComponent).not.toBeTruthy(); }); }); diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts new file mode 100644 index 000000000000..12b0b9310ae5 --- /dev/null +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts @@ -0,0 +1,102 @@ +import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { FaIconComponent } from '@fortawesome/angular-fontawesome'; +import { User } from 'app/core/user/user.model'; +import { Exam } from 'app/entities/exam.model'; +import { ExerciseGroup } from 'app/entities/exercise-group.model'; +import { Exercise, ExerciseType } from 'app/entities/exercise.model'; +import { StudentParticipation } from 'app/entities/participation/student-participation.model'; +import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { SubmissionType } from 'app/entities/submission.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; +import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; +import { ExamResultSummaryExerciseCardHeaderComponent } from 'app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component'; +import { ResultSummaryExerciseInfo } from 'app/exam/participate/summary/exam-result-summary.component'; + +let fixture: ComponentFixture; +let component: ExamResultSummaryExerciseCardHeaderComponent; + +const user = { id: 1, name: 'Test User' } as User; + +const exam = { + id: 1, + title: 'ExamForTesting', +} as Exam; + +const exerciseGroup = { + exam, + title: 'exercise group', +} as ExerciseGroup; + +const programmingSubmission = { id: 1 } as ProgrammingSubmission; + +const programmingParticipation = { id: 4, student: user, submissions: [programmingSubmission] } as StudentParticipation; + +const programmingExercise = { id: 4, type: ExerciseType.PROGRAMMING, studentParticipations: [programmingParticipation], exerciseGroup } as ProgrammingExercise; + +describe('ExamResultSummaryExerciseCardHeaderComponent', () => { + beforeEach(() => { + return TestBed.configureTestingModule({ + declarations: [ExamResultSummaryExerciseCardHeaderComponent, MockComponent(FaIconComponent), MockDirective(TranslateDirective), MockPipe(ArtemisTranslatePipe)], + }) + .compileComponents() + .then(() => { + fixture = TestBed.createComponent(ExamResultSummaryExerciseCardHeaderComponent); + component = fixture.componentInstance; + component.index = 3; + component.exercise = programmingExercise; + component.exerciseInfo = { isCollapsed: false } as ResultSummaryExerciseInfo; + }); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + it('should collapse and expand exercise when collapse button is clicked', fakeAsync(() => { + fixture.detectChanges(); + const toggleCollapseExerciseButtonFour = fixture.debugElement.query(By.css('#toggleCollapseExerciseButton-4')); + + expect(toggleCollapseExerciseButtonFour).not.toBeNull(); + + toggleCollapseExerciseButtonFour.nativeElement.click(); + + expect(component.exerciseInfo?.isCollapsed).toBeTrue(); + + toggleCollapseExerciseButtonFour.nativeElement.click(); + + expect(component.exerciseInfo?.isCollapsed).toBeFalse(); + })); + + it.each([ + [{}, false], + [{ studentParticipations: null }, false], + [{ studentParticipations: undefined }, false], + [{ studentParticipations: [] }, false], + [{ studentParticipations: [{}] }, false], + [{ studentParticipations: [{ submissions: null }] }, false], + [{ studentParticipations: [{ submissions: undefined }] }, false], + [{ studentParticipations: [{ submissions: [{ type: SubmissionType.MANUAL }] }] }, false], + [{ studentParticipations: [{ submissions: [{ type: SubmissionType.ILLEGAL }] }] }, true], + ])('should handle missing/empty fields correctly for %o when displaying illegal submission badge', (exercise, shouldBeNonNull) => { + component.exercise = exercise as Exercise; + + fixture.detectChanges(); + const span = fixture.debugElement.query(By.css('.badge.bg-danger')); + if (shouldBeNonNull) { + expect(span).not.toBeNull(); + } else { + expect(span).toBeNull(); + } + }); + + it('should show exercise group title', () => { + fixture.detectChanges(); + + const exerciseTitleElement: HTMLElement = fixture.nativeElement.querySelector('#exercise-group-title-' + programmingExercise.id); + expect(exerciseTitleElement.textContent).toContain('#' + (component.index + 1)); + expect(exerciseTitleElement.textContent).toContain(programmingExercise.exerciseGroup?.title); + }); +}); diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/modeling-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/modeling-exam-summary.component.spec.ts index a4ff6e71b58a..580c7a9b3aba 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/modeling-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/modeling-exam-summary.component.spec.ts @@ -4,23 +4,23 @@ import { Course } from 'app/entities/course.model'; import { ModelingExercise, UMLDiagramType } from 'app/entities/modeling-exercise.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { ModelingExamSummaryComponent } from 'app/exam/participate/summary/exercises/modeling-exam-summary/modeling-exam-summary.component'; -import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component'; import { MockComponent } from 'ng-mocks'; +import { ModelingSubmissionComponent } from 'app/exercises/modeling/participate/modeling-submission.component'; describe('ModelingExamSummaryComponent', () => { let fixture: ComponentFixture; - let comp: ModelingExamSummaryComponent; + let component: ModelingExamSummaryComponent; beforeEach(() => { TestBed.configureTestingModule({ imports: [], - declarations: [ModelingExamSummaryComponent, MockComponent(ModelingEditorComponent)], + declarations: [ModelingExamSummaryComponent, MockComponent(ModelingSubmissionComponent)], schemas: [], }) .compileComponents() .then(() => { fixture = TestBed.createComponent(ModelingExamSummaryComponent); - comp = fixture.componentInstance; + component = fixture.componentInstance; }); }); @@ -33,24 +33,28 @@ describe('ModelingExamSummaryComponent', () => { fixture.detectChanges(); const el = fixture.debugElement.query((de) => de.nativeElement.textContent === 'No submission'); expect(el).not.toBeNull(); - const modelingEditor = fixture.debugElement.query(By.directive(ModelingEditorComponent)); + const modelingEditor = fixture.debugElement.query(By.directive(ModelingSubmissionComponent)); expect(modelingEditor).toBeNull(); }); - it('should show modeling editor with correct props when there is submission and exercise', () => { + it('should show modeling submission when there is submission and exercise', () => { const mockSubmission = { explanationText: 'Test Explanation', model: JSON.stringify({ model: true }) } as ModelingSubmission; const course = new Course(); + const exercise = { course: course, exerciseGroup: undefined, diagramType: UMLDiagramType.ClassDiagram, studentParticipations: [{ id: 1 }] } as ModelingExercise; course.isAtLeastInstructor = true; - comp.exercise = new ModelingExercise(UMLDiagramType.ClassDiagram, course, undefined); - comp.submission = mockSubmission; + component.exercise = exercise; + component.submission = mockSubmission; + + fixture.detectChanges(); + + const modelingSubmissionComponent = fixture.debugElement.query(By.directive(ModelingSubmissionComponent))?.componentInstance; + expect(modelingSubmissionComponent).toBeTruthy(); + }); + + it('should not show modeling submission when there is no submission or exercise', () => { fixture.detectChanges(); - const modelingEditor = fixture.debugElement.query(By.directive(ModelingEditorComponent)); - expect(modelingEditor).not.toBeNull(); - const modelingEditorComponent = modelingEditor.componentInstance; - expect(modelingEditorComponent.diagramType).toEqual(UMLDiagramType.ClassDiagram); - expect(modelingEditorComponent.umlModel).toEqual({ model: true }); - expect(modelingEditorComponent.readOnly).toBeTrue(); - expect(modelingEditorComponent.withExplanation).toEqual(!!mockSubmission.explanationText); - expect(modelingEditorComponent.explanation).toEqual(mockSubmission.explanationText); + + const modelingSubmissionComponent = fixture.debugElement.query(By.directive(ModelingSubmissionComponent))?.componentInstance; + expect(modelingSubmissionComponent).not.toBeTruthy(); }); }); diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts new file mode 100644 index 000000000000..22e88bb64873 --- /dev/null +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts @@ -0,0 +1,178 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ExerciseType } from 'app/entities/exercise.model'; +import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { ProgrammingExamSummaryComponent } from 'app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component'; +import { CloneRepoButtonComponent } from 'app/shared/components/clone-repo-button/clone-repo-button.component'; +import { FeedbackComponent } from 'app/exercises/shared/feedback/feedback.component'; +import { ProgrammingExerciseInstructionComponent } from 'app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component'; +import { ComplaintsStudentViewComponent } from 'app/complaints/complaints-for-students/complaints-student-view.component'; +import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; +import { ExerciseCacheService } from 'app/exercises/shared/exercise/exercise-cache.service'; +import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; +import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { User } from 'app/core/user/user.model'; +import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; +import { Exam } from 'app/entities/exam.model'; +import { ExerciseGroup } from 'app/entities/exercise-group.model'; +import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; +import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; +import { BehaviorSubject } from 'rxjs'; +import { MockProfileService } from '../../../../../helpers/mocks/service/mock-profile.service'; +import { SubmissionType } from 'app/entities/submission.model'; +import { ParticipationType } from 'app/entities/participation/participation.model'; +import { By } from '@angular/platform-browser'; +import dayjs from 'dayjs/esm'; +import { Result } from 'app/entities/result.model'; +import { Feedback } from 'app/entities/feedback.model'; +import { AssessmentType } from 'app/entities/assessment-type.model'; + +const user = { id: 1, name: 'Test User' } as User; + +const exam = { + id: 1, + title: 'ExamForTesting', + latestIndividualEndDate: dayjs().subtract(10, 'minutes'), +} as Exam; + +const exerciseGroup = { + exam, + title: 'exercise group', +} as ExerciseGroup; + +const programmingSubmission = { + id: 1, + type: SubmissionType.MANUAL, + commitHash: '123456789ab', +} as ProgrammingSubmission; + +const programmingParticipation = { + id: 4, + student: user, + submissions: [programmingSubmission], + type: ParticipationType.PROGRAMMING, + participantIdentifier: 'student1', + repositoryUrl: 'https://bitbucket.ase.in.tum.de/projects/TEST/repos/test-exercise', +} as ProgrammingExerciseStudentParticipation; + +const programmingExercise = { + id: 4, + type: ExerciseType.PROGRAMMING, + studentParticipations: [programmingParticipation], + exerciseGroup, + projectKey: 'TEST', + dueDate: dayjs().subtract(5, 'minutes'), +} as ProgrammingExercise; + +const feedbackReference = { + id: 1, + result: { id: 2 } as Result, + hasLongFeedback: false, +} as Feedback; + +const feedback = { + type: 'Test', + name: 'artemisApp.result.detail.feedback', + title: 'artemisApp.result.detail.test.passedTest', + positive: true, + credits: 3, + feedbackReference, +}; + +const result = { + id: 89, + participation: { + id: 55, + type: ParticipationType.PROGRAMMING, + participantIdentifier: 'student42', + repositoryUrl: 'https://bitbucket.ase.in.tum.de/projects/somekey/repos/somekey-student42', + }, + feedbacks: [feedback], + assessmentType: AssessmentType.MANUAL, +} as Result; + +describe('ProgrammingExamSummaryComponent', () => { + let component: ProgrammingExamSummaryComponent; + let fixture: ComponentFixture; + + let profileService: ProfileService; + + beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [ + ProgrammingExamSummaryComponent, + MockComponent(CloneRepoButtonComponent), + MockComponent(FeedbackComponent), + MockComponent(ProgrammingExerciseInstructionComponent), + MockComponent(ComplaintsStudentViewComponent), + MockPipe(ArtemisTranslatePipe), + ], + providers: [MockProvider(ExerciseService), MockProvider(ExerciseCacheService), { provide: ProfileService, useValue: new MockProfileService() }], + }) + .compileComponents() + .then(() => { + fixture = TestBed.createComponent(ProgrammingExamSummaryComponent); + component = fixture.componentInstance; + + component.exercise = programmingExercise; + programmingParticipation.results = [result]; + component.participation = programmingParticipation; + component.submission = programmingSubmission; + component.exam = exam; + + profileService = TestBed.inject(ProfileService); + + const commitHashURLTemplate = 'https://bitbucket.ase.in.tum.de/projects/{projectKey}/repos/{repoSlug}/commits/{commitHash}'; + const profileInfo = new ProfileInfo(); + profileInfo.commitHashURLTemplate = commitHashURLTemplate; + jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(new BehaviorSubject(profileInfo)); + }); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + it('should initialize', () => { + fixture.detectChanges(); + + expect(component).toBeTruthy(); + }); + + it('should set commitUrl', () => { + const spyOnGetProfileInfo = jest.spyOn(profileService, 'getProfileInfo'); + + fixture.detectChanges(); + + expect(spyOnGetProfileInfo).toHaveBeenCalledOnce(); + expect(component.commitHash).toBe('123456789ab'); + expect(component.commitUrl).toBe('https://bitbucket.ase.in.tum.de/projects/test/repos/test-student1/commits/123456789ab'); + }); + + it('should show result if present and results are published', () => { + component.isAfterResultsArePublished = true; + + fixture.detectChanges(); + + expect(component.feedbackComponentParameters.exercise).toEqual(programmingExercise); + expect(component.feedbackComponentParameters.result).toEqual(result); + expect(component.feedbackComponentParameters.exerciseType).toEqual(programmingExercise.type); + + const modelingSubmissionComponent = fixture.debugElement.query(By.directive(FeedbackComponent))?.componentInstance; + expect(modelingSubmissionComponent).toBeTruthy(); + }); + + it('should not show results if not yet published', () => { + component.isAfterResultsArePublished = false; + + fixture.detectChanges(); + + const modelingSubmissionComponent = fixture.debugElement.query(By.directive(FeedbackComponent))?.componentInstance; + expect(modelingSubmissionComponent).not.toBeTruthy(); + }); + + it('should display clone button', () => { + const modelingSubmissionComponent = fixture.debugElement.query(By.directive(CloneRepoButtonComponent))?.componentInstance; + expect(modelingSubmissionComponent).toBeTruthy(); + }); +}); diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts index 278296af2ea1..a6a54f521bfb 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts @@ -26,8 +26,7 @@ import { ArtemisQuizQuestionTypesModule } from 'app/exercises/quiz/shared/questi import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; import dayjs from 'dayjs/esm'; -import { MockModule, MockProvider } from 'ng-mocks'; -import { MockPipe } from 'ng-mocks'; +import { MockModule, MockPipe, MockProvider } from 'ng-mocks'; const multipleChoiceQuestion = { id: 1, type: QuizQuestionType.MULTIPLE_CHOICE } as MultipleChoiceQuestion; const wrongAnswerOption = { id: 1, isCorrect: false, question: multipleChoiceQuestion } as AnswerOption; @@ -86,7 +85,10 @@ describe('QuizExamSummaryComponent', () => { .then(() => { fixture = TestBed.createComponent(QuizExamSummaryComponent); component = fixture.componentInstance; - component.exercise = exercise; + component.quizParticipation = { + quizQuestions: exercise.quizQuestions!, + studentParticipations: exercise.studentParticipations, + }; component.submission = { id: 2, submittedAnswers: [] }; component.resultsPublished = true; component.exam = { id: 1 } as Exam; @@ -95,7 +97,7 @@ describe('QuizExamSummaryComponent', () => { it('should initialize', () => { component.exam = { id: 1, publishResultsDate: dayjs().subtract(1, 'hours') } as Exam; - fixture.detectChanges(); + component.ngOnChanges(); expect(component).not.toBeNull(); expect(component.exam).not.toBeNull(); expect(component.showMissingResultsNotice).toBeTrue(); @@ -103,7 +105,7 @@ describe('QuizExamSummaryComponent', () => { it('should initialize the solution dictionaries correctly', () => { component.submission = submissionWithAnswers; - fixture.detectChanges(); + component.ngOnChanges(); expect(component.selectedAnswerOptions.get(1)![0]).toEqual(correctAnswerOption); expect(component.getScoreForQuizQuestion(1)).toBe(1); expect(component.dragAndDropMappings.get(2)![0]).toEqual(correctDragAndDropMapping); diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts index dfb41fbc5034..7606478c4e1c 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts @@ -1,13 +1,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TextExamSummaryComponent } from 'app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component'; import { TextSubmission } from 'app/entities/text-submission.model'; +import { Exercise } from 'app/entities/exercise.model'; +import { TextEditorComponent } from 'app/exercises/text/participate/text-editor.component'; +import { MockComponent } from 'ng-mocks'; +import { By } from '@angular/platform-browser'; // Import By describe('TextExamSummaryComponent', () => { let fixture: ComponentFixture; let component: TextExamSummaryComponent; beforeEach(() => { - TestBed.configureTestingModule({ declarations: [TextExamSummaryComponent] }) + TestBed.configureTestingModule({ declarations: [TextExamSummaryComponent, MockComponent(TextEditorComponent)] }) .compileComponents() .then(() => { fixture = TestBed.createComponent(TextExamSummaryComponent); @@ -18,14 +22,18 @@ describe('TextExamSummaryComponent', () => { it('should initialize', () => { fixture.detectChanges(); expect(component).not.toBeNull(); - expect(fixture.debugElement.nativeElement.querySelector('div').innerHTML).toBe('No submission'); + expect(fixture.debugElement.nativeElement.querySelector('div').innerHTML).toContain('No submission'); }); it('should display the submission text', () => { const submissionText = 'A test submission text'; component.submission = { text: submissionText } as TextSubmission; + component.exercise = { studentParticipations: [{ id: 1 }] } as Exercise; fixture.detectChanges(); - expect(component).not.toBeNull(); - expect(fixture.debugElement.nativeElement.querySelector('div').innerHTML).toEqual(submissionText); + + const textEditorComponent = fixture.debugElement.query(By.directive(TextEditorComponent)).componentInstance; + expect(textEditorComponent).not.toBeNull(); + expect(textEditorComponent.participationId).toBe(1); + expect(textEditorComponent.inputSubmission.text).toBe(submissionText); }); }); diff --git a/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts index 8ed3b7b1de23..d61a00d3b545 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts @@ -271,7 +271,7 @@ describe('ExamResultOverviewComponent', () => { component.scrollToExercise(INVALID_EXERCISE_ID); - expect(consoleErrorMock).toHaveBeenCalledWith(expect.stringContaining('Could not find corresponding exercise with id')); + expect(consoleErrorMock).toHaveBeenCalledWith(expect.stringContaining('Cannot scroll to exercise, could not find exercise with corresponding id')); }); it('should return immediately when exerciseId is undefined', () => { @@ -282,41 +282,4 @@ describe('ExamResultOverviewComponent', () => { expect(consoleErrorSpy).not.toHaveBeenCalled(); }); }); - - describe('getAchievedPercentageByExerciseId', () => { - it('should return undefined if exercise result is undefined', () => { - component.studentExamWithGrade.studentResult.exerciseGroupIdToExerciseResult = {}; - const scoreAsPercentage = component.getAchievedPercentageByExerciseId(textExercise.id); - - expect(scoreAsPercentage).toBeUndefined(); - }); - - it('should calculate percentage based on achievedScore considering course settings', () => { - textExerciseResult.achievedScore = 60.6666; - - const scoreAsPercentage = component.getAchievedPercentageByExerciseId(textExercise.id); - - expect(scoreAsPercentage).toBe(60.67); - }); - - it('should calculate percentage based on maxScore and achievedPoints', () => { - textExerciseResult.achievedScore = undefined; - textExerciseResult.maxScore = 10; - textExerciseResult.achievedPoints = 6.066666; - component.studentExamWithGrade.studentExam!.exam!.course!.accuracyOfScores = 3; - - const scoreAsPercentage = component.getAchievedPercentageByExerciseId(textExercise.id); - - expect(scoreAsPercentage).toBe(60.667); - }); - - it('should return undefined if not set and not calculable', () => { - textExerciseResult.achievedScore = undefined; - textExerciseResult.achievedPoints = undefined; - - const scoreAsPercentage = component.getAchievedPercentageByExerciseId(textExercise.id); - - expect(scoreAsPercentage).toBeUndefined(); - }); - }); }); diff --git a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts index 86b1fcf29f83..27ce3c15be42 100644 --- a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts +++ b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts @@ -9,6 +9,7 @@ import { MockTranslateService } from '../../../../helpers/mocks/service/mock-tra import { TranslateService } from '@ngx-translate/core'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; +import { WorkingTimeChangeComponent } from 'app/exam/shared/working-time-change/working-time-change.component'; describe('ExamLiveEventComponent', () => { let component: ExamLiveEventComponent; @@ -16,7 +17,7 @@ describe('ExamLiveEventComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ExamLiveEventComponent, ArtemisTranslatePipe, ArtemisDatePipe, HtmlForMarkdownPipe, ArtemisDurationFromSecondsPipe], + declarations: [ExamLiveEventComponent, WorkingTimeChangeComponent, ArtemisTranslatePipe, ArtemisDatePipe, HtmlForMarkdownPipe, ArtemisDurationFromSecondsPipe], imports: [FontAwesomeModule], providers: [{ provide: TranslateService, useClass: MockTranslateService }], }).compileComponents(); @@ -62,8 +63,8 @@ describe('ExamLiveEventComponent', () => { fixture.detectChanges(); - const previousTimeElement = fixture.debugElement.query(By.css('.previous > .time')).nativeElement; - const newTimeElement = fixture.debugElement.query(By.css('.new > .time')).nativeElement; + const previousTimeElement = fixture.debugElement.query(By.css('[data-testid="old-time"]')).nativeElement; + const newTimeElement = fixture.debugElement.query(By.css('[data-testid="new-time"]')).nativeElement; const titleElement = fixture.debugElement.query(By.css('.wt-title')).nativeElement; expect(previousTimeElement.textContent).toContain('5min'); diff --git a/src/test/javascript/spec/component/exercises/quiz/quiz-participation.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/quiz-participation.component.spec.ts index df01ea324cc6..825195ba4a6a 100644 --- a/src/test/javascript/spec/component/exercises/quiz/quiz-participation.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/quiz-participation.component.spec.ts @@ -43,7 +43,15 @@ import { NgModel } from '@angular/forms'; // Store a copy of now to avoid timing issues const now = dayjs(); const question1: QuizQuestion = { id: 1, type: QuizQuestionType.DRAG_AND_DROP, points: 1, invalid: false, exportQuiz: false, randomizeOrder: true }; -const question2: MultipleChoiceQuestion = { id: 2, type: QuizQuestionType.MULTIPLE_CHOICE, points: 2, answerOptions: [], invalid: false, exportQuiz: false, randomizeOrder: true }; +const question2: MultipleChoiceQuestion = { + id: 2, + type: QuizQuestionType.MULTIPLE_CHOICE, + points: 2, + answerOptions: [{ id: 1 } as AnswerOption], + invalid: false, + exportQuiz: false, + randomizeOrder: true, +}; const question3: QuizQuestion = { id: 3, type: QuizQuestionType.SHORT_ANSWER, points: 3, invalid: false, exportQuiz: false, randomizeOrder: true }; const quizExercise: QuizExercise = { @@ -125,6 +133,7 @@ describe('QuizParticipationComponent', () => { let resultForSolutionServiceSpy: jest.SpyInstance; let httpMock: HttpTestingController; let exerciseService: QuizExerciseService; + let participationService: ParticipationService; describe('live mode', () => { beforeEach(() => { @@ -162,7 +171,7 @@ describe('QuizParticipationComponent', () => { fixture = TestBed.createComponent(QuizParticipationComponent); component = fixture.componentInstance; - const participationService = fixture.debugElement.injector.get(ParticipationService); + participationService = fixture.debugElement.injector.get(ParticipationService); const participation: StudentParticipation = { exercise: { ...quizExercise } }; participationSpy = jest .spyOn(participationService, 'findParticipationForCurrentUser') @@ -198,15 +207,56 @@ describe('QuizParticipationComponent', () => { expect(component.submission).not.toBeNull(); }); - it('should update in intervals', fakeAsync(() => { + it('should update in intervals of individual quiz', fakeAsync(() => { + const individualQuizExercise = { ...quizExercise }; + individualQuizExercise.quizMode = QuizMode.INDIVIDUAL; + individualQuizExercise.quizStarted = false; + individualQuizExercise.quizBatches = [ + { + startTime: dayjs(now).subtract(2, 'minutes'), + started: false, + }, + ]; + participationSpy = jest + .spyOn(participationService, 'findParticipationForCurrentUser') + .mockReturnValue(of({ body: { exercise: individualQuizExercise } } as HttpResponse)); + fixture.detectChanges(); + + const updateSpy = jest.spyOn(component, 'updateDisplayedTimes'); + const refreshSpy = jest.spyOn(component, 'refreshQuiz').mockImplementation(); + tick(5000); + fixture.detectChanges(); + discardPeriodicTasks(); + + expect(updateSpy).toHaveBeenCalledTimes(50); + expect(refreshSpy).toHaveBeenCalledOnce(); + })); + + it('should update in intervals of not individual quiz', fakeAsync(() => { + const notIndividualQuizExercise = { ...quizExercise }; + notIndividualQuizExercise.quizMode = QuizMode.SYNCHRONIZED; + notIndividualQuizExercise.quizStarted = false; + notIndividualQuizExercise.quizBatches = [ + { + startTime: dayjs(now).subtract(2, 'minutes'), + started: false, + }, + ]; + participationSpy = jest + .spyOn(participationService, 'findParticipationForCurrentUser') + .mockReturnValue(of({ body: { exercise: notIndividualQuizExercise } } as HttpResponse)); fixture.detectChanges(); const updateSpy = jest.spyOn(component, 'updateDisplayedTimes'); + const refreshSpy = jest.spyOn(component, 'refreshQuiz').mockImplementation(); tick(5000); fixture.detectChanges(); discardPeriodicTasks(); expect(updateSpy).toHaveBeenCalledTimes(50); + expect(refreshSpy).toHaveBeenCalledTimes(0); + + tick(5000); })); it('should check quiz end in intervals', fakeAsync(() => { @@ -249,7 +299,14 @@ describe('QuizParticipationComponent', () => { component.quizBatch!.startTime = undefined; // Returns the started exercise - const findStudentSpy = jest.spyOn(exerciseService, 'findForStudent').mockReturnValue(of({ body: quizExercise } as HttpResponse)); + const findStudentSpy = jest.spyOn(exerciseService, 'findForStudent').mockReturnValue( + of({ + body: { + ...quizExercise, + quizEnded: true, + }, + } as HttpResponse), + ); fixture.detectChanges(); const initLiveModeSpy = jest.spyOn(component, 'initLiveMode'); @@ -298,6 +355,11 @@ describe('QuizParticipationComponent', () => { }); it('should submit quiz', () => { + const individualQuizExercise = { ...quizExercise }; + individualQuizExercise.quizMode = QuizMode.INDIVIDUAL; + participationSpy = jest + .spyOn(participationService, 'findParticipationForCurrentUser') + .mockReturnValue(of({ body: { exercise: individualQuizExercise } } as HttpResponse)); fixture.detectChanges(); const submitButton = fixture.debugElement.nativeElement.querySelector('#submit-quiz button'); @@ -319,6 +381,9 @@ describe('QuizParticipationComponent', () => { component.quizExercise = { ...quizExercise, quizQuestions: undefined }; expect(component.areAllQuestionsAnswered()).toBeTrue(); + component.quizExercise = { ...quizExercise, quizQuestions: [] }; + expect(component.areAllQuestionsAnswered()).toBeTrue(); + component.quizExercise = quizExercise; component.selectedAnswerOptions = new Map(); component.selectedAnswerOptions.set(2, []); diff --git a/src/test/javascript/spec/component/exercises/quiz/quiz-scoring-info-student-modal.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/quiz-scoring-info-student-modal.component.spec.ts index 895492c0a50d..cd22daab498f 100644 --- a/src/test/javascript/spec/component/exercises/quiz/quiz-scoring-info-student-modal.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/quiz-scoring-info-student-modal.component.spec.ts @@ -13,7 +13,6 @@ import { ShortAnswerSpot } from 'app/entities/quiz/short-answer-spot.model'; import { ShortAnswerSubmittedText } from 'app/entities/quiz/short-answer-submitted-text.model'; import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model'; import { AnswerOption } from 'app/entities/quiz/answer-option.model'; -import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { Result } from 'app/entities/result.model'; import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model'; import { SubmittedAnswer } from 'app/entities/quiz/submitted-answer.model'; @@ -168,9 +167,7 @@ describe('Quiz Scoring Info Student Modal Component', () => { question.answerOptions = [correctAnswer1, wrongAnswer1]; comp.question = question; - const submittedExercise = new QuizExercise(undefined, undefined); - submittedExercise.quizQuestions = [question]; - comp.submittedQuizExercise = submittedExercise; + comp.quizQuestions = [question]; const submittedResult = new Result(); comp.multipleChoiceSubmittedResult = submittedResult; diff --git a/src/test/javascript/spec/component/file-upload-submission/file-upload-submission.component.spec.ts b/src/test/javascript/spec/component/file-upload-submission/file-upload-submission.component.spec.ts index 7d4db3d8ac14..1e52b847a7fb 100644 --- a/src/test/javascript/spec/component/file-upload-submission/file-upload-submission.component.spec.ts +++ b/src/test/javascript/spec/component/file-upload-submission/file-upload-submission.component.spec.ts @@ -16,7 +16,7 @@ import { MockComplaintService } from '../../helpers/mocks/service/mock-complaint import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable'; import { routes } from 'app/exercises/file-upload/participate/file-upload-participation.route'; import { FileUploadSubmissionComponent } from 'app/exercises/file-upload/participate/file-upload-submission.component'; -import { MockFileUploadSubmissionService, createFileUploadSubmission } from '../../helpers/mocks/service/mock-file-upload-submission.service'; +import { MockFileUploadSubmissionService, createFileUploadSubmission, fileUploadParticipation } from '../../helpers/mocks/service/mock-file-upload-submission.service'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { fileUploadExercise } from '../../helpers/mocks/service/mock-file-upload-exercise.service'; import { MAX_SUBMISSION_FILE_SIZE } from 'app/shared/constants/input.constants'; @@ -396,4 +396,25 @@ describe('FileUploadSubmissionComponent', () => { expect(comp.submittedFileName).toBe(fileName + '.pdf'); expect(comp.submittedFileExtension).toBe('pdf'); }); + + it('should be set up with input values if present instead of loading new values from server', () => { + // @ts-ignore method is private + const setUpComponentWithInputValuesSpy = jest.spyOn(comp, 'setupComponentWithInputValues'); + const getDataForFileUploadEditorSpy = jest.spyOn(fileUploadSubmissionService, 'getDataForFileUploadEditor'); + const fileUploadSubmission = createFileUploadSubmission(); + fileUploadSubmission.submitted = true; + comp.inputExercise = fileUploadExercise; + comp.inputSubmission = fileUploadSubmission; + comp.inputParticipation = fileUploadParticipation; + + fixture.detectChanges(); + + expect(setUpComponentWithInputValuesSpy).toHaveBeenCalledOnce(); + expect(comp.fileUploadExercise).toEqual(fileUploadExercise); + expect(comp.submission).toEqual(fileUploadSubmission); + expect(comp.participation).toEqual(fileUploadParticipation); + + // should not fetch additional information from server, reason for input values! + expect(getDataForFileUploadEditorSpy).not.toHaveBeenCalled(); + }); }); diff --git a/src/test/javascript/spec/component/iris/state-store.service.spec.ts b/src/test/javascript/spec/component/iris/state-store.service.spec.ts index ad5cdba0554e..a57af8623f19 100644 --- a/src/test/javascript/spec/component/iris/state-store.service.spec.ts +++ b/src/test/javascript/spec/component/iris/state-store.service.spec.ts @@ -16,6 +16,7 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { mockClientMessage, mockServerMessage, mockState } from '../../helpers/sample/iris-sample-data'; import { IrisErrorMessageKey, errorMessages } from 'app/entities/iris/iris-errors.model'; +import { IrisRateLimitInformation } from 'app/iris/websocket.service'; describe('IrisStateStore', () => { let stateStore: IrisStateStore; @@ -371,7 +372,7 @@ describe('IrisStateStore', () => { const promise = obs.pipe(skip(1), take(1)).toPromise(); - stateStore.dispatch(new RateLimitUpdatedAction(1, 2)); + stateStore.dispatch(new RateLimitUpdatedAction(new IrisRateLimitInformation(1, 2, 3))); const state = (await promise) as MessageStoreState; @@ -380,6 +381,7 @@ describe('IrisStateStore', () => { error: null, currentMessageCount: 1, rateLimit: 2, + rateLimitTimeframeHours: 3, }); }); @@ -388,7 +390,7 @@ describe('IrisStateStore', () => { const promise = obs.pipe(skip(1), take(1)).toPromise(); - stateStore.dispatch(new RateLimitUpdatedAction(2, 2)); + stateStore.dispatch(new RateLimitUpdatedAction(new IrisRateLimitInformation(2, 2, 3))); const state = (await promise) as MessageStoreState; @@ -397,6 +399,7 @@ describe('IrisStateStore', () => { error: errorMessages[IrisErrorMessageKey.RATE_LIMIT_EXCEEDED], currentMessageCount: 2, rateLimit: 2, + rateLimitTimeframeHours: 3, }); }); }); diff --git a/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts b/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts index ac0d270ae7ea..e152d95a6df4 100644 --- a/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts @@ -10,7 +10,7 @@ import { MockParticipationWebsocketService } from '../../helpers/mocks/service/m import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { TranslateService } from '@ngx-translate/core'; import { RouterTestingModule } from '@angular/router/testing'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { ChangeDetectorRef, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; @@ -44,7 +44,7 @@ import { HttpResponse } from '@angular/common/http'; import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model'; import { AlertService } from 'app/core/util/alert.service'; -describe('ModelingSubmission Management Component', () => { +describe('ModelingSubmissionComponent', () => { // needed to make sure ace is defined ace.acequire('ace/ext/modelist.js'); let comp: ModelingSubmissionComponent; @@ -52,7 +52,6 @@ describe('ModelingSubmission Management Component', () => { let debugElement: DebugElement; let service: ModelingSubmissionService; let alertService: AlertService; - let router: Router; const route = { params: of({ courseId: 5, exerciseId: 22, participationId: 123 }) } as any as ActivatedRoute; const participation = new StudentParticipation(); @@ -99,7 +98,6 @@ describe('ModelingSubmission Management Component', () => { debugElement = fixture.debugElement; service = debugElement.injector.get(ModelingSubmissionService); alertService = debugElement.injector.get(AlertService); - router = debugElement.injector.get(Router); comp.modelingEditor = TestBed.createComponent(MockComponent(ModelingEditorComponent)).componentInstance; }); console.error = jest.fn(); @@ -191,11 +189,12 @@ describe('ModelingSubmission Management Component', () => { expect(comp.isActive).toBeFalse(); }); - it('should navigate to access denied page on 403 error status', () => { + it('should catch error on 403 error status', () => { jest.spyOn(service, 'getLatestSubmissionForModelingEditor').mockReturnValue(throwError(() => ({ status: 403 }))); - const routerStub = jest.spyOn(router, 'navigate').mockReturnValue(new Promise(() => true)); + const alertServiceSpy = jest.spyOn(alertService, 'error'); fixture.detectChanges(); - expect(routerStub).toHaveBeenCalledOnce(); + + expect(alertServiceSpy).toHaveBeenCalledOnce(); }); it('should set correct properties on modeling exercise update when saving', () => { @@ -464,4 +463,33 @@ describe('ModelingSubmission Management Component', () => { expect(referencedFeedback).toHaveLength(1); expect(referencedFeedback![0].isSubsequent).toBeTrue(); }); + + it('should be set up with input values if present instead of loading new values from server', () => { + // @ts-ignore method is private + const setUpComponentWithInputValuesSpy = jest.spyOn(comp, 'setupComponentWithInputValues'); + const getDataForFileUploadEditorSpy = jest.spyOn(service, 'getLatestSubmissionForModelingEditor'); + const modelingSubmission = submission; + modelingSubmission.model = JSON.stringify({ + elements: [ + { + content: 'some element', + }, + ], + }); + comp.inputExercise = participation.exercise; + comp.inputSubmission = modelingSubmission; + comp.inputParticipation = participation; + + fixture.detectChanges(); + + expect(setUpComponentWithInputValuesSpy).toHaveBeenCalledOnce(); + expect(comp.modelingExercise).toEqual(participation.exercise); + expect(comp.submission).toEqual(modelingSubmission); + expect(comp.participation).toEqual(participation); + expect(comp.umlModel).toBeTruthy(); + expect(comp.hasElements).toBeTrue(); + + // should not fetch additional information from server, reason for input values! + expect(getDataForFileUploadEditorSpy).not.toHaveBeenCalled(); + }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts index f2a888d281fc..f488e31968f6 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts @@ -11,7 +11,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ProgrammingExerciseInstructorTriggerBuildButtonComponent } from 'app/exercises/programming/shared/actions/programming-exercise-instructor-trigger-build-button.component'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { of } from 'rxjs'; import { ParticipationType } from 'app/entities/participation/participation.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; diff --git a/src/test/javascript/spec/component/shared/date-time-picker.component.spec.ts b/src/test/javascript/spec/component/shared/date-time-picker.component.spec.ts index e2220d7505a5..46d0a9fc5a91 100644 --- a/src/test/javascript/spec/component/shared/date-time-picker.component.spec.ts +++ b/src/test/javascript/spec/component/shared/date-time-picker.component.spec.ts @@ -36,13 +36,13 @@ describe('FormDateTimePickerComponent', () => { describe('test date conversion', () => { let convertedDate: Date | null; it('should convert the dayjs if it is not undefined', () => { - convertedDate = component.convert(normalDate); + convertedDate = component.convertToDate(normalDate); expect(convertedDate).toEqual(normalDateAsDateObject); }); it('should return null if dayjs is undefined', () => { - convertedDate = component.convert(); + convertedDate = component.convertToDate(); expect(convertedDate).toBeNull(); }); @@ -52,7 +52,7 @@ describe('FormDateTimePickerComponent', () => { expect(unconvertedDate.isValid()).toBeFalse(); - convertedDate = component.convert(unconvertedDate); + convertedDate = component.convertToDate(unconvertedDate); expect(convertedDate).toBeNull(); }); @@ -73,16 +73,19 @@ describe('FormDateTimePickerComponent', () => { }); it('should register callback function', () => { - const testCallBackFunction = (date: dayjs.Dayjs) => 'I am a test callbackFunction: ' + date.toDate(); + const onChangeSpy = jest.fn(); + component.registerOnChange(onChangeSpy); - component.registerOnChange(testCallBackFunction); + (component as any).onChange?.(normalDate); - expect(component._onChange(normalDate)).toBe(testCallBackFunction(normalDate)); + expect(onChangeSpy).toHaveBeenCalledOnce(); + expect(onChangeSpy).toHaveBeenCalledWith(normalDate); }); it('should update field', () => { + const onChangeSpy = jest.fn(); + component.registerOnChange(onChangeSpy); const valueChangedStub = jest.spyOn(component, 'valueChanged').mockImplementation(); - const onChangeSpy = jest.spyOn(component, '_onChange'); const newDate = normalDate.add(2, 'days'); component.value = normalDate; diff --git a/src/test/javascript/spec/component/shared/feedback/feedback.component.spec.ts b/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts similarity index 90% rename from src/test/javascript/spec/component/shared/feedback/feedback.component.spec.ts rename to src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts index 97a130ae2fd6..44e50126971c 100644 --- a/src/test/javascript/spec/component/shared/feedback/feedback.component.spec.ts +++ b/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts @@ -26,6 +26,8 @@ import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { BehaviorSubject, of, throwError } from 'rxjs'; import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service'; import { ArtemisTestModule } from '../../../test.module'; +import { SimpleChange } from '@angular/core'; +import { FeedbackGroup } from 'app/exercises/shared/feedback/group/feedback-group'; describe('FeedbackComponent', () => { let comp: FeedbackComponent; @@ -273,7 +275,7 @@ describe('FeedbackComponent', () => { comp.ngOnInit(); expect(comp.getCommitHash()).toBe('123456789ab'); - expect(comp.getCommitUrl()).toBe('https://bitbucket.ase.in.tum.de/projects/somekey/repos/somekey-student42/commits/123456789ab'); + expect(comp.commitUrl).toBe('https://bitbucket.ase.in.tum.de/projects/somekey/repos/somekey-student42/commits/123456789ab'); }); it('should not try to retrieve the feedbacks from the server if provided result has feedbacks', () => { @@ -408,4 +410,36 @@ describe('FeedbackComponent', () => { expect(createSpy).toHaveBeenCalledWith(feedbacks, true); }); + + it('should expand feedback when being printed', () => { + // @ts-ignore method is private + const expandFeedbackItemGroupsSpy = jest.spyOn(comp, 'expandFeedbackItemGroups'); + + const feedbackItem = generateManualFeedbackPair(true, 'Positive', 'This is good', 4).item; + const feedbackItem1 = generateManualFeedbackPair(true, 'Positive', 'This is good', 4).item; + + const feedbackGroup: FeedbackGroup = { ...feedbackItem, members: [feedbackItem1], open: false } as unknown as FeedbackGroup; + comp.feedbackItemNodes = [feedbackGroup]; + + // start printing => expand feedback + const previousValue = undefined; + const currentValue = true; + const firstChange = false; + const startPrinting = new SimpleChange(previousValue, currentValue, firstChange); + comp.ngOnChanges({ isPrinting: startPrinting }); + + expect(expandFeedbackItemGroupsSpy).toHaveBeenCalledOnce(); + expect(feedbackGroup.open).toBeTrue(); + + // stop printing => collapse feedback (as it was collapsed before) + const stopPrinting = new SimpleChange(true, false, false); + comp.ngOnChanges({ isPrinting: stopPrinting }); + + expect(expandFeedbackItemGroupsSpy).toHaveBeenCalledOnce(); // should not have been called again + + /** + * references were removed during saving old state => cannot use {@link feedbackGroup} for comparison anymore + */ + expect((comp.feedbackItemNodes[0] as unknown as FeedbackGroup).open).toBeFalse(); + }); }); diff --git a/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts b/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts index 1f0595cb0105..8cf036109027 100644 --- a/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts @@ -128,6 +128,18 @@ describe('Notification Sidebar Component', () => { expect(notificationService.subscribeToLoadingStateUpdates).toHaveBeenCalledOnce(); expect(notificationSidebarComponent.sortedNotifications).toHaveLength(notifications.length); }); + + /** + * The notification-sidebar overlaps the exam summary when being printed, + * so it needs to be hidden for printing for which the display property of + * the notification sidebar is used + * + * If the id is changed it needs to be changed in {@link ThemeService#print} as well + */ + test('should exist with the id "notification-sidebar"', () => { + const notificationSidebar = document.getElementById('notification-sidebar'); + expect(notificationSidebar).toBeTruthy(); + }); }); describe('Notification Translations', () => { diff --git a/src/test/javascript/spec/component/shared/result.component.spec.ts b/src/test/javascript/spec/component/shared/result.component.spec.ts index 51065b477f6d..642a522d5328 100644 --- a/src/test/javascript/spec/component/shared/result.component.spec.ts +++ b/src/test/javascript/spec/component/shared/result.component.spec.ts @@ -5,21 +5,77 @@ import { ResultTemplateStatus } from 'app/exercises/shared/result/result.utils'; import { SimpleChange } from '@angular/core'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; +import { Result } from 'app/entities/result.model'; +import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; +import { MockPipe } from 'ng-mocks'; +import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe'; +import { Exercise, ExerciseType } from 'app/entities/exercise.model'; +import { AssessmentType } from 'app/entities/assessment-type.model'; +import { Participation, ParticipationType } from 'app/entities/participation/participation.model'; +import dayjs from 'dayjs/esm'; +import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module'; +import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; +import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import * as utils from 'app/exercises/shared/feedback/feedback.utils'; +import { FeedbackComponentPreparedParams } from 'app/exercises/shared/feedback/feedback.utils'; +import { FeedbackComponent } from 'app/exercises/shared/feedback/feedback.component'; + +const mockExercise: Exercise = { + id: 1, + title: 'Sample Exercise', + maxPoints: 100, + dueDate: dayjs().subtract(3, 'hours'), + assessmentType: AssessmentType.AUTOMATIC, +} as Exercise; + +const mockParticipation: Participation = { + id: 1, + type: ParticipationType.STUDENT, + exercise: mockExercise, +}; + +const mockResult: Result = { + id: 1, + completionDate: dayjs().subtract(2, 'hours'), + score: 85, + rated: true, + feedbacks: [ + { + id: 1, + text: 'Well done!', + }, + ], + participation: mockParticipation, +}; + +const preparedFeedback: FeedbackComponentPreparedParams = { + exercise: mockExercise, + result: mockResult, + exerciseType: ExerciseType.PROGRAMMING, + showScoreChart: true, + messageKey: 'artemisApp.result.notLatestSubmission', + latestDueDate: dayjs().subtract(1, 'hours'), + showMissingAutomaticFeedbackInformation: true, +}; describe('ResultComponent', () => { let comp: ResultComponent; let fixture: ComponentFixture; + let modalService: NgbModal; beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule], - declarations: [ResultComponent, TranslatePipeMock], - providers: [], + imports: [ArtemisTestModule, NgbTooltipMocksModule], + declarations: [ResultComponent, TranslatePipeMock, MockPipe(ArtemisDatePipe), MockPipe(ArtemisTimeAgoPipe)], + providers: [{ provide: NgbModal, useClass: MockNgbModalService }], }) .compileComponents() .then(() => { fixture = TestBed.createComponent(ResultComponent); comp = fixture.componentInstance; + modalService = TestBed.inject(NgbModal); + + fixture.detectChanges(); }); }); @@ -49,4 +105,54 @@ describe('ResultComponent', () => { expect(comp.templateStatus).toEqual(ResultTemplateStatus.IS_BUILDING); }); + + describe('should display HAS_RESULT status properly', () => { + const RESULT_SCORE_SELECTOR = '#result-score'; + + it('should not display if result is not present', () => { + const button = fixture.debugElement.nativeElement.querySelector(RESULT_SCORE_SELECTOR); + expect(button).not.toBeTruthy(); + }); + + it('should display result if present', () => { + comp.result = mockResult; + comp.templateStatus = ResultTemplateStatus.HAS_RESULT; + + fixture.detectChanges(); + + const button = fixture.debugElement.nativeElement.querySelector(RESULT_SCORE_SELECTOR); + expect(button).toBeTruthy(); + }); + + it('should display modal onClick and initialize results modal', () => { + const mockModalRef: NgbModalRef = { componentInstance: {} } as NgbModalRef; + const modalComponentInstance: FeedbackComponent = mockModalRef.componentInstance; + + const showDetailsSpy = jest.spyOn(comp, 'showDetails'); + const openModalSpy = jest.spyOn(modalService, 'open').mockReturnValue(mockModalRef); + const prepareFeedbackSpy = jest.spyOn(utils, 'prepareFeedbackComponentParameters').mockReturnValue(preparedFeedback); + + comp.exercise = preparedFeedback.exercise; + comp.result = mockResult; + comp.templateStatus = ResultTemplateStatus.HAS_RESULT; + + fixture.detectChanges(); + + const button = fixture.debugElement.nativeElement.querySelector(RESULT_SCORE_SELECTOR); + expect(button).toBeTruthy(); + + button.dispatchEvent(new Event('click')); + + expect(showDetailsSpy).toHaveBeenCalled(); + expect(openModalSpy).toHaveBeenCalled(); + expect(prepareFeedbackSpy).toHaveBeenCalledOnce(); + expect(modalComponentInstance.exercise).toEqual(preparedFeedback.exercise); + expect(modalComponentInstance.result).toEqual(preparedFeedback.result); + expect(modalComponentInstance.exerciseType).toEqual(preparedFeedback.exerciseType); + expect(modalComponentInstance.showScoreChart).toEqual(preparedFeedback.showScoreChart); + expect(modalComponentInstance.messageKey).toEqual(preparedFeedback.messageKey); + expect(modalComponentInstance.latestDueDate).toEqual(preparedFeedback.latestDueDate); + expect(modalComponentInstance.showMissingAutomaticFeedbackInformation).toEqual(preparedFeedback.showMissingAutomaticFeedbackInformation); + }); + }); }); diff --git a/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts b/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts index d08cc2d5d920..653989626b68 100644 --- a/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts +++ b/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts @@ -113,6 +113,22 @@ describe('TextEditorComponent', () => { jest.restoreAllMocks(); }); + it('should use inputValues if present instead of loading new details', fakeAsync(() => { + comp.inputExercise = textExercise; + comp.inputParticipation = participation; + + // @ts-ignore updateParticipation is private + const updateParticipationSpy = jest.spyOn(comp, 'updateParticipation'); + // @ts-ignore setupComponentWithInputValuesSpy is private + const setupComponentWithInputValuesSpy = jest.spyOn(comp, 'setupComponentWithInputValues'); + + fixture.detectChanges(); + + expect(getTextForParticipationStub).not.toHaveBeenCalled(); + expect(updateParticipationSpy).not.toHaveBeenCalled(); + expect(setupComponentWithInputValuesSpy).toHaveBeenCalled(); + })); + it('should not allow to submit after the due date if there is no due date', fakeAsync(() => { const participationSubject = new BehaviorSubject(participation); getTextForParticipationStub.mockReturnValue(participationSubject); diff --git a/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts b/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts index b3189e54388e..355bed4320fa 100644 --- a/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts +++ b/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts @@ -31,7 +31,8 @@ import { TextBlockRef } from 'app/entities/text-block-ref.model'; import { UnreferencedFeedbackComponent } from 'app/exercises/shared/unreferenced-feedback/unreferenced-feedback.component'; import { AlertService } from 'app/core/util/alert.service'; import { DebugElement } from '@angular/core'; -import { ConfirmAutofocusButtonComponent, ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-button.component'; +import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; +import { ConfirmAutofocusButtonComponent } from 'app/shared/components/confirm-autofocus-button.component'; describe('ExampleTextSubmissionComponent', () => { let fixture: ComponentFixture; @@ -109,7 +110,10 @@ describe('ExampleTextSubmissionComponent', () => { it('should fetch example submission with result for existing example submission and switch to edit state', async () => { // GIVEN // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; jest.spyOn(exerciseService, 'find').mockReturnValue(httpResponse(exercise)); jest.spyOn(exampleSubmissionService, 'get').mockReturnValue(httpResponse(exampleSubmission)); jest.spyOn(assessmentsService, 'getExampleResult').mockReturnValue(of(result)); @@ -127,7 +131,10 @@ describe('ExampleTextSubmissionComponent', () => { it('should mark text blocks not included in the example submission correctly', async () => { // GIVEN // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; // @ts-ignore activatedRouteSnapshot.queryParamMap.params = { toComplete: true }; jest.spyOn(exerciseService, 'find').mockReturnValue(httpResponse(exercise)); @@ -209,7 +216,10 @@ describe('ExampleTextSubmissionComponent', () => { jest.spyOn(exampleSubmissionService, 'get').mockReturnValue(httpResponse(exampleSubmission)); // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; await comp.ngOnInit(); comp.exercise = exercise; @@ -227,7 +237,10 @@ describe('ExampleTextSubmissionComponent', () => { it('should save assessment', async () => { // GIVEN // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; await comp.ngOnInit(); comp.exercise = exercise; @@ -312,7 +325,10 @@ describe('ExampleTextSubmissionComponent', () => { it('should verify correct tutorial submission', async () => { // GIVEN // @ts-ignore - activatedRouteSnapshot.paramMap.params = { exerciseId: EXERCISE_ID, exampleSubmissionId: EXAMPLE_SUBMISSION_ID }; + activatedRouteSnapshot.paramMap.params = { + exerciseId: EXERCISE_ID, + exampleSubmissionId: EXAMPLE_SUBMISSION_ID, + }; // @ts-ignore activatedRouteSnapshot.queryParamMap.params = { toComplete: true }; jest.spyOn(exerciseService, 'find').mockReturnValue(httpResponse(exercise)); diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-websocket.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-websocket.service.ts index f6f031a41f54..102ff4b0075d 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-websocket.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-websocket.service.ts @@ -10,6 +10,10 @@ export class MockWebsocketService implements IWebsocketService { enableReconnect(): void {} + isConnected(): boolean { + return true; + } + receive(): Observable { return of(); } diff --git a/src/test/javascript/spec/helpers/sample/iris-sample-data.ts b/src/test/javascript/spec/helpers/sample/iris-sample-data.ts index b3e9809c9296..3ddd3a622734 100644 --- a/src/test/javascript/spec/helpers/sample/iris-sample-data.ts +++ b/src/test/javascript/spec/helpers/sample/iris-sample-data.ts @@ -76,4 +76,5 @@ export const mockState = { serverResponseTimeout: null, currentMessageCount: -1, rateLimit: -1, + rateLimitTimeframeHours: -1, }; diff --git a/src/test/javascript/spec/integration/course/course-overview-exercise-list-controls.integration.spec.ts b/src/test/javascript/spec/integration/course/course-overview-exercise-list-controls.integration.spec.ts index 16c4860fc8f2..1a6c70291a98 100644 --- a/src/test/javascript/spec/integration/course/course-overview-exercise-list-controls.integration.spec.ts +++ b/src/test/javascript/spec/integration/course/course-overview-exercise-list-controls.integration.spec.ts @@ -23,6 +23,8 @@ import { ActivatedRoute, Router } from '@angular/router'; import { MockRouter } from '../../helpers/mocks/mock-router'; import { NgModel } from '@angular/forms'; import { CourseStorageService } from 'app/course/manage/course-storage.service'; +import { CourseExercisesGroupedByCategoryComponent } from 'app/overview/course-exercises/course-exercises-grouped-by-category.component'; +import { CourseExercisesGroupedByWeekComponent } from 'app/overview/course-exercises/course-exercises-grouped-by-week.component'; describe('CourseOverviewExerciseListControls', () => { let parentFixture: ComponentFixture; @@ -47,6 +49,8 @@ describe('CourseOverviewExerciseListControls', () => { MockDirective(NgModel), MockComponent(SidePanelComponent), MockComponent(HeaderCourseComponent), + MockComponent(CourseExercisesGroupedByCategoryComponent), + MockComponent(CourseExercisesGroupedByWeekComponent), TranslatePipeMock, MockPipe(ArtemisDatePipe), MockTranslateValuesDirective, diff --git a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts index bb8e3783a326..c30b6f7d69a8 100644 --- a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts +++ b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts @@ -1,3 +1,5 @@ +import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { FeedbackGroup } from 'app/exercises/shared/feedback/group/feedback-group'; import { ProgrammingFeedbackItemService } from 'app/exercises/shared/feedback/item/programming-feedback-item.service'; import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER, SUBMISSION_POLICY_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model'; import { TranslateService } from '@ngx-translate/core'; @@ -6,6 +8,7 @@ import { GradingInstruction } from 'app/exercises/shared/structured-grading-crit describe('ProgrammingFeedbackItemService', () => { let service: ProgrammingFeedbackItemService; + const exercise = new ProgrammingExercise(undefined, undefined); beforeEach(() => { const fake = { instant: (key: string) => key }; @@ -171,6 +174,32 @@ describe('ProgrammingFeedbackItemService', () => { expect(service.create([feedback], true)).toEqual([expected]); }); + it('should handle not executed tests', () => { + const feedbacks: Feedback[] = [{ text: 'test1', type: FeedbackType.AUTOMATIC, credits: 0, detailText: 'Test was not executed.' }]; + + const items = service.create(feedbacks, false); + const groups = service.group(items, exercise) as FeedbackGroup[]; + + expect(groups).toBeArrayOfSize(1); + + const wrongGroup = groups.find((group) => group.name === 'wrong'); + const feedbackInGroup = wrongGroup!.members[0].feedbackReference; + expect(feedbackInGroup).toEqual(feedbacks[0]); + }); + + it('should handle automatic feedback with missing positive attribute', () => { + const feedbacks: Feedback[] = [{ text: 'test1', type: FeedbackType.AUTOMATIC, credits: 2 }]; + + const items = service.create(feedbacks, false); + const groups = service.group(items, exercise) as FeedbackGroup[]; + + expect(groups).toBeArrayOfSize(1); + + const correctGroup = groups.find((group) => group.name === 'correct'); + const feedbackInGroup = correctGroup!.members[0].feedbackReference; + expect(feedbackInGroup).toEqual(feedbacks[0]); + }); + const createSCAFeedback = (): Feedback => { const scaIssue = { rule: 'rule', diff --git a/src/test/javascript/spec/service/quiz.service.spec.ts b/src/test/javascript/spec/service/quiz.service.spec.ts index 2b0d3d7c3eae..d878ec1070b6 100644 --- a/src/test/javascript/spec/service/quiz.service.spec.ts +++ b/src/test/javascript/spec/service/quiz.service.spec.ts @@ -184,14 +184,14 @@ describe('Quiz Service', () => { it('shuffles order of Answer options', () => { const quizExercise: any = Object.assign({}, quiz, { quizQuestions: [multipleChoice] }); - service.randomizeOrder(quizExercise); + service.randomizeOrder(quizExercise.quizQuestions, quizExercise.randomizeQuestionOrder); expect(quizExercise.quizQuestions[0].answerOptions).toStrictEqual(shuffledAnswers); }); it('switches order of Quiz Questions', () => { - const quizExercise = Object.assign({}, quiz, { quizQuestions: [shortAnswer, multipleChoice] }); + const quizExercise: any = Object.assign({}, quiz, { quizQuestions: [shortAnswer, multipleChoice] }); const expected = Object.assign({}, quiz, { quizQuestions: [multipleChoice, shortAnswer] }); - service.randomizeOrder(quizExercise); + service.randomizeOrder(quizExercise.quizQuestions, quizExercise.randomizeQuestionOrder); expect(quizExercise).toStrictEqual(expected); }); }); diff --git a/src/test/javascript/spec/service/theme.service.spec.ts b/src/test/javascript/spec/service/theme.service.spec.ts index 7a0f6bcc7c23..16441b4c4bd8 100644 --- a/src/test/javascript/spec/service/theme.service.spec.ts +++ b/src/test/javascript/spec/service/theme.service.spec.ts @@ -141,8 +141,10 @@ describe('ThemeService', () => { }); it('does print correctly', fakeAsync(() => { + const initialDisplayClass = 'someDisplayClass'; + const winSpy = jest.spyOn(window, 'print').mockImplementation(); - const returnedElement = { rel: 'stylesheet' }; + const returnedElement = { rel: 'stylesheet', style: { display: initialDisplayClass } }; const docSpy = jest.spyOn(document, 'getElementById').mockReturnValue(returnedElement as any as HTMLElement); service.print(); @@ -151,8 +153,11 @@ describe('ThemeService', () => { expect(docSpy).toHaveBeenCalledWith(THEME_OVERRIDE_ID); expect(returnedElement.rel).toBe('none-tmp'); tick(250); + expect(docSpy).toHaveBeenCalledWith('notification-sidebar'); + expect(docSpy).toHaveBeenCalledTimes(3); // 1x for theme override, 2x for notification sidebar (changing style to display: none and back to initial value) expect(winSpy).toHaveBeenCalledOnce(); tick(250); expect(returnedElement.rel).toBe('stylesheet'); + expect(returnedElement.style.display).toBe(initialDisplayClass); })); }); diff --git a/src/test/resources/config/application-iris.yml b/src/test/resources/config/application-iris.yml index dced5f46f5a8..074ded544b64 100644 --- a/src/test/resources/config/application-iris.yml +++ b/src/test/resources/config/application-iris.yml @@ -2,5 +2,3 @@ artemis: iris: url: "http://iris.fake" secret-token: "secret-token" - rate-limit: 100000 - rate-limit-timeframe-hours: 1