Merge branch 'develop' into feature/lectures/add-status-bar

Author: krusche

jest.config.js

@@ -105,10 +105,10 @@ module.exports = {
     coverageThreshold: {
         global: {
             // TODO: in the future, the following values should increase to at least 90%
-            statements: 87.73,
-            branches: 73.87,
-            functions: 82.44,
-            lines: 87.78,
+            statements: 87.78,
+            branches: 73.93,
+            functions: 82.47,
+            lines: 87.83,
         },
     },
     coverageReporters: ['clover', 'json', 'lcov', 'text-summary'],

src/main/webapp/app/exam/manage/exam-management.module.ts

@@ -66,14 +66,16 @@ import { ArtemisProgrammingExerciseModule } from 'app/exercises/programming/shar
 import { DetailModule } from 'app/detail-overview-list/detail.module';
 import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe';
 import { NoDataComponent } from 'app/shared/no-data-component';
+import { SafeHtmlPipe } from 'app/shared/pipes/safe-html.pipe';
+import { GradeStepBoundsPipe } from 'app/shared/pipes/grade-step-bounds.pipe';
 import { examScoresState } from 'app/exam/exam-scores/exam-scores.route';
 import { GitDiffLineStatComponent } from 'app/exercises/programming/git-diff-report/git-diff-line-stat.component';
 
 const ENTITY_STATES = [...examManagementState, ...examScoresState];
 
 @NgModule({
     // TODO: For better modularization we could define an exercise module with the corresponding exam routes
-    providers: [ArtemisDurationFromSecondsPipe],
+    providers: [ArtemisDurationFromSecondsPipe, SafeHtmlPipe, GradeStepBoundsPipe],
     imports: [
         RouterModule.forChild(ENTITY_STATES),
         ArtemisTextExerciseModule,
@@ -108,6 +110,9 @@ const ENTITY_STATES = [...examManagementState, ...examScoresState];
         DetailModule,
         NoDataComponent,
         GitDiffLineStatComponent,
+        SafeHtmlPipe,
+        GradeStepBoundsPipe,
+        BonusComponent,
     ],
     declarations: [
         ExamManagementComponent,
@@ -135,7 +140,6 @@ const ENTITY_STATES = [...examManagementState, ...examScoresState];
         StudentExamDetailTableRowComponent,
         ExamImportComponent,
         ExamExerciseImportComponent,
-        BonusComponent,
         ExamEditWorkingTimeComponent,
         ExamEditWorkingTimeDialogComponent,
         ExamLiveAnnouncementCreateModalComponent,

src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instructions-render.module.ts

@@ -6,9 +6,10 @@ import { ProgrammingExerciseInstructionStepWizardComponent } from 'app/exercises
 import { ProgrammingExerciseInstructionTaskStatusComponent } from 'app/exercises/programming/shared/instructions-render/task/programming-exercise-instruction-task-status.component';
 import { ArtemisMarkdownModule } from 'app/shared/markdown.module';
 import { ExamExerciseUpdateHighlighterModule } from 'app/exam/participate/exercises/exam-exercise-update-highlighter/exam-exercise-update-highlighter.module';
+import { SafeHtmlPipe } from 'app/shared/pipes/safe-html.pipe';
 
 @NgModule({
-    imports: [ArtemisSharedModule, ArtemisResultModule, ArtemisMarkdownModule, ExamExerciseUpdateHighlighterModule],
+    imports: [ArtemisSharedModule, ArtemisResultModule, ArtemisMarkdownModule, ExamExerciseUpdateHighlighterModule, SafeHtmlPipe],
     declarations: [ProgrammingExerciseInstructionComponent, ProgrammingExerciseInstructionStepWizardComponent, ProgrammingExerciseInstructionTaskStatusComponent],
     exports: [ProgrammingExerciseInstructionComponent],
 })

src/main/webapp/app/grading-system/base-grading-system/base-grading-system.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { GradeType, GradingScale } from 'app/entities/grading-scale.model';
 import { GradeStep } from 'app/entities/grade-step.model';
 import { ActivatedRoute } from '@angular/router';
@@ -39,6 +39,12 @@ export enum GradeEditMode {
 
 @Component({ template: '' })
 export abstract class BaseGradingSystemComponent implements OnInit {
+    protected gradingSystemService = inject(GradingSystemService);
+    private route = inject(ActivatedRoute);
+    private translateService = inject(TranslateService);
+    private courseService = inject(CourseManagementService);
+    private examService = inject(ExamManagementService);
+
     GradeType = GradeType;
     ButtonSize = ButtonSize;
     GradingScale = GradingScale;
@@ -67,14 +73,6 @@ export abstract class BaseGradingSystemComponent implements OnInit {
     faExclamationTriangle = faExclamationTriangle;
     faInfo = faInfo;
 
-    constructor(
-        protected gradingSystemService: GradingSystemService,
-        private route: ActivatedRoute,
-        private translateService: TranslateService,
-        private courseService: CourseManagementService,
-        private examService: ExamManagementService,
-    ) {}
-
     ngOnInit(): void {
         this.route.parent?.params.subscribe((params) => {
             this.isLoading = true;

src/main/webapp/app/grading-system/bonus/bonus.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { BonusService } from 'app/grading-system/bonus/bonus.service';
 import { GradingSystemService } from 'app/grading-system/grading-system.service';
 import { GradingScale } from 'app/entities/grading-scale.model';
@@ -9,10 +9,14 @@ import { faExclamationTriangle, faPlus, faQuestionCircle, faSave, faTimes } from
 import { GradeStep, GradeStepsDTO } from 'app/entities/grade-step.model';
 import { ButtonSize } from 'app/shared/components/button.component';
 import { Subject, forkJoin, of } from 'rxjs';
-import { TranslateService } from '@ngx-translate/core';
 import { SearchTermPageableSearch, SortingOrder } from 'app/shared/table/pageable-table';
 import { GradeEditMode } from 'app/grading-system/base-grading-system/base-grading-system.component';
 import { AlertService } from 'app/core/util/alert.service';
+import { ArtemisSharedModule } from 'app/shared/shared.module';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { SafeHtmlPipe } from 'app/shared/pipes/safe-html.pipe';
+import { GradeStepBoundsPipe } from 'app/shared/pipes/grade-step-bounds.pipe';
+import { ArtemisModePickerModule } from 'app/exercises/shared/mode-picker/mode-picker.module';
 
 export enum BonusStrategyOption {
     GRADES,
@@ -28,8 +32,16 @@ export enum BonusStrategyDiscreteness {
     selector: 'jhi-bonus',
     templateUrl: './bonus.component.html',
     styleUrls: ['./bonus.component.scss'],
+    standalone: true,
+    imports: [ArtemisSharedModule, ArtemisSharedComponentModule, ArtemisModePickerModule, SafeHtmlPipe, GradeStepBoundsPipe],
 })
 export class BonusComponent implements OnInit {
+    private bonusService = inject(BonusService);
+    private gradingSystemService = inject(GradingSystemService);
+    private route = inject(ActivatedRoute);
+    private router = inject(Router);
+    private alertService = inject(AlertService);
+
     readonly CALCULATION_PLUS = 1;
     readonly CALCULATION_MINUS = -1;
 
@@ -98,15 +110,6 @@ export class BonusComponent implements OnInit {
         sortedColumn: 'ID',
     };
 
-    constructor(
-        private bonusService: BonusService,
-        private gradingSystemService: GradingSystemService,
-        private route: ActivatedRoute,
-        private router: Router,
-        private translateService: TranslateService,
-        private alertService: AlertService,
-    ) {}
-
     ngOnInit(): void {
         this.isLoading = true;
 

src/main/webapp/app/grading-system/bonus/bonus.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { GradeStep, GradeStepsDTO } from 'app/entities/grade-step.model';
@@ -11,12 +11,10 @@ export type EntityResponseType = HttpResponse<Bonus>;
 
 @Injectable({ providedIn: 'root' })
 export class BonusService {
-    public resourceUrl = 'api';
+    private http = inject(HttpClient);
+    private gradingSystemService = inject(GradingSystemService);
 
-    constructor(
-        private http: HttpClient,
-        private gradingSystemService: GradingSystemService,
-    ) {}
+    public resourceUrl = 'api';
 
     /**
      * Deletes the bonus.

src/main/webapp/app/grading-system/detailed-grading-system/detailed-grading-system.component.ts

@@ -1,11 +1,19 @@
 import { Component } from '@angular/core';
 import { BaseGradingSystemComponent, CsvGradeStep } from 'app/grading-system/base-grading-system/base-grading-system.component';
 import { parse } from 'papaparse';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { FormsModule } from '@angular/forms';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { ArtemisSharedModule } from 'app/shared/shared.module';
+import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 
 @Component({
     selector: 'jhi-detailed-grading-system',
     templateUrl: './detailed-grading-system.component.html',
     styleUrls: ['./detailed-grading-system.component.scss'],
+    standalone: true,
+    imports: [TranslateDirective, ArtemisSharedComponentModule, FormsModule, FaIconComponent, ArtemisSharedModule, ArtemisTranslatePipe],
 })
 export class DetailedGradingSystemComponent extends BaseGradingSystemComponent {
     /**

src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.ts

@@ -1,31 +1,33 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { GradingSystemService } from 'app/grading-system/grading-system.service';
 import { GradeStep } from 'app/entities/grade-step.model';
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
 import { faChevronLeft, faPrint } from '@fortawesome/free-solid-svg-icons';
 import { ThemeService } from 'app/core/theme/theme.service';
 import { loadGradingKeyUrlParams } from 'app/grading-system/grading-key-overview/grading-key-helper';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { GradingKeyTableComponent } from 'app/grading-system/grading-key-overview/grading-key/grading-key-table.component';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 
 @Component({
     selector: 'jhi-grade-key-overview',
     templateUrl: './grading-key-overview.component.html',
     styleUrls: ['./grading-key-overview.scss'],
+    standalone: true,
+    imports: [TranslateDirective, GradingKeyTableComponent, FaIconComponent, ArtemisTranslatePipe],
 })
 export class GradingKeyOverviewComponent implements OnInit {
+    private route = inject(ActivatedRoute);
+    private navigationUtilService = inject(ArtemisNavigationUtilService);
+    private themeService = inject(ThemeService);
+
     readonly faChevronLeft = faChevronLeft;
     readonly faPrint = faPrint;
 
     plagiarismGrade: string;
     noParticipationGrade: string;
 
-    constructor(
-        private route: ActivatedRoute,
-        private gradingSystemService: GradingSystemService,
-        private navigationUtilService: ArtemisNavigationUtilService,
-        private themeService: ThemeService,
-    ) {}
-
     isExam = false;
 
     courseId?: number;

src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.module.ts

@@ -5,8 +5,7 @@ import { ArtemisSharedComponentModule } from 'app/shared/components/shared-compo
 import { GradingKeyTableComponent } from 'app/grading-system/grading-key-overview/grading-key/grading-key-table.component';
 
 @NgModule({
-    declarations: [GradingKeyOverviewComponent, GradingKeyTableComponent],
-    imports: [ArtemisSharedModule, ArtemisSharedComponentModule],
+    imports: [ArtemisSharedModule, ArtemisSharedComponentModule, GradingKeyOverviewComponent, GradingKeyTableComponent],
     exports: [GradingKeyOverviewComponent, GradingKeyTableComponent],
 })
 export class GradingKeyOverviewModule {}

src/main/webapp/app/grading-system/grading-key-overview/grading-key/grading-key-table.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, inject } from '@angular/core';
 import { GradingSystemService } from 'app/grading-system/grading-system.service';
 import { GradeStep, GradeStepsDTO } from 'app/entities/grade-step.model';
 import { GradeType, GradingScale } from 'app/entities/grading-scale.model';
@@ -11,27 +11,32 @@ import { ScoresStorageService } from 'app/course/course-scores/scores-storage.se
 import { ScoreType } from 'app/shared/constants/score-type.constants';
 import { ActivatedRoute } from '@angular/router';
 import { loadGradingKeyUrlParams } from 'app/grading-system/grading-key-overview/grading-key-helper';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
+import { GradeStepBoundsPipe } from 'app/shared/pipes/grade-step-bounds.pipe';
+import { SafeHtmlPipe } from 'app/shared/pipes/safe-html.pipe';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 
 @Component({
     selector: 'jhi-grade-key-table',
     templateUrl: './grading-key-table.component.html',
     styleUrls: ['../grading-key-overview.scss'],
+    standalone: true,
+    imports: [TranslateDirective, ArtemisTranslatePipe, GradeStepBoundsPipe, SafeHtmlPipe, ArtemisSharedComponentModule],
 })
 export class GradingKeyTableComponent implements OnInit {
+    private route = inject(ActivatedRoute);
+    private gradingSystemService = inject(GradingSystemService);
+    private bonusService = inject(BonusService);
+    private scoresStorageService = inject(ScoresStorageService);
+
     readonly faChevronLeft = faChevronLeft;
 
     readonly GradeEditMode = GradeEditMode;
 
     @Input() studentGradeOrBonusPointsOrGradeBonus?: string;
     @Input() forBonus?: boolean;
 
-    constructor(
-        private route: ActivatedRoute,
-        private gradingSystemService: GradingSystemService,
-        private bonusService: BonusService,
-        private scoresStorageService: ScoresStorageService,
-    ) {}
-
     plagiarismGrade: string;
     noParticipationGrade: string;