From b7213f35c73b60e93bfff0649f857187971f734d Mon Sep 17 00:00:00 2001 From: Timor Morrien Date: Fri, 22 Sep 2023 11:08:52 +0200 Subject: [PATCH] Iris: Add Iris to README & about-us page (#7230) --- README.md | 9 +++++---- docs/dev/development-process.rst | 3 ++- src/main/webapp/app/core/about-us/about-us.component.ts | 1 + src/main/webapp/i18n/de/aboutUs.json | 3 +++ src/main/webapp/i18n/de/health.json | 3 ++- src/main/webapp/i18n/en/aboutUs.json | 3 +++ src/main/webapp/i18n/en/health.json | 3 ++- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 73b97ae88f5e..69f118e11e07 100644 --- a/README.md +++ b/README.md @@ -41,10 +41,11 @@ 15. **[Learning analytics](https://ls1intum.github.io/Artemis/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. 16. **[Adaptive Learning](https://ls1intum.github.io/Artemis/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. 17. **[Tutorial Groups](https://ls1intum.github.io/Artemis/user/tutorialgroups/)**: Artemis support the management of tutorial groups of a course. This includes planning the sessions, assigning responsible tutors, registering students and tracking the attendance. -18. **[Scalable](https://ls1intum.github.io/Artemis/user/scaling/)**: Artemis scales to multiple courses with thousands of students. In fact, the largest course had 2,400 students. Administrators can easily scale Artemis with additional build agents in the continuous integration environment. -19. **[High user satisfaction](https://ls1intum.github.io/Artemis/user/user-experience/)**: Artemis is easy to use, provides guided tutorials. Developers focus on usability, user experience, and performance. -20. **Customizable**: It supports multiple instructors, editors, and tutors per course and allows instructors to customize many course settings -21. **[Open-source](https://ls1intum.github.io/Artemis/dev/open-source/)**: Free to use with a large community and many active maintainers. +18. **[Iris](https://artemis.cit.tum.de/about-iris)**: Artemis integrates Iris, a chatbot that supports students and instructors with common questions and tasks. +19. **[Scalable](https://ls1intum.github.io/Artemis/user/scaling/)**: Artemis scales to multiple courses with thousands of students. In fact, the largest course had 2,400 students. Administrators can easily scale Artemis with additional build agents in the continuous integration environment. +20. **[High user satisfaction](https://ls1intum.github.io/Artemis/user/user-experience/)**: Artemis is easy to use, provides guided tutorials. Developers focus on usability, user experience, and performance. +21. **Customizable**: It supports multiple instructors, editors, and tutors per course and allows instructors to customize many course settings +22. **[Open-source](https://ls1intum.github.io/Artemis/dev/open-source/)**: Free to use with a large community and many active maintainers. ## Roadmap diff --git a/docs/dev/development-process.rst b/docs/dev/development-process.rst index 4206185d1849..b5e073fb9da4 100644 --- a/docs/dev/development-process.rst +++ b/docs/dev/development-process.rst @@ -12,7 +12,8 @@ Naming Conventions for GitHub Pull Requests 1. The first term is a main feature of Artemis and is using code highlighting, e.g. “``Programming exercises``:”. 1. Possible feature tags are: ``Programming exercises``, ``Quiz exercises``, ``Modeling exercises``, ``Text exercises``, ``File upload exercises``, ``Exam mode``, - ``Grading``, ``Assessment``, ``Communication``, ``Notifications``, ``Team exercises``, ``Lectures``, ``Plagiarism checks``, ``Learning analytics``, ``Adaptive learning``, ``Tutorial groups``. + ``Grading``, ``Assessment``, ``Communication``, ``Notifications``, ``Team exercises``, ``Lectures``, ``Plagiarism checks``, ``Learning analytics``, + ``Adaptive learning``, ``Tutorial groups``, ``Iris``. 2. If the change is not visible to end users, or it is a pure development or test improvement, we use the term “``Development``:”. 3. Everything else belongs to the ``General`` category. diff --git a/src/main/webapp/app/core/about-us/about-us.component.ts b/src/main/webapp/app/core/about-us/about-us.component.ts index 34ba2b455a03..1d6fb1b5fd58 100644 --- a/src/main/webapp/app/core/about-us/about-us.component.ts +++ b/src/main/webapp/app/core/about-us/about-us.component.ts @@ -41,6 +41,7 @@ export class AboutUsComponent implements OnInit { ['learningAnalytics', { learningAnalyticsUrl: 'https://ls1intum.github.io/Artemis/user/learning-analytics/' }], ['adaptiveLearning', { adaptiveLearningUrl: 'https://ls1intum.github.io/Artemis/user/adaptive-learning/' }], ['tutorialGroups', { tutorialGroupsUrl: 'https://ls1intum.github.io/Artemis/user/tutorialgroups/' }], + ['iris', { irisUrl: 'https://artemis.cit.tum.de/about-iris' }], ['scalable', { scalingUrl: 'https://ls1intum.github.io/Artemis/user/scaling/' }], ['highUserSatisfaction', { userExperienceUrl: 'https://ls1intum.github.io/Artemis/user/user-experience/' }], ['customizable', { customizableUrl: 'https://ls1intum.github.io/Artemis/user/courses/customizable' }], diff --git a/src/main/webapp/i18n/de/aboutUs.json b/src/main/webapp/i18n/de/aboutUs.json index 26078189fa76..43112e6bb220 100644 --- a/src/main/webapp/i18n/de/aboutUs.json +++ b/src/main/webapp/i18n/de/aboutUs.json @@ -56,6 +56,9 @@ "tutorialGroups": { "text": "Übungsgruppen: Verwaltung der Übungsgruppen eines Kurses. Planung der Sitzungen, Zuweisung der verantwortlichen Tutor:innen, Registrierung der Studierenden und Verfolgung der Anwesenheit." }, + "iris": { + "text": "Iris: Artemis integriert Iris, einen Chatbot, der Studierende und Lehrende bei häufig gestellten Fragen und Aufgaben unterstützt." + }, "scalable": { "text": "Skalierbar auf mehrere Kurse mit Tausenden von Studierenden. Konfigurieren von zusätzlichen Build-Agenten in der kontinuierlichen Integrationsumgebung." }, diff --git a/src/main/webapp/i18n/de/health.json b/src/main/webapp/i18n/de/health.json index f059ccd6a1bf..16a7a407c33d 100644 --- a/src/main/webapp/i18n/de/health.json +++ b/src/main/webapp/i18n/de/health.json @@ -28,7 +28,8 @@ "hazelcast": "Hazelcast", "websocketBroker": "Websocket Broker (Server -> Broker)", "athena": "Athena", - "apollon": "Apollon Conversion Server" + "apollon": "Apollon Conversion Server", + "iris": "Pyris Server" }, "table": { "service": "Dienst Name", diff --git a/src/main/webapp/i18n/en/aboutUs.json b/src/main/webapp/i18n/en/aboutUs.json index 67d52eae0dd6..0e582d2793cf 100644 --- a/src/main/webapp/i18n/en/aboutUs.json +++ b/src/main/webapp/i18n/en/aboutUs.json @@ -56,6 +56,9 @@ "tutorialGroups": { "text": "Tutorial Groups: Manage the tutorial groups of a course. Plan the sessions, assign responsible tutors, register students and track the attendance." }, + "iris": { + "text": "Iris: Artemis integrates Iris, a chatbot that supports students and instructors with common questions and tasks." + }, "scalable": { "text": "Scalable to multiple courses with thousands of students. Configure additional build agents in the continuous integration environment." }, diff --git a/src/main/webapp/i18n/en/health.json b/src/main/webapp/i18n/en/health.json index 8fe047ae5775..b100bc030af0 100644 --- a/src/main/webapp/i18n/en/health.json +++ b/src/main/webapp/i18n/en/health.json @@ -28,7 +28,8 @@ "hazelcast": "Hazelcast", "websocketBroker": "Websocket Broker (Server -> Broker)", "athena": "Athena", - "apollon": "Apollon Conversion Server" + "apollon": "Apollon Conversion Server", + "iris": "Pyris Server" }, "table": { "service": "Service name",