From 58e01dde90b629965cfd42008cddb30ca5e3afd7 Mon Sep 17 00:00:00 2001 From: Lucas <24826124+Luro02@users.noreply.github.com> Date: Thu, 14 Dec 2023 12:53:44 +0100 Subject: [PATCH 1/5] Add support for non-instructors (#9) * only prompt to select a course when you have a choice * allow tutors to use the tool --- .../java/edu/kit/kastel/sdq/scorestats/cli/CLI.java | 9 ++++++--- .../core/client/Artemis4JArtemisClient.java | 11 +++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/kit/kastel/sdq/scorestats/cli/CLI.java b/src/main/java/edu/kit/kastel/sdq/scorestats/cli/CLI.java index d1135c3..56d8552 100644 --- a/src/main/java/edu/kit/kastel/sdq/scorestats/cli/CLI.java +++ b/src/main/java/edu/kit/kastel/sdq/scorestats/cli/CLI.java @@ -67,10 +67,13 @@ public void run(String[] args) { courses.sort(Comparator.comparing(Course::getCourseId)); try (Scanner scanner = new Scanner(System.in)) { - - OptionDialogue courseDialogue = new OptionDialogue<>(scanner, "Please select the course:", + Course course = courses.get(0); + // only prompt if there is more than one course to select from + if (courses.size() > 1) { + OptionDialogue courseDialogue = new OptionDialogue<>(scanner, "Please select the course:", courses.stream().collect(Collectors.toMap(Course::getShortName, item -> item, (i1, i2) -> null, LinkedHashMap::new))); - Course course = courseDialogue.prompt(); + course = courseDialogue.prompt(); + } List exercises; try { diff --git a/src/main/java/edu/kit/kastel/sdq/scorestats/core/client/Artemis4JArtemisClient.java b/src/main/java/edu/kit/kastel/sdq/scorestats/core/client/Artemis4JArtemisClient.java index 73665b0..d88b0c4 100644 --- a/src/main/java/edu/kit/kastel/sdq/scorestats/core/client/Artemis4JArtemisClient.java +++ b/src/main/java/edu/kit/kastel/sdq/scorestats/core/client/Artemis4JArtemisClient.java @@ -3,6 +3,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -13,6 +14,7 @@ import edu.kit.kastel.sdq.artemis4j.api.artemis.assessment.Feedback; import edu.kit.kastel.sdq.artemis4j.api.artemis.assessment.Result; import edu.kit.kastel.sdq.artemis4j.api.artemis.assessment.Submission; +import edu.kit.kastel.sdq.artemis4j.api.client.ISubmissionsArtemisClient; import edu.kit.kastel.sdq.artemis4j.api.grading.IAnnotation; import edu.kit.kastel.sdq.artemis4j.client.AssessmentArtemisClient; import edu.kit.kastel.sdq.artemis4j.client.RestClientManager; @@ -26,7 +28,7 @@ /** * An {@link ArtemisClient} using artemis4j. - * + * * @author Moritz Hertler * @version 1.0 */ @@ -51,8 +53,13 @@ public List loadCourses() throws ArtemisClientException { } public Assessments loadAssessments(Exercise exercise, ExerciseConfig config) throws ArtemisClientException { + ISubmissionsArtemisClient submissionsClient = this.client.getSubmissionArtemisClient(); - List submissions = this.client.getSubmissionArtemisClient().getSubmissions(exercise); + Collection submissions = new ArrayList<>(submissionsClient.getSubmissions(exercise, 0, false)); + + if (exercise.hasSecondCorrectionRound()) { + submissions.addAll(submissionsClient.getSubmissions(exercise, 1, false)); + } AnnotationDeserializer deserializer = null; if (config != null) { From 29093e597ac742ad30f51c74c48a1207cc627913 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 20:13:53 +0100 Subject: [PATCH 2/5] Dependency(deps): Bump actions/upload-artifact from 3 to 4 (#14) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 7192260..cebc9d2 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -46,7 +46,7 @@ jobs: run: mvn -B clean package -DskipTests - name: Save Final JAR - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "JAR File" path: "target/artemis-score-stats-complete.jar" From 0e269296ad32129494124824efffa1aecaecdc50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 20:16:12 +0100 Subject: [PATCH 3/5] Dependency(deps): Bump org.apache.maven.plugins:maven-compiler-plugin from 3.11.0 to 3.12.0 (#13) Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 21139c6..c99d07f 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.0 org.apache.maven.plugins From a990cbe1dea9f0d8a1b2bcf688ce0774c7f24a8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 00:37:59 +0100 Subject: [PATCH 4/5] Dependency(deps): Bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.0 to 3.12.1 (#15) Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.12.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.12.0...maven-compiler-plugin-3.12.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c99d07f..d0d05ee 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.0 + 3.12.1 org.apache.maven.plugins From 2df417951c0dc461d55e29058dec27130caa3b3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:17:24 +0100 Subject: [PATCH 5/5] Dependency(deps): Bump org.slf4j:slf4j-simple from 2.0.9 to 2.0.10 (#16) Bumps org.slf4j:slf4j-simple from 2.0.9 to 2.0.10. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-simple dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0d05ee..a2543f6 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ org.slf4j slf4j-simple - 2.0.9 + 2.0.10