Merge branch 'develop' into chore/development/use-directive-for-progr…

…amming-test-status-details

src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.ts

@@ -3,7 +3,7 @@ import { HttpResponse } from '@angular/common/http';
 import { EntityArrayResponseType as ExerciseEntityArrayResponseType, ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { Exercise } from 'app/entities/exercise.model';
 import { SortService } from 'app/shared/service/sort.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 
 @Component({

src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, HostListener, Input, Output } from '@angular/c
 import { Result } from 'app/entities/result.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { ActivatedRoute } from '@angular/router';
 import { ComplaintType } from 'app/entities/complaint.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';

src/main/webapp/app/assessment/assessment-instructions/assessment-instructions/assessment-instructions.component.ts

@@ -3,10 +3,10 @@ import { SafeHtml } from '@angular/platform-browser';
 import { UMLDiagramType, UMLModel } from '@ls1intum/apollon';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 

src/main/webapp/app/assessment/athena.service.ts

@@ -5,9 +5,9 @@ import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { ModelingFeedbackSuggestion, ProgrammingFeedbackSuggestion, TextFeedbackSuggestion } from 'app/entities/feedback-suggestion.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { FEEDBACK_SUGGESTION_ACCEPTED_IDENTIFIER, FEEDBACK_SUGGESTION_IDENTIFIER, Feedback, FeedbackType } from 'app/entities/feedback.model';
-import { TextBlock } from 'app/entities/text-block.model';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { PROFILE_ATHENA } from 'app/app.constants';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 import { UMLModel, findElement } from '@ls1intum/apollon';

src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.ts

@@ -6,7 +6,7 @@ import { StudentParticipation } from 'app/entities/participation/student-partici
 import { Result } from 'app/entities/result.model';
 import { Course } from 'app/entities/course.model';
 import { ArtemisServerDateService } from 'app/shared/server-date.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { Submission } from 'app/entities/submission.model';
 import { filter } from 'rxjs/operators';

src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.ts

@@ -13,7 +13,7 @@ import { Course } from 'app/entities/course.model';
 import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
 import { FilterProp as TeamFilterProp } from 'app/exercises/shared/team/teams.component';
 import { SortService } from 'app/shared/service/sort.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';

src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.ts

@@ -9,7 +9,7 @@ import { Course } from 'app/entities/course.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { HttpErrorResponse } from '@angular/common/http';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { AccountService } from 'app/core/auth/account.service';
 import { onError } from 'app/shared/util/global.utils';

src/main/webapp/app/course/manage/course-update.component.ts

@@ -21,7 +21,7 @@ import { OrganizationSelectorComponent } from 'app/shared/organization-selector/
 import { faBan, faExclamationTriangle, faPen, faQuestionCircle, faSave, faTimes, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { base64StringToBlob } from 'app/utils/blob-util';
 import { ImageCroppedEvent } from 'app/shared/image-cropper/interfaces/image-cropped-event.interface';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { CourseAdminService } from 'app/course/manage/course-admin.service';
 import { FeatureToggle, FeatureToggleService } from 'app/shared/feature-toggle/feature-toggle.service';
 import { AccountService } from 'app/core/auth/account.service';

src/main/webapp/app/course/manage/courses-for-dashboard-dto.ts

@@ -1,5 +1,5 @@
 import { CourseForDashboardDTO } from 'app/course/manage/course-for-dashboard-dto';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 export class CoursesForDashboardDTO {
     courses: CourseForDashboardDTO[];

src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts

@@ -5,7 +5,7 @@ import { ButtonSize, TooltipPlacement } from 'app/shared/components/button.compo
 import { IrisSubSettingsType } from 'app/entities/iris/settings/iris-sub-settings.model';
 import { ModelingExerciseService } from 'app/exercises/modeling/manage/modeling-exercise.service';
 import { AlertService } from 'app/core/util/alert.service';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
 import { Detail } from 'app/detail-overview-list/detail.model';
 import { UMLModel } from '@ls1intum/apollon';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';

src/main/webapp/app/detail-overview-list/detail.model.ts

@@ -1,12 +1,12 @@
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
-import type { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import type { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { ProgrammingExerciseInstructorRepositoryType } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
 import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
-import { BuildLogStatisticsDTO } from 'app/entities/build-log-statistics-dto';
+import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto';
 import { DetailType } from 'app/detail-overview-list/detail-overview-list.component';
 import { SafeHtml } from '@angular/platform-browser';
 import { UMLDiagramType, UMLModel } from '@ls1intum/apollon';

src/main/webapp/app/entities/consistency-check-result.model.ts

@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export const enum ErrorType {
     TEMPLATE_REPO_MISSING = 'TEMPLATE_REPO_MISSING',

src/main/webapp/app/entities/course.model.ts

@@ -3,11 +3,11 @@ import dayjs from 'dayjs/esm';
 import { Lecture } from 'app/entities/lecture.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Competency } from 'app/entities/competency.model';
 import { Organization } from 'app/entities/organization.model';
 import { Post } from 'app/entities/metis/post.model';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { OnlineCourseConfiguration } from 'app/entities/online-course-configuration.model';
 import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
 import { TutorialGroupsConfiguration } from 'app/entities/tutorial-group/tutorial-groups-configuration.model';

src/main/webapp/app/entities/exam-session.model.ts → src/main/webapp/app/entities/exam/exam-session.model.ts

@@ -1,6 +1,6 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
 import dayjs from 'dayjs/esm';
-import { StudentExam } from './student-exam.model';
+import { StudentExam } from '../student-exam.model';
 
 export enum SuspiciousSessionReason {
     DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS = 'DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS',

src/main/webapp/app/entities/exam-user.model.ts → src/main/webapp/app/entities/exam/exam-user.model.ts

@@ -1,5 +1,5 @@
 import { User } from 'app/core/user/user.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 
 export class ExamUser implements BaseEntity {

src/main/webapp/app/entities/exam.model.ts → src/main/webapp/app/entities/exam/exam.model.ts

@@ -1,4 +1,4 @@
-import { ExamUser } from 'app/entities/exam-user.model';
+import { ExamUser } from 'app/entities/exam/exam-user.model';
 import dayjs from 'dayjs/esm';
 import { Course } from 'app/entities/course.model';
 import { StudentExam } from 'app/entities/student-exam.model';

src/main/webapp/app/entities/exercise-group.model.ts

@@ -1,5 +1,5 @@
 import { Exercise } from 'app/entities/exercise.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 
 export class ExerciseGroup implements BaseEntity {

src/main/webapp/app/entities/feedback.model.ts

@@ -1,9 +1,9 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { Result } from 'app/entities/result.model';
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model';
 import { convertToHtmlLinebreaks, escapeString } from 'app/utils/text.utils';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 
 export enum FeedbackHighlightColor {
     RED = 'rgba(219, 53, 69, 0.6)',

src/main/webapp/app/entities/grading-scale.model.ts

@@ -1,7 +1,7 @@
 import { GradeStep } from 'app/entities/grade-step.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 export class GradingScale implements BaseEntity {
     public static readonly DEFAULT_PLAGIARISM_GRADE = 'U'; // This should be the same as the corresponding constant in GradingScale.java

src/main/webapp/app/entities/hestia/exercise-hint.model.ts

@@ -1,4 +1,4 @@
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model';
 

src/main/webapp/app/entities/hestia/programming-exercise-git-diff-report.model.ts

@@ -1,4 +1,4 @@
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { ProgrammingExerciseGitDiffEntry } from 'app/entities/hestia/programming-exercise-git-diff-entry.model';
 

src/main/webapp/app/entities/hestia/programming-exercise-solution-entry.model.ts

@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { CodeHint } from 'app/entities/hestia/code-hint-model';
 
 export class ProgrammingExerciseSolutionEntry implements BaseEntity {

src/main/webapp/app/entities/hestia/programming-exercise-task.model.ts

@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 
 export class ProgrammingExerciseServerSideTask implements BaseEntity {
     public id?: number;

src/main/webapp/app/entities/hestia/testwise-coverage-report-entry.model.ts

@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 
 export class TestwiseCoverageReportEntry implements BaseEntity {
     public id?: number;

src/main/webapp/app/entities/iris/iris-exercise-chat-session.model.ts

@@ -1,5 +1,5 @@
 import { IrisSession } from 'app/entities/iris/iris-session.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class IrisExerciseChatSession extends IrisSession {
     exercise?: ProgrammingExercise;

src/main/webapp/app/entities/metis/conversation/channel.model.ts

@@ -1,7 +1,7 @@
 import { Conversation, ConversationDTO, ConversationType } from 'app/entities/metis/conversation/conversation.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { Lecture } from 'app/entities/lecture.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 // IMPORTANT NOTICE: The following strings have to be consistent with
 // the types defined in ChannelSubType.java

src/main/webapp/app/entities/participation/solution-programming-exercise-participation.model.ts

@@ -1,5 +1,5 @@
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class SolutionProgrammingExerciseParticipation extends Participation {
     public programmingExercise?: ProgrammingExercise;

src/main/webapp/app/entities/participation/template-programming-exercise-participation.model.ts

@@ -1,5 +1,5 @@
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class TemplateProgrammingExerciseParticipation extends Participation {
     public programmingExercise?: ProgrammingExercise;

src/main/webapp/app/entities/programming/aeolus.result.ts

@@ -0,0 +1,7 @@
+export class AeolusResult {
+    name: string;
+    path: string;
+    ignore: string;
+    type?: string;
+    before?: boolean;
+}

src/main/webapp/app/entities/build-agent.model.ts → src/main/webapp/app/entities/programming/build-agent.model.ts

@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { BuildJob } from 'app/entities/build-job.model';
+import { BuildJob } from 'app/entities/programming/build-job.model';
 
 export class BuildAgent implements BaseEntity {
     public id?: number;

src/main/webapp/app/entities/build-job.model.ts → src/main/webapp/app/entities/programming/build-job.model.ts

@@ -1,7 +1,7 @@
 import { StringBaseEntity } from 'app/shared/model/base-entity';
-import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/repository-info.model';
+import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { JobTimingInfo } from 'app/entities/job-timing-info.model';
-import { BuildConfig } from 'app/entities/build-config.model';
+import { BuildConfig } from 'app/entities/programming/build-config.model';
 import { Result } from 'app/entities/result.model';
 import dayjs from 'dayjs/esm';
 

src/main/webapp/app/entities/build-log.model.ts → src/main/webapp/app/entities/programming/build-log.model.ts

@@ -1,6 +1,6 @@
 import { safeUnescape } from 'app/shared/util/security.util';
 import { Annotation } from 'app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component';
-import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 
 export enum BuildLogType {
     ERROR = 'ERROR',

src/main/webapp/app/entities/build-plan.model.ts → src/main/webapp/app/entities/programming/build-plan.model.ts

@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class BuildPlan implements BaseEntity {
     public id?: number;

src/main/webapp/app/entities/programming/build.action.ts

@@ -0,0 +1,19 @@
+import { AeolusResult } from 'app/entities/programming/aeolus.result';
+
+export class BuildAction {
+    name: string;
+    runAlways: boolean;
+    workdir: string;
+    results?: AeolusResult[];
+    platform?: string;
+    parameters: Map<string, string | boolean | number> = new Map<string, string | boolean | number>();
+}
+
+export class ScriptAction extends BuildAction {
+    script: string;
+}
+
+export class PlatformAction extends BuildAction {
+    type: string;
+    kind: string;
+}

src/main/webapp/app/entities/checkout-directories-dto.ts → src/main/webapp/app/entities/programming/checkout-directories-dto.ts

@@ -1,4 +1,4 @@
-import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/build-plan-checkout-directories-dto';
+import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/programming/build-plan-checkout-directories-dto';
 
 export class CheckoutDirectoriesDto {
     submissionBuildPlanCheckoutDirectories?: BuildPlanCheckoutDirectoriesDTO;

src/main/webapp/app/entities/programming/docker.configuration.ts

@@ -0,0 +1,6 @@
+export class DockerConfiguration {
+    image: string;
+    tag?: string;
+    volumes: Map<string, string>;
+    parameters: Map<string, string>;
+}

src/main/webapp/app/entities/programming/programming-exercise-build.config.ts

@@ -0,0 +1,19 @@
+import { WindFile } from 'app/entities/programming/wind.file';
+
+export class ProgrammingExerciseBuildConfig {
+    public sequentialTestRuns?: boolean;
+    public buildPlanConfiguration?: string;
+    public buildScript?: string;
+    public checkoutSolutionRepository?: boolean;
+    public checkoutPath?: string;
+    public timeoutSeconds?: number;
+    public dockerFlags?: string;
+    public windfile?: WindFile;
+    public testwiseCoverageEnabled?: boolean;
+    public theiaImage?: string;
+
+    constructor() {
+        this.checkoutSolutionRepository = false; // default value
+        this.testwiseCoverageEnabled = false; // default value
+    }
+}

src/main/webapp/app/entities/programming-exercise-test-case.model.ts → src/main/webapp/app/entities/programming/programming-exercise-test-case.model.ts

@@ -1,4 +1,4 @@
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
 import { TestCaseStats } from './programming-exercise-test-case-statistics.model';