Skip to content

Commit

Permalink
Merge branch 'develop' into chore/plagiarism-checks/add-navigation-ca…
Browse files Browse the repository at this point in the history
…se-view
  • Loading branch information
MarkusPaulsen authored Jan 14, 2025
2 parents d9fc794 + e0cda16 commit 329d60f
Show file tree
Hide file tree
Showing 1,794 changed files with 17,890 additions and 15,074 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Artemis brings interactive learning to life with instant, individual feedback on
* **Integrated feedback**: Reviews can provide feedback and points directly next to the text segments.
* **Language detection**: Artemis detects the language of the submission and shows the word and character count.
7. **[File upload exercises](https://docs.artemis.cit.tum.de/user/exercises/file-upload/)** allow full flexibility to instructors. Students can create any kind of file (e.g. PDF, PNG) and submit it to Artemis when they have completed their work. Artemis allows instructors and tutors to download the files and assess them manually based on structured grading criteria (see below in the section Assessment).
8. **[Exam mode](https://docs.artemis.cit.tum.de/user/exam_mode/)**: Instructors can create online exams with exercise variants, integrated plagiarism checks, test runs and student reviews. You can find more information on [Exam mode student features](https://artemis.cit.tum.de/features/students) and on [Exam mode instructor features](https://artemis.cit.tum.de/features/instructors).
8. **[Exam mode](https://docs.artemis.cit.tum.de/user/exam_mode/)**: Instructors can create online exams with exercise variants, integrated plagiarism checks, test runs and student reviews. You can find more information on [Exam mode student features](https://artemis.tum.de/features/students) and on [Exam mode instructor features](https://artemis.tum.de/features/instructors).
9. **[Assessment](https://docs.artemis.cit.tum.de/user/exercises/assessment/)**: Artemis uses double-blind grading and structured grading criteria to improve consistency and fairness.
* **Training process**: It integrates an assessment training process (based on example submissions and example assessments defined by the instructor), has a grading leader board, and allows students to rate the assessments. Students can complain or ask for more feedback.
* **Grading**: Instructors can configure grade keys for courses and exams to automatically calculate grades and display them to students. Grades can be easily exported as csv files to upload them into university systems (such as Campus online). They can define bonus configurations for final exams to improve student grades according to their grades from a midterm exam or course exercises.
Expand All @@ -59,7 +59,7 @@ Artemis brings interactive learning to life with instant, individual feedback on
* **[Adaptive learning](https://docs.artemis.cit.tum.de/user/adaptive-learning)**: Artemis allows instructors and students to define and track competencies. Students can monitor their progress towards these goals, while instructors can provide tailored feedback. This approach integrates lectures and exercises under overarching learning objectives.
* **[Learning analytics](https://docs.artemis.cit.tum.de/user/learning-analytics)**: Artemis integrated different statistics for students to compare themselves to the course average. It allows instructors to evaluate the average student performance based on exercises and competencies.
* **[Learning paths](https://docs.artemis.cit.tum.de/user/adaptive-learning/adaptive-learning-student.html#learning-paths)**: Based on the competency model and students' individual progress, Artemis creates learning paths that guide students through the course content.
13. **[Iris](https://artemis.cit.tum.de/about-iris)**: Artemis integrates Iris, a LLM based virtual assistant that supports students and instructors with common questions and tasks.
13. **[Iris](https://artemis.tum.de/about-iris)**: Artemis integrates Iris, a LLM based virtual assistant that supports students and instructors with common questions and tasks.
* **Questions**: Iris supports students with answering questions about exercises, lectures, and the learning performance instantly.
* **Pro-active assistance**: Iris can pro-actively communicate with the students, help them with the next steps in their learning experience and motivate them to continue.
14. **[Athena](https://github.com/ls1intum/Athena)**: Artemis integrates Athena, a machine learning-based tool that supports instructors with the assessment of text, modeling and programming exercises. Athena offers different modules including automatic feedback suggestions based on generate AI.
Expand Down Expand Up @@ -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.8.3.war
./artemis-server-cli deploy [email protected] -w build/libs/Artemis-7.9.0.war
```

## Architecture
Expand Down Expand Up @@ -242,7 +242,7 @@ We communicate using GitHub issues and pull requests. Additionally, you can join
The following universities are actively using Artemis or are currently evaluating Artemis.

* **Technical University of Munich**
https://artemis.cit.tum.de
https://artemis.tum.de
Main contact person: [Stephan Krusche](mailto:[email protected])

* **LFU Innsbruck, Uni Salzburg, JKU Linz, AAU Klagenfurt, TU Wien**
Expand Down
4 changes: 2 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"prefix": "jhi",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"builder": "@angular/build:application",
"options": {
"allowedCommonJsDependencies": [
"@vscode/markdown-it-katex",
Expand Down Expand Up @@ -187,7 +187,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular/build:dev-server",
"options": {
"buildTarget": "artemis:build:development",
"proxyConfig": "proxy.conf.mjs",
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {
}

group = "de.tum.cit.aet.artemis"
version = "7.8.3"
version = "7.9.0"
description = "Interactive Learning with Individual Feedback"

java {
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/registration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Example:
trust: <host>
jhipster:
mail:
base-url: https://artemis.cit.tum.de
base-url: https://artemis.tum.de
from: [email protected]
management:
health:
Expand Down
4 changes: 4 additions & 0 deletions docs/user/exercises/programming-exercise-features.inc
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ Instructors can still use those templates to generate programming exercises and
+----------------------+----------+---------+
| Go | yes | yes |
+----------------------+----------+---------+
| Bash | yes | yes |
+----------------------+----------+---------+

- Not all ``templates`` support the same feature set and supported features can also change depending on the continuous integration system setup.
Depending on the feature set, some options might not be available during the creation of the programming exercise.
Expand Down Expand Up @@ -91,6 +93,8 @@ Instructors can still use those templates to generate programming exercises and
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+
| Go | no | no | yes | yes | n/a | no | L: yes, J: no |
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+
| Bash | no | no | no | no | n/a | no | L: yes, J: no |
+----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+------------------------+

- *Sequential Test Runs*: ``Artemis`` can generate a build plan which first executes structural and then behavioral tests. This feature can help students to better concentrate on the immediate challenge at hand.
- *Static Code Analysis*: ``Artemis`` can generate a build plan which additionally executes static code analysis tools.
Expand Down
4 changes: 2 additions & 2 deletions docs/user/mobile-applications.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Server Selection

After installation, users have to first decide which Artemis server they want to connect to. Per default, the user can choose between the following instances:

* TUM: https://artemis.cit.tum.de
* TUM: https://artemis.tum.de
* CodeAbility: https://artemis.codeability.uibk.ac.at
* KIT: https://artemis.praktomat.cs.kit.edu

Expand Down Expand Up @@ -170,7 +170,7 @@ Server Selection

After installation, users have to first decide which Artemis server they want to connect to. Per default, the user can choose between the following instances:

* TUM: https://artemis.cit.tum.de
* TUM: https://artemis.tum.de
* CodeAbility: https://artemis.codeability.uibk.ac.at
* KIT: https://artemis.praktomat.cs.kit.edu
* Hochschule Munich: https://artemis.cs.hm.edu/
Expand Down
4 changes: 2 additions & 2 deletions docs/user/orion.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ Settings

Orion's settings are at *Settings -> Tools -> Orion*. The settings include:

- Artemis base url: Can be changed to switch to a specific Artemis instance. Defaults to https://artemis.cit.tum.de. **Important:** The url must not end with a ``/``, otherwise it does not work!
- Artemis git url: Can be changed to switch to a specific Artemis instance. Defaults to https://artemis.cit.tum.de/git
- Artemis base url: Can be changed to switch to a specific Artemis instance. Defaults to https://artemis.tum.de. **Important:** The url must not end with a ``/``, otherwise it does not work!
- Artemis git url: Can be changed to switch to a specific Artemis instance. Defaults to https://artemis.tum.de/git
- Artemis exercise paths: Orion suggests to store newly downloaded exercises at ``default-path/course/exercise-name``, with the default path dependent of the setting.
- Default commit message: The default message for each commit.
- Change user agent: The user agent is sent to Artemis to identify Orion. Usually, no changes are required.
Expand Down
16 changes: 0 additions & 16 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,6 @@ module.exports = [
...tsPlugin.configs.recommended.rules,
...angularPlugin.configs.recommended.rules,
'custom-rules/enforce-no-http-client-testing-module': 'error',
'@angular-eslint/directive-selector': [
'warn',
{
type: 'attribute',
prefix: 'jhi',
style: 'camelCase',
},
],
'@angular-eslint/component-selector': [
'warn',
{
type: 'element',
prefix: 'jhi',
style: 'kebab-case',
},
],
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/no-unsafe-return': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
Expand Down
8 changes: 4 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ module.exports = {
coverageThreshold: {
global: {
// TODO: in the future, the following values should increase to at least 90%
statements: 87.81,
branches: 73.97,
functions: 82.50,
lines: 87.86,
statements: 88.18,
branches: 74.20,
functions: 81.09,
lines: 88.46,
},
},
coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],
Expand Down
Loading

0 comments on commit 329d60f

Please sign in to comment.