Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development: Add student code of conduct and apso as a static assets #7390

Merged
merged 7 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/dev/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,8 @@ instead of the TUM defaults:
* The logo next to the “Artemis” heading on the navbar → ``${artemisRunDirectory}/public/images/logo.png``
* The favicon → ``${artemisRunDirectory}/logo/favicon.svg``
* The contact email address in the ``application-{dev,prod}.yml`` configuration file under the key ``info.contact``
* The Student Code of Conduct -> ``${artemisRunDirectory}/public/documents/student-code-of-conduct.pdf``
* The General Examination and Study Regulations -> ``${artemisRunDirectory}/public/documents/apso.pdf``

------------------------------------------------------------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class ContinuousPlagiarismControlPostContentProvider {

private static final String POST_CONTENT_DE = "Sehr geehrter %s,<br><br>nach einer automatisierten Auswertung Ihrer letzten Einsendung für die Übung \"%s\" in der Lehrveranstaltung \"%s\" haben wir eine signifikante Übereinstimmung Ihrer Einsendung mit der Einsendung von mindestens einem anderen Studenten festgestellt. Dies ist möglicherweise ein Verstoß gegen die <a href=\"%s\">Student Code of Conduct</a> der School of Computation, Information and Technology, der Sie zugestimmt haben. Sie können diese Warnmeldung beheben, indem Sie eine neue Version Ihrer Lösung vor dem Abgabetermin der Übung einreichen";

private static final String COC_LINK = "https://www.in.tum.de/fileadmin/w00bws/in/2.Fur_Studierende/Pruefungen_und_Formalitaeten/1.Gute_studentische_Praxis/englisch/leitfaden-en_2016Jun22.pdf";
private static final String COC_LINK = "/content/documents/student-code-of-conduct.pdf";

private ContinuousPlagiarismControlPostContentProvider() {
}
Expand Down
Binary file added src/main/resources/public/documents/apso.pdf
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ export class PlagiarismCaseInstructorDetailViewComponent implements OnInit, OnDe
exercise: exerciseTitle,
inCourseOrExam: this.translateService.instant('artemisApp.plagiarism.plagiarismCases.notification.' + (belongsToExam ? 'inExam' : 'inCourse')),
courseOrExam: courseOrExamTitle,
cocLink: 'https://www.in.tum.de/fileadmin/w00bws/in/2.Fur_Studierende/Pruefungen_und_Formalitaeten/1.Gute_studentische_Praxis/englisch/leitfaden-en_2016Jun22.pdf',
aspoLink: 'https://portal.mytum.de/archiv/kompendium_rechtsangelegenheiten/apso/Lesb-F-APSO-vom-18-03-2011-mit-3-AeS-vom-27-04-18-ohne-Markierungen.pdf',
jakubriegel marked this conversation as resolved.
Show resolved Hide resolved
cocLink: '/public/documents/student-code-of-conduct.pdf',
apsoLink: '/public/documents/apso.pdf',
dueDate: dayjs().add(7, 'day').format('DD.MM.YYYY'),
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/de/plagiarism.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"resolvedPlagiarismCase": "Gelöster Plagiatsfall",
"notification": {
"title": "Plagiatsfall: {{ exercise }}",
"body": "Liebe(r) <b>{{ student }}</b>,<br><br>Nach einer sorgfältigen Durchsicht Deiner finalen Abgabe zur Übung \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\" sind wir zu dem Schluss gekommen, dass Du ein Plagiat begangen hast. Dies ist ein Verstoß gegen die <a href=\"{{ cocLink }}\">Grundsätze guter studentischer Praxis</a> die School of Computation, Information and Technology, denen Du zugestimmt hast. Die <a href=\"{{ aspoLink }}\">Allgemeine Studien- und Prüfungsordnung</a> regelt in §22.1 die Konsequenzen für solche Fälle. Dies bedeutet, dass die betreffende Prüfung potentiell mit \"5,0 (U)\" bewertet werden kann, was schwerwiegende Folgen für dein weiteres Studium haben kann.<br><br><b>Du hast eine Woche Zeit (bis {{ dueDate }}), um eine Stellungnahme zu diesem Fall direkt in Artemis abzugeben (nicht per E-Mail).</b><br><br>Mit freundlichen Grüßen,<br>{{ instructor }}",
"body": "Liebe(r) <b>{{ student }}</b>,<br><br>Nach einer sorgfältigen Durchsicht Deiner finalen Abgabe zur Übung \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\" sind wir zu dem Schluss gekommen, dass Du ein Plagiat begangen hast. Dies ist ein Verstoß gegen die <a href=\"{{ cocLink }}\">Grundsätze guter studentischer Praxis</a> die School of Computation, Information and Technology, denen Du zugestimmt hast. Die <a href=\"{{ apsoLink }}\">Allgemeine Studien- und Prüfungsordnung</a> regelt in §22.1 die Konsequenzen für solche Fälle. Dies bedeutet, dass die betreffende Prüfung potentiell mit \"5,0 (U)\" bewertet werden kann, was schwerwiegende Folgen für dein weiteres Studium haben kann.<br><br><b>Du hast eine Woche Zeit (bis {{ dueDate }}), um eine Stellungnahme zu diesem Fall direkt in Artemis abzugeben (nicht per E-Mail).</b><br><br>Mit freundlichen Grüßen,<br>{{ instructor }}",
"inCourse": "im Kurs",
"inExam": "in der Prüfung"
},
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/en/plagiarism.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"resolvedPlagiarismCase": "Resolved Plagiarism Case",
"notification": {
"title": "Plagiarism Case: {{ exercise }}",
"body": "Dear <b>{{ student }}</b>,<br><br>After a meticulous review of your final submission for the exercise \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\", we have concluded that you have committed plagiarism. This is a violation of the <a href=\"{{ cocLink }}\">Student Code of Conduct</a> of the School of Computation, Information and Technology that you have agreed upon. The <a href=\"{{ aspoLink }}\">Allgemeine Studien- und Prüfungsordnung</a> (General Examination and Study Regulations) regulates consequences for such cases in §22.1. This means that the exam in question can potentially be graded \"5.0 (U)\", which can have serious consequences for your further studies.<br><br><b>You have one week (until {{ dueDate }}) to provide a statement about this particular case directly in Artemis (not via E-Mail).</b><br><br>Best regards,<br>{{ instructor }}",
"body": "Dear <b>{{ student }}</b>,<br><br>After a meticulous review of your final submission for the exercise \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\", we have concluded that you have committed plagiarism. This is a violation of the <a href=\"{{ cocLink }}\">Student Code of Conduct</a> of the School of Computation, Information and Technology that you have agreed upon. The <a href=\"{{ apsoLink }}\">Allgemeine Studien- und Prüfungsordnung</a> (General Examination and Study Regulations) regulates consequences for such cases in §22.1. This means that the exam in question can potentially be graded \"5.0 (U)\", which can have serious consequences for your further studies.<br><br><b>You have one week (until {{ dueDate }}) to provide a statement about this particular case directly in Artemis (not via E-Mail).</b><br><br>Best regards,<br>{{ instructor }}",
"inCourse": "in the course",
"inExam": "in the exam"
},
Expand Down
Loading