-
Notifications
You must be signed in to change notification settings - Fork 289
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into bugfix/long-feedback-not-beeing-displayed
- Loading branch information
Showing
499 changed files
with
16,778 additions
and
4,326 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| assessment: | ||
| - assessment | ||
| - bonus | ||
| - complaint | ||
| - submission | ||
| - grading | ||
| - grade | ||
| - score | ||
| - caseSensitive: false | ||
|
|
||
| athena: | ||
| - athena | ||
| - caseSensitive: false | ||
|
|
||
| atlas: | ||
| - atlas | ||
| - competency | ||
| - competencies | ||
| - knowledge area | ||
| - learning path | ||
| - learner profile | ||
| - science event | ||
| - adaptive learning | ||
| - caseSensitive: false | ||
|
|
||
| buildagent: | ||
| - buildagent | ||
| - build agent | ||
| - buildjob | ||
| - build job | ||
| - build result | ||
| - caseSensitive: false | ||
|
|
||
| communication: | ||
| - communication | ||
| - conversation | ||
| - notification | ||
| - agreement | ||
| - faq | ||
| - post | ||
| - reaction | ||
| - chat | ||
| - message | ||
| - caseSensitive: false | ||
|
|
||
| core: | ||
| - user-management | ||
| - authority | ||
| - data export | ||
| - migration | ||
| - user | ||
| - group | ||
| - caseSensitive: false | ||
|
|
||
| exam: | ||
| - exam | ||
| - exercisegroup | ||
| - student exam | ||
| - suspicious behavior | ||
| - suspicious behaviour | ||
| - caseSensitive: false | ||
|
|
||
| exercise: | ||
| - exercise | ||
| - participation | ||
| - participant | ||
| - difficulty | ||
| - lifecycle | ||
| - team | ||
| - assignment | ||
| - caseSensitive: false | ||
|
|
||
| fileupload: | ||
| - fileupload | ||
| - upload | ||
| - caseSensitive: false | ||
|
|
||
| iris: | ||
| - iris | ||
| - llm | ||
| - chatbot | ||
| - ai | ||
| - caseSensitive: false | ||
|
|
||
| lecture: | ||
| - lecture | ||
| - attachment | ||
| - online | ||
| - slide | ||
| - video | ||
| - text unit | ||
| - caseSensitive: false | ||
|
|
||
| lti: | ||
| - lti | ||
| - online course | ||
| - caseSensitive: false | ||
|
|
||
| modeling: | ||
| - modeling | ||
| - diagram | ||
| - uml | ||
| - caseSensitive: false | ||
|
|
||
| plagiarism: | ||
| - plagiarism | ||
| - caseSensitive: false | ||
|
|
||
| programming: | ||
| - programming | ||
| - build | ||
| - build plan | ||
| - code hint | ||
| - git | ||
| - testwise coverage | ||
| - ide | ||
| - submission policy | ||
| - aeolus | ||
| - penalty | ||
| - auxilary | ||
| - commit | ||
| - project | ||
| - static code analysis | ||
| - caseSensitive: false | ||
|
|
||
| quiz: | ||
| - quiz | ||
| - drag | ||
| - drop | ||
| - single choice | ||
| - multiple choice | ||
| - batch | ||
| - short answer | ||
| - caseSensitive: false | ||
|
|
||
| text: | ||
| - text | ||
| - block | ||
| - caseSensitive: false | ||
|
|
||
| tutorialgroup: | ||
| - tutorialgroup | ||
| - session | ||
| - caseSensitive: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| name: "Issue Labeler" | ||
| on: | ||
| issues: | ||
| types: [opened, edited] | ||
|
|
||
| permissions: | ||
| issues: write | ||
| contents: read | ||
|
|
||
| jobs: | ||
| triage: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: MaximilianAnzinger/[email protected] | ||
| with: | ||
| configuration-path: .github/issue-labeler.yml | ||
| repo-token: ${{ github.token }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -193,7 +193,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for | |
| The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine): | ||
|
|
||
| ```shell | ||
| ./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.6.1.war | ||
| ./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.6.3.war | ||
| ``` | ||
|
|
||
| ## Architecture | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package de.tum.cit.aet.artemis.assessment.dto; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
|
|
||
| import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; | ||
|
|
||
| @JsonInclude(JsonInclude.Include.NON_EMPTY) | ||
| public record FeedbackAnalysisResponseDTO(SearchResultPageDTO<FeedbackDetailDTO> feedbackDetails, long totalItems, int totalAmountOfTasks, List<String> testCaseNames) { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackPageableDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package de.tum.cit.aet.artemis.assessment.dto; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; | ||
|
|
||
| public class FeedbackPageableDTO extends PageableSearchDTO<String> { | ||
|
|
||
| private List<String> filterTasks; | ||
|
|
||
| private List<String> filterTestCases; | ||
|
|
||
| private String[] filterOccurrence; | ||
|
|
||
| private String searchTerm; | ||
|
|
||
| public List<String> getFilterTasks() { | ||
| return filterTasks; | ||
| } | ||
|
|
||
| public void setFilterTasks(List<String> filterTasks) { | ||
| this.filterTasks = filterTasks; | ||
| } | ||
|
|
||
| public List<String> getFilterTestCases() { | ||
| return filterTestCases; | ||
| } | ||
|
|
||
| public void setFilterTestCases(List<String> filterTestCases) { | ||
| this.filterTestCases = filterTestCases; | ||
| } | ||
|
|
||
| public String[] getFilterOccurrence() { | ||
| return filterOccurrence; | ||
| } | ||
|
|
||
| public void setFilterOccurrence(String[] filterOccurrence) { | ||
| this.filterOccurrence = filterOccurrence; | ||
| } | ||
|
|
||
| public String getSearchTerm() { | ||
| return searchTerm != null ? searchTerm : ""; | ||
| } | ||
|
|
||
| public void setSearchTerm(String searchTerm) { | ||
| this.searchTerm = searchTerm; | ||
| } | ||
| } |
Oops, something went wrong.