diff --git a/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.ts b/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.ts index bb8614435e1d..8855ae1fb047 100644 --- a/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.ts +++ b/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({ diff --git a/src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts b/src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts index a2418b6b35d4..3245b9f4af72 100644 --- a/src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts +++ b/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'; diff --git a/src/main/webapp/app/assessment/assessment-instructions/assessment-instructions/assessment-instructions.component.ts b/src/main/webapp/app/assessment/assessment-instructions/assessment-instructions/assessment-instructions.component.ts index c7c7aa77c910..d854c6f7ad58 100644 --- a/src/main/webapp/app/assessment/assessment-instructions/assessment-instructions/assessment-instructions.component.ts +++ b/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'; diff --git a/src/main/webapp/app/assessment/athena.service.ts b/src/main/webapp/app/assessment/athena.service.ts index 01e7d4ca0def..962e56b70a39 100644 --- a/src/main/webapp/app/assessment/athena.service.ts +++ b/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'; diff --git a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.ts b/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.ts index b37486509496..b469dcab432f 100644 --- a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.ts +++ b/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'; diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.ts b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.ts index 1f813c75104c..a39b6af80e77 100644 --- a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.ts +++ b/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'; diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.ts b/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.ts index 704c19d37fdc..7bc20e00e55c 100644 --- a/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.ts +++ b/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'; diff --git a/src/main/webapp/app/course/manage/course-update.component.ts b/src/main/webapp/app/course/manage/course-update.component.ts index cc260d0a289b..a3406ad5f46b 100644 --- a/src/main/webapp/app/course/manage/course-update.component.ts +++ b/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'; diff --git a/src/main/webapp/app/course/manage/courses-for-dashboard-dto.ts b/src/main/webapp/app/course/manage/courses-for-dashboard-dto.ts index 43d6336168a7..123e334cca33 100644 --- a/src/main/webapp/app/course/manage/courses-for-dashboard-dto.ts +++ b/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[]; diff --git a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts b/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts index 71cf05de5b35..60ed25bd572a 100644 --- a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts +++ b/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'; diff --git a/src/main/webapp/app/detail-overview-list/detail.model.ts b/src/main/webapp/app/detail-overview-list/detail.model.ts index fdb8b2eabf15..4e80437fe3d2 100644 --- a/src/main/webapp/app/detail-overview-list/detail.model.ts +++ b/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'; diff --git a/src/main/webapp/app/entities/consistency-check-result.model.ts b/src/main/webapp/app/entities/consistency-check-result.model.ts index b887135572b7..67b23aeb1193 100644 --- a/src/main/webapp/app/entities/consistency-check-result.model.ts +++ b/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', diff --git a/src/main/webapp/app/entities/course.model.ts b/src/main/webapp/app/entities/course.model.ts index 77abadd7a640..4f179de3a687 100644 --- a/src/main/webapp/app/entities/course.model.ts +++ b/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'; diff --git a/src/main/webapp/app/entities/exam-checklist.model.ts b/src/main/webapp/app/entities/exam/exam-checklist.model.ts similarity index 100% rename from src/main/webapp/app/entities/exam-checklist.model.ts rename to src/main/webapp/app/entities/exam/exam-checklist.model.ts diff --git a/src/main/webapp/app/entities/exam-exercise-overview-item.model.ts b/src/main/webapp/app/entities/exam/exam-exercise-overview-item.model.ts similarity index 100% rename from src/main/webapp/app/entities/exam-exercise-overview-item.model.ts rename to src/main/webapp/app/entities/exam/exam-exercise-overview-item.model.ts diff --git a/src/main/webapp/app/entities/exam-information.model.ts b/src/main/webapp/app/entities/exam/exam-information.model.ts similarity index 100% rename from src/main/webapp/app/entities/exam-information.model.ts rename to src/main/webapp/app/entities/exam/exam-information.model.ts diff --git a/src/main/webapp/app/entities/exam-page.model.ts b/src/main/webapp/app/entities/exam/exam-page.model.ts similarity index 100% rename from src/main/webapp/app/entities/exam-page.model.ts rename to src/main/webapp/app/entities/exam/exam-page.model.ts diff --git a/src/main/webapp/app/entities/exam-session.model.ts b/src/main/webapp/app/entities/exam/exam-session.model.ts similarity index 97% rename from src/main/webapp/app/entities/exam-session.model.ts rename to src/main/webapp/app/entities/exam/exam-session.model.ts index feb4670ac5c9..96fc05c9b400 100644 --- a/src/main/webapp/app/entities/exam-session.model.ts +++ b/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', diff --git a/src/main/webapp/app/entities/exam-user-dto.model.ts b/src/main/webapp/app/entities/exam/exam-user-dto.model.ts similarity index 100% rename from src/main/webapp/app/entities/exam-user-dto.model.ts rename to src/main/webapp/app/entities/exam/exam-user-dto.model.ts diff --git a/src/main/webapp/app/entities/exam-user.model.ts b/src/main/webapp/app/entities/exam/exam-user.model.ts similarity index 93% rename from src/main/webapp/app/entities/exam-user.model.ts rename to src/main/webapp/app/entities/exam/exam-user.model.ts index 53a46e26e36d..e1d3edae6fb1 100644 --- a/src/main/webapp/app/entities/exam-user.model.ts +++ b/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 { diff --git a/src/main/webapp/app/entities/exam-users-attendance-check-dto.model.ts b/src/main/webapp/app/entities/exam/exam-users-attendance-check-dto.model.ts similarity index 100% rename from src/main/webapp/app/entities/exam-users-attendance-check-dto.model.ts rename to src/main/webapp/app/entities/exam/exam-users-attendance-check-dto.model.ts diff --git a/src/main/webapp/app/entities/exam.model.ts b/src/main/webapp/app/entities/exam/exam.model.ts similarity index 97% rename from src/main/webapp/app/entities/exam.model.ts rename to src/main/webapp/app/entities/exam/exam.model.ts index f8c813558467..4ebd6fea578f 100644 --- a/src/main/webapp/app/entities/exam.model.ts +++ b/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'; diff --git a/src/main/webapp/app/entities/exercise-group.model.ts b/src/main/webapp/app/entities/exercise-group.model.ts index 65c14544f2e4..aeca98ee9109 100644 --- a/src/main/webapp/app/entities/exercise-group.model.ts +++ b/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 { diff --git a/src/main/webapp/app/entities/feedback.model.ts b/src/main/webapp/app/entities/feedback.model.ts index 7666973744e9..7c6809e6e2f3 100644 --- a/src/main/webapp/app/entities/feedback.model.ts +++ b/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)', diff --git a/src/main/webapp/app/entities/grading-scale.model.ts b/src/main/webapp/app/entities/grading-scale.model.ts index 7652eb6e9248..2042535aab54 100644 --- a/src/main/webapp/app/entities/grading-scale.model.ts +++ b/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 diff --git a/src/main/webapp/app/entities/hestia/exercise-hint.model.ts b/src/main/webapp/app/entities/hestia/exercise-hint.model.ts index d48c828adba2..fa61b885b7ec 100644 --- a/src/main/webapp/app/entities/hestia/exercise-hint.model.ts +++ b/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'; diff --git a/src/main/webapp/app/entities/hestia/programming-exercise-git-diff-report.model.ts b/src/main/webapp/app/entities/hestia/programming-exercise-git-diff-report.model.ts index 4471eb472fce..5fccf4e2f4aa 100644 --- a/src/main/webapp/app/entities/hestia/programming-exercise-git-diff-report.model.ts +++ b/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'; diff --git a/src/main/webapp/app/entities/hestia/programming-exercise-solution-entry.model.ts b/src/main/webapp/app/entities/hestia/programming-exercise-solution-entry.model.ts index eb1ee53e4ec2..9380ec858a4f 100644 --- a/src/main/webapp/app/entities/hestia/programming-exercise-solution-entry.model.ts +++ b/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 { diff --git a/src/main/webapp/app/entities/hestia/programming-exercise-task.model.ts b/src/main/webapp/app/entities/hestia/programming-exercise-task.model.ts index d83351b2883b..43d4a5b5d144 100644 --- a/src/main/webapp/app/entities/hestia/programming-exercise-task.model.ts +++ b/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; diff --git a/src/main/webapp/app/entities/hestia/testwise-coverage-report-entry.model.ts b/src/main/webapp/app/entities/hestia/testwise-coverage-report-entry.model.ts index 47c49d57483d..59234fffbcfe 100644 --- a/src/main/webapp/app/entities/hestia/testwise-coverage-report-entry.model.ts +++ b/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; diff --git a/src/main/webapp/app/entities/iris/iris-exercise-chat-session.model.ts b/src/main/webapp/app/entities/iris/iris-exercise-chat-session.model.ts index 752551cb58c7..c86342e1d332 100644 --- a/src/main/webapp/app/entities/iris/iris-exercise-chat-session.model.ts +++ b/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; diff --git a/src/main/webapp/app/entities/metis/conversation/channel.model.ts b/src/main/webapp/app/entities/metis/conversation/channel.model.ts index 450cfc266691..dbcc9bb3aac1 100644 --- a/src/main/webapp/app/entities/metis/conversation/channel.model.ts +++ b/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 diff --git a/src/main/webapp/app/entities/participation/solution-programming-exercise-participation.model.ts b/src/main/webapp/app/entities/participation/solution-programming-exercise-participation.model.ts index d9db5fc2b9d3..80bad35f24db 100644 --- a/src/main/webapp/app/entities/participation/solution-programming-exercise-participation.model.ts +++ b/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; diff --git a/src/main/webapp/app/entities/participation/template-programming-exercise-participation.model.ts b/src/main/webapp/app/entities/participation/template-programming-exercise-participation.model.ts index 248a30b3e3f4..d6db1617acec 100644 --- a/src/main/webapp/app/entities/participation/template-programming-exercise-participation.model.ts +++ b/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; diff --git a/src/main/webapp/app/entities/programming/aeolus.result.ts b/src/main/webapp/app/entities/programming/aeolus.result.ts new file mode 100644 index 000000000000..593a09df693e --- /dev/null +++ b/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; +} diff --git a/src/main/webapp/app/entities/build-agent.model.ts b/src/main/webapp/app/entities/programming/build-agent.model.ts similarity index 84% rename from src/main/webapp/app/entities/build-agent.model.ts rename to src/main/webapp/app/entities/programming/build-agent.model.ts index bb33b3a4dd4e..172a8596b299 100644 --- a/src/main/webapp/app/entities/build-agent.model.ts +++ b/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; diff --git a/src/main/webapp/app/entities/build-config.model.ts b/src/main/webapp/app/entities/programming/build-config.model.ts similarity index 100% rename from src/main/webapp/app/entities/build-config.model.ts rename to src/main/webapp/app/entities/programming/build-config.model.ts diff --git a/src/main/webapp/app/entities/build-job.model.ts b/src/main/webapp/app/entities/programming/build-job.model.ts similarity index 93% rename from src/main/webapp/app/entities/build-job.model.ts rename to src/main/webapp/app/entities/programming/build-job.model.ts index 55155414cc8d..a36bb9756091 100644 --- a/src/main/webapp/app/entities/build-job.model.ts +++ b/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'; diff --git a/src/main/webapp/app/entities/build-log-statistics-dto.ts b/src/main/webapp/app/entities/programming/build-log-statistics-dto.ts similarity index 100% rename from src/main/webapp/app/entities/build-log-statistics-dto.ts rename to src/main/webapp/app/entities/programming/build-log-statistics-dto.ts diff --git a/src/main/webapp/app/entities/build-log.model.ts b/src/main/webapp/app/entities/programming/build-log.model.ts similarity index 99% rename from src/main/webapp/app/entities/build-log.model.ts rename to src/main/webapp/app/entities/programming/build-log.model.ts index db33d9a63412..fd4135a005cd 100644 --- a/src/main/webapp/app/entities/build-log.model.ts +++ b/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', diff --git a/src/main/webapp/app/entities/build-plan-checkout-directories-dto.ts b/src/main/webapp/app/entities/programming/build-plan-checkout-directories-dto.ts similarity index 100% rename from src/main/webapp/app/entities/build-plan-checkout-directories-dto.ts rename to src/main/webapp/app/entities/programming/build-plan-checkout-directories-dto.ts diff --git a/src/main/webapp/app/entities/build-plan.model.ts b/src/main/webapp/app/entities/programming/build-plan.model.ts similarity index 71% rename from src/main/webapp/app/entities/build-plan.model.ts rename to src/main/webapp/app/entities/programming/build-plan.model.ts index f1f79e0e1e9f..cb6abecf235d 100644 --- a/src/main/webapp/app/entities/build-plan.model.ts +++ b/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; diff --git a/src/main/webapp/app/entities/programming/build.action.ts b/src/main/webapp/app/entities/programming/build.action.ts new file mode 100644 index 000000000000..5e9e3e4463a1 --- /dev/null +++ b/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 = new Map(); +} + +export class ScriptAction extends BuildAction { + script: string; +} + +export class PlatformAction extends BuildAction { + type: string; + kind: string; +} diff --git a/src/main/webapp/app/entities/checkout-directories-dto.ts b/src/main/webapp/app/entities/programming/checkout-directories-dto.ts similarity index 63% rename from src/main/webapp/app/entities/checkout-directories-dto.ts rename to src/main/webapp/app/entities/programming/checkout-directories-dto.ts index 71b05a32d187..657fbce65f6f 100644 --- a/src/main/webapp/app/entities/checkout-directories-dto.ts +++ b/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; diff --git a/src/main/webapp/app/entities/programming/docker.configuration.ts b/src/main/webapp/app/entities/programming/docker.configuration.ts new file mode 100644 index 000000000000..edc08214185c --- /dev/null +++ b/src/main/webapp/app/entities/programming/docker.configuration.ts @@ -0,0 +1,6 @@ +export class DockerConfiguration { + image: string; + tag?: string; + volumes: Map; + parameters: Map; +} diff --git a/src/main/webapp/app/entities/programming-exercise-auxiliary-repository-model.ts b/src/main/webapp/app/entities/programming/programming-exercise-auxiliary-repository-model.ts similarity index 100% rename from src/main/webapp/app/entities/programming-exercise-auxiliary-repository-model.ts rename to src/main/webapp/app/entities/programming/programming-exercise-auxiliary-repository-model.ts diff --git a/src/main/webapp/app/entities/programming/programming-exercise-build.config.ts b/src/main/webapp/app/entities/programming/programming-exercise-build.config.ts new file mode 100644 index 000000000000..eaa526406e08 --- /dev/null +++ b/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 + } +} diff --git a/src/main/webapp/app/entities/programming-exercise-participation.model.ts b/src/main/webapp/app/entities/programming/programming-exercise-participation.model.ts similarity index 100% rename from src/main/webapp/app/entities/programming-exercise-participation.model.ts rename to src/main/webapp/app/entities/programming/programming-exercise-participation.model.ts diff --git a/src/main/webapp/app/entities/programming-exercise-test-case-statistics.model.ts b/src/main/webapp/app/entities/programming/programming-exercise-test-case-statistics.model.ts similarity index 100% rename from src/main/webapp/app/entities/programming-exercise-test-case-statistics.model.ts rename to src/main/webapp/app/entities/programming/programming-exercise-test-case-statistics.model.ts diff --git a/src/main/webapp/app/entities/programming-exercise-test-case.model.ts b/src/main/webapp/app/entities/programming/programming-exercise-test-case.model.ts similarity index 92% rename from src/main/webapp/app/entities/programming-exercise-test-case.model.ts rename to src/main/webapp/app/entities/programming/programming-exercise-test-case.model.ts index 7b0cdfa37311..2d6822dc7ce4 100644 --- a/src/main/webapp/app/entities/programming-exercise-test-case.model.ts +++ b/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'; diff --git a/src/main/webapp/app/entities/programming-exercise.model.ts b/src/main/webapp/app/entities/programming/programming-exercise.model.ts similarity index 76% rename from src/main/webapp/app/entities/programming-exercise.model.ts rename to src/main/webapp/app/entities/programming/programming-exercise.model.ts index daf1bf77e907..3d47a8320bd2 100644 --- a/src/main/webapp/app/entities/programming-exercise.model.ts +++ b/src/main/webapp/app/entities/programming/programming-exercise.model.ts @@ -1,80 +1,16 @@ -import dayjs from 'dayjs/esm'; -import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; -import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; -import { Exercise, ExerciseType, resetForImport } from 'app/entities/exercise.model'; +import { AssessmentType } from 'app/entities/assessment-type.model'; import { Course } from 'app/entities/course.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; -import { SubmissionPolicy } from 'app/entities/submission-policy.model'; -import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; +import { Exercise, ExerciseType, resetForImport } from 'app/entities/exercise.model'; import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model'; -import { BuildLogStatisticsDTO } from 'app/entities/build-log-statistics-dto'; -import { AssessmentType } from 'app/entities/assessment-type.model'; - -export class BuildAction { - name: string; - runAlways: boolean; - workdir: string; - results?: AeolusResult[]; - platform?: string; - parameters: Map = new Map(); -} - -export class AeolusResult { - name: string; - path: string; - ignore: string; - type?: string; - before?: boolean; -} - -export class ScriptAction extends BuildAction { - script: string; -} - -export class PlatformAction extends BuildAction { - type: string; - kind: string; -} - -export class WindMetadata { - author: string | any; - description: string; - id: string; - name: string; - docker: DockerConfiguration; -} - -export class DockerConfiguration { - image: string; - tag?: string; - volumes: Map; - parameters: Map; -} - -export class WindFile { - api: string; - metadata: WindMetadata; - actions: BuildAction[]; -} - -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 - } -} +import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; +import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; +import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; +import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; +import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config'; +import { SubmissionPolicy } from 'app/entities/submission-policy.model'; +import dayjs from 'dayjs/esm'; export enum ProgrammingLanguage { JAVA = 'JAVA', diff --git a/src/main/webapp/app/entities/programming-submission.model.ts b/src/main/webapp/app/entities/programming/programming-submission.model.ts similarity index 100% rename from src/main/webapp/app/entities/programming-submission.model.ts rename to src/main/webapp/app/entities/programming/programming-submission.model.ts diff --git a/src/main/webapp/app/entities/repository-info.model.ts b/src/main/webapp/app/entities/programming/repository-info.model.ts similarity index 100% rename from src/main/webapp/app/entities/repository-info.model.ts rename to src/main/webapp/app/entities/programming/repository-info.model.ts diff --git a/src/main/webapp/app/entities/static-code-analysis-category.model.ts b/src/main/webapp/app/entities/programming/static-code-analysis-category.model.ts similarity index 100% rename from src/main/webapp/app/entities/static-code-analysis-category.model.ts rename to src/main/webapp/app/entities/programming/static-code-analysis-category.model.ts diff --git a/src/main/webapp/app/entities/static-code-analysis-issue.model.ts b/src/main/webapp/app/entities/programming/static-code-analysis-issue.model.ts similarity index 100% rename from src/main/webapp/app/entities/static-code-analysis-issue.model.ts rename to src/main/webapp/app/entities/programming/static-code-analysis-issue.model.ts diff --git a/src/main/webapp/app/entities/test-case-result.model.ts b/src/main/webapp/app/entities/programming/test-case-result.model.ts similarity index 100% rename from src/main/webapp/app/entities/test-case-result.model.ts rename to src/main/webapp/app/entities/programming/test-case-result.model.ts diff --git a/src/main/webapp/app/entities/programming/wind.file.ts b/src/main/webapp/app/entities/programming/wind.file.ts new file mode 100644 index 000000000000..6e960c30c44c --- /dev/null +++ b/src/main/webapp/app/entities/programming/wind.file.ts @@ -0,0 +1,8 @@ +import { BuildAction } from 'app/entities/programming/build.action'; +import { WindMetadata } from 'app/entities/programming/wind.metadata'; + +export class WindFile { + api: string; + metadata: WindMetadata; + actions: BuildAction[]; +} diff --git a/src/main/webapp/app/entities/programming/wind.metadata.ts b/src/main/webapp/app/entities/programming/wind.metadata.ts new file mode 100644 index 000000000000..6ef6f1abc38e --- /dev/null +++ b/src/main/webapp/app/entities/programming/wind.metadata.ts @@ -0,0 +1,9 @@ +import { DockerConfiguration } from 'app/entities/programming/docker.configuration'; + +export class WindMetadata { + author: string | any; + description: string; + id: string; + name: string; + docker: DockerConfiguration; +} diff --git a/src/main/webapp/app/entities/quiz/quiz-pool.model.ts b/src/main/webapp/app/entities/quiz/quiz-pool.model.ts index b6d7f82b7a83..8b59ba5473c3 100644 --- a/src/main/webapp/app/entities/quiz/quiz-pool.model.ts +++ b/src/main/webapp/app/entities/quiz/quiz-pool.model.ts @@ -1,6 +1,6 @@ import { QuizGroup } from 'app/entities/quiz/quiz-group.model'; import { QuizQuestion } from 'app/entities/quiz/quiz-question.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 QuizPool implements BaseEntity { diff --git a/src/main/webapp/app/entities/student-exam.model.ts b/src/main/webapp/app/entities/student-exam.model.ts index 1b15503b27cd..b7eb32c151d6 100644 --- a/src/main/webapp/app/entities/student-exam.model.ts +++ b/src/main/webapp/app/entities/student-exam.model.ts @@ -1,9 +1,9 @@ import dayjs from 'dayjs/esm'; import { User } from 'app/core/user/user.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Exercise } from 'app/entities/exercise.model'; import { BaseEntity } from 'app/shared/model/base-entity'; -import { ExamSession } from 'app/entities/exam-session.model'; +import { ExamSession } from 'app/entities/exam/exam-session.model'; export class StudentExam implements BaseEntity { public id?: number; diff --git a/src/main/webapp/app/entities/submission-policy.model.ts b/src/main/webapp/app/entities/submission-policy.model.ts index 9ae55f0d465e..c6f0d9620f4b 100644 --- a/src/main/webapp/app/entities/submission-policy.model.ts +++ b/src/main/webapp/app/entities/submission-policy.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'; export enum SubmissionPolicyType { diff --git a/src/main/webapp/app/entities/text-assesment-event.model.ts b/src/main/webapp/app/entities/text/text-assesment-event.model.ts similarity index 95% rename from src/main/webapp/app/entities/text-assesment-event.model.ts rename to src/main/webapp/app/entities/text/text-assesment-event.model.ts index c0b04482f1a2..478f39d62ccf 100644 --- a/src/main/webapp/app/entities/text-assesment-event.model.ts +++ b/src/main/webapp/app/entities/text/text-assesment-event.model.ts @@ -1,7 +1,7 @@ import dayjs from 'dayjs/esm'; import { BaseEntity } from 'app/shared/model/base-entity'; import { FeedbackType } from 'app/entities/feedback.model'; -import { TextBlockType } from 'app/entities/text-block.model'; +import { TextBlockType } from 'app/entities/text/text-block.model'; export enum TextAssessmentEventType { ADD_FEEDBACK_AUTOMATICALLY_SELECTED_BLOCK = 'ADD_FEEDBACK_AUTOMATICALLY_SELECTED_BLOCK', diff --git a/src/main/webapp/app/entities/text-block-ref.model.ts b/src/main/webapp/app/entities/text/text-block-ref.model.ts similarity index 91% rename from src/main/webapp/app/entities/text-block-ref.model.ts rename to src/main/webapp/app/entities/text/text-block-ref.model.ts index b31b08353cf3..b643652a939e 100644 --- a/src/main/webapp/app/entities/text-block-ref.model.ts +++ b/src/main/webapp/app/entities/text/text-block-ref.model.ts @@ -1,4 +1,4 @@ -import { TextBlock, TextBlockType } from 'app/entities/text-block.model'; +import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; export class TextBlockRef { diff --git a/src/main/webapp/app/entities/text-block.model.ts b/src/main/webapp/app/entities/text/text-block.model.ts similarity index 96% rename from src/main/webapp/app/entities/text-block.model.ts rename to src/main/webapp/app/entities/text/text-block.model.ts index 4267639950e8..034c590439b1 100644 --- a/src/main/webapp/app/entities/text-block.model.ts +++ b/src/main/webapp/app/entities/text/text-block.model.ts @@ -1,5 +1,5 @@ import { sha1Hex } from 'app/shared/util/crypto.utils'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; export enum TextBlockType { AUTOMATIC = 'AUTOMATIC', diff --git a/src/main/webapp/app/entities/text-change.model.ts b/src/main/webapp/app/entities/text/text-change.model.ts similarity index 100% rename from src/main/webapp/app/entities/text-change.model.ts rename to src/main/webapp/app/entities/text/text-change.model.ts diff --git a/src/main/webapp/app/entities/text-exercise.model.ts b/src/main/webapp/app/entities/text/text-exercise.model.ts similarity index 100% rename from src/main/webapp/app/entities/text-exercise.model.ts rename to src/main/webapp/app/entities/text/text-exercise.model.ts diff --git a/src/main/webapp/app/entities/text-submission.model.ts b/src/main/webapp/app/entities/text/text-submission.model.ts similarity index 84% rename from src/main/webapp/app/entities/text-submission.model.ts rename to src/main/webapp/app/entities/text/text-submission.model.ts index 941e239a1a1f..922987ed7a5b 100644 --- a/src/main/webapp/app/entities/text-submission.model.ts +++ b/src/main/webapp/app/entities/text/text-submission.model.ts @@ -1,4 +1,4 @@ -import { TextBlock } from 'app/entities/text-block.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; import { Submission, SubmissionExerciseType } from 'app/entities/submission.model'; import { Language } from 'app/entities/course.model'; diff --git a/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts b/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts index 49a8462bc98d..e33354d96359 100644 --- a/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts +++ b/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts @@ -1,5 +1,5 @@ import { StudentExamService } from 'app/exam/manage/student-exams/student-exam.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 { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service'; diff --git a/src/main/webapp/app/exam/manage/exam-management.component.ts b/src/main/webapp/app/exam/manage/exam-management.component.ts index 73b0b4c6ed85..bd55ca990c1c 100644 --- a/src/main/webapp/app/exam/manage/exam-management.component.ts +++ b/src/main/webapp/app/exam/manage/exam-management.component.ts @@ -3,14 +3,14 @@ import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; import { Subject, Subscription } from 'rxjs'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { onError } from 'app/shared/util/global.utils'; import { AlertService } from 'app/core/util/alert.service'; import { Course } from 'app/entities/course.model'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { AccountService } from 'app/core/auth/account.service'; import { SortService } from 'app/shared/service/sort.service'; -import { ExamInformationDTO } from 'app/entities/exam-information.model'; +import { ExamInformationDTO } from 'app/entities/exam/exam-information.model'; import dayjs from 'dayjs/esm'; import { EventManager } from 'app/core/util/event-manager.service'; import { faClipboard, faEye, faFileImport, faListAlt, faPlus, faSort, faThList, faTimes, faUser, faWrench } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/exam/manage/exam-management.service.ts b/src/main/webapp/app/exam/manage/exam-management.service.ts index 24fa83f28e40..5f2d4c8f8397 100644 --- a/src/main/webapp/app/exam/manage/exam-management.service.ts +++ b/src/main/webapp/app/exam/manage/exam-management.service.ts @@ -1,18 +1,18 @@ import { Injectable } from '@angular/core'; -import { ExamUserDTO } from 'app/entities/exam-user-dto.model'; -import { ExamUserAttendanceCheckDTO } from 'app/entities/exam-users-attendance-check-dto.model'; +import { ExamUserDTO } from 'app/entities/exam/exam-user-dto.model'; +import { ExamUserAttendanceCheckDTO } from 'app/entities/exam/exam-users-attendance-check-dto.model'; import { filter, map, tap } from 'rxjs/operators'; import { HttpClient, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import dayjs from 'dayjs/esm'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { createRequestOption } from 'app/shared/util/request.util'; import { StudentDTO } from 'app/entities/student-dto.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ExamScoreDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; -import { ExamInformationDTO } from 'app/entities/exam-information.model'; -import { ExamChecklist } from 'app/entities/exam-checklist.model'; +import { ExamInformationDTO } from 'app/entities/exam/exam-information.model'; +import { ExamChecklist } from 'app/entities/exam/exam-checklist.model'; import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.model'; import { Submission, reconnectSubmissions } from 'app/entities/submission.model'; import { AccountService } from 'app/core/auth/account.service'; diff --git a/src/main/webapp/app/exam/manage/exam-status.component.ts b/src/main/webapp/app/exam/manage/exam-status.component.ts index 268e12d47d66..fafa2f201137 100644 --- a/src/main/webapp/app/exam/manage/exam-status.component.ts +++ b/src/main/webapp/app/exam/manage/exam-status.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core'; import { faArrowRight, faCheckCircle, faCircleExclamation, faDotCircle, faTimes, faTimesCircle } from '@fortawesome/free-solid-svg-icons'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExamChecklistService } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist.service'; -import { ExamChecklist } from 'app/entities/exam-checklist.model'; +import { ExamChecklist } from 'app/entities/exam/exam-checklist.model'; import dayjs from 'dayjs/esm'; import { round } from 'app/shared/util/utils'; import { Course } from 'app/entities/course.model'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-button.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-button.component.ts index 1abff9c1f9ea..826a85b0a83d 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-button.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-button.component.ts @@ -4,7 +4,7 @@ import { faBullhorn } from '@fortawesome/free-solid-svg-icons'; import dayjs from 'dayjs/esm'; import { Subscription, from } from 'rxjs'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { AlertService } from 'app/core/util/alert.service'; import { ExamLiveAnnouncementCreateModalComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.ts index 5a2a236c2396..f873b396b058 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core'; -import { Exam } from 'app/entities/exam.model'; -import { ExamChecklist } from 'app/entities/exam-checklist.model'; +import { Exam } from 'app/entities/exam/exam.model'; +import { ExamChecklist } from 'app/entities/exam/exam-checklist.model'; import { faChartBar, faEye, faListAlt, faThList, faUser, faWrench } from '@fortawesome/free-solid-svg-icons'; import { ExamChecklistService } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist.service'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.service.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.service.ts index fc85375c8e28..ac6133a43d76 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.service.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.service.ts @@ -1,7 +1,7 @@ import { HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ExamChecklist } from 'app/entities/exam-checklist.model'; -import { Exam } from 'app/entities/exam.model'; +import { ExamChecklist } from 'app/entities/exam/exam-checklist.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts index 8eb453d1a091..a1bb4e17c565 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts @@ -3,7 +3,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { faBan, faCheck, faSpinner } from '@fortawesome/free-solid-svg-icons'; -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 { examWorkingTime } from 'app/exam/participate/exam.utils'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts index 5433a4e48887..4024634666c9 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts @@ -4,7 +4,7 @@ import { faHourglassHalf } from '@fortawesome/free-solid-svg-icons'; import dayjs from 'dayjs/esm'; import { Subscription, from } from 'rxjs'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { AlertService } from 'app/core/util/alert.service'; import { ExamEditWorkingTimeDialogComponent } from './exam-edit-working-time-dialog.component'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts index 582e72ad65d5..21638aa00238 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { SafeHtml } from '@angular/platform-browser'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { Subject } from 'rxjs'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; import { ButtonSize } from 'app/shared/components/button.component'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.ts b/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.ts index 342c7b6fb1c1..9739343cb687 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { faCheckDouble, faFont } from '@fortawesome/free-solid-svg-icons'; import { Exercise, ExerciseType, getIcon } from 'app/entities/exercise.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import-paging.service.ts b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import-paging.service.ts index e9b8976146f3..ca9bcbf3f1fc 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import-paging.service.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import-paging.service.ts @@ -1,6 +1,6 @@ import { HttpClient, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { PagingService } from 'app/exercises/shared/manage/paging.service'; import { SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table'; import { Observable } from 'rxjs'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.ts b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.ts index 35a04a6c96cc..f97c8c3d537b 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.ts @@ -3,7 +3,7 @@ import { Component, Input, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { ExamExerciseImportComponent } from 'app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component'; diff --git a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.ts b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.ts index 946654f067f4..c022b55ec428 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; @Component({ selector: 'jhi-exam-mode-picker', diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts index d9068bff7473..ea4d3a510ec4 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts @@ -6,7 +6,7 @@ import { Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/c import { ActivatedRoute, Router } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { faBan, faExclamationTriangle, faSave } from '@fortawesome/free-solid-svg-icons'; -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 { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { AlertService } from 'app/core/util/alert.service'; diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.ts b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.ts index bfee12779e25..7acfb1fac6a6 100644 --- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.ts +++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.ts @@ -5,7 +5,7 @@ import { AlertService } from 'app/core/util/alert.service'; import { Observable } from 'rxjs'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { onError } from 'app/shared/util/global.utils'; import { faBan, faSave } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.ts b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.ts index b2c563ecbfd1..8fcac15d391b 100644 --- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.ts +++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.ts @@ -10,10 +10,10 @@ import { onError } from 'app/shared/util/global.utils'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; -import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model'; +import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { AlertService } from 'app/core/util/alert.service'; import { EventManager } from 'app/core/util/event-manager.service'; diff --git a/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts b/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts index 949ab1482efe..a2b6d64ca6e0 100644 --- a/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts +++ b/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { HttpResponse } from '@angular/common/http'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model'; import { Exercise } from 'app/entities/exercise.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { createBuildPlanUrl } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.ts index 7d489674a1e0..7eafe4900d96 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.ts +++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { ButtonSize } from 'app/shared/components/button.component'; import { GitDiffReportModalComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component'; diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component.ts index f351e89940b8..1b54bd14ff8a 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component.ts +++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component.ts @@ -2,14 +2,14 @@ import { AfterViewInit, Component, OnDestroy, OnInit, QueryList, ViewChild, View import { ActivatedRoute } from '@angular/router'; import { StudentExam } from 'app/entities/student-exam.model'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ExamPage } from 'app/entities/exam-page.model'; +import { ExamPage } from 'app/entities/exam/exam-page.model'; import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component'; import { ExamNavigationBarComponent } from 'app/exam/participate/exam-navigation-bar/exam-navigation-bar.component'; import { SubmissionService } from 'app/exercises/shared/submission/submission.service'; import dayjs from 'dayjs/esm'; import { SubmissionVersion } from 'app/entities/submission-version.model'; import { Observable, Subscription, forkJoin, map, mergeMap, toArray } from 'rxjs'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { Submission } from 'app/entities/submission.model'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; import { FileUploadExamSubmissionComponent } from 'app/exam/participate/exercises/file-upload/file-upload-exam-submission.component'; diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts index 8ca3aed74f49..f10fc54ecf2a 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts +++ b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts @@ -10,7 +10,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 { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import dayjs from 'dayjs/esm'; import { AccountService } from 'app/core/auth/account.service'; diff --git a/src/main/webapp/app/exam/manage/students/exam-students.component.ts b/src/main/webapp/app/exam/manage/students/exam-students.component.ts index 43e72be1cbe3..ccc0f9e42671 100644 --- a/src/main/webapp/app/exam/manage/students/exam-students.component.ts +++ b/src/main/webapp/app/exam/manage/students/exam-students.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { ExamUser } from 'app/entities/exam-user.model'; +import { ExamUser } from 'app/entities/exam/exam-user.model'; import { Observable, Subject, Subscription, of } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { User } from 'app/core/user/user.model'; @@ -9,7 +9,7 @@ import { catchError, map, switchMap, tap } from 'rxjs/operators'; import { UserService } from 'app/core/user/user.service'; import { DataTableComponent } from 'app/shared/data-table/data-table.component'; import { iconsAsHTML } from 'app/utils/icons.utils'; -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 { ButtonSize, ButtonType } from 'app/shared/components/button.component'; import { AccountService } from 'app/core/auth/account.service'; diff --git a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-button.component.ts b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-button.component.ts index 5f2cee93c4bf..16b03fe9bbcd 100644 --- a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-button.component.ts +++ b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-button.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { StudentsUploadImagesDialogComponent } from 'app/exam/manage/students/upload-images/students-upload-images-dialog.component'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { faPlus, faUpload } from '@fortawesome/free-solid-svg-icons'; @Component({ diff --git a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.ts b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.ts index 3208de448eb1..f94e4b9f836c 100644 --- a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.ts +++ b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.ts @@ -5,7 +5,7 @@ import { AlertService } from 'app/core/util/alert.service'; import { HttpErrorResponse } from '@angular/common/http'; import { Subject } from 'rxjs'; import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; -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 { faArrowRight, faBan, faCheck, faCircleNotch, faSpinner, faUpload } from '@fortawesome/free-solid-svg-icons'; import { onError } from 'app/shared/util/global.utils'; diff --git a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.ts b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.ts index 1d78d6e3806e..e8cfdfa14426 100644 --- a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.ts +++ b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.ts @@ -1,12 +1,12 @@ import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { ExamUserAttendanceCheckDTO } from 'app/entities/exam-users-attendance-check-dto.model'; +import { ExamUserAttendanceCheckDTO } from 'app/entities/exam/exam-users-attendance-check-dto.model'; import { SortService } from 'app/shared/service/sort.service'; import { Subject, Subscription } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; import { UserService } from 'app/core/user/user.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 { ButtonSize, ButtonType } from 'app/shared/components/button.component'; import { AccountService } from 'app/core/auth/account.service'; diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.ts index 18cf6ea1d227..f29b03f4d428 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.ts +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Exercise } from 'app/entities/exercise.model'; -import { SuspiciousExamSessions, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam/exam-session.model'; import { SuspiciousSessionsService } from 'app/exam/manage/suspicious-behavior/suspicious-sessions.service'; import { ActivatedRoute, Router } from '@angular/router'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts index d24b473ec63c..01189459c644 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model'; import { cloneDeep } from 'lodash-es'; @Component({ diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts index 4f104cb23de8..8c526b0461ba 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts @@ -1,6 +1,6 @@ import { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { SuspiciousExamSessions, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam/exam-session.model'; import { Observable } from 'rxjs'; @Injectable({ diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts index 05885359d821..860dd819fd01 100644 --- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts +++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model'; import { StudentExam } from 'app/entities/student-exam.model'; @Component({ diff --git a/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.ts b/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.ts index 829ef039fd9a..a43fa4a9e41c 100644 --- a/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.ts +++ b/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { StudentExam } from 'app/entities/student-exam.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Exercise } from 'app/entities/exercise.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { FormControl, FormGroup, Validators } from '@angular/forms'; diff --git a/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.ts b/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.ts index b10eb427b1dd..06d0196d6ba9 100644 --- a/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.ts +++ b/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { Course } from 'app/entities/course.model'; import { StudentExam } from 'app/entities/student-exam.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 { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { AlertService } from 'app/core/util/alert.service'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/exam/participate/exam-bar/exam-bar.component.ts b/src/main/webapp/app/exam/participate/exam-bar/exam-bar.component.ts index 1b44965d5241..daf2532e3b15 100644 --- a/src/main/webapp/app/exam/participate/exam-bar/exam-bar.component.ts +++ b/src/main/webapp/app/exam/participate/exam-bar/exam-bar.component.ts @@ -7,7 +7,7 @@ import { ExamParticipationService } from 'app/exam/participate/exam-participatio import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { faDoorClosed } from '@fortawesome/free-solid-svg-icons'; import dayjs from 'dayjs/esm'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; @Component({ diff --git a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.ts b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.ts index eeb5bc50f9d4..090588335574 100644 --- a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.ts +++ b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.ts @@ -3,7 +3,7 @@ import { SafeHtml } from '@angular/platform-browser'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { TranslateService } from '@ngx-translate/core'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Course } from 'app/entities/course.model'; import { AccountService } from 'app/core/auth/account.service'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; diff --git a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.ts b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.ts index e73b90d55907..800285feeda1 100644 --- a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.ts +++ b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.ts @@ -1,6 +1,6 @@ import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { LayoutService } from 'app/shared/breakpoints/layout.service'; import { CustomBreakpointNames } from 'app/shared/breakpoints/breakpoints.service'; import dayjs from 'dayjs/esm'; @@ -12,9 +12,9 @@ import { CommitState, DomainChange, DomainType } from 'app/exercises/programming import { CodeEditorRepositoryService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; import { map } from 'rxjs/operators'; import { CodeEditorConflictStateService } from 'app/exercises/programming/shared/code-editor/service/code-editor-conflict-state.service'; -import { ExamSession } from 'app/entities/exam-session.model'; +import { ExamSession } from 'app/entities/exam/exam-session.model'; import { faBars, faCheck, faEdit } from '@fortawesome/free-solid-svg-icons'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { SubmissionVersion } from 'app/entities/submission-version.model'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; diff --git a/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.ts b/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.ts index 61408881fe77..93bcecfa27ae 100644 --- a/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.ts +++ b/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.ts @@ -6,9 +6,9 @@ import { Subscription } from 'rxjs'; import { SidebarEventService } from 'app/shared/sidebar/sidebar-event.service'; import { SidebarData } from 'app/types/sidebar'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; -import { ExamSession } from 'app/entities/exam-session.model'; +import { ExamSession } from 'app/entities/exam/exam-session.model'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { SubmissionVersion } from 'app/entities/submission-version.model'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; import { CodeEditorRepositoryService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; @@ -17,7 +17,7 @@ import { ExamExerciseUpdateService } from 'app/exam/manage/exam-exercise-update. import { ButtonTooltipType, ExamParticipationService } from 'app/exam/participate/exam-participation.service'; import { map } from 'rxjs/operators'; import { CommitState, DomainChange, DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { faChevronRight, faFileLines, faHourglassHalf } from '@fortawesome/free-solid-svg-icons'; import { facSaveSuccess, facSaveWarning } from '../../../../content/icons/icons'; diff --git a/src/main/webapp/app/exam/participate/exam-participation.component.ts b/src/main/webapp/app/exam/participate/exam-participation.component.ts index 18b5eec1daf5..a26170db25ca 100644 --- a/src/main/webapp/app/exam/participate/exam-participation.component.ts +++ b/src/main/webapp/app/exam/participate/exam-participation.component.ts @@ -5,30 +5,30 @@ import { ExamParticipationService } from 'app/exam/participate/exam-participatio import { StudentExam } from 'app/entities/student-exam.model'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { ModelingSubmissionService } from 'app/exercises/modeling/participate/modeling-submission.service'; import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service'; import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service'; import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model'; import { Submission } from 'app/entities/submission.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { BehaviorSubject, Observable, Subject, Subscription, of, throwError } from 'rxjs'; import { catchError, distinctUntilChanged, filter, map, tap, throttleTime, timeout } from 'rxjs/operators'; import { InitializationState } from 'app/entities/participation/participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ComponentCanDeactivate } from 'app/shared/guard/can-deactivate.model'; import { TranslateService } from '@ngx-translate/core'; import { AlertService } from 'app/core/util/alert.service'; import dayjs from 'dayjs/esm'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { cloneDeep } from 'lodash-es'; import { Course } from 'app/entities/course.model'; import { captureException } from '@sentry/angular'; import { HttpErrorResponse } from '@angular/common/http'; -import { ExamPage } from 'app/entities/exam-page.model'; +import { ExamPage } from 'app/entities/exam/exam-page.model'; import { ExamPageComponent } from 'app/exam/participate/exercises/exam-page.component'; import { AUTOSAVE_CHECK_INTERVAL, AUTOSAVE_EXERCISE_INTERVAL } from 'app/shared/constants/exercise-exam-constants'; import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; diff --git a/src/main/webapp/app/exam/participate/exam-participation.service.ts b/src/main/webapp/app/exam/participate/exam-participation.service.ts index a790afa7a361..5e125f6b1288 100644 --- a/src/main/webapp/app/exam/participate/exam-participation.service.ts +++ b/src/main/webapp/app/exam/participate/exam-participation.service.ts @@ -2,7 +2,7 @@ import { HttpClient, HttpErrorResponse, HttpParams, HttpResponse } from '@angula import { Injectable } from '@angular/core'; import { faLightbulb } from '@fortawesome/free-solid-svg-icons'; import { captureException } from '@sentry/angular'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { Exercise, ExerciseType, getIcon } from 'app/entities/exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; diff --git a/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts b/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts index eafff2d69467..33237b989106 100644 --- a/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts +++ b/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { InformationBox, InformationBoxComponent } from 'app/shared/information-box/information-box.component'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { ArtemisExamSharedModule } from 'app/exam/shared/exam-shared.module'; import dayjs from 'dayjs/esm'; diff --git a/src/main/webapp/app/exam/participate/exam.utils.ts b/src/main/webapp/app/exam/participate/exam.utils.ts index fecd529e9a80..1070606f377c 100644 --- a/src/main/webapp/app/exam/participate/exam.utils.ts +++ b/src/main/webapp/app/exam/participate/exam.utils.ts @@ -1,4 +1,4 @@ -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; import dayjs from 'dayjs/esm'; import { round } from 'app/shared/util/utils'; diff --git a/src/main/webapp/app/exam/participate/exercises/exercise-overview-page/exam-exercise-overview-page.component.ts b/src/main/webapp/app/exam/participate/exercises/exercise-overview-page/exam-exercise-overview-page.component.ts index 9e9c12dc8148..483891aba2c1 100644 --- a/src/main/webapp/app/exam/participate/exercises/exercise-overview-page/exam-exercise-overview-page.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/exercise-overview-page/exam-exercise-overview-page.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, O import { Exercise, ExerciseType, getIcon, getIconTooltip } from 'app/entities/exercise.model'; import { ExamPageComponent } from 'app/exam/participate/exercises/exam-page.component'; import { StudentExam } from 'app/entities/student-exam.model'; -import { ExamExerciseOverviewItem } from 'app/entities/exam-exercise-overview-item.model'; +import { ExamExerciseOverviewItem } from 'app/entities/exam/exam-exercise-overview-item.model'; import { ButtonTooltipType, ExamParticipationService } from 'app/exam/participate/exam-participation.service'; import { faHourglassHalf } from '@fortawesome/free-solid-svg-icons'; import { facSaveSuccess, facSaveWarning } from '../../../../../content/icons/icons'; diff --git a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts index 2179d1ba37c6..7b18cda9e20a 100644 --- a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts @@ -3,7 +3,7 @@ import { Submission } from 'app/entities/submission.model'; import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { CommitState, DomainType, EditorState } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; import { Exercise, ExerciseType, IncludedInOverallScore, getCourseFromExercise } from 'app/entities/exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; diff --git a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts index 6b7359bab58b..3a493af08507 100644 --- a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; import { TextEditorService } from 'app/exercises/text/participate/text-editor.service'; import { Subject } from 'rxjs'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { StringCountService } from 'app/exercises/text/participate/string-count.service'; import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component'; diff --git a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts index fb79c9e8ffab..89dc3774bf64 100644 --- a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts +++ b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges } from '@angular/core'; import { StudentExam } from 'app/entities/student-exam.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { endTime, examWorkingTime, getAdditionalWorkingTime, isExamOverMultipleDays } from 'app/exam/participate/exam.utils'; import dayjs from 'dayjs/esm'; diff --git a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts index ef25fa45c928..dc3af180c411 100644 --- a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts +++ b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts @@ -4,7 +4,7 @@ import { Exercise, ExerciseType, IncludedInOverallScore, getIcon } from 'app/ent import dayjs from 'dayjs/esm'; import { ActivatedRoute } from '@angular/router'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { ThemeService } from 'app/core/theme/theme.service'; import { ExerciseResult, StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; @@ -22,7 +22,7 @@ import { faArrowUp, faEye, faEyeSlash, faFolderOpen, faInfoCircle, faPrint } fro import { cloneDeep } from 'lodash-es'; import { captureException } from '@sentry/angular'; import { AlertService } from 'app/core/util/alert.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { isExamResultPublished } from 'app/exam/participate/exam.utils'; import { Course } from 'app/entities/course.model'; diff --git a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts index 6ba27112ac6b..2243c413644a 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts +++ b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnInit, Optional } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseType } from 'app/entities/exercise.model'; import { MissingResultInformation, evaluateTemplateStatus } from 'app/exercises/shared/result/result.utils'; import { FeedbackComponentPreparedParams, prepareFeedbackComponentParameters } from 'app/exercises/shared/feedback/feedback.utils'; diff --git a/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.ts index d1c71b7c9349..217925a8e230 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.ts +++ b/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.ts @@ -9,7 +9,7 @@ import { MultipleChoiceSubmittedAnswer } from 'app/entities/quiz/multiple-choice import { DragAndDropSubmittedAnswer } from 'app/entities/quiz/drag-and-drop-submitted-answer.model'; import { ShortAnswerSubmittedAnswer } from 'app/entities/quiz/short-answer-submitted-answer.model'; import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; import { Result } from 'app/entities/result.model'; import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils'; diff --git a/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts index 5ea1bf223f68..a1dcf5c9de34 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts +++ b/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Exercise } from 'app/entities/exercise.model'; @Component({ diff --git a/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts b/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts index a343ac1c2743..4d90cf31e917 100644 --- a/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts +++ b/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { round } from 'app/shared/util/utils'; import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; import { getRelativeWorkingTimeExtension } from 'app/exam/participate/exam.utils'; diff --git a/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts b/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts index 6ed273f43d6f..ca4b299f55bd 100644 --- a/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts +++ b/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts @@ -8,13 +8,13 @@ import { ButtonSize } from 'app/shared/components/button.component'; import { DomainService } from 'app/exercises/programming/shared/code-editor/service/code-editor-domain.service'; import { ExerciseType, IncludedInOverallScore, getCourseFromExercise } from 'app/entities/exercise.model'; import { Result } from 'app/entities/result.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { Complaint } from 'app/entities/complaint.model'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ProgrammingAssessmentManualResultService } from 'app/exercises/programming/assess/manual-result/programming-assessment-manual-result.service'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { Location } from '@angular/common'; import { AccountService } from 'app/core/auth/account.service'; import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service'; diff --git a/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component.ts b/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component.ts index ab616e7037ca..9a2b5af07fb0 100644 --- a/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component.ts +++ b/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component.ts @@ -4,7 +4,7 @@ import { ProgrammingAssessmentRepoExportDialogComponent } from 'app/exercises/pr import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; import { faDownload } from '@fortawesome/free-solid-svg-icons'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; @Component({ selector: 'jhi-programming-assessment-repo-export', diff --git a/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component.ts b/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component.ts index a33b555747b7..e61c909e6893 100644 --- a/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component.ts +++ b/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component.ts @@ -4,7 +4,7 @@ import { AlertService } from 'app/core/util/alert.service'; import { ProgrammingAssessmentRepoExportService, RepositoryExportOptions } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export.service'; import { HttpResponse } from '@angular/common/http'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { downloadZipFileFromResponse } from 'app/shared/util/download.util'; import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.ts index 56d9dffe846e..d039db390a19 100644 --- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.ts +++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { CoverageReport } from 'app/entities/hestia/coverage-report.model'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; import { CodeHint, CodeHintGenerationStep } from 'app/entities/hestia/code-hint-model'; diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.ts index 71bd928ba2ed..0df03f1664b3 100644 --- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Subject } from 'rxjs'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { CodeHint } from 'app/entities/hestia/code-hint-model'; diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.ts index 254537ce8ad6..59e8150e2fe8 100644 --- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.ts +++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { CodeHint } from 'app/entities/hestia/code-hint-model'; import { faWrench } from '@fortawesome/free-solid-svg-icons'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { CodeHintService } from 'app/exercises/shared/exercise-hint/services/code-hint.service'; import { AlertService } from 'app/core/util/alert.service'; diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component.ts index 44658811f194..0fdc47306615 100644 --- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component.ts +++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { CoverageReport } from 'app/entities/hestia/coverage-report.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { AlertService } from 'app/core/util/alert.service'; @Component({ diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component.ts index 2c2a2929fdfd..3903491a1477 100644 --- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component.ts +++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { AlertService } from 'app/core/util/alert.service'; import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts index 13a0b57ec028..5d4b3c68f675 100644 --- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts +++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts @@ -3,8 +3,8 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; import { SolutionEntryDetailsModalComponent } from 'app/exercises/programming/hestia/generation-overview/solution-entry-details-modal/solution-entry-details-modal.component'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExerciseTestCaseType } from 'app/entities/programming-exercise-test-case.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExerciseTestCaseType } from 'app/entities/programming/programming-exercise-test-case.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { AlertService } from 'app/core/util/alert.service'; import { Subject } from 'rxjs'; import { faSort, faSortDown, faSortUp, faTimes } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/exercises/programming/manage/build-plan-editor.component.ts b/src/main/webapp/app/exercises/programming/manage/build-plan-editor.component.ts index 9aca74dfa4ef..b160bf88b2be 100644 --- a/src/main/webapp/app/exercises/programming/manage/build-plan-editor.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/build-plan-editor.component.ts @@ -3,9 +3,9 @@ import { faCircleNotch, faPlayCircle } from '@fortawesome/free-solid-svg-icons'; import { onError } from 'app/shared/util/global.utils'; import { AlertService } from 'app/core/util/alert.service'; import { BuildPlanService } from 'app/exercises/programming/manage/services/build-plan.service'; -import { BuildPlan } from 'app/entities/build-plan.model'; +import { BuildPlan } from 'app/entities/programming/build-plan.model'; import { ActivatedRoute } from '@angular/router'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; diff --git a/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component.ts b/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component.ts index 3dad17de0cf1..e53bf800e1a9 100644 --- a/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component.ts @@ -12,7 +12,7 @@ import { TemplateProgrammingExerciseParticipation } from 'app/entities/participa import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; import { ExerciseType } from 'app/entities/exercise.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; import { DomainChange, DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts index 27aeb8f9ff8d..236a85bf0cce 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges } from '@angular/core'; -import { IssuesMap } from 'app/entities/programming-exercise-test-case-statistics.model'; -import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model'; +import { IssuesMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; +import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model'; export class IssueColumn { w: string; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component.ts index 59c58c9fc817..58e2d7aa9dd3 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model'; -import { CategoryIssuesMap } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model'; +import { CategoryIssuesMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; import { TranslateService } from '@ngx-translate/core'; import { getColor } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.utils'; import { ProgrammingGradingChartsDirective } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.directive'; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.ts index 5aceb9c57804..568402289fca 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; -import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { TestCaseStatsMap } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { TestCaseStatsMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; import { TranslateService } from '@ngx-translate/core'; import { getColor } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.utils'; import { ProgrammingGradingChartsDirective } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.directive'; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component.ts index d7c9dadfe0ed..03e4a076bc58 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnChanges } from '@angular/core'; -import { TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; import { round } from 'app/shared/util/utils'; @Component({ diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading-actions.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading-actions.component.ts index fec4e31523f6..6c91acef5676 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading-actions.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading-actions.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; /** * The actions of the grading page: diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts index c242b861d14e..be99194cbd3c 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts @@ -7,10 +7,10 @@ import { AccountService } from 'app/core/auth/account.service'; import { AlertService } from 'app/core/util/alert.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { Course } from 'app/entities/course.model'; -import { IssuesMap, ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model'; -import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model'; -import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; -import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model'; +import { IssuesMap, ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; +import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; +import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; +import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model'; import { SubmissionPolicy, SubmissionPolicyType } from 'app/entities/submission-policy.model'; import { ProgrammingGradingChartsDirective } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.directive'; import { ProgrammingExerciseGradingService, StaticCodeAnalysisCategoryUpdate } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-submission-policy-configuration-actions.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-submission-policy-configuration-actions.component.ts index 36fcfeb230b6..7e5156faaa52 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-submission-policy-configuration-actions.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-submission-policy-configuration-actions.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { faSave } from '@fortawesome/free-solid-svg-icons'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { SubmissionPolicyType } from 'app/entities/submission-policy.model'; import { ButtonType } from 'app/shared/components/button.component'; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-table-actions.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-table-actions.component.ts index 714ef84c2beb..ae956e5b7a96 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-table-actions.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-table-actions.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { faCopy } from '@fortawesome/free-solid-svg-icons'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { GradingTab } from 'app/exercises/programming/manage/grading/programming-exercise-configure-grading.component'; import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component'; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.ts index a40d38cade8e..bd491c999df9 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.ts @@ -1,12 +1,12 @@ import { Component, Input, OnInit } from '@angular/core'; import { ProgrammingExerciseTaskService } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { faAngleDown, faAngleRight, faAsterisk, faMedal, faQuestionCircle, faScaleUnbalanced, faSort, faSortDown, faSortUp } from '@fortawesome/free-solid-svg-icons'; -import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; import { ProgrammingExerciseTask } from './programming-exercise-task'; import { Observable, Subject } from 'rxjs'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { isExamExercise } from 'app/shared/util/utils'; import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model'; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.service.ts index 508c1e4d21bf..5f45d551b476 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.service.ts @@ -4,11 +4,11 @@ import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programmi import { Observable, catchError, of, tap } from 'rxjs'; import { Exercise } from 'app/entities/exercise.model'; import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils'; -import { ProgrammingExerciseGradingStatistics, TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseGradingStatistics, TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { ProgrammingExerciseGradingService, ProgrammingExerciseTestCaseUpdate } from '../../services/programming-exercise-grading.service'; import { AlertService } from 'app/core/util/alert.service'; import { map, mergeMap } from 'rxjs/operators'; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.ts b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.ts index cff99aac5cc2..3a5844ddbb9e 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.ts @@ -1,6 +1,6 @@ import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model'; -import { TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model'; -import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType, Visibility } from 'app/entities/programming-exercise-test-case.model'; +import { TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; +import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; export class ProgrammingExerciseTask extends ProgrammingExerciseServerSideTask { declare testCases: ProgrammingExerciseTestCase[]; diff --git a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component.ts index d8c77b50c8df..837c0210f76d 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { faAngleDown, faAngleRight } from '@fortawesome/free-solid-svg-icons'; import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task'; -import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; import { ProgrammingExerciseTaskService } from '../programming-exercise-task.service'; import { Subject } from 'rxjs'; diff --git a/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.ts b/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.ts index b20fb2d6e149..e194057bfd89 100644 --- a/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.ts @@ -2,11 +2,11 @@ import { AfterViewInit, Component, EventEmitter, HostListener, Input, OnChanges, import { AlertService } from 'app/core/util/alert.service'; import { Observable, Subject, Subscription, of, throwError } from 'rxjs'; import { catchError, map as rxMap, switchMap, tap } from 'rxjs/operators'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { ProblemStatementAnalysis } from 'app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.model'; import { Participation } from 'app/entities/participation/participation.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { hasExerciseChanged } from 'app/exercises/shared/exercise/exercise.utils'; import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.ts index 5ec55e54f894..9c842a025b85 100644 --- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.ts @@ -4,7 +4,7 @@ import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service' import { faFileImport, faKeyboard, faPlus } from '@fortawesome/free-solid-svg-icons'; import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component'; import { ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { Router } from '@angular/router'; diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts index 6576932d20e1..1a1a95462530 100644 --- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts @@ -1,11 +1,12 @@ import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { SafeHtml } from '@angular/platform-browser'; +import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config'; import { Subject, Subscription } from 'rxjs'; -import { ProgrammingExercise, ProgrammingExerciseBuildConfig, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { AlertService, AlertType } 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 { AccountService } from 'app/core/auth/account.service'; import { HttpErrorResponse } from '@angular/common/http'; import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-edit-selected.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-edit-selected.component.ts index 5dd785d95005..287e50b11913 100644 --- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-edit-selected.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-edit-selected.component.ts @@ -3,7 +3,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { AlertService, AlertType } from 'app/core/util/alert.service'; import { faSave } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts index 39ed8888464a..54c277c9bd7d 100644 --- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts +++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts @@ -3,7 +3,7 @@ import { UserRouteAccessService } from 'app/core/auth/user-route-access-service' import { Injectable, NgModule } from '@angular/core'; import { ProgrammingExerciseDetailComponent } from 'app/exercises/programming/manage/programming-exercise-detail.component'; import { ProgrammingExerciseUpdateComponent } from 'app/exercises/programming/manage/update/programming-exercise-update.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { map } from 'rxjs/operators'; import { HttpResponse } from '@angular/common/http'; diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts index b28fbed3d6b9..e40533f526cc 100644 --- a/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts @@ -1,7 +1,7 @@ import { Component, ContentChild, Input, OnDestroy, OnInit, TemplateRef } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { merge } from 'rxjs'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseInstructorRepositoryType, ProgrammingExerciseService } from './services/programming-exercise.service'; import { ActivatedRoute } from '@angular/router'; import { ExerciseComponent } from 'app/exercises/shared/exercise/exercise.component'; @@ -15,7 +15,7 @@ import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service' import { CourseManagementService } from 'app/course/manage/course-management.service'; import { SortService } from 'app/shared/service/sort.service'; import { ProgrammingExerciseEditSelectedComponent } from 'app/exercises/programming/manage/programming-exercise-edit-selected.component'; -import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model'; +import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model'; import { AlertService } from 'app/core/util/alert.service'; import { EventManager } from 'app/core/util/event-manager.service'; import { createBuildPlanUrl } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; diff --git a/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-button.directive.ts b/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-button.directive.ts index a16d439806db..f249959c63b5 100644 --- a/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-button.directive.ts +++ b/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-button.directive.ts @@ -1,7 +1,7 @@ import { Directive, ElementRef, HostListener, Input, OnInit, Renderer2 } from '@angular/core'; import { ProgrammingExerciseResetDialogComponent } from 'app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; @Directive({ selector: '[jhiProgrammingExerciseResetButton]', diff --git a/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component.ts b/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component.ts index 2ffe3935810a..f064e177d1ff 100644 --- a/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component.ts @@ -3,7 +3,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseResetOptions, ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { faBan, faCircleNotch, faSpinner, faUndo } from '@fortawesome/free-solid-svg-icons'; import { PROFILE_AEOLUS, PROFILE_LOCALCI } from 'app/app.constants'; diff --git a/src/main/webapp/app/exercises/programming/manage/services/build-plan.service.ts b/src/main/webapp/app/exercises/programming/manage/services/build-plan.service.ts index ebafd624ea66..49f0aa9dcbff 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/build-plan.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/build-plan.service.ts @@ -1,7 +1,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { BuildPlan } from 'app/entities/build-plan.model'; +import { BuildPlan } from 'app/entities/programming/build-plan.model'; export type EntityResponseType = HttpResponse; diff --git a/src/main/webapp/app/exercises/programming/manage/services/code-analysis-paging.service.ts b/src/main/webapp/app/exercises/programming/manage/services/code-analysis-paging.service.ts index a6bbcc6931cf..39fe777826e6 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/code-analysis-paging.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/code-analysis-paging.service.ts @@ -1,6 +1,6 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExercisePagingService } from 'app/exercises/programming/manage/services/programming-exercise-paging.service'; import { ExercisePagingService } from 'app/exercises/shared/manage/exercise-paging.service'; diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-grading.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-grading.service.ts index 134da4e5abe5..f2ebc62a33f7 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-grading.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-grading.service.ts @@ -3,9 +3,9 @@ import { HttpClient, HttpParams } from '@angular/common/http'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { catchError, map, switchMap, tap } from 'rxjs/operators'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; -import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model'; -import { StaticCodeAnalysisCategory } from 'app/entities/static-code-analysis-category.model'; -import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; +import { StaticCodeAnalysisCategory } from 'app/entities/programming/static-code-analysis-category.model'; +import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; export class ProgrammingExerciseTestCaseUpdate { constructor( diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-paging.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-paging.service.ts index 29c311cfd44b..08012217fb18 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-paging.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-paging.service.ts @@ -1,6 +1,6 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ExercisePagingService } from 'app/exercises/shared/manage/exercise-paging.service'; @Injectable({ providedIn: 'root' }) diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-participation.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-participation.service.ts index 7af098d1a5a7..5953571a4190 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-participation.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-participation.service.ts @@ -7,7 +7,7 @@ import { Result } from 'app/entities/result.model'; import { EntityTitleService, EntityType } from 'app/shared/layouts/navbar/entity-title.service'; import { createRequestOption } from 'app/shared/util/request.util'; import { Observable, map, tap } from 'rxjs'; -import { CommitInfo } from 'app/entities/programming-submission.model'; +import { CommitInfo } from 'app/entities/programming/programming-submission.model'; export interface IProgrammingExerciseParticipationService { getLatestResultWithFeedback: (participationId: number, withSubmission: boolean) => Observable; diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-websocket.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-websocket.service.ts index a73a3bc5c715..30d8f11507b7 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-websocket.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-websocket.service.ts @@ -3,7 +3,7 @@ import { HttpResponse } from '@angular/common/http'; import { BehaviorSubject, Observable } from 'rxjs'; import { filter, tap } from 'rxjs/operators'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; export type EntityResponseType = HttpResponse; export type EntityArrayResponseType = HttpResponse; diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts index 39fa4800ecb6..82077ff4ffd6 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts @@ -7,7 +7,7 @@ import { omit as _omit } from 'lodash-es'; import { createRequestOption } from 'app/shared/util/request.util'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; -import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { 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 { TextPlagiarismResult } from 'app/exercises/shared/plagiarism/types/text/TextPlagiarismResult'; @@ -19,14 +19,14 @@ import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programmin import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model'; import { convertDateFromClient, convertDateFromServer } from 'app/utils/date.utils'; import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; -import { BuildLogStatisticsDTO } from 'app/entities/build-log-statistics-dto'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; +import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto'; import { SortService } from 'app/shared/service/sort.service'; import { Result } from 'app/entities/result.model'; import { Participation } from 'app/entities/participation/participation.model'; import { PlagiarismResultDTO } from 'app/exercises/shared/plagiarism/types/PlagiarismResultDTO'; import { ImportOptions } from 'app/types/programming-exercises'; -import { CheckoutDirectoriesDto } from 'app/entities/checkout-directories-dto'; +import { CheckoutDirectoriesDto } from 'app/entities/programming/checkout-directories-dto'; export type EntityResponseType = HttpResponse; export type EntityArrayResponseType = HttpResponse; diff --git a/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-exercise-status.component.ts b/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-exercise-status.component.ts index 85bf8287074f..f9bd6758fd23 100644 --- a/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-exercise-status.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-exercise-status.component.ts @@ -3,7 +3,7 @@ import { Subscription } from 'rxjs'; import { filter, tap } from 'rxjs/operators'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { Participation } from 'app/entities/participation/participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { findLatestResult } from 'app/shared/util/utils'; import { faCheckCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'; import { hasSolutionParticipationChanged, hasTemplateParticipationChanged } from 'app/exercises/shared/participation/participation.utils'; diff --git a/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-status.component.ts b/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-status.component.ts index 66638d6d712f..9ad6970303a1 100644 --- a/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-status.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-status.component.ts @@ -4,8 +4,8 @@ import { filter } from 'rxjs/operators'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { Result } from 'app/entities/result.model'; import { Participation } from 'app/entities/participation/participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model'; import { findLatestResult } from 'app/shared/util/utils'; import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; diff --git a/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts b/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts index 2b9ece99aff9..06d5d6940c83 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; import { faPlus } from '@fortawesome/free-solid-svg-icons'; @Component({ diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-creation-config.ts b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-creation-config.ts index 8ab3314ac388..36c9b8df3a8c 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-creation-config.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-creation-config.ts @@ -1,8 +1,8 @@ -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { ModePickerOption } from 'app/exercises/shared/mode-picker/mode-picker.component'; import { Observable } from 'rxjs'; -import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; export type ProgrammingExerciseCreationConfig = { titleNamePattern: string; diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts index 5fe22b0b6ff9..e1257c9c467f 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts @@ -2,9 +2,10 @@ import { ActivatedRoute, Params } from '@angular/router'; import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { AlertService, AlertType } from 'app/core/util/alert.service'; +import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config'; import { Observable, Subject, Subscription } from 'rxjs'; import { CourseManagementService } from 'app/course/manage/course-management.service'; -import { ProgrammingExercise, ProgrammingExerciseBuildConfig, ProgrammingLanguage, ProjectType, resetProgrammingForImport } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage, ProjectType, resetProgrammingForImport } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseService } from '../services/programming-exercise.service'; import { FileService } from 'app/shared/http/file.service'; import { TranslateService } from '@ngx-translate/core'; @@ -22,7 +23,7 @@ import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { cloneDeep } from 'lodash-es'; import { ExerciseUpdateWarningService } from 'app/exercises/shared/exercise-update-warning/exercise-update-warning.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; import { SubmissionPolicyType } from 'app/entities/submission-policy.model'; import { faExclamationCircle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; import { ModePickerOption } from 'app/exercises/shared/mode-picker/mode-picker.component'; diff --git a/src/main/webapp/app/exercises/programming/manage/update/remove-auxiliary-repository-button.component.ts b/src/main/webapp/app/exercises/programming/manage/update/remove-auxiliary-repository-button.component.ts index dcd21a30e18c..2ce643767155 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/remove-auxiliary-repository-button.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/remove-auxiliary-repository-button.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; import { faTrash } from '@fortawesome/free-solid-svg-icons'; @Component({ diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.ts index 4f51ccd37432..e350d8c201b9 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.ts @@ -1,5 +1,6 @@ import { Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core'; -import { BuildAction, ProgrammingExercise, ProgrammingLanguage, ProjectType, ScriptAction } from 'app/entities/programming-exercise.model'; +import { BuildAction, ScriptAction } from 'app/entities/programming/build.action'; +import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config'; import { AeolusService } from 'app/exercises/programming/shared/service/aeolus.service'; diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.ts index 1a314af06cfd..437c22fc0f40 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core'; -import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config'; import { AeolusService } from 'app/exercises/programming/shared/service/aeolus.service'; diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts index 5c3f1eb64302..9b90e235dcec 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { ProgrammingExercise, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config'; import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component'; diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts index b82813fa9f06..5a5c6a17c6d3 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Component, Input, OnDestroy, ViewChild } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { SubmissionPolicyType } from 'app/entities/submission-policy.model'; import { TranslateService } from '@ngx-translate/core'; diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts index b1bd35bca30a..f60b0948a4c6 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts @@ -1,6 +1,6 @@ import { AfterViewInit, Component, Input, OnDestroy, QueryList, ViewChild, ViewChildren } from '@angular/core'; import { NgModel } from '@angular/forms'; -import { ProgrammingExercise, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config'; import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component'; import { Subject, Subscription } from 'rxjs'; diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts index 5bcf49abc770..696d75ce185f 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts @@ -1,5 +1,5 @@ import { AfterViewChecked, AfterViewInit, Component, EventEmitter, Input, OnDestroy, ViewChild } from '@angular/core'; -import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config'; import { PROFILE_AEOLUS, PROFILE_LOCALCI } from 'app/app.constants'; diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts index 74eba35715a5..803b06558f72 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config'; diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.ts index 98849723625d..b516009846ed 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; -import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config'; import { TheiaService } from 'app/exercises/programming/shared/service/theia.service'; import { ArtemisSharedLibsModule } from 'app/shared/shared-libs.module'; diff --git a/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts b/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts index 826902c2058a..34aa3e0b0d5a 100644 --- a/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts +++ b/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts @@ -10,7 +10,7 @@ import { DomainService } from 'app/exercises/programming/shared/code-editor/serv import { ExerciseType, IncludedInOverallScore, getCourseFromExercise } from 'app/entities/exercise.model'; import { Result } from 'app/entities/result.model'; import { Feedback, FeedbackType, checkSubsequentFeedbackInAssessment } from 'app/entities/feedback.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; import { ActivatedRoute } from '@angular/router'; import { CodeEditorContainerComponent } from 'app/exercises/programming/shared/code-editor/container/code-editor-container.component'; diff --git a/src/main/webapp/app/exercises/programming/participate/programming-submission-policy-status.ts b/src/main/webapp/app/exercises/programming/participate/programming-submission-policy-status.ts index e6162da1afd9..826437a4ce28 100644 --- a/src/main/webapp/app/exercises/programming/participate/programming-submission-policy-status.ts +++ b/src/main/webapp/app/exercises/programming/participate/programming-submission-policy-status.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { SubmissionPolicyType } from 'app/entities/submission-policy.model'; @Component({ diff --git a/src/main/webapp/app/exercises/programming/participate/programming-submission.service.ts b/src/main/webapp/app/exercises/programming/participate/programming-submission.service.ts index c13539943903..0fd3d43a0535 100644 --- a/src/main/webapp/app/exercises/programming/participate/programming-submission.service.ts +++ b/src/main/webapp/app/exercises/programming/participate/programming-submission.service.ts @@ -7,7 +7,7 @@ import { Result } from 'app/entities/result.model'; import { createRequestOption } from 'app/shared/util/request.util'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { SubmissionType, getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { findLatestResult } from 'app/shared/util/utils'; diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component.ts index afa3062da5b8..60081cc274f3 100644 --- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component.ts @@ -3,7 +3,7 @@ import { debounceTime, map, tap } from 'rxjs/operators'; import { ExerciseSubmissionState, ProgrammingSubmissionService, ProgrammingSubmissionState } from 'app/exercises/programming/participate/programming-submission.service'; import { Subscription } from 'rxjs'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { hasExerciseChanged } from 'app/exercises/shared/exercise/exercise.utils'; import { ButtonType } from 'app/shared/components/button.component'; import { faCircleNotch, faClock, faRedo } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-re-evaluate-button.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-re-evaluate-button.component.ts index 06c2447d5248..2d1710b1b692 100644 --- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-re-evaluate-button.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-re-evaluate-button.component.ts @@ -3,7 +3,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import { AlertService } from 'app/core/util/alert.service'; import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ButtonType } from 'app/shared/components/button.component'; import { faRedo } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component.ts index 3dc928117229..28454d8c0e72 100644 --- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component.ts @@ -6,7 +6,7 @@ import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { hasDueDatePassed } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; import { BuildRunState, ProgrammingBuildRunService } from 'app/exercises/programming/participate/programming-build-run.service'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ButtonType } from 'app/shared/components/button.component'; import { faBan, faRedo, faTimes } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-build-button.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-build-button.component.ts index 5efd0b6ea087..52089b28c991 100644 --- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-build-button.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-build-button.component.ts @@ -10,7 +10,7 @@ import { hasDueDatePassed } from 'app/exercises/programming/shared/utils/program import { Result } from 'app/entities/result.model'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { SubmissionType } from 'app/entities/submission.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { AlertService } from 'app/core/util/alert.service'; import { hasParticipationChanged } from 'app/exercises/shared/participation/participation.utils'; diff --git a/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component.ts b/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component.ts index 4bcffecaa5af..d1932dc53ff3 100644 --- a/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; -import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/build-plan-checkout-directories-dto'; -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; +import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/programming/build-plan-checkout-directories-dto'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; @Component({ selector: 'jhi-programming-exercise-build-plan-checkout-directories', diff --git a/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component.ts b/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component.ts index 30021b146f48..f44d22e06ff7 100644 --- a/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component.ts @@ -1,9 +1,9 @@ import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; import { getCourseFromExercise } from 'app/entities/exercise.model'; -import type { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import type { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { Subscription } from 'rxjs'; -import type { CheckoutDirectoriesDto } from 'app/entities/checkout-directories-dto'; +import type { CheckoutDirectoriesDto } from 'app/entities/programming/checkout-directories-dto'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { ProgrammingExerciseBuildPlanCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component'; diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component.ts b/src/main/webapp/app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component.ts index d4506dbc256b..1c7535cbc9d6 100644 --- a/src/main/webapp/app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component.ts @@ -2,7 +2,7 @@ import { ParticipationWebsocketService } from 'app/overview/participation-websoc import { AfterViewInit, Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { Observable, Subscription, of } from 'rxjs'; import { catchError, filter, map, switchMap, tap } from 'rxjs/operators'; -import { BuildLogEntry, BuildLogEntryArray } from 'app/entities/build-log.model'; +import { BuildLogEntry, BuildLogEntryArray } from 'app/entities/programming/build-log.model'; import { Participation, getExercise } from 'app/entities/participation/participation.model'; import { CodeEditorSubmissionService } from 'app/exercises/programming/shared/code-editor/service/code-editor-submission.service'; import { CodeEditorBuildLogService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; @@ -11,10 +11,10 @@ import { ResultService } from 'app/exercises/shared/result/result.service'; import { Result } from 'app/entities/result.model'; import { Interactable } from '@interactjs/core/Interactable'; import interact from 'interactjs'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { findLatestResult } from 'app/shared/util/utils'; -import { StaticCodeAnalysisIssue } from 'app/entities/static-code-analysis-issue.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { StaticCodeAnalysisIssue } from 'app/entities/programming/static-code-analysis-issue.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { faChevronDown, faCircleNotch, faTerminal } from '@fortawesome/free-solid-svg-icons'; import { hasParticipationChanged } from 'app/exercises/shared/participation/participation.utils'; import { AssessmentType } from 'app/entities/assessment-type.model'; diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/model/code-editor.model.ts b/src/main/webapp/app/exercises/programming/shared/code-editor/model/code-editor.model.ts index 15e715b290ef..a3215aa04c48 100644 --- a/src/main/webapp/app/exercises/programming/shared/code-editor/model/code-editor.model.ts +++ b/src/main/webapp/app/exercises/programming/shared/code-editor/model/code-editor.model.ts @@ -1,7 +1,7 @@ import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; /** * Enumeration defining type of the exported file. diff --git a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-group.component.ts b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-group.component.ts index 4700569d8c97..64ed91bab723 100644 --- a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-group.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-group.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import type { CommitInfo } from 'app/entities/programming-submission.model'; +import type { CommitInfo } from 'app/entities/programming/programming-submission.model'; @Component({ selector: 'jhi-commits-info-group', diff --git a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component.ts b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component.ts index 51edbcc7652c..a944e452e1b4 100644 --- a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import type { CommitInfo } from 'app/entities/programming-submission.model'; +import type { CommitInfo } from 'app/entities/programming/programming-submission.model'; import { faCircle } from '@fortawesome/free-regular-svg-icons'; import { faAngleDown, faAngleLeft } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info.component.ts b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info.component.ts index d3728a48dc46..28a46506caab 100644 --- a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; import dayjs from 'dayjs/esm'; import { createCommitUrl } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension.ts b/src/main/webapp/app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension.ts index 6b7a28165b4a..2c0d4036369b 100644 --- a/src/main/webapp/app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension.ts +++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { Subject } from 'rxjs'; import { tap } from 'rxjs/operators'; import { escapeStringForUseInRegex } from 'app/shared/util/global.utils'; diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts b/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts index 75e060446c19..f1f669c7fb5c 100644 --- a/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts @@ -14,12 +14,12 @@ import { } from '@angular/core'; import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; import { ThemeService } from 'app/core/theme/theme.service'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; import { ShowdownExtension } from 'showdown'; import { catchError, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators'; import { Observable, Subscription, merge, of } from 'rxjs'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { ProgrammingExerciseTaskExtensionWrapper, taskRegex } from './extensions/programming-exercise-task.extension'; import { ProgrammingExercisePlantUmlExtensionWrapper } from 'app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension'; diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-instruction.service.ts b/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-instruction.service.ts index 3234cae415ee..73cd7de06eba 100644 --- a/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-instruction.service.ts +++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-instruction.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { Result } from 'app/entities/result.model'; /** diff --git a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts index 9185f229d2ff..aa2e0e951699 100644 --- a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts @@ -2,7 +2,7 @@ import { AfterViewInit, Component, Input, OnChanges, OnDestroy, OnInit, QueryLis import dayjs from 'dayjs/esm'; import { TranslateService } from '@ngx-translate/core'; import { AssessmentType } from 'app/entities/assessment-type.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { faCogs, faUserCheck, faUserSlash } from '@fortawesome/free-solid-svg-icons'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { IncludedInOverallScore } from 'app/entities/exercise.model'; diff --git a/src/main/webapp/app/exercises/programming/shared/service/aeolus.service.ts b/src/main/webapp/app/exercises/programming/shared/service/aeolus.service.ts index e13138c55c04..1b468776d570 100644 --- a/src/main/webapp/app/exercises/programming/shared/service/aeolus.service.ts +++ b/src/main/webapp/app/exercises/programming/shared/service/aeolus.service.ts @@ -1,8 +1,10 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { BuildAction, PlatformAction, ScriptAction } from 'app/entities/programming/build.action'; +import { WindFile } from 'app/entities/programming/wind.file'; import { Observable } from 'rxjs'; -import { BuildAction, PlatformAction, ProgrammingLanguage, ProjectType, ScriptAction, WindFile } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; @Injectable({ providedIn: 'root' }) export class AeolusService { diff --git a/src/main/webapp/app/exercises/programming/shared/service/build-log.service.ts b/src/main/webapp/app/exercises/programming/shared/service/build-log.service.ts index 029e09af8e16..3f749357f188 100644 --- a/src/main/webapp/app/exercises/programming/shared/service/build-log.service.ts +++ b/src/main/webapp/app/exercises/programming/shared/service/build-log.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { HttpClient, HttpParams } from '@angular/common/http'; -import { BuildLogEntry } from 'app/entities/build-log.model'; +import { BuildLogEntry } from 'app/entities/programming/build-log.model'; export interface IBuildLogService { getBuildLogs: (participationId: number, resultId?: number) => Observable; diff --git a/src/main/webapp/app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service.ts b/src/main/webapp/app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service.ts index 3c7d1c9eaccd..7f2e95b0f73a 100644 --- a/src/main/webapp/app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service.ts +++ b/src/main/webapp/app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; /** diff --git a/src/main/webapp/app/exercises/programming/shared/service/theia.service.ts b/src/main/webapp/app/exercises/programming/shared/service/theia.service.ts index d59673d738ac..3165730ddab7 100644 --- a/src/main/webapp/app/exercises/programming/shared/service/theia.service.ts +++ b/src/main/webapp/app/exercises/programming/shared/service/theia.service.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; @Injectable({ providedIn: 'root' }) export class TheiaService { diff --git a/src/main/webapp/app/exercises/programming/shared/utils/programming-exercise.utils.ts b/src/main/webapp/app/exercises/programming/shared/utils/programming-exercise.utils.ts index 3234ee6a1cf1..5e95bb66dbac 100644 --- a/src/main/webapp/app/exercises/programming/shared/utils/programming-exercise.utils.ts +++ b/src/main/webapp/app/exercises/programming/shared/utils/programming-exercise.utils.ts @@ -1,8 +1,8 @@ import { Result } from 'app/entities/result.model'; import dayjs from 'dayjs/esm'; import { Participation, ParticipationType } from 'app/entities/participation/participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { SubmissionType } from 'app/entities/submission.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts index a1cc56e466c1..b6fda2b6e1ee 100644 --- a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts +++ b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts @@ -19,7 +19,7 @@ import { Course } from 'app/entities/course.model'; import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { cloneDeep } from 'lodash-es'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-pool.component.ts b/src/main/webapp/app/exercises/quiz/manage/quiz-pool.component.ts index 7714b90a5841..ea04a7e2fe7f 100644 --- a/src/main/webapp/app/exercises/quiz/manage/quiz-pool.component.ts +++ b/src/main/webapp/app/exercises/quiz/manage/quiz-pool.component.ts @@ -15,7 +15,7 @@ import { QuizQuestionListEditComponent } from 'app/exercises/quiz/manage/quiz-qu import { onError } from 'app/shared/util/global.utils'; import { computeQuizQuestionInvalidReason, isQuizQuestionValid } from 'app/exercises/quiz/shared/quiz-manage-util.service'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; @Component({ diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-question-list-edit-existing.component.ts b/src/main/webapp/app/exercises/quiz/manage/quiz-question-list-edit-existing.component.ts index a361064be33f..7dc2df7ed5d3 100644 --- a/src/main/webapp/app/exercises/quiz/manage/quiz-question-list-edit-existing.component.ts +++ b/src/main/webapp/app/exercises/quiz/manage/quiz-question-list-edit-existing.component.ts @@ -9,7 +9,7 @@ import { Course } from 'app/entities/course.model'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.service'; import { AlertService } from 'app/core/util/alert.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 { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; diff --git a/src/main/webapp/app/exercises/shared/course-exercises/course-exercise.service.ts b/src/main/webapp/app/exercises/shared/course-exercises/course-exercise.service.ts index f9eefb8f5d7f..c9ea1e512eb3 100644 --- a/src/main/webapp/app/exercises/shared/course-exercises/course-exercise.service.ts +++ b/src/main/webapp/app/exercises/shared/course-exercises/course-exercise.service.ts @@ -1,9 +1,9 @@ import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { AccountService } from 'app/core/auth/account.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { Exercise } from 'app/entities/exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; diff --git a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.ts b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.ts index 62f371f95057..a5bffcbe5575 100644 --- a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.ts +++ b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.ts @@ -9,7 +9,7 @@ import { TutorParticipationService } from 'app/exercises/shared/dashboards/tutor import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service'; import { ExampleSubmission } from 'app/entities/example-submission.model'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; -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 { UMLModel } from '@ls1intum/apollon'; import { ComplaintService } from 'app/complaints/complaint.service'; @@ -22,7 +22,7 @@ import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.mod import { TranslateService } from '@ngx-translate/core'; import { FileUploadSubmissionService } from 'app/exercises/file-upload/participate/file-upload-submission.service'; 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 { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service'; import { AccountService } from 'app/core/auth/account.service'; import { GuidedTourService } from 'app/guided-tour/guided-tour.service'; @@ -31,8 +31,8 @@ import { Exercise, ExerciseType, getCourseFromExercise } from 'app/entities/exer import { TutorParticipation, TutorParticipationStatus } from 'app/entities/participation/tutor-participation.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { DueDateStat } from 'app/course/dashboards/due-date-stat.model'; -import { Exam } from 'app/entities/exam.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { Exam } from 'app/entities/exam/exam.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { SubmissionService, SubmissionWithComplaintDTO } from 'app/exercises/shared/submission/submission.service'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { SortService } from 'app/shared/service/sort.service'; diff --git a/src/main/webapp/app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component.ts b/src/main/webapp/app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component.ts index 6ad8422696dc..96741ee28f37 100644 --- a/src/main/webapp/app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component.ts +++ b/src/main/webapp/app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { Submission } from 'app/entities/submission.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; @Component({ selector: 'jhi-language-table-cell', diff --git a/src/main/webapp/app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component.ts b/src/main/webapp/app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component.ts index 79f1e755b358..49a62930183d 100644 --- a/src/main/webapp/app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component.ts +++ b/src/main/webapp/app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component.ts @@ -8,7 +8,7 @@ import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.ser import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { ModelingExerciseService } from 'app/exercises/modeling/manage/modeling-exercise.service'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { EventManager } from 'app/core/util/event-manager.service'; diff --git a/src/main/webapp/app/exercises/shared/example-submission/example-submission.service.ts b/src/main/webapp/app/exercises/shared/example-submission/example-submission.service.ts index 08e1b3eccb6e..5fe845bfe309 100644 --- a/src/main/webapp/app/exercises/shared/example-submission/example-submission.service.ts +++ b/src/main/webapp/app/exercises/shared/example-submission/example-submission.service.ts @@ -6,7 +6,7 @@ import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service' import { map } from 'rxjs/operators'; import { Submission } from 'app/entities/submission.model'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { StringCountService } from 'app/exercises/text/participate/string-count.service'; diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.ts b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.ts index 3d7af78e4a85..b89694846761 100644 --- a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.ts @@ -2,19 +2,19 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { SortService } from 'app/shared/service/sort.service'; import dayjs from 'dayjs/esm'; import { Exercise, ExerciseType, IncludedInOverallScore, getCourseFromExercise, getIcon, getIconTooltip } from 'app/entities/exercise.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { SubmissionPolicy } from 'app/entities/submission-policy.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { getExerciseDueDate } from 'app/exercises/shared/exercise/exercise.utils'; import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { ComplaintService } from 'app/complaints/complaint.service'; import { SubmissionType } from 'app/entities/submission.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils'; @Component({ diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts index b734c1c628df..c9d222f78ee3 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts @@ -9,7 +9,7 @@ import { faBan, faCircleNotch, faSave } from '@fortawesome/free-solid-svg-icons' import { ExerciseHint, HintType } from 'app/entities/hestia/exercise-hint.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model'; import { ManualSolutionEntryCreationModalComponent } from 'app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.component.ts index 49829c3f3fef..3b542f17643b 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.component.ts @@ -11,7 +11,7 @@ import { EventManager } from 'app/core/util/event-manager.service'; import { faArrowsRotate, faCode, faEye, faFont, faPlus, faTimes, faWrench } from '@fortawesome/free-solid-svg-icons'; import { ExerciseHint, HintType } from 'app/entities/hestia/exercise-hint.model'; import { ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; @Component({ selector: 'jhi-exercise-hint', diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores-export-button.component.ts b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores-export-button.component.ts index 62720c9c897f..704737e2b4d0 100644 --- a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores-export-button.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores-export-button.component.ts @@ -6,12 +6,12 @@ import { Exercise, ExerciseType, getCourseFromExercise } from 'app/entities/exer import { Component, Input, OnInit } from '@angular/core'; import { ResultService } from 'app/exercises/shared/result/result.service'; import { getTestCaseNamesFromResults, getTestCaseResults } from 'app/exercises/shared/result/result.utils'; -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 { ResultWithPointsPerGradingCriterion } from 'app/entities/result-with-points-per-grading-criterion.model'; import { faDownload } from '@fortawesome/free-solid-svg-icons'; import { download, generateCsv, mkConfig } from 'export-to-csv'; -import { TestCaseResult } from 'app/entities/test-case-result.model'; +import { TestCaseResult } from 'app/entities/programming/test-case-result.model'; @Component({ selector: 'jhi-exercise-scores-export-button', diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts index 1b578e4ecbd4..b518bd05bb5a 100644 --- a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts @@ -14,11 +14,11 @@ import { ResultService } from 'app/exercises/shared/result/result.service'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { Result } from 'app/entities/result.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { formatTeamAsSearchResult } from 'app/exercises/shared/team/team.utils'; import { faCodeBranch, faComment, faDownload, faFilter, faFolderOpen, faListAlt, faSync } from '@fortawesome/free-solid-svg-icons'; import { faFileCode } from '@fortawesome/free-regular-svg-icons'; diff --git a/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts b/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts index 50c2227751e3..a5c6b2febc1a 100644 --- a/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts +++ b/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts @@ -12,10 +12,10 @@ import { TranslateService } from '@ngx-translate/core'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { convertDateFromClient, convertDateFromServer } from 'app/utils/date.utils'; import { EntityTitleService, EntityType } from 'app/shared/layouts/navbar/entity-title.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { InitializationState } from 'app/entities/participation/participation.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { SafeHtml } from '@angular/platform-browser'; diff --git a/src/main/webapp/app/exercises/shared/exercise/exercise.utils.ts b/src/main/webapp/app/exercises/shared/exercise/exercise.utils.ts index 655133c142c3..091f4af5364d 100644 --- a/src/main/webapp/app/exercises/shared/exercise/exercise.utils.ts +++ b/src/main/webapp/app/exercises/shared/exercise/exercise.utils.ts @@ -2,7 +2,7 @@ import { SimpleChanges } from '@angular/core'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import dayjs from 'dayjs/esm'; import { InitializationState, Participation } from 'app/entities/participation/participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { Observable, from, of } from 'rxjs'; diff --git a/src/main/webapp/app/exercises/shared/feedback/feedback.component.ts b/src/main/webapp/app/exercises/shared/feedback/feedback.component.ts index 8fe19b908551..576445b7831d 100644 --- a/src/main/webapp/app/exercises/shared/feedback/feedback.component.ts +++ b/src/main/webapp/app/exercises/shared/feedback/feedback.component.ts @@ -3,14 +3,14 @@ import { HttpErrorResponse } from '@angular/common/http'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { catchError, map, switchMap, tap } from 'rxjs/operators'; import { of, throwError } from 'rxjs'; -import { BuildLogEntry, BuildLogEntryArray, BuildLogType } from 'app/entities/build-log.model'; +import { BuildLogEntry, BuildLogEntryArray, BuildLogType } from 'app/entities/programming/build-log.model'; import { Feedback, checkSubsequentFeedbackInAssessment } from 'app/entities/feedback.model'; import { Badge, ResultService } from 'app/exercises/shared/result/result.service'; import { Exercise, ExerciseType, getCourseFromExercise } from 'app/entities/exercise.model'; import { Result } from 'app/entities/result.model'; import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { TranslateService } from '@ngx-translate/core'; import { createCommitUrl, isProgrammingExerciseParticipation } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; import { AssessmentType } from 'app/entities/assessment-type.model'; diff --git a/src/main/webapp/app/exercises/shared/feedback/group/programming-feedback-groups.ts b/src/main/webapp/app/exercises/shared/feedback/group/programming-feedback-groups.ts index 006f24f2fba0..8bdf9ecd30b4 100644 --- a/src/main/webapp/app/exercises/shared/feedback/group/programming-feedback-groups.ts +++ b/src/main/webapp/app/exercises/shared/feedback/group/programming-feedback-groups.ts @@ -1,7 +1,7 @@ import { FeedbackGroup } from 'app/exercises/shared/feedback/group/feedback-group'; import { FeedbackItem } from 'app/exercises/shared/feedback/item/feedback-item'; import { Exercise } from 'app/entities/exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; /** * Returns all FeedbackItemGroups for Programming exercises in the order, in which they will be displayed diff --git a/src/main/webapp/app/exercises/shared/feedback/item/programming-feedback-item.service.ts b/src/main/webapp/app/exercises/shared/feedback/item/programming-feedback-item.service.ts index 03b491da0195..8b231443aa32 100644 --- a/src/main/webapp/app/exercises/shared/feedback/item/programming-feedback-item.service.ts +++ b/src/main/webapp/app/exercises/shared/feedback/item/programming-feedback-item.service.ts @@ -11,7 +11,7 @@ import { SUBMISSION_POLICY_FEEDBACK_IDENTIFIER, } from 'app/entities/feedback.model'; import { TranslateService } from '@ngx-translate/core'; -import { StaticCodeAnalysisIssue } from 'app/entities/static-code-analysis-issue.model'; +import { StaticCodeAnalysisIssue } from 'app/entities/programming/static-code-analysis-issue.model'; import { getAllFeedbackGroups } from 'app/exercises/shared/feedback/group/programming-feedback-groups'; import { FeedbackItem } from 'app/exercises/shared/feedback/item/feedback-item'; import { Exercise } from 'app/entities/exercise.model'; diff --git a/src/main/webapp/app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component.ts b/src/main/webapp/app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component.ts index d0389d076607..23673a0cd2da 100644 --- a/src/main/webapp/app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component.ts +++ b/src/main/webapp/app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; @Component({ selector: 'jhi-exercise-import-wrapper', diff --git a/src/main/webapp/app/exercises/shared/import/exercise-import.component.ts b/src/main/webapp/app/exercises/shared/import/exercise-import.component.ts index 85a408c2fdc1..1fea53eaacbd 100644 --- a/src/main/webapp/app/exercises/shared/import/exercise-import.component.ts +++ b/src/main/webapp/app/exercises/shared/import/exercise-import.component.ts @@ -2,7 +2,7 @@ import { Component, Injector, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { FileUploadExercisePagingService } from 'app/exercises/file-upload/manage/file-upload-exercise-paging.service'; import { ModelingExercisePagingService } from 'app/exercises/modeling/manage/modeling-exercise-paging.service'; import { CodeAnalysisPagingService } from 'app/exercises/programming/manage/services/code-analysis-paging.service'; diff --git a/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts b/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts index bc6621cf3e64..688b7cd6fb44 100644 --- a/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts +++ b/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts @@ -1,10 +1,11 @@ import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; +import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config'; import { MAX_FILE_SIZE } from 'app/shared/constants/input.constants'; import { AlertService } from 'app/core/util/alert.service'; import { faUpload } from '@fortawesome/free-solid-svg-icons'; -import { ProgrammingExercise, ProgrammingExerciseBuildConfig, copyBuildConfigFromExerciseJson } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, copyBuildConfigFromExerciseJson } from 'app/entities/programming/programming-exercise.model'; import JSZip from 'jszip'; @Component({ diff --git a/src/main/webapp/app/exercises/shared/manage/exercise-paging.service.ts b/src/main/webapp/app/exercises/shared/manage/exercise-paging.service.ts index 5d646d031991..1697967842ad 100644 --- a/src/main/webapp/app/exercises/shared/manage/exercise-paging.service.ts +++ b/src/main/webapp/app/exercises/shared/manage/exercise-paging.service.ts @@ -1,6 +1,6 @@ import { HttpClient, HttpResponse } from '@angular/common/http'; import { Exercise } from 'app/entities/exercise.model'; -import { ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { PagingService } from 'app/exercises/shared/manage/paging.service'; import { SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table'; import { Observable, map } from 'rxjs'; diff --git a/src/main/webapp/app/exercises/shared/participation-submission/participation-submission.component.ts b/src/main/webapp/app/exercises/shared/participation-submission/participation-submission.component.ts index 57f529b33147..733059f76d8d 100644 --- a/src/main/webapp/app/exercises/shared/participation-submission/participation-submission.component.ts +++ b/src/main/webapp/app/exercises/shared/participation-submission/participation-submission.component.ts @@ -11,8 +11,8 @@ import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service' import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import dayjs from 'dayjs/esm'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { TranslateService } from '@ngx-translate/core'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { ButtonSize } from 'app/shared/components/button.component'; diff --git a/src/main/webapp/app/exercises/shared/participation/participation.component.ts b/src/main/webapp/app/exercises/shared/participation/participation.component.ts index dfdb90b6d53e..627a33ce8815 100644 --- a/src/main/webapp/app/exercises/shared/participation/participation.component.ts +++ b/src/main/webapp/app/exercises/shared/participation/participation.component.ts @@ -17,7 +17,7 @@ import { ProgrammingExerciseStudentParticipation } from 'app/entities/participat import { AlertService } from 'app/core/util/alert.service'; import { EventManager } from 'app/core/util/event-manager.service'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { faCircleNotch, faCodeBranch, faEraser, faFilePowerpoint, faTable, faTimes, faTrash } from '@fortawesome/free-solid-svg-icons'; import { GradingSystemService } from 'app/grading-system/grading-system.service'; import { GradeStepsDTO } from 'app/entities/grade-step.model'; diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.ts b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.ts index dc76831f9517..ba3fd8301876 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.ts +++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.ts @@ -1,10 +1,10 @@ import { Component, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service'; import { PlagiarismSubmission } from 'app/exercises/shared/plagiarism/types/PlagiarismSubmission'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { FromToElement, TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ExerciseType } from 'app/entities/exercise.model'; import { DomainChange, DomainType, FileType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; import { CodeEditorRepositoryFileService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; diff --git a/src/main/webapp/app/exercises/shared/result/result.component.ts b/src/main/webapp/app/exercises/shared/result/result.component.ts index 9bad543faa64..b323a640b21e 100644 --- a/src/main/webapp/app/exercises/shared/result/result.component.ts +++ b/src/main/webapp/app/exercises/shared/result/result.component.ts @@ -3,11 +3,11 @@ import { ParticipationService } from 'app/exercises/shared/participation/partici import { MissingResultInformation, ResultTemplateStatus, evaluateTemplateStatus, getResultIconClass, getTextColorClass } from 'app/exercises/shared/result/result.utils'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import dayjs from 'dayjs/esm'; import { isProgrammingExerciseStudentParticipation, isResultPreliminary } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; import { Participation, ParticipationType, getExercise } from 'app/entities/participation/participation.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { Submission, SubmissionExerciseType } from 'app/entities/submission.model'; import { Exercise, ExerciseType, getCourseFromExercise } from 'app/entities/exercise.model'; import { FeedbackComponent } from 'app/exercises/shared/feedback/feedback.component'; diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts index 72390f6979c8..800fe1b4aecd 100644 --- a/src/main/webapp/app/exercises/shared/result/result.service.ts +++ b/src/main/webapp/app/exercises/shared/result/result.service.ts @@ -14,8 +14,8 @@ import { convertDateFromClient, convertDateFromServer } from 'app/utils/date.uti import { TranslateService } from '@ngx-translate/core'; import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils'; import { isResultPreliminary } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { captureException } from '@sentry/angular'; import { Participation, ParticipationType } from 'app/entities/participation/participation.model'; import { SubmissionService } from 'app/exercises/shared/submission/submission.service'; diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts index 9a997cd2be69..b8b43ed63c80 100644 --- a/src/main/webapp/app/exercises/shared/result/result.utils.ts +++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts @@ -4,9 +4,9 @@ import { StudentParticipation } from 'app/entities/participation/student-partici import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants'; import { isProgrammingExerciseStudentParticipation, isResultPreliminary } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Submission, SubmissionExerciseType } from 'app/entities/submission.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons'; @@ -16,7 +16,7 @@ import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { Participation, ParticipationType } from 'app/entities/participation/participation.model'; import dayjs from 'dayjs/esm'; import { ResultWithPointsPerGradingCriterion } from 'app/entities/result-with-points-per-grading-criterion.model'; -import { TestCaseResult } from 'app/entities/test-case-result.model'; +import { TestCaseResult } from 'app/entities/programming/test-case-result.model'; /** * Enumeration object representing the possible options that diff --git a/src/main/webapp/app/exercises/shared/result/updating-result.component.ts b/src/main/webapp/app/exercises/shared/result/updating-result.component.ts index 375582cb5132..55cde780b0ec 100644 --- a/src/main/webapp/app/exercises/shared/result/updating-result.component.ts +++ b/src/main/webapp/app/exercises/shared/result/updating-result.component.ts @@ -6,7 +6,7 @@ import { RepositoryService } from 'app/exercises/shared/result/repository.servic import dayjs from 'dayjs/esm'; import { ProgrammingSubmissionService, ProgrammingSubmissionState } from 'app/exercises/programming/participate/programming-submission.service'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ResultService } from 'app/exercises/shared/result/result.service'; import { Submission, SubmissionType } from 'app/entities/submission.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; diff --git a/src/main/webapp/app/exercises/shared/submission-policy/submission-policy-update.component.ts b/src/main/webapp/app/exercises/shared/submission-policy/submission-policy-update.component.ts index 58220c431757..08961c9407d6 100644 --- a/src/main/webapp/app/exercises/shared/submission-policy/submission-policy-update.component.ts +++ b/src/main/webapp/app/exercises/shared/submission-policy/submission-policy-update.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { LockRepositoryPolicy, SubmissionPenaltyPolicy, SubmissionPolicyType } from 'app/entities/submission-policy.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { FormControl, FormGroup, Validators } from '@angular/forms'; @Component({ diff --git a/src/main/webapp/app/exercises/shared/submission/submission.service.ts b/src/main/webapp/app/exercises/shared/submission/submission.service.ts index 4ab2d0ccdf10..d2cad659ac83 100644 --- a/src/main/webapp/app/exercises/shared/submission/submission.service.ts +++ b/src/main/webapp/app/exercises/shared/submission/submission.service.ts @@ -5,7 +5,7 @@ import { createRequestOption } from 'app/shared/util/request.util'; import { Result } from 'app/entities/result.model'; import { Submission, getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model'; import { filter, map, tap } from 'rxjs/operators'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Feedback } from 'app/entities/feedback.model'; import { Complaint } from 'app/entities/complaint.model'; import { ComplaintResponseService } from 'app/complaints/complaint-response.service'; diff --git a/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts b/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts index d37a8a428dd1..22178ca78f3c 100644 --- a/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts +++ b/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; -import { TextAssessmentEvent, TextAssessmentEventType } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEvent, TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { AccountService } from 'app/core/auth/account.service'; import { FeedbackType } from 'app/entities/feedback.model'; -import { TextBlockType } from 'app/entities/text-block.model'; +import { TextBlockType } from 'app/entities/text/text-block.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { Location } from '@angular/common'; diff --git a/src/main/webapp/app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component.ts b/src/main/webapp/app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component.ts index 094acf5431b8..5c9c22ab595f 100644 --- a/src/main/webapp/app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component.ts +++ b/src/main/webapp/app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; -import { TextBlock } from 'app/entities/text-block.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model'; import { wordSelection } from 'app/exercises/text/shared/manual-text-selection/manual-text-selection.component'; diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts b/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts index f834639f59f0..200f7b69d95a 100644 --- a/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts +++ b/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; -import { TextSubmission } from 'app/entities/text-submission.model'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { StringCountService } from 'app/exercises/text/participate/string-count.service'; import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model'; diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts b/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts index 69eb2bb1847a..8c1f564182d5 100644 --- a/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts +++ b/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; -import { TextBlock, TextBlockType } from 'app/entities/text-block.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Result } from 'app/entities/result.model'; import { AccountService } from 'app/core/auth/account.service'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts b/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts index 8e2274337833..d996953e4cf6 100644 --- a/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts +++ b/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts @@ -6,11 +6,11 @@ import { Result } from 'app/entities/result.model'; import { ComplaintResponse } from 'app/entities/complaint-response.model'; import { Feedback } from 'app/entities/feedback.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { TextBlock } from 'app/entities/text-block.model'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { Submission, getLatestSubmissionResult, getSubmissionResultByCorrectionRound, getSubmissionResultById, setLatestSubmissionResult } from 'app/entities/submission.model'; import { Participation } from 'app/entities/participation/participation.model'; -import { TextAssessmentEvent } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEvent } from 'app/entities/text/text-assesment-event.model'; import { AccountService } from 'app/core/auth/account.service'; import { convertDateFromServer } from 'app/utils/date.utils'; diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts index f35fe3bb044d..875555a1492c 100644 --- a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts +++ b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts @@ -6,8 +6,8 @@ import { AlertService } from 'app/core/util/alert.service'; import dayjs from 'dayjs/esm'; import { AccountService } from 'app/core/auth/account.service'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Result } from 'app/entities/result.model'; import { Complaint } from 'app/entities/complaint.model'; import { ComplaintService } from 'app/complaints/complaint.service'; @@ -34,9 +34,9 @@ import { Course } from 'app/entities/course.model'; import { isAllowedToModifyFeedback } from 'app/assessment/assessment.service'; import { faListAlt } from '@fortawesome/free-regular-svg-icons'; import { AssessmentAfterComplaint } from 'app/complaints/complaints-for-tutor/complaints-for-tutor.component'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { AthenaService } from 'app/assessment/athena.service'; -import { TextBlock } from 'app/entities/text-block.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; import { Subscription } from 'rxjs'; @Component({ diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts index 517009175196..83e63bcd21b1 100644 --- a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts +++ b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, Routes } from '@angular/router'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { of } from 'rxjs'; import { UserRouteAccessService } from 'app/core/auth/user-route-access-service'; import { TextSubmissionAssessmentComponent } from './text-submission-assessment.component'; diff --git a/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts b/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts index 1498affd1415..2a34e2b47136 100644 --- a/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts +++ b/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts @@ -1,10 +1,10 @@ import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component'; import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service'; -import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { FeedbackType } from 'app/entities/feedback.model'; -import { TextBlockType } from 'app/entities/text-block.model'; +import { TextBlockType } from 'app/entities/text/text-block.model'; import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service'; import { ActivatedRoute } from '@angular/router'; import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model'; diff --git a/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts b/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts index f99baf73f449..72d8ef60ad19 100644 --- a/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts +++ b/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts @@ -1,11 +1,11 @@ import { AfterViewInit, Component, ElementRef, EventEmitter, HostBinding, Input, Output, ViewChild } from '@angular/core'; -import { TextBlock } from 'app/entities/text-block.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { ConfirmIconComponent } from 'app/shared/confirm-icon/confirm-icon.component'; import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { ActivatedRoute } from '@angular/router'; -import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service'; import { faAngleRight, faEdit, faExclamation, faExclamationTriangle, faLightbulb, faQuestionCircle, faTimes, faTrash } from '@fortawesome/free-solid-svg-icons'; import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model'; diff --git a/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts b/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts index 3db47679dc4a..1640da7b1978 100644 --- a/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts +++ b/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts @@ -11,8 +11,8 @@ import { tutorAssessmentTour } from 'app/guided-tour/tours/tutor-assessment-tour import { ExampleSubmission, ExampleSubmissionMode } from 'app/entities/example-submission.model'; import { Feedback, FeedbackCorrectionError, FeedbackType } from 'app/entities/feedback.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; import { setLatestSubmissionResult } from 'app/entities/submission.model'; import { TextAssessmentBaseComponent } from 'app/exercises/text/assess/text-assessment-base.component'; diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts index 72a0414b70fe..4199461314b2 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts @@ -3,7 +3,7 @@ import { SafeHtml } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { HttpResponse } from '@angular/common/http'; import { Subscription } from 'rxjs'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { TextExerciseService } from './text-exercise.service'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { AssessmentType } from 'app/entities/assessment-type.model'; diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts index df3c7f767a84..ed167d578dd0 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts @@ -1,6 +1,6 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ExercisePagingService } from 'app/exercises/shared/manage/exercise-paging.service'; @Injectable({ providedIn: 'root' }) diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts index fff2f2a799f8..00e2973a5cc6 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; import { Subject } from 'rxjs'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { EventManager } from 'app/core/util/event-manager.service'; import { faBook, faTable, faTrash, faUsers, faWrench } from '@fortawesome/free-solid-svg-icons'; import { faListAlt } from '@fortawesome/free-regular-svg-icons'; diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts index e55e5fb28db2..a9304c422e89 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { HttpErrorResponse } from '@angular/common/http'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { TextExerciseService } from './text-exercise.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts index 7714fe2a28eb..ac46f89650d7 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ExerciseType } from 'app/entities/exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { TextExerciseService } from './text-exercise.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts index 67c3f64a6dd4..2e3198bc4186 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts @@ -2,7 +2,7 @@ import { ActivatedRouteSnapshot, Resolve, Routes } from '@angular/router'; import { UserRouteAccessService } from 'app/core/auth/user-route-access-service'; import { TextExerciseDetailComponent } from './text-exercise-detail.component'; import { TextExerciseUpdateComponent } from './text-exercise-update.component'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Injectable } from '@angular/core'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts index 6cdfb5c91e95..994f1ac75eeb 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts @@ -3,7 +3,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { createRequestOption } from 'app/shared/util/request.util'; import { ExerciseServicable, ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { TextPlagiarismResult } from 'app/exercises/shared/plagiarism/types/text/TextPlagiarismResult'; diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts index 08be104f935c..82d8de5b26cf 100644 --- a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts +++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts @@ -14,10 +14,10 @@ import { TextSubmissionService } from 'app/exercises/text/participate/text-submi import { ComponentCanDeactivate } from 'app/shared/guard/can-deactivate.model'; import { Feedback } from 'app/entities/feedback.model'; import { hasExerciseDueDatePassed } from 'app/exercises/shared/exercise/exercise.utils'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ButtonType } from 'app/shared/components/button.component'; import { Result } from 'app/entities/result.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { StringCountService } from 'app/exercises/text/participate/string-count.service'; import { AccountService } from 'app/core/auth/account.service'; import { getFirstResultWithComplaint, getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model'; diff --git a/src/main/webapp/app/exercises/text/participate/text-result/text-result-block.ts b/src/main/webapp/app/exercises/text/participate/text-result/text-result-block.ts index 2ed52a5002fa..33960c213bcc 100644 --- a/src/main/webapp/app/exercises/text/participate/text-result/text-result-block.ts +++ b/src/main/webapp/app/exercises/text/participate/text-result/text-result-block.ts @@ -1,7 +1,7 @@ import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { faCheck, faCheckCircle, faCircle, faDotCircle, faTimes, faTimesCircle } from '@fortawesome/free-solid-svg-icons'; import { Feedback } from 'app/entities/feedback.model'; -import { TextBlock } from 'app/entities/text-block.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; import { convertToHtmlLinebreaks, escapeString } from 'app/utils/text.utils'; enum FeedbackType { diff --git a/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts b/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts index 681266e5ef85..c63aaece1335 100644 --- a/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts +++ b/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts @@ -1,10 +1,10 @@ import { Component, Input } from '@angular/core'; import { Feedback, buildFeedbackTextForReview, checkSubsequentFeedbackInAssessment } from 'app/entities/feedback.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; import { TextResultBlock } from './text-result-block'; import { TranslateService } from '@ngx-translate/core'; -import { TextBlock } from 'app/entities/text-block.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'; import { LocaleConversionService } from 'app/shared/service/locale-conversion.service'; import { Course } from 'app/entities/course.model'; diff --git a/src/main/webapp/app/exercises/text/participate/text-submission.service.ts b/src/main/webapp/app/exercises/text/participate/text-submission.service.ts index 26d493d36b75..2c90d0c7188c 100644 --- a/src/main/webapp/app/exercises/text/participate/text-submission.service.ts +++ b/src/main/webapp/app/exercises/text/participate/text-submission.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { createRequestOption } from 'app/shared/util/request.util'; import { stringifyCircular } from 'app/shared/util/utils'; import { getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model'; diff --git a/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts b/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts index d4cd37b3b8a6..1a846ba58988 100644 --- a/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts +++ b/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts @@ -1,10 +1,10 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { FeedbackType } from 'app/entities/feedback.model'; -import { TextBlockType } from 'app/entities/text-block.model'; +import { TextBlockType } from 'app/entities/text/text-block.model'; import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service'; import { ActivatedRoute } from '@angular/router'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { TextBlockRefGroup } from 'app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component'; export type wordSelection = { diff --git a/src/main/webapp/app/grading-system/base-grading-system/base-grading-system.component.ts b/src/main/webapp/app/grading-system/base-grading-system/base-grading-system.component.ts index a53bc9c26f75..21e2a3aef781 100644 --- a/src/main/webapp/app/grading-system/base-grading-system/base-grading-system.component.ts +++ b/src/main/webapp/app/grading-system/base-grading-system/base-grading-system.component.ts @@ -9,7 +9,7 @@ import { HttpResponse } from '@angular/common/http'; import { catchError, finalize } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { download, generateCsv, mkConfig } from 'export-to-csv'; diff --git a/src/main/webapp/app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component.ts b/src/main/webapp/app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component.ts index 05bb0f2689c8..074c1e704695 100644 --- a/src/main/webapp/app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component.ts +++ b/src/main/webapp/app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component.ts @@ -1,10 +1,10 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { BuildAgent } from 'app/entities/build-agent.model'; +import { BuildAgent } from 'app/entities/programming/build-agent.model'; import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service'; import { Subscription } from 'rxjs'; import { faCircleCheck, faExclamationCircle, faExclamationTriangle, faTimes } from '@fortawesome/free-solid-svg-icons'; import dayjs from 'dayjs/esm'; -import { TriggeredByPushTo } from 'app/entities/repository-info.model'; +import { TriggeredByPushTo } from 'app/entities/programming/repository-info.model'; import { ActivatedRoute } from '@angular/router'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { BuildQueueService } from 'app/localci/build-queue/build-queue.service'; diff --git a/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts b/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts index cac89931b3be..b7f232bf0fc4 100644 --- a/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts +++ b/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts @@ -1,5 +1,5 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { BuildAgent } from 'app/entities/build-agent.model'; +import { BuildAgent } from 'app/entities/programming/build-agent.model'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service'; import { Subscription } from 'rxjs'; diff --git a/src/main/webapp/app/localci/build-agents/build-agents.service.ts b/src/main/webapp/app/localci/build-agents/build-agents.service.ts index 1acca8c34375..99905ad80c51 100644 --- a/src/main/webapp/app/localci/build-agents/build-agents.service.ts +++ b/src/main/webapp/app/localci/build-agents/build-agents.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable, throwError } from 'rxjs'; -import { BuildAgent } from 'app/entities/build-agent.model'; +import { BuildAgent } from 'app/entities/programming/build-agent.model'; import { catchError } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.ts b/src/main/webapp/app/localci/build-queue/build-queue.component.ts index 2ab4ae9bc7f8..79ca4931786c 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.component.ts +++ b/src/main/webapp/app/localci/build-queue/build-queue.component.ts @@ -1,11 +1,11 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { BuildJob, BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/build-job.model'; +import { BuildJob, BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/programming/build-job.model'; import { faAngleDown, faAngleRight, faCircleCheck, faExclamationCircle, faExclamationTriangle, faFilter, faSort, faSync, faTimes } from '@fortawesome/free-solid-svg-icons'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { BuildQueueService } from 'app/localci/build-queue/build-queue.service'; import { debounceTime, distinctUntilChanged, map, switchMap, take, tap } from 'rxjs/operators'; -import { TriggeredByPushTo } from 'app/entities/repository-info.model'; +import { TriggeredByPushTo } from 'app/entities/programming/repository-info.model'; import { ITEMS_PER_PAGE } from 'app/shared/constants/pagination.constants'; import { SortingOrder } from 'app/shared/table/pageable-table'; import { onError } from 'app/shared/util/global.utils'; diff --git a/src/main/webapp/app/localci/build-queue/build-queue.service.ts b/src/main/webapp/app/localci/build-queue/build-queue.service.ts index c0a958f84715..fdc9bec66e2f 100644 --- a/src/main/webapp/app/localci/build-queue/build-queue.service.ts +++ b/src/main/webapp/app/localci/build-queue/build-queue.service.ts @@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { throwError } from 'rxjs'; -import { BuildJob, BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/build-job.model'; +import { BuildJob, BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/programming/build-job.model'; import { createNestedRequestOption } from 'app/shared/util/request.util'; import { HttpResponse } from '@angular/common/http'; import { FinishedBuildJobFilter } from 'app/localci/build-queue/build-queue.component'; diff --git a/src/main/webapp/app/localvc/commit-details-view/commit-details-view.component.ts b/src/main/webapp/app/localvc/commit-details-view/commit-details-view.component.ts index 617797f048c1..98ced261dc32 100644 --- a/src/main/webapp/app/localvc/commit-details-view/commit-details-view.component.ts +++ b/src/main/webapp/app/localvc/commit-details-view/commit-details-view.component.ts @@ -4,7 +4,7 @@ import { ProgrammingExerciseService } from 'app/exercises/programming/manage/ser import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; import { Subscription, throwError } from 'rxjs'; import { ActivatedRoute } from '@angular/router'; -import { CommitInfo } from 'app/entities/programming-submission.model'; +import { CommitInfo } from 'app/entities/programming/programming-submission.model'; import dayjs from 'dayjs/esm'; import { catchError, map, tap } from 'rxjs/operators'; diff --git a/src/main/webapp/app/localvc/commit-history/commit-history.component.ts b/src/main/webapp/app/localvc/commit-history/commit-history.component.ts index 056104710066..fe98dd02cb53 100644 --- a/src/main/webapp/app/localvc/commit-history/commit-history.component.ts +++ b/src/main/webapp/app/localvc/commit-history/commit-history.component.ts @@ -3,11 +3,11 @@ import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs'; import dayjs from 'dayjs/esm'; import { ExerciseType } from 'app/entities/exercise.model'; -import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; import { tap } from 'rxjs/operators'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; diff --git a/src/main/webapp/app/localvc/repository-view/repository-view.component.ts b/src/main/webapp/app/localvc/repository-view/repository-view.component.ts index 8125fbbcb1d6..22ee9747edbb 100644 --- a/src/main/webapp/app/localvc/repository-view/repository-view.component.ts +++ b/src/main/webapp/app/localvc/repository-view/repository-view.component.ts @@ -3,7 +3,7 @@ import { Observable, Subscription } from 'rxjs'; import { ActivatedRoute, Router } from '@angular/router'; import { DomainService } from 'app/exercises/programming/shared/code-editor/service/code-editor-domain.service'; import { ExerciseType, getCourseFromExercise } from 'app/entities/exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { AccountService } from 'app/core/auth/account.service'; diff --git a/src/main/webapp/app/orion/assessment/orion-assessment.service.ts b/src/main/webapp/app/orion/assessment/orion-assessment.service.ts index 27a068b37f2e..9463fc7f3e32 100644 --- a/src/main/webapp/app/orion/assessment/orion-assessment.service.ts +++ b/src/main/webapp/app/orion/assessment/orion-assessment.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { ProgrammingAssessmentRepoExportService, RepositoryExportOptions } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export.service'; import { OrionConnectorService } from 'app/shared/orion/orion-connector.service'; import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service'; diff --git a/src/main/webapp/app/orion/management/orion-programming-exercise.component.ts b/src/main/webapp/app/orion/management/orion-programming-exercise.component.ts index 5728cd2c99be..2854122be21c 100644 --- a/src/main/webapp/app/orion/management/orion-programming-exercise.component.ts +++ b/src/main/webapp/app/orion/management/orion-programming-exercise.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { OrionConnectorService } from 'app/shared/orion/orion-connector.service'; import { ExerciseView, OrionState } from 'app/shared/orion/orion'; import { Router } from '@angular/router'; diff --git a/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.ts b/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.ts index aa415ecd9432..30f6b585e32c 100644 --- a/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.ts +++ b/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { ExerciseView, OrionState } from 'app/shared/orion/orion'; import { OrionConnectorService } from 'app/shared/orion/orion-connector.service'; diff --git a/src/main/webapp/app/overview/course-exams/course-exams.component.ts b/src/main/webapp/app/overview/course-exams/course-exams.component.ts index 916f669790e3..1b78c89b712e 100644 --- a/src/main/webapp/app/overview/course-exams/course-exams.component.ts +++ b/src/main/webapp/app/overview/course-exams/course-exams.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Course } from 'app/entities/course.model'; import { ActivatedRoute, Router } from '@angular/router'; import { Subscription } from 'rxjs'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; import { StudentExam } from 'app/entities/student-exam.model'; diff --git a/src/main/webapp/app/overview/course-overview.service.ts b/src/main/webapp/app/overview/course-overview.service.ts index ab2f9f32744d..0432dc2e361b 100644 --- a/src/main/webapp/app/overview/course-overview.service.ts +++ b/src/main/webapp/app/overview/course-overview.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { Exercise, getIcon } 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'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { getExerciseDueDate } from 'app/exercises/shared/exercise/exercise.utils'; diff --git a/src/main/webapp/app/overview/courses.component.ts b/src/main/webapp/app/overview/courses.component.ts index 73ce68512b8c..0d5218bb21b0 100644 --- a/src/main/webapp/app/overview/courses.component.ts +++ b/src/main/webapp/app/overview/courses.component.ts @@ -8,7 +8,7 @@ import { courseOverviewTour } from 'app/guided-tour/tours/course-overview-tour'; import { TeamService } from 'app/exercises/shared/team/team.service'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import dayjs from 'dayjs/esm'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Router } from '@angular/router'; import { faPenAlt } from '@fortawesome/free-solid-svg-icons'; import { CourseAccessStorageService } from 'app/course/course-access-storage.service'; diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts index 260428c680e3..d0b7264723b6 100644 --- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts +++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts @@ -16,7 +16,7 @@ import { StudentParticipation } from 'app/entities/participation/student-partici import { ExampleSolutionInfo, ExerciseDetailsType, ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { hasExerciseDueDatePassed } from 'app/exercises/shared/exercise/exercise.utils'; -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 { AlertService } from 'app/core/util/alert.service'; import { TeamAssignmentPayload } from 'app/entities/team.model'; diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts index 87e74ad54d11..26e3bec0a7b0 100644 --- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts +++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts @@ -7,7 +7,7 @@ import { InitializationState } from 'app/entities/participation/participation.mo import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { hasExerciseDueDatePassed, isResumeExerciseAvailable, isStartExerciseAvailable, isStartPracticeAvailable } from 'app/exercises/shared/exercise/exercise.utils'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ArtemisQuizService } from 'app/shared/quiz/quiz.service'; import { finalize } from 'rxjs/operators'; diff --git a/src/main/webapp/app/overview/participation-websocket.service.ts b/src/main/webapp/app/overview/participation-websocket.service.ts index 97e802f2350c..3836e7a81209 100644 --- a/src/main/webapp/app/overview/participation-websocket.service.ts +++ b/src/main/webapp/app/overview/participation-websocket.service.ts @@ -9,7 +9,7 @@ import { ParticipationService } from 'app/exercises/shared/participation/partici import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import dayjs from 'dayjs/esm'; import { cloneDeep } from 'lodash-es'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; const PERSONAL_PARTICIPATION_TOPIC = `/user/topic/newResults`; const EXERCISE_PARTICIPATION_TOPIC = (exerciseId: number) => `/topic/exercise/${exerciseId}/newResults`; diff --git a/src/main/webapp/app/shared/components/code-button/code-button.component.ts b/src/main/webapp/app/shared/components/code-button/code-button.component.ts index c9dac5178ab5..0b356bf859e6 100644 --- a/src/main/webapp/app/shared/components/code-button/code-button.component.ts +++ b/src/main/webapp/app/shared/components/code-button/code-button.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; -import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { ExternalCloningService } from 'app/exercises/programming/shared/service/external-cloning.service'; import { TranslateService } from '@ngx-translate/core'; diff --git a/src/main/webapp/app/shared/components/course-exam-archive-button/course-exam-archive-button.component.ts b/src/main/webapp/app/shared/components/course-exam-archive-button/course-exam-archive-button.component.ts index f15e7b2971d7..a26b939ed089 100644 --- a/src/main/webapp/app/shared/components/course-exam-archive-button/course-exam-archive-button.component.ts +++ b/src/main/webapp/app/shared/components/course-exam-archive-button/course-exam-archive-button.component.ts @@ -7,7 +7,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { tap } from 'rxjs/operators'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { ButtonSize } from '../button.component'; import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; diff --git a/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.ts b/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.ts index b196fd1d3df3..07f7b5f7ca94 100644 --- a/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.ts +++ b/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.ts @@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { faBackward } from '@fortawesome/free-solid-svg-icons'; import { ParticipationService } from 'app/exercises/shared/participation/participation.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; import { InitializationState } from 'app/entities/participation/participation.model'; diff --git a/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.ts b/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.ts index 3541ca8f141a..2601765baf68 100644 --- a/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.ts +++ b/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { finalize } from 'rxjs/operators'; import { faRedo } from '@fortawesome/free-solid-svg-icons'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { AlertService } from 'app/core/util/alert.service'; diff --git a/src/main/webapp/app/shared/consistency-check/consistency-check.component.ts b/src/main/webapp/app/shared/consistency-check/consistency-check.component.ts index 0383adf0244e..cfa9cf0ee405 100644 --- a/src/main/webapp/app/shared/consistency-check/consistency-check.component.ts +++ b/src/main/webapp/app/shared/consistency-check/consistency-check.component.ts @@ -3,7 +3,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ConsistencyCheckService } from 'app/shared/consistency-check/consistency-check.service'; import { AlertService } from 'app/core/util/alert.service'; import { ConsistencyCheckError } from 'app/entities/consistency-check-result.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { getCourseId } from 'app/entities/exercise.model'; import { faCheck, faTimes } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.ts b/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.ts index 48c99e458d89..da1cc727af85 100644 --- a/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.ts +++ b/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.ts @@ -4,7 +4,7 @@ import { Course } from 'app/entities/course.model'; import { Exercise, getCourseFromExercise } from 'app/entities/exercise.model'; import { AccountService } from 'app/core/auth/account.service'; import { SortService } from 'app/shared/service/sort.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { faExclamationTriangle, faSort } from '@fortawesome/free-solid-svg-icons'; @Component({ diff --git a/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.ts b/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.ts index d3b2fb105efa..e1da8a6b0498 100644 --- a/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.ts +++ b/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.ts @@ -4,7 +4,7 @@ import { get } from 'lodash-es'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { TutorParticipation, TutorParticipationStatus } from 'app/entities/participation/tutor-participation.model'; import { DueDateStat } from 'app/course/dashboards/due-date-stat.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { faBook, faChalkboardTeacher } from '@fortawesome/free-solid-svg-icons'; @Component({ diff --git a/src/main/webapp/app/shared/http/file.service.ts b/src/main/webapp/app/shared/http/file.service.ts index 330d449bc4f6..c14136a6688d 100644 --- a/src/main/webapp/app/shared/http/file.service.ts +++ b/src/main/webapp/app/shared/http/file.service.ts @@ -4,7 +4,7 @@ import { lastValueFrom } from 'rxjs'; import { v4 as uuid } from 'uuid'; import { Observable } from 'rxjs'; -import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; @Injectable({ providedIn: 'root' }) export class FileService { diff --git a/src/main/webapp/app/shared/orion/orion-build-and-test.service.ts b/src/main/webapp/app/shared/orion/orion-build-and-test.service.ts index fd3e57b80ddd..d46ee941b24a 100644 --- a/src/main/webapp/app/shared/orion/orion-build-and-test.service.ts +++ b/src/main/webapp/app/shared/orion/orion-build-and-test.service.ts @@ -5,12 +5,12 @@ import { filter, map, tap } from 'rxjs/operators'; import { Observable, Subject, Subscription } from 'rxjs'; import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service'; import { Participation } from 'app/entities/participation/participation.model'; -import { BuildLogEntryArray } from 'app/entities/build-log.model'; -import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { BuildLogEntryArray } from 'app/entities/programming/build-log.model'; +import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { Result } from 'app/entities/result.model'; import { OrionConnectorService } from 'app/shared/orion/orion-connector.service'; import { Feedback } from 'app/entities/feedback.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; /** * Notifies the IDE about a result, that is currently building and forwards incoming test results. diff --git a/src/main/webapp/app/shared/orion/orion-connector.service.ts b/src/main/webapp/app/shared/orion/orion-connector.service.ts index b49f8745e8db..61c8a0933cec 100644 --- a/src/main/webapp/app/shared/orion/orion-connector.service.ts +++ b/src/main/webapp/app/shared/orion/orion-connector.service.ts @@ -4,7 +4,7 @@ import { ExerciseView, OrionState } from 'app/shared/orion/orion'; import { Router } from '@angular/router'; import { REPOSITORY } from 'app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component'; import { stringifyCircular } from 'app/shared/util/utils'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Feedback } from 'app/entities/feedback.model'; import { OrionTutorAssessmentComponent } from 'app/orion/assessment/orion-tutor-assessment.component'; import { AlertService } from 'app/core/util/alert.service'; diff --git a/src/main/webapp/app/shared/user-import/users-import-button.component.ts b/src/main/webapp/app/shared/user-import/users-import-button.component.ts index 8056a4dbf2d1..88cd5df1b505 100644 --- a/src/main/webapp/app/shared/user-import/users-import-button.component.ts +++ b/src/main/webapp/app/shared/user-import/users-import-button.component.ts @@ -3,7 +3,7 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { ButtonSize, ButtonType } from 'app/shared/components/button.component'; import { UsersImportDialogComponent } from 'app/shared/user-import/users-import-dialog.component'; import { CourseGroup } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { faFileImport } from '@fortawesome/free-solid-svg-icons'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; diff --git a/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts b/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts index cb8287d7b74d..147cf3a2e661 100644 --- a/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts +++ b/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts @@ -3,12 +3,12 @@ import { NgForm } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; import { HttpResponse } from '@angular/common/http'; -import { ExamUserDTO } from 'app/entities/exam-user-dto.model'; +import { ExamUserDTO } from 'app/entities/exam/exam-user-dto.model'; import { cleanString } from 'app/shared/util/utils'; import { Subject } from 'rxjs'; import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; import { CourseManagementService } from 'app/course/manage/course-management.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 { StudentDTO } from 'app/entities/student-dto.model'; import { parse } from 'papaparse'; diff --git a/src/test/javascript/spec/component/assessment-dashboard/assessment-dashboard.component.spec.ts b/src/test/javascript/spec/component/assessment-dashboard/assessment-dashboard.component.spec.ts index b9b5192b7e70..bc3cfc327be3 100644 --- a/src/test/javascript/spec/component/assessment-dashboard/assessment-dashboard.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-dashboard/assessment-dashboard.component.spec.ts @@ -12,10 +12,10 @@ import { ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.mode import { TutorParticipationStatus } from 'app/entities/participation/tutor-participation.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { Exam } from 'app/entities/exam.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { SecondCorrectionEnableButtonComponent } from 'app/exercises/shared/dashboards/tutor/second-correction-button/second-correction-enable-button.component'; import { AssessmentDashboardComponent } from 'app/course/dashboards/assessment-dashboard/assessment-dashboard.component'; diff --git a/src/test/javascript/spec/component/assessment-dashboard/exam-assessment-buttons.component.spec.ts b/src/test/javascript/spec/component/assessment-dashboard/exam-assessment-buttons.component.spec.ts index 8b424f245ce8..e3e18abc527a 100644 --- a/src/test/javascript/spec/component/assessment-dashboard/exam-assessment-buttons.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-dashboard/exam-assessment-buttons.component.spec.ts @@ -8,7 +8,7 @@ import { Course } from 'app/entities/course.model'; import { of, throwError } from 'rxjs'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { StudentExam } from 'app/entities/student-exam.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { User } from 'app/core/user/user.model'; import dayjs from 'dayjs/esm'; import { By } from '@angular/platform-browser'; diff --git a/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts b/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts index f8bdd14321c4..92a1d051230e 100644 --- a/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts @@ -24,19 +24,19 @@ import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.mod import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service'; import { FileUploadSubmissionService } from 'app/exercises/file-upload/participate/file-upload-submission.service'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Complaint, ComplaintType } from 'app/entities/complaint.model'; import { Language } from 'app/entities/course.model'; import { Submission, SubmissionExerciseType } from 'app/entities/submission.model'; import { TutorParticipationService } from 'app/exercises/shared/dashboards/tutor/tutor-participation.service'; import { Participation } from 'app/entities/participation/participation.model'; import { Result } from 'app/entities/result.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { SecondCorrectionEnableButtonComponent } from 'app/exercises/shared/dashboards/tutor/second-correction-button/second-correction-enable-button.component'; import { LanguageTableCellComponent } from 'app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component'; diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts index 83d241b52277..6c151bfbce91 100644 --- a/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts @@ -14,7 +14,7 @@ import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.s import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { TranslateDirective, TranslateService } from '@ngx-translate/core'; -import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { GradingSystemService } from 'app/grading-system/grading-system.service'; import { GradingScale } from 'app/entities/grading-scale.model'; diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-instructions.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-instructions.component.spec.ts index 9f823f82f15f..548e3b7b9c1a 100644 --- a/src/test/javascript/spec/component/assessment-shared/assessment-instructions.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-shared/assessment-instructions.component.spec.ts @@ -6,9 +6,9 @@ import { ExpandableSectionComponent } from 'app/assessment/assessment-instructio import { StructuredGradingInstructionsAssessmentLayoutComponent } from 'app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-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 { ExerciseType } from 'app/entities/exercise.model'; import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component'; import { ExtensionPointDirective } from 'app/shared/extension-point/extension-point.directive'; diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts index a61789265a44..54ebbc921892 100644 --- a/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts @@ -8,8 +8,8 @@ import { MockHasAnyAuthorityDirective } from '../../helpers/mocks/directive/mock import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { ModelingAssessmentService } from 'app/exercises/modeling/assess/modeling-assessment.service'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; import { ProgrammingAssessmentManualResultService } from 'app/exercises/programming/assess/manual-result/programming-assessment-manual-result.service'; diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-warning.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-warning.component.spec.ts index e7ba6af20d1c..eefbd24f2338 100644 --- a/src/test/javascript/spec/component/assessment-shared/assessment-warning.component.spec.ts +++ b/src/test/javascript/spec/component/assessment-shared/assessment-warning.component.spec.ts @@ -2,9 +2,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import dayjs from 'dayjs/esm'; import { AssessmentWarningComponent } from 'app/assessment/assessment-warning/assessment-warning.component'; import { ArtemisTestModule } from '../../test.module'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; describe('AssessmentWarningComponent', () => { let component: AssessmentWarningComponent; diff --git a/src/test/javascript/spec/component/code-editor/code-editor-build-output.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-build-output.component.spec.ts index cca5d65fc88d..87206e5b1fff 100644 --- a/src/test/javascript/spec/component/code-editor/code-editor-build-output.component.spec.ts +++ b/src/test/javascript/spec/component/code-editor/code-editor-build-output.component.spec.ts @@ -7,17 +7,17 @@ import { ParticipationWebsocketService } from 'app/overview/participation-websoc import { triggerChanges } from '../../helpers/utils/general.utils'; import { CodeEditorBuildOutputComponent } from 'app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component'; import { Participation } from 'app/entities/participation/participation.model'; -import { BuildLogEntryArray } from 'app/entities/build-log.model'; +import { BuildLogEntryArray } from 'app/entities/programming/build-log.model'; import { CodeEditorBuildLogService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; import { ResultService } from 'app/exercises/shared/result/result.service'; import { MockResultService } from '../../helpers/mocks/service/mock-result.service'; import { MockCodeEditorBuildLogService } from '../../helpers/mocks/service/mock-code-editor-build-log.service'; import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { Result } from 'app/entities/result.model'; -import { StaticCodeAnalysisIssue } from 'app/entities/static-code-analysis-issue.model'; +import { StaticCodeAnalysisIssue } from 'app/entities/programming/static-code-analysis-issue.model'; import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model'; -import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { MockPipe, MockProvider } from 'ng-mocks'; import { CodeEditorSubmissionService } from 'app/exercises/programming/shared/code-editor/service/code-editor-submission.service'; diff --git a/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts b/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts index 149e46dae205..5d93f7870fa0 100644 --- a/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts +++ b/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts @@ -9,7 +9,7 @@ import { AccountService } from 'app/core/auth/account.service'; import { MockProvider } from 'ng-mocks'; import dayjs from 'dayjs/esm'; import { User } from 'app/core/user/user.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ComplaintAction, ComplaintResponseUpdateDTO } from 'app/entities/complaint-response-dto.model'; describe('ComplaintResponseService', () => { diff --git a/src/test/javascript/spec/component/complaints/complaint-student-view.component.spec.ts b/src/test/javascript/spec/component/complaints/complaint-student-view.component.spec.ts index 58ba0cd9a035..528e9d6d5c6a 100644 --- a/src/test/javascript/spec/component/complaints/complaint-student-view.component.spec.ts +++ b/src/test/javascript/spec/component/complaints/complaint-student-view.component.spec.ts @@ -7,7 +7,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { Participation } from 'app/entities/participation/participation.model'; import { Result } from 'app/entities/result.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Submission } from 'app/entities/submission.model'; import { Complaint } from 'app/entities/complaint.model'; import { Observable, of } from 'rxjs'; diff --git a/src/test/javascript/spec/component/complaints/complaint.service.spec.ts b/src/test/javascript/spec/component/complaints/complaint.service.spec.ts index 95b704d76e81..959355b8d92a 100644 --- a/src/test/javascript/spec/component/complaints/complaint.service.spec.ts +++ b/src/test/javascript/spec/component/complaints/complaint.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { ComplaintService } from 'app/complaints/complaint.service'; import { Complaint, ComplaintType } from 'app/entities/complaint.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ComplaintResponse } from 'app/entities/complaint-response.model'; import { User } from 'app/core/user/user.model'; import { AccountService } from 'app/core/auth/account.service'; diff --git a/src/test/javascript/spec/component/complaints/list-of-complaints.component.spec.ts b/src/test/javascript/spec/component/complaints/list-of-complaints.component.spec.ts index aeff086bc8e6..e3abe463b09d 100644 --- a/src/test/javascript/spec/component/complaints/list-of-complaints.component.spec.ts +++ b/src/test/javascript/spec/component/complaints/list-of-complaints.component.spec.ts @@ -13,8 +13,8 @@ import { Complaint, ComplaintType } from 'app/entities/complaint.model'; import { Course } from 'app/entities/course.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { Result } from 'app/entities/result.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { SortService } from 'app/shared/service/sort.service'; import dayjs from 'dayjs/esm'; diff --git a/src/test/javascript/spec/component/consistency-check/consistency-check.component.spec.ts b/src/test/javascript/spec/component/consistency-check/consistency-check.component.spec.ts index 78a8c5a7577c..5a845b83473d 100644 --- a/src/test/javascript/spec/component/consistency-check/consistency-check.component.spec.ts +++ b/src/test/javascript/spec/component/consistency-check/consistency-check.component.spec.ts @@ -1,6 +1,6 @@ import { ConsistencyCheckComponent } from 'app/shared/consistency-check/consistency-check.component'; import { ConsistencyCheckService } from 'app/shared/consistency-check/consistency-check.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { ConsistencyCheckError, ErrorType } from 'app/entities/consistency-check-result.model'; import { ArtemisTestModule } from '../../test.module'; diff --git a/src/test/javascript/spec/component/course/course-lti-configuration.component.spec.ts b/src/test/javascript/spec/component/course/course-lti-configuration.component.spec.ts index c8d23f7f5ddc..2912262c8621 100644 --- a/src/test/javascript/spec/component/course/course-lti-configuration.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-lti-configuration.component.spec.ts @@ -11,7 +11,7 @@ import { TranslateDirective } from 'app/shared/language/translate.directive'; import { CourseLtiConfigurationComponent } from 'app/course/manage/course-lti-configuration/course-lti-configuration.component'; import { SortService } from 'app/shared/service/sort.service'; import { Course } from 'app/entities/course.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; diff --git a/src/test/javascript/spec/component/course/course-overview.component.spec.ts b/src/test/javascript/spec/component/course/course-overview.component.spec.ts index cb3496dcb9b7..b411f3760596 100644 --- a/src/test/javascript/spec/component/course/course-overview.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-overview.component.spec.ts @@ -31,7 +31,7 @@ import { AlertService } from 'app/core/util/alert.service'; import { AfterViewInit, ChangeDetectorRef, Component, TemplateRef, ViewChild } from '@angular/core'; import { By } from '@angular/platform-browser'; import { TeamAssignmentPayload } from 'app/entities/team.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { CompetencyService } from 'app/course/competencies/competency.service'; import { CourseOverviewComponent } from 'app/overview/course-overview.component'; import { BarControlConfiguration, BarControlConfigurationProvider } from 'app/shared/tab-bar/tab-bar'; diff --git a/src/test/javascript/spec/component/course/course-overview.service.spec.ts b/src/test/javascript/spec/component/course/course-overview.service.spec.ts index d0527dde176a..7dbc94aabaea 100644 --- a/src/test/javascript/spec/component/course/course-overview.service.spec.ts +++ b/src/test/javascript/spec/component/course/course-overview.service.spec.ts @@ -11,8 +11,8 @@ import { TranslateService } from '@ngx-translate/core'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { Exam } from 'app/entities/exam.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ChannelDTO, ChannelSubType, getAsChannelDTO } from 'app/entities/metis/conversation/channel.model'; describe('CourseOverviewService', () => { diff --git a/src/test/javascript/spec/component/course/course-update.component.spec.ts b/src/test/javascript/spec/component/course/course-update.component.spec.ts index 2239ab6f91d1..289e91dbd948 100644 --- a/src/test/javascript/spec/component/course/course-update.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-update.component.spec.ts @@ -29,7 +29,7 @@ import { OrganizationManagementService } from 'app/admin/organization-management import { Organization } from 'app/entities/organization.model'; import dayjs from 'dayjs/esm'; import { ImageCropperModule } from 'app/shared/image-cropper/image-cropper.module'; -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 { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../../helpers/mocks/service/mock-account.service'; diff --git a/src/test/javascript/spec/component/course/course.component.spec.ts b/src/test/javascript/spec/component/course/course.component.spec.ts index dae7b6996b55..0922550c27e3 100644 --- a/src/test/javascript/spec/component/course/course.component.spec.ts +++ b/src/test/javascript/spec/component/course/course.component.spec.ts @@ -32,7 +32,7 @@ import { AlertService } from 'app/core/util/alert.service'; import { Component } from '@angular/core'; import { of } from 'rxjs'; import dayjs from 'dayjs/esm'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { CourseAccessStorageService } from 'app/course/course-access-storage.service'; const endDate1 = dayjs().add(1, 'days'); diff --git a/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts b/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts index 232aab57fafa..b2720b28a415 100644 --- a/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts +++ b/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts @@ -1,8 +1,8 @@ import { ExerciseFilter } from 'app/entities/exercise-filter.model'; import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Exercise } from 'app/entities/exercise.model'; describe('Exercise Filter Test', () => { diff --git a/src/test/javascript/spec/component/exam-exercise-row-buttons/exam-exercise-row-buttons.component.spec.ts b/src/test/javascript/spec/component/exam-exercise-row-buttons/exam-exercise-row-buttons.component.spec.ts index 187443be2be4..cc2d7aaf230a 100644 --- a/src/test/javascript/spec/component/exam-exercise-row-buttons/exam-exercise-row-buttons.component.spec.ts +++ b/src/test/javascript/spec/component/exam-exercise-row-buttons/exam-exercise-row-buttons.component.spec.ts @@ -3,9 +3,9 @@ import { ArtemisTestModule } from '../../test.module'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { ExamExerciseRowButtonsComponent } from 'app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component'; import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ExerciseType } from 'app/entities/exercise.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { ModelingExerciseService } from 'app/exercises/modeling/manage/modeling-exercise.service'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; @@ -17,7 +17,7 @@ import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { of, throwError } from 'rxjs'; import { HttpErrorResponse } from '@angular/common/http'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { MockDirective, MockProvider } from 'ng-mocks'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; import { MockRouterLinkDirective } from '../../helpers/mocks/directive/mock-router-link.directive'; diff --git a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts index 6de1e1db5c13..7dd87ad9bef8 100644 --- a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts +++ b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts @@ -15,7 +15,7 @@ import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; @@ -41,7 +41,7 @@ import { DifficultyBadgeComponent } from 'app/exercises/shared/exercise-headers/ import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/title-channel-name.component'; import { UMLDiagramType } from '@ls1intum/apollon'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; @Component({ diff --git a/src/test/javascript/spec/component/exam/feedback.utils.spec.ts b/src/test/javascript/spec/component/exam/feedback.utils.spec.ts index adf848356db6..5fc2c9311d97 100644 --- a/src/test/javascript/spec/component/exam/feedback.utils.spec.ts +++ b/src/test/javascript/spec/component/exam/feedback.utils.spec.ts @@ -2,7 +2,7 @@ import { prepareFeedbackComponentParameters } from 'app/exercises/shared/feedbac import { ResultTemplateStatus } from 'app/exercises/shared/result/result.utils'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import dayjs from 'dayjs/esm'; import { of } from 'rxjs'; import { MockProvider } from 'ng-mocks'; diff --git a/src/test/javascript/spec/component/exam/manage/exam-exercise-import.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-exercise-import.component.spec.ts index 304a86ef1639..38b8d1df5b58 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-exercise-import.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-exercise-import.component.spec.ts @@ -3,12 +3,12 @@ import { ArtemisTestModule } from '../../../test.module'; import { MockModule, MockPipe } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { FormsModule } from '@angular/forms'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExamExerciseImportComponent } from 'app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { Exercise } from 'app/entities/exercise.model'; diff --git a/src/test/javascript/spec/component/exam/manage/exam-exercise-row-buttons.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-exercise-row-buttons.component.spec.ts index fc769df6b8d6..430a59b2f55b 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-exercise-row-buttons.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-exercise-row-buttons.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Router, RouterModule } from '@angular/router'; import { Course } from 'app/entities/course.model'; import { HttpResponse } from '@angular/common/http'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExamExerciseRowButtonsComponent } from 'app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; diff --git a/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts index c743acdb5e98..b0476cd518fe 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; diff --git a/src/test/javascript/spec/component/exam/manage/exam-management-resolve.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-management-resolve.spec.ts index c3a2ed6b9848..9c7482c9fe6f 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-management-resolve.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-management-resolve.spec.ts @@ -6,7 +6,7 @@ import { MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExamService } from 'app/exam/manage/student-exams/student-exam.service'; import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service'; import { StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; diff --git a/src/test/javascript/spec/component/exam/manage/exam-management.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-management.component.spec.ts index ecd81a41c681..b5601206f621 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-management.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-management.component.spec.ts @@ -10,11 +10,11 @@ import { TranslateService } from '@ngx-translate/core'; import { ActivatedRoute, Router, UrlSegment, convertToParamMap } from '@angular/router'; import { Course } from 'app/entities/course.model'; import { ExamManagementComponent } from 'app/exam/manage/exam-management.component'; -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 { CourseManagementService } from 'app/course/manage/course-management.service'; import { SortService } from 'app/shared/service/sort.service'; -import { ExamInformationDTO } from 'app/entities/exam-information.model'; +import { ExamInformationDTO } from 'app/entities/exam/exam-information.model'; import { EventManager } from 'app/core/util/event-manager.service'; import { HasAnyAuthorityDirective } from 'app/shared/auth/has-any-authority.directive'; import { MockDirective, MockPipe } from 'ng-mocks'; diff --git a/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts index a452d76c4a7b..747d87a8a3c5 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts @@ -3,19 +3,19 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { Course } from 'app/entities/course.model'; import { ArtemisTestModule } from '../../../test.module'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; -import { ExamInformationDTO } from 'app/entities/exam-information.model'; +import { ExamInformationDTO } from 'app/entities/exam/exam-information.model'; import { StudentDTO } from 'app/entities/student-dto.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ExamScoreDTO } from 'app/exam/exam-scores/exam-score-dtos.model'; import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { AccountService } from 'app/core/auth/account.service'; -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 { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { UMLDiagramType } from '@ls1intum/apollon'; describe('Exam Management Service Tests', () => { diff --git a/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts index 1e6b737b7266..dfe43434b530 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts @@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; import { User } from 'app/core/user/user.model'; import { Course } from 'app/entities/course.model'; -import { ExamUserAttendanceCheckDTO } from 'app/entities/exam-users-attendance-check-dto.model'; -import { Exam } from 'app/entities/exam.model'; +import { ExamUserAttendanceCheckDTO } from 'app/entities/exam/exam-users-attendance-check-dto.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { ExamStudentsAttendanceCheckComponent } from 'app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; diff --git a/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts index 048b06c65333..58a448041153 100644 --- a/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts @@ -7,7 +7,7 @@ import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable'; import { User } from 'app/core/user/user.model'; import { UserService } from 'app/core/user/user.service'; import { Course } from 'app/entities/course.model'; -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 { ExamStudentsComponent } from 'app/exam/manage/students/exam-students.component'; import { StudentsUploadImagesButtonComponent } from 'app/exam/manage/students/upload-images/students-upload-images-button.component'; @@ -20,8 +20,8 @@ import { MockTranslateService } from '../../../helpers/mocks/service/mock-transl import { ArtemisTestModule } from '../../../test.module'; import { UsersImportButtonComponent } from 'app/shared/user-import/users-import-button.component'; import { TranslateDirective } from 'app/shared/language/translate.directive'; -import { ExamUserDTO } from 'app/entities/exam-user-dto.model'; -import { ExamUser } from 'app/entities/exam-user.model'; +import { ExamUserDTO } from 'app/entities/exam/exam-user-dto.model'; +import { ExamUser } from 'app/entities/exam/exam-user.model'; describe('ExamStudentsComponent', () => { const course = { id: 1 } as Course; diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-button.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-button.component.spec.ts index 1c31b7cd263f..09c6836b7cbb 100644 --- a/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-button.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-button.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { faBullhorn } from '@fortawesome/free-solid-svg-icons'; import dayjs from 'dayjs/esm'; import { By } from '@angular/platform-browser'; diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-checklist.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-checklist.component.spec.ts index 317ab262a4a9..814df06dd42b 100644 --- a/src/test/javascript/spec/component/exam/manage/exams/exam-checklist.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exams/exam-checklist.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ExamChecklist } from 'app/entities/exam-checklist.model'; -import { Exam } from 'app/entities/exam.model'; +import { ExamChecklist } from 'app/entities/exam/exam-checklist.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExamChecklistExerciseGroupTableComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist-exercisegroup-table/exam-checklist-exercisegroup-table.component'; import { ExamChecklistComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist.component'; import { ProgressBarComponent } from 'app/shared/dashboards/tutor-participation-graph/progress-bar/progress-bar.component'; diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts index 211c90093b8b..9d29bcdc9a23 100644 --- a/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts @@ -8,7 +8,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { AccountService } from 'app/core/auth/account.service'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ChecklistCheckComponent } from 'app/shared/components/checklist-check.component'; import { ExamChecklistExerciseGroupTableComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist-exercisegroup-table/exam-checklist-exercisegroup-table.component'; import { ExamChecklistComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist.component'; diff --git a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts index 8ca421927fb9..900f896fa97a 100644 --- a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts @@ -6,7 +6,7 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { TranslateService } from '@ngx-translate/core'; import { EntityResponseType } from 'app/complaints/complaint.service'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ExerciseGroupUpdateComponent } from 'app/exam/manage/exercise-groups/exercise-group-update.component'; import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service'; diff --git a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts index cc5dd2cb5225..040752cb4ffb 100644 --- a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts @@ -7,8 +7,8 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; import { EventManager } from 'app/core/util/event-manager.service'; import { Course } from 'app/entities/course.model'; -import { ExamInformationDTO } from 'app/entities/exam-information.model'; -import { Exam } from 'app/entities/exam.model'; +import { ExamInformationDTO } from 'app/entities/exam/exam-information.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; diff --git a/src/test/javascript/spec/component/exam/manage/exercise-groups/programming-exercise-group-cell.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exercise-groups/programming-exercise-group-cell.component.spec.ts index 43d15f8f8634..499338bffb52 100644 --- a/src/test/javascript/spec/component/exam/manage/exercise-groups/programming-exercise-group-cell.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exercise-groups/programming-exercise-group-cell.component.spec.ts @@ -5,7 +5,7 @@ import { ProgrammingExerciseGroupCellComponent } from 'app/exam/manage/exercise- import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { ExerciseType } from 'app/entities/exercise.model'; import { By } from '@angular/platform-browser'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { TranslatePipeMock } from '../../../../helpers/mocks/service/mock-translate.service'; import { of } from 'rxjs'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; diff --git a/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts b/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts index e4ecca13e935..cb10c66e1574 100644 --- a/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts @@ -4,7 +4,7 @@ import { ArtemisTestModule } from '../../../test.module'; import { CommitsInfoComponent } from 'app/exercises/programming/shared/commits-info/commits-info.component'; import { MockComponent, MockPipe } from 'ng-mocks'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { of } from 'rxjs'; import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/exam-status.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/exam-status.component.spec.ts index 213d77fac9b6..453df0f6be55 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/exam-status.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/exam-status.component.spec.ts @@ -5,12 +5,12 @@ import { MockPipe } from 'ng-mocks'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { MockExamChecklistService } from '../../../../helpers/mocks/service/mock-exam-checklist.service'; -import { ExamChecklist } from 'app/entities/exam-checklist.model'; +import { ExamChecklist } from 'app/entities/exam/exam-checklist.model'; import { of } from 'rxjs'; import { Course } from 'app/entities/course.model'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts index d7cd5e7161e6..22cdaf2eb531 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts @@ -9,11 +9,11 @@ import { ReactiveFormsModule } from '@angular/forms'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ParticipationType } from 'app/entities/participation/participation.model'; import { Result } from 'app/entities/result.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts index ae4ca95910a7..531f3d5aef50 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts @@ -17,7 +17,7 @@ import { NgForm, NgModel, ReactiveFormsModule } from '@angular/forms'; import { Exercise } from 'app/entities/exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ParticipationType } from 'app/entities/participation/participation.model'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-summary.component.spec.ts index fe4ee6e5d5eb..07ff99eac312 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-summary.component.spec.ts @@ -4,7 +4,7 @@ import { MockComponent } from 'ng-mocks'; import { Course } from 'app/entities/course.model'; import { of } from 'rxjs'; import { StudentExam } from 'app/entities/student-exam.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExamSummaryComponent } from 'app/exam/manage/student-exams/student-exam-summary.component'; import { ExamResultSummaryComponent } from 'app/exam/participate/summary/exam-result-summary.component'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-timeline.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-timeline.component.spec.ts index 09cc4dee6962..e28f9b6390ca 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-timeline.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-timeline.component.spec.ts @@ -4,7 +4,7 @@ import { MockComponent, MockPipe } from 'ng-mocks'; import { Course } from 'app/entities/course.model'; import { Observable, of } from 'rxjs'; import { StudentExam } from 'app/entities/student-exam.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExamTimelineComponent } from 'app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component'; import { ModelingExamSubmissionComponent } from 'app/exam/participate/exercises/modeling/modeling-exam-submission.component'; import { TextExamSubmissionComponent } from 'app/exam/participate/exercises/text/text-exam-submission.component'; @@ -16,14 +16,14 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ExamNavigationBarComponent } from 'app/exam/participate/exam-navigation-bar/exam-navigation-bar.component'; import { MockTranslateValuesDirective } from '../../../../helpers/mocks/directive/mock-translate-values.directive'; import { EntityArrayResponseType, SubmissionService } from 'app/exercises/shared/submission/submission.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import dayjs from 'dayjs/esm'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; import { SubmissionVersion } from 'app/entities/submission-version.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Submission } from 'app/entities/submission.model'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockLocalStorageService } from '../../../../helpers/mocks/service/mock-local-storage.service'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts index 1534c947d717..c5fbbc5b1a02 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts @@ -16,7 +16,7 @@ import { Course } from 'app/entities/course.model'; import { of, throwError } from 'rxjs'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { StudentExam } from 'app/entities/student-exam.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { User } from 'app/core/user/user.model'; import dayjs from 'dayjs/esm'; import { By } from '@angular/platform-browser'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-button.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-button.component.spec.ts index 3a2b4012bc1f..918148de4548 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-button.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-button.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MockComponent, MockModule, MockProvider } from 'ng-mocks'; import { AlertService } from 'app/core/util/alert.service'; import { TranslateModule } from '@ngx-translate/core'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { By } from '@angular/platform-browser'; import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { ButtonComponent } from 'app/shared/components/button.component'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-dialog.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-dialog.component.spec.ts index f0c4be9a98ce..c96fe070e773 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-dialog.component.spec.ts @@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Course } from 'app/entities/course.model'; -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 { StudentsUploadImagesDialogComponent } from 'app/exam/manage/students/upload-images/students-upload-images-dialog.component'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/user-import-button.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/user-import-button.component.spec.ts index ca19b1567ba3..e803ff5deb7f 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/user-import-button.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/user-import-button.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MockComponent, MockModule, MockProvider } from 'ng-mocks'; import { AlertService } from 'app/core/util/alert.service'; import { TranslateModule } from '@ngx-translate/core'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { By } from '@angular/platform-browser'; import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { ButtonComponent } from 'app/shared/components/button.component'; diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/user-import-dialog.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/user-import-dialog.component.spec.ts index 0541146c9d95..4f97eab7cc62 100644 --- a/src/test/javascript/spec/component/exam/manage/student-exams/user-import-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/student-exams/user-import-dialog.component.spec.ts @@ -5,7 +5,7 @@ import { By } from '@angular/platform-browser'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Course } from 'app/entities/course.model'; -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 { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { TranslateDirective } from 'app/shared/language/translate.directive'; @@ -19,7 +19,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { Router } from '@angular/router'; import * as fs from 'fs'; import * as path from 'path'; -import { ExamUserDTO } from 'app/entities/exam-user-dto.model'; +import { ExamUserDTO } from 'app/entities/exam/exam-user-dto.model'; describe('UsersImportDialogComponent', () => { let fixture: ComponentFixture; diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts index ae26c8a72e3b..b7586940ad52 100644 --- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts @@ -14,7 +14,7 @@ import { ButtonComponent } from 'app/shared/components/button.component'; import { MockRouterLinkDirective } from '../../../../helpers/mocks/directive/mock-router-link.directive'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { Exercise } from 'app/entities/exercise.model'; -import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model'; import { MockRouter } from '../../../../helpers/mocks/mock-router'; import { FormsModule } from '@angular/forms'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts index 3676e637591f..f375ca4fb6cc 100644 --- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; import { SuspiciousSessionsOverviewComponent } from 'app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component'; -import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model'; import { ArtemisTestModule } from '../../../../test.module'; import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { SuspiciousSessionsComponent } from 'app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component'; diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts index 68d38513ba77..8024d4a251c2 100644 --- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts @@ -4,7 +4,7 @@ import { SuspiciousSessionsComponent } from 'app/exam/manage/suspicious-behavior import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockPipe } from 'ng-mocks'; import { StudentExam } from 'app/entities/student-exam.model'; -import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { ArtemisTestModule } from '../../../../test.module'; diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts index bc1e1522f292..0760f147551b 100644 --- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { SuspiciousSessionsService } from 'app/exam/manage/suspicious-behavior/suspicious-sessions.service'; -import { SuspiciousExamSessions, SuspiciousSessionReason, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam-session.model'; +import { SuspiciousExamSessions, SuspiciousSessionReason, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam/exam-session.model'; describe('SuspiciousSessionsService', () => { let service: SuspiciousSessionsService; diff --git a/src/test/javascript/spec/component/exam/participate/exam-bar.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-bar.component.spec.ts index 2c187f95b291..03eb5e090d94 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-bar.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-bar.component.spec.ts @@ -12,7 +12,7 @@ import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storag import { TranslateService } from '@ngx-translate/core'; import { ExamBarComponent } from 'app/exam/participate/exam-bar/exam-bar.component'; import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; describe('ExamBarComponent', () => { diff --git a/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts index fb8f91a5ba57..40c65e3f008d 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import dayjs from 'dayjs/esm'; import { MockComponent, MockDirective, MockModule } from 'ng-mocks'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ExamSession } from 'app/entities/exam-session.model'; +import { ExamSession } from 'app/entities/exam/exam-session.model'; import { of } from 'rxjs'; import { ExamNavigationBarComponent } from 'app/exam/participate/exam-navigation-bar/exam-navigation-bar.component'; import { CodeEditorRepositoryService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; diff --git a/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts index 9e2e2cf7b70d..45ce49fc2b4d 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { MockComponent, MockModule } from 'ng-mocks'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ExamSession } from 'app/entities/exam-session.model'; +import { ExamSession } from 'app/entities/exam/exam-session.model'; import { of } from 'rxjs'; import { ExamNavigationSidebarComponent } from 'app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component'; import { CodeEditorRepositoryService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; diff --git a/src/test/javascript/spec/component/exam/participate/exam-participation-cover.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-participation-cover.component.spec.ts index 9e7b34dedae5..4f5514b08626 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-participation-cover.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-participation-cover.component.spec.ts @@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core'; import { AccountService } from 'app/core/auth/account.service'; import { User } from 'app/core/user/user.model'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { ExamParticipationCoverComponent } from 'app/exam/participate/exam-cover/exam-participation-cover.component'; diff --git a/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts index 4742c845c8ad..de433ab78169 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts @@ -9,20 +9,20 @@ import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { CourseStorageService } from 'app/course/manage/course-storage.service'; import { Course } from 'app/entities/course.model'; -import { ExamPage } from 'app/entities/exam-page.model'; -import { Exam } from 'app/entities/exam.model'; +import { ExamPage } from 'app/entities/exam/exam-page.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { InitializationState } from 'app/entities/participation/participation.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { Submission } from 'app/entities/submission.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { ExamExerciseUpdateService } from 'app/exam/manage/exam-exercise-update.service'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { TestRunRibbonComponent } from 'app/exam/manage/test-runs/test-run-ribbon.component'; diff --git a/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts index 5f3b9f04df78..6332ee962a6c 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { User } from 'app/core/user/user.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { ExamStartInformationComponent } from 'app/exam/participate/exam-start-information/exam-start-information.component'; import { InformationBoxComponent } from 'app/shared/information-box/information-box.component'; diff --git a/src/test/javascript/spec/component/exam/participate/exam.utils.spec.ts b/src/test/javascript/spec/component/exam/participate/exam.utils.spec.ts index 1254b6abcb98..2f75558e228f 100644 --- a/src/test/javascript/spec/component/exam/participate/exam.utils.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam.utils.spec.ts @@ -2,7 +2,7 @@ import { isExamResultPublished } from 'app/exam/participate/exam.utils'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; import { MockArtemisServerDateService } from '../../../helpers/mocks/service/mock-server-date.service'; import { TestBed } from '@angular/core/testing'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; let artemisServerDateService: ArtemisServerDateService; diff --git a/src/test/javascript/spec/component/exam/participate/exercises/programming-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/programming-exam-submission.component.spec.ts index bcd570d8c8a2..ad5c65c27275 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/programming-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/programming-exam-submission.component.spec.ts @@ -4,8 +4,8 @@ import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { Course } from 'app/entities/course.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { ProgrammingExamSubmissionComponent } from 'app/exam/participate/exercises/programming/programming-exam-submission.component'; import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component'; import { CodeEditorContainerComponent } from 'app/exercises/programming/shared/code-editor/container/code-editor-container.component'; diff --git a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts index 6671fb12acf4..176692131b10 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts @@ -3,8 +3,8 @@ import { NgModel } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { Course } from 'app/entities/course.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { TextExamSubmissionComponent } from 'app/exam/participate/exercises/text/text-exam-submission.component'; import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component'; import { TextEditorService } from 'app/exercises/text/participate/text-editor.service'; diff --git a/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts b/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts index 4be44e0709b1..9ead47365e2e 100644 --- a/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { User } from 'app/core/user/user.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { ExamGeneralInformationComponent } from 'app/exam/participate/general-information/exam-general-information.component'; import { StudentExamWorkingTimeComponent } from 'app/exam/shared/student-exam-working-time/student-exam-working-time.component'; diff --git a/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts index 815e36582b17..a36b5b62eb0e 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts @@ -9,20 +9,20 @@ import { ThemeService } from 'app/core/theme/theme.service'; import { User } from 'app/core/user/user.model'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { GradeType } from 'app/entities/grading-scale.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model'; import { StudentExam } from 'app/entities/student-exam.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { ExerciseResult, StudentExamWithGradeDTO, StudentResult } from 'app/exam/exam-scores/exam-score-dtos.model'; import { TestRunRibbonComponent } from 'app/exam/manage/test-runs/test-run-ribbon.component'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts index 2fd0a02f46d8..b5a588f2f83f 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts @@ -2,12 +2,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { User } from 'app/core/user/user.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { SubmissionType } from 'app/entities/submission.model'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts index deaa197ba1b6..6d8d7327aed3 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts @@ -9,11 +9,11 @@ import { ComplaintsStudentViewComponent } from 'app/complaints/complaints-for-st import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { ExerciseCacheService } from 'app/exercises/shared/exercise/exercise-cache.service'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { User } from 'app/core/user/user.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts index a6a54f521bfb..6dc458e8d548 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateService } from '@ngx-translate/core'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { AnswerOption } from 'app/entities/quiz/answer-option.model'; import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.model'; diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts index 7606478c4e1c..cf9a391476c0 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TextExamSummaryComponent } from 'app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Exercise } from 'app/entities/exercise.model'; import { TextEditorComponent } from 'app/exercises/text/participate/text-editor.component'; import { MockComponent } from 'ng-mocks'; diff --git a/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts index df597333fc63..836d997c7530 100644 --- a/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts @@ -4,14 +4,14 @@ import { RouterTestingModule } from '@angular/router/testing'; import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { User } from 'app/core/user/user.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExamResultOverviewComponent } from 'app/exam/participate/summary/result-overview/exam-result-overview.component'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Result } from 'app/entities/result.model'; diff --git a/src/test/javascript/spec/component/exam/shared/student-exam-working-time.component.spec.ts b/src/test/javascript/spec/component/exam/shared/student-exam-working-time.component.spec.ts index 1c71302e88cc..81da42c6eb6a 100644 --- a/src/test/javascript/spec/component/exam/shared/student-exam-working-time.component.spec.ts +++ b/src/test/javascript/spec/component/exam/shared/student-exam-working-time.component.spec.ts @@ -3,7 +3,7 @@ import { MockPipe } from 'ng-mocks'; import dayjs from 'dayjs/esm'; import { StudentExamWorkingTimeComponent } from 'app/exam/shared/student-exam-working-time/student-exam-working-time.component'; import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; describe('StudentExamWorkingTimeComponent', () => { diff --git a/src/test/javascript/spec/component/exam/shared/testexam-working-time.component.spec.ts b/src/test/javascript/spec/component/exam/shared/testexam-working-time.component.spec.ts index 7a4817aa9936..b3ca685443bd 100644 --- a/src/test/javascript/spec/component/exam/shared/testexam-working-time.component.spec.ts +++ b/src/test/javascript/spec/component/exam/shared/testexam-working-time.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MockPipe } from 'ng-mocks'; import dayjs from 'dayjs/esm'; import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { TestexamWorkingTimeComponent } from 'app/exam/shared/testExam-workingTime/testexam-working-time.component'; import { round } from 'app/shared/util/utils'; diff --git a/src/test/javascript/spec/component/exam/shared/working-time-control.component.spec.ts b/src/test/javascript/spec/component/exam/shared/working-time-control.component.spec.ts index 75382fcb9e4d..322846cc0bb2 100644 --- a/src/test/javascript/spec/component/exam/shared/working-time-control.component.spec.ts +++ b/src/test/javascript/spec/component/exam/shared/working-time-control.component.spec.ts @@ -2,7 +2,7 @@ import dayjs from 'dayjs/esm'; import { FormsModule } from '@angular/forms'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { WorkingTimeControlComponent } from 'app/exam/shared/working-time-control/working-time-control.component'; const createTestExam = (duration: number) => ({ workingTime: duration, startDate: dayjs.unix(0), endDate: dayjs.unix(duration) }) as Exam; diff --git a/src/test/javascript/spec/component/exam/test-run/create-test-run-modal.component.spec.ts b/src/test/javascript/spec/component/exam/test-run/create-test-run-modal.component.spec.ts index 23f0394ec3f3..4ca659c9076f 100644 --- a/src/test/javascript/spec/component/exam/test-run/create-test-run-modal.component.spec.ts +++ b/src/test/javascript/spec/component/exam/test-run/create-test-run-modal.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Course } from 'app/entities/course.model'; import { CreateTestRunModalComponent } from 'app/exam/manage/test-runs/create-test-run-modal.component'; import dayjs from 'dayjs/esm'; diff --git a/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts b/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts index 70e64fbff5d8..40d92651dcfa 100644 --- a/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts +++ b/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts @@ -9,7 +9,7 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { AccountService } from 'app/core/auth/account.service'; import { User } from 'app/core/user/user.model'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { Exercise } from 'app/entities/exercise.model'; import { StudentExam } from 'app/entities/student-exam.model'; diff --git a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts index 2af4e435afaf..4ef9a51082c3 100644 --- a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts +++ b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts @@ -13,8 +13,8 @@ import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model'; import { ActivatedRoute } from '@angular/router'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; -import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; +import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { CodeHint } from 'app/entities/hestia/code-hint-model'; import { CodeHintService } from 'app/exercises/shared/exercise-hint/services/code-hint.service'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; diff --git a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint.component.spec.ts index 5d9ffdb54ca2..b7b531efa5a8 100644 --- a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint.component.spec.ts +++ b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint.component.spec.ts @@ -9,7 +9,7 @@ import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model'; import { ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service'; import { MockActivatedRoute } from '../../../helpers/mocks/activated-route/mock-activated-route'; import { EventManager } from 'app/core/util/event-manager.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; describe('ExerciseHint Management Component', () => { let comp: ExerciseHintComponent; diff --git a/src/test/javascript/spec/component/exercise-hint/participate/exercise-hint-expandable.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/participate/exercise-hint-expandable.component.spec.ts index 9bbadd2c6bb0..0dbdd2699087 100644 --- a/src/test/javascript/spec/component/exercise-hint/participate/exercise-hint-expandable.component.spec.ts +++ b/src/test/javascript/spec/component/exercise-hint/participate/exercise-hint-expandable.component.spec.ts @@ -9,7 +9,7 @@ import { ArtemisTestModule } from '../../../test.module'; import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model'; import { ExerciseHintResponse, ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service'; import { ExerciseHintExpandableComponent } from 'app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { StarRatingComponent } from 'app/exercises/shared/rating/star-rating/star-rating.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; diff --git a/src/test/javascript/spec/component/exercise-hint/shared/code-hint-container.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/shared/code-hint-container.component.spec.ts index 745539ab66f3..d7852f272f21 100644 --- a/src/test/javascript/spec/component/exercise-hint/shared/code-hint-container.component.spec.ts +++ b/src/test/javascript/spec/component/exercise-hint/shared/code-hint-container.component.spec.ts @@ -3,7 +3,7 @@ import { ArtemisTestModule } from '../../../test.module'; import { CodeHintContainerComponent } from 'app/exercises/shared/exercise-hint/shared/code-hint-container.component'; import { CodeHint } from 'app/entities/hestia/code-hint-model'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { CodeHintService } from 'app/exercises/shared/exercise-hint/services/code-hint.service'; describe('ExerciseHint Management Component', () => { diff --git a/src/test/javascript/spec/component/exercises/problem-statement.component.spec.ts b/src/test/javascript/spec/component/exercises/problem-statement.component.spec.ts index dfe3302f9d69..8135e4878ae5 100644 --- a/src/test/javascript/spec/component/exercises/problem-statement.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/problem-statement.component.spec.ts @@ -6,8 +6,8 @@ import { ParticipationService } from 'app/exercises/shared/participation/partici import { HttpResponse } from '@angular/common/http'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProblemStatementComponent } from 'app/overview/exercise-details/problem-statement/problem-statement.component'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts index 598ed280ae94..c3c268ae9481 100644 --- a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts @@ -15,7 +15,7 @@ import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-questi import { QuizGroup } from 'app/entities/quiz/quiz-group.model'; import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { QuizPoolMappingComponent } from 'app/exercises/quiz/manage/quiz-pool-mapping.component'; import { QuizQuestionListEditComponent } from 'app/exercises/quiz/manage/quiz-question-list-edit.component'; diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts index e0c07d841d71..cac2387f7258 100644 --- a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts @@ -10,7 +10,7 @@ import { QuizQuestionListEditExistingComponent, State } from 'app/exercises/quiz import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { Course } from 'app/entities/course.model'; import { FormsModule } from '@angular/forms'; diff --git a/src/test/javascript/spec/component/exercises/shared/example-submission-import.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/example-submission-import.component.spec.ts index 8a82a0dd3925..4a7188fd906c 100644 --- a/src/test/javascript/spec/component/exercises/shared/example-submission-import.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/example-submission-import.component.spec.ts @@ -4,7 +4,7 @@ import { NgbPagination } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { Submission, SubmissionType } from 'app/entities/submission.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { ExampleSubmissionImportPagingService } from 'app/exercises/shared/example-submission/example-submission-import/example-submission-import-paging.service'; import { ExampleSubmissionImportComponent } from 'app/exercises/shared/example-submission/example-submission-import/example-submission-import.component'; import { ExampleSubmissionService } from 'app/exercises/shared/example-submission/example-submission.service'; diff --git a/src/test/javascript/spec/component/exercises/shared/example-submissions.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/example-submissions.component.spec.ts index 0d292309f796..4b40d355f277 100644 --- a/src/test/javascript/spec/component/exercises/shared/example-submissions.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/example-submissions.component.spec.ts @@ -14,7 +14,7 @@ import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ResultComponent } from 'app/exercises/shared/result/result.component'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { HttpResponse } from '@angular/common/http'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { AlertService } from 'app/core/util/alert.service'; describe('Example Submission Component', () => { diff --git a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores-export-button.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores-export-button.component.spec.ts index 0faee4a0f4c9..4d6e2636cb3d 100644 --- a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores-export-button.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores-export-button.component.spec.ts @@ -7,7 +7,7 @@ import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { ResultService } from 'app/exercises/shared/result/result.service'; import { Result } from 'app/entities/result.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { Course } from 'app/entities/course.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; diff --git a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts index c7bd261c1ed2..2bc2d727ee5e 100644 --- a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts @@ -11,7 +11,7 @@ import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { Participation } from 'app/entities/participation/participation.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Result } from 'app/entities/result.model'; import { Submission } from 'app/entities/submission.model'; import { Team } from 'app/entities/team.model'; diff --git a/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts index 23e6a4c7183c..37b91a62f115 100644 --- a/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts @@ -2,7 +2,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgForm } from '@angular/forms'; import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component'; import { TitleChannelNameModule } from 'app/shared/form/title-channel-name/title-channel-name.module'; diff --git a/src/test/javascript/spec/component/exercises/shared/headers/difficulty-badge.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/headers/difficulty-badge.component.spec.ts index f1a7ce415e15..0b2b00eff87c 100644 --- a/src/test/javascript/spec/component/exercises/shared/headers/difficulty-badge.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/headers/difficulty-badge.component.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing'; import { TranslateService } from '@ngx-translate/core'; import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service'; import { DifficultyBadgeComponent } from 'app/exercises/shared/exercise-headers/difficulty-badge.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { DifficultyLevel } from 'app/entities/exercise.model'; describe('DifficultyBadge', () => { diff --git a/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts index 6682b12aa12c..433069739443 100644 --- a/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; import { MockComponent, MockPipe } from 'ng-mocks'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { HeaderExercisePageWithDetailsComponent } from 'app/exercises/shared/exercise-headers/header-exercise-page-with-details.component'; import { NotReleasedTagComponent } from 'app/shared/components/not-released-tag.component'; import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe'; @@ -11,10 +11,10 @@ import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-hea import { ExerciseTypePipe } from 'app/shared/pipes/exercise-type.pipe'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ParticipationType } from 'app/entities/participation/participation.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { SubmissionType } from 'app/entities/submission.model'; import { Result } from 'app/entities/result.model'; import { LockRepositoryPolicy } from 'app/entities/submission-policy.model'; diff --git a/src/test/javascript/spec/component/exercises/shared/headers/header-participation-page.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/headers/header-participation-page.component.spec.ts index 11e02319eee8..b8e5b4266769 100644 --- a/src/test/javascript/spec/component/exercises/shared/headers/header-participation-page.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/headers/header-participation-page.component.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; import { MockComponent, MockPipe } from 'ng-mocks'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { DifficultyBadgeComponent } from 'app/exercises/shared/exercise-headers/difficulty-badge.component'; @@ -8,7 +8,7 @@ import { ArtemisTestModule } from '../../../../test.module'; import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ParticipationType } from 'app/entities/participation/participation.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { HeaderParticipationPageComponent } from 'app/exercises/shared/exercise-headers/header-participation-page.component'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts index 3314be02465d..782145a2aa63 100644 --- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts @@ -13,7 +13,7 @@ import { cloneDeep } from 'lodash-es'; import { Submission } from 'app/entities/submission.model'; import { ExerciseType } from 'app/entities/exercise.model'; import { faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; diff --git a/src/test/javascript/spec/component/exercises/shared/team-config-form-group.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/team-config-form-group.component.spec.ts index 91d124000a49..558987481795 100644 --- a/src/test/javascript/spec/component/exercises/shared/team-config-form-group.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/team-config-form-group.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Exercise, ExerciseMode } from 'app/entities/exercise.model'; import { TeamAssignmentConfig } from 'app/entities/team-assignment-config.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component'; import { Subject } from 'rxjs'; diff --git a/src/test/javascript/spec/component/exercises/shared/team-submission-sync.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/team-submission-sync.component.spec.ts index 9fb883b25037..6bab9646a59b 100644 --- a/src/test/javascript/spec/component/exercises/shared/team-submission-sync.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/team-submission-sync.component.spec.ts @@ -14,7 +14,7 @@ import { MockHttpService } from '../../../helpers/mocks/service/mock-http.servic import { HttpClient } from '@angular/common/http'; import { Submission } from 'app/entities/submission.model'; import { Observable, Subject, of } from 'rxjs'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { SubmissionSyncPayload } from 'app/entities/submission-sync-payload.model'; import { User } from 'app/core/user/user.model'; import { AccountService } from 'app/core/auth/account.service'; diff --git a/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts b/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts index caec2f8dbd54..3579287a3913 100644 --- a/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts @@ -17,8 +17,8 @@ import { MockProvider } from 'ng-mocks'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import dayjs from 'dayjs/esm'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { Exam } from 'app/entities/exam.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { fileUploadExercise } from '../../helpers/mocks/service/mock-file-upload-exercise.service'; import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component'; import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component'; diff --git a/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts b/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts index 4e3b44045052..7ecabd855b07 100644 --- a/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts +++ b/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts @@ -14,7 +14,7 @@ import { of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Course } from 'app/entities/course.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; diff --git a/src/test/javascript/spec/component/grading-system/interval-grading-system.component.spec.ts b/src/test/javascript/spec/component/grading-system/interval-grading-system.component.spec.ts index 70f795c2051c..531b3f1f2064 100644 --- a/src/test/javascript/spec/component/grading-system/interval-grading-system.component.spec.ts +++ b/src/test/javascript/spec/component/grading-system/interval-grading-system.component.spec.ts @@ -11,7 +11,7 @@ import { GradeStep } from 'app/entities/grade-step.model'; import { cloneDeep } from 'lodash-es'; import { of } from 'rxjs'; import { ActivatedRoute } from '@angular/router'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Course } from 'app/entities/course.model'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; diff --git a/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-overview.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-overview.component.spec.ts index d34c0758200a..360a08238306 100644 --- a/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-overview.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-overview.component.spec.ts @@ -1,6 +1,6 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { CodeHint, CodeHintGenerationStep } from 'app/entities/hestia/code-hint-model'; import { CodeHintGenerationOverviewComponent } from 'app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component'; import { MockActivatedRoute } from '../../../helpers/mocks/activated-route/mock-activated-route'; diff --git a/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-step.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-step.component.spec.ts index 1581002cfad0..f0e9e9999233 100644 --- a/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-step.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-step.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; import { CodeHintGenerationStepComponent } from 'app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { CodeHintService } from 'app/exercises/shared/exercise-hint/services/code-hint.service'; import { CodeHint } from 'app/entities/hestia/code-hint-model'; diff --git a/src/test/javascript/spec/component/hestia/generation-overview/coverage-generation-step.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/coverage-generation-step.component.spec.ts index 2707ed4960a3..cda7ed0c1f60 100644 --- a/src/test/javascript/spec/component/hestia/generation-overview/coverage-generation-step.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/generation-overview/coverage-generation-step.component.spec.ts @@ -2,7 +2,7 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { CoverageGenerationStepComponent } from 'app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component'; import { CoverageReport } from 'app/entities/hestia/coverage-report.model'; diff --git a/src/test/javascript/spec/component/hestia/generation-overview/diff-generation-step.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/diff-generation-step.component.spec.ts index 72b487652668..6d9f4cca6346 100644 --- a/src/test/javascript/spec/component/hestia/generation-overview/diff-generation-step.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/generation-overview/diff-generation-step.component.spec.ts @@ -2,7 +2,7 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { DiffGenerationStepComponent } from 'app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component'; import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; diff --git a/src/test/javascript/spec/component/hestia/generation-overview/manual-solution-entry-creation-modal.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/manual-solution-entry-creation-modal.component.spec.ts index 34c79f31899d..9720294dde47 100644 --- a/src/test/javascript/spec/component/hestia/generation-overview/manual-solution-entry-creation-modal.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/generation-overview/manual-solution-entry-creation-modal.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ManualSolutionEntryCreationModalComponent } from 'app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { ProgrammingExerciseSolutionEntryService } from 'app/exercises/shared/exercise-hint/services/programming-exercise-solution-entry.service'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { of } from 'rxjs'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-details-modal.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-details-modal.component.spec.ts index 603c7838f5cd..7852a6aa8f5f 100644 --- a/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-details-modal.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-details-modal.component.spec.ts @@ -1,7 +1,7 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ProgrammingExerciseSolutionEntryService } from 'app/exercises/shared/exercise-hint/services/programming-exercise-solution-entry.service'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { of } from 'rxjs'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-generation-step.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-generation-step.component.spec.ts index f231e94f008c..9e4ff7118bc9 100644 --- a/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-generation-step.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-generation-step.component.spec.ts @@ -2,7 +2,7 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Observable, of } from 'rxjs'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { SolutionEntryGenerationStepComponent } from 'app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; @@ -11,7 +11,7 @@ import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programmin import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { EventEmitter } from '@angular/core'; -import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType } from 'app/entities/programming/programming-exercise-test-case.model'; import { SortingOrder } from 'app/shared/table/pageable-table'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; diff --git a/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-file.component.spec.ts b/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-file.component.spec.ts index d837ef16643a..a35ac8f46b3b 100644 --- a/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-file.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-file.component.spec.ts @@ -2,7 +2,7 @@ import { ArtemisTestModule } from '../../../test.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TestwiseCoverageFileComponent } from 'app/exercises/programming/hestia/testwise-coverage-report/testwise-coverage-file.component'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { TestwiseCoverageReportEntry } from 'app/entities/hestia/testwise-coverage-report-entry.model'; import { CoverageFileReport } from 'app/entities/hestia/coverage-file-report.model'; import { MatExpansionModule } from '@angular/material/expansion'; diff --git a/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-report.component.spec.ts b/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-report.component.spec.ts index 77f8c1db5cbd..1c2e97853b5b 100644 --- a/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-report.component.spec.ts +++ b/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-report.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TestwiseCoverageReportComponent } from 'app/exercises/programming/hestia/testwise-coverage-report/testwise-coverage-report.component'; import { CoverageReport } from 'app/entities/hestia/coverage-report.model'; import { CoverageFileReport } from 'app/entities/hestia/coverage-file-report.model'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { TestwiseCoverageReportEntry } from 'app/entities/hestia/testwise-coverage-report-entry.model'; describe('TestwiseCoverageReport Component', () => { diff --git a/src/test/javascript/spec/component/import/exercise-import-from-file.component.spec.ts b/src/test/javascript/spec/component/import/exercise-import-from-file.component.spec.ts index 1e6d212a1c9a..d855c5af0aa1 100644 --- a/src/test/javascript/spec/component/import/exercise-import-from-file.component.spec.ts +++ b/src/test/javascript/spec/component/import/exercise-import-from-file.component.spec.ts @@ -6,14 +6,14 @@ import { ArtemisTestModule } from '../../test.module'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { MockComponent, MockDirective } from 'ng-mocks'; import { ButtonComponent } from 'app/shared/components/button.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ExerciseType } from 'app/entities/exercise.model'; import { AlertService } from 'app/core/util/alert.service'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import JSZip from 'jszip'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { UMLDiagramType } from '@ls1intum/apollon'; diff --git a/src/test/javascript/spec/component/import/exercise-import-wrapper.component.spec.ts b/src/test/javascript/spec/component/import/exercise-import-wrapper.component.spec.ts index fb60d4ab979c..eeb648c6126e 100644 --- a/src/test/javascript/spec/component/import/exercise-import-wrapper.component.spec.ts +++ b/src/test/javascript/spec/component/import/exercise-import-wrapper.component.spec.ts @@ -9,7 +9,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ArtemisTestModule } from '../../test.module'; import { ExerciseImportTabsComponent } from 'app/exercises/shared/import/exercise-import-tabs.component'; -import { ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; describe('ExerciseImportWrapperComponent', () => { let component: ExerciseImportWrapperComponent; diff --git a/src/test/javascript/spec/component/import/exercise-import.component.spec.ts b/src/test/javascript/spec/component/import/exercise-import.component.spec.ts index cf1a0da9a91f..ae6201f3dea5 100644 --- a/src/test/javascript/spec/component/import/exercise-import.component.spec.ts +++ b/src/test/javascript/spec/component/import/exercise-import.component.spec.ts @@ -3,9 +3,9 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { FormsModule } from '@angular/forms'; import { NgbActiveModal, NgbPagination } from '@ng-bootstrap/ng-bootstrap'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ModelingExercisePagingService } from 'app/exercises/modeling/manage/modeling-exercise-paging.service'; import { CodeAnalysisPagingService } from 'app/exercises/programming/manage/services/code-analysis-paging.service'; import { ProgrammingExercisePagingService } from 'app/exercises/programming/manage/services/programming-exercise-paging.service'; diff --git a/src/test/javascript/spec/component/import/import.component.spec.ts b/src/test/javascript/spec/component/import/import.component.spec.ts index 637cfb5c95de..88919c3b0a58 100644 --- a/src/test/javascript/spec/component/import/import.component.spec.ts +++ b/src/test/javascript/spec/component/import/import.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; import { NgbActiveModal, NgbPagination } from '@ng-bootstrap/ng-bootstrap'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ButtonComponent } from 'app/shared/components/button.component'; import { ImportComponent } from 'app/shared/import/import.component'; import { BaseEntity } from 'app/shared/model/base-entity'; diff --git a/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts index a79259f2268a..ba02154c4bc5 100644 --- a/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts +++ b/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts @@ -9,7 +9,7 @@ import { IrisSettings } from 'app/entities/iris/settings/iris-settings.model'; import { HttpResponse } from '@angular/common/http'; import { IrisEnabledComponent } from 'app/iris/settings/shared/iris-enabled.component'; import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { IrisSubSettingsType } from 'app/entities/iris/settings/iris-sub-settings.model'; diff --git a/src/test/javascript/spec/component/learning-paths/graph/node-details/exercise-node-details.component.spec.ts b/src/test/javascript/spec/component/learning-paths/graph/node-details/exercise-node-details.component.spec.ts index 7469f93f790d..bf1140cc06fb 100644 --- a/src/test/javascript/spec/component/learning-paths/graph/node-details/exercise-node-details.component.spec.ts +++ b/src/test/javascript/spec/component/learning-paths/graph/node-details/exercise-node-details.component.spec.ts @@ -8,7 +8,7 @@ import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTo import { ExerciseNodeDetailsComponent } from 'app/course/learning-paths/learning-path-graph/node-details/exercise-node-details.component'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { Exercise } from 'app/entities/exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; describe('ExerciseNodeDetailsComponent', () => { let fixture: ComponentFixture; diff --git a/src/test/javascript/spec/component/learning-paths/participate/learning-path-container.component.spec.ts b/src/test/javascript/spec/component/learning-paths/participate/learning-path-container.component.spec.ts index 3c0cc20079f0..9ead2c3a9994 100644 --- a/src/test/javascript/spec/component/learning-paths/participate/learning-path-container.component.spec.ts +++ b/src/test/javascript/spec/component/learning-paths/participate/learning-path-container.component.spec.ts @@ -13,7 +13,7 @@ import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model'; import { Exercise } from 'app/entities/exercise.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { LearningPathLectureUnitViewComponent } from 'app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.component'; import { CourseExerciseDetailsComponent } from 'app/overview/exercise-details/course-exercise-details.component'; import { ExerciseEntry, LearningPathStorageService, LectureUnitEntry, StorageEntry } from 'app/course/learning-paths/participate/learning-path-storage.service'; diff --git a/src/test/javascript/spec/component/lecture-unit/exercise-unit/create-exercise-unit.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/exercise-unit/create-exercise-unit.component.spec.ts index 4841051e7ad9..c01d76662132 100644 --- a/src/test/javascript/spec/component/lecture-unit/exercise-unit/create-exercise-unit.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/exercise-unit/create-exercise-unit.component.spec.ts @@ -10,8 +10,8 @@ import { ExerciseUnitService } from 'app/lecture/lecture-unit/lecture-unit-manag import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; diff --git a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.component.spec.ts index d44b64a65ff0..5d72248e268d 100644 --- a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.component.spec.ts @@ -4,7 +4,7 @@ import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model'; import { Component, Input } from '@angular/core'; import { Exercise } from 'app/entities/exercise.model'; import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { By } from '@angular/platform-browser'; @Component({ selector: 'jhi-course-exercise-row', template: '' }) diff --git a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts index 486196aa88dd..61d60ac7d907 100644 --- a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts @@ -7,7 +7,7 @@ import { take } from 'rxjs/operators'; import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model'; import { ExerciseUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/exerciseUnit.service'; import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Course } from 'app/entities/course.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; diff --git a/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts index c068f467ac38..9195af36b64b 100644 --- a/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts @@ -10,7 +10,7 @@ import { TextUnit } from 'app/entities/lecture-unit/textUnit.model'; import { VideoUnit } from 'app/entities/lecture-unit/videoUnit.model'; import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model'; import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Attachment, AttachmentType } from 'app/entities/attachment.model'; import { ArtemisTestModule } from '../../test.module'; diff --git a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-competencies.component.spec.ts b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-competencies.component.spec.ts index 2882280317c4..914fe55c18ab 100644 --- a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-competencies.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-competencies.component.spec.ts @@ -16,7 +16,7 @@ import { Course } from 'app/entities/course.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { TextUnit } from 'app/entities/lecture-unit/textUnit.model'; import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { CourseCompetencyFormData } from 'app/course/competencies/forms/course-competency-form.component'; diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agent-details.component.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agent-details.component.spec.ts index 9b458fcfea34..41ab0dfcea81 100644 --- a/src/test/javascript/spec/component/localci/build-agents/build-agent-details.component.spec.ts +++ b/src/test/javascript/spec/component/localci/build-agents/build-agent-details.component.spec.ts @@ -2,17 +2,17 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service'; import { of } from 'rxjs'; -import { BuildJob } from 'app/entities/build-job.model'; +import { BuildJob } from 'app/entities/programming/build-job.model'; import dayjs from 'dayjs/esm'; import { ArtemisTestModule } from '../../../test.module'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { DataTableComponent } from 'app/shared/data-table/data-table.component'; import { MockComponent, MockPipe } from 'ng-mocks'; import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable'; -import { BuildAgent } from 'app/entities/build-agent.model'; -import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/repository-info.model'; +import { BuildAgent } from 'app/entities/programming/build-agent.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 { BuildAgentDetailsComponent } from 'app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component'; import { MockActivatedRoute } from '../../../helpers/mocks/activated-route/mock-activated-route'; import { ActivatedRoute } from '@angular/router'; diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts index 2ffc69f9b823..76a76f16c094 100644 --- a/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts +++ b/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts @@ -3,17 +3,17 @@ import { BuildAgentSummaryComponent } from 'app/localci/build-agents/build-agent import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service'; import { of } from 'rxjs'; -import { BuildJob } from 'app/entities/build-job.model'; +import { BuildJob } from 'app/entities/programming/build-job.model'; import dayjs from 'dayjs/esm'; import { ArtemisTestModule } from '../../../test.module'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { DataTableComponent } from 'app/shared/data-table/data-table.component'; import { MockComponent, MockPipe } from 'ng-mocks'; import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable'; -import { BuildAgent } from 'app/entities/build-agent.model'; -import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/repository-info.model'; +import { BuildAgent } from 'app/entities/programming/build-agent.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'; describe('BuildAgentSummaryComponent', () => { let component: BuildAgentSummaryComponent; diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts index 20ac1e1e4011..494f211ee2b3 100644 --- a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts +++ b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts @@ -3,13 +3,13 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; -import { BuildJob } from 'app/entities/build-job.model'; +import { BuildJob } from 'app/entities/programming/build-job.model'; import dayjs from 'dayjs/esm'; import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service'; -import { BuildAgent } from 'app/entities/build-agent.model'; -import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/repository-info.model'; +import { BuildAgent } from 'app/entities/programming/build-agent.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'; describe('BuildAgentsService', () => { let service: BuildAgentsService; diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts index 966e1cdeb551..2d8f1c622405 100644 --- a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts +++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts @@ -10,8 +10,8 @@ import { AccountService } from 'app/core/auth/account.service'; import { DataTableComponent } from 'app/shared/data-table/data-table.component'; import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable'; import { ArtemisTestModule } from '../../../test.module'; -import { BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/build-job.model'; -import { TriggeredByPushTo } from 'app/entities/repository-info.model'; +import { BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/programming/build-job.model'; +import { TriggeredByPushTo } from 'app/entities/programming/repository-info.model'; import { waitForAsync } from '@angular/core/testing'; import { HttpResponse } from '@angular/common/http'; import { SortingOrder } from 'app/shared/table/pageable-table'; diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts index aa1b2ad95943..e762ed0d878b 100644 --- a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts +++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts @@ -8,11 +8,11 @@ import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storag import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { TranslateService } from '@ngx-translate/core'; -import { BuildJob, BuildJobStatistics, SpanType } from 'app/entities/build-job.model'; +import { BuildJob, BuildJobStatistics, SpanType } from 'app/entities/programming/build-job.model'; import dayjs from 'dayjs/esm'; -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 { FinishedBuildJobFilter } from 'app/localci/build-queue/build-queue.component'; describe('BuildQueueService', () => { diff --git a/src/test/javascript/spec/component/localvc/commit-details-view.component.spec.ts b/src/test/javascript/spec/component/localvc/commit-details-view.component.spec.ts index 3fb6e53ee8f7..fb964f7ea127 100644 --- a/src/test/javascript/spec/component/localvc/commit-details-view.component.spec.ts +++ b/src/test/javascript/spec/component/localvc/commit-details-view.component.spec.ts @@ -7,7 +7,7 @@ import { DueDateStat } from 'app/course/dashboards/due-date-stat.model'; import dayjs from 'dayjs/esm'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { Observable, of, throwError } from 'rxjs'; -import { CommitInfo } from 'app/entities/programming-submission.model'; +import { CommitInfo } from 'app/entities/programming/programming-submission.model'; import { MockComponent, MockPipe } from 'ng-mocks'; import { CommitDetailsViewComponent } from 'app/localvc/commit-details-view/commit-details-view.component'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; @@ -16,7 +16,7 @@ import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programmin import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { GitDiffReportComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-report.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { HttpResponse } from '@angular/common/http'; describe('CommitDetailsViewComponent', () => { diff --git a/src/test/javascript/spec/component/localvc/commit-history.component.spec.ts b/src/test/javascript/spec/component/localvc/commit-history.component.spec.ts index 1ab3572e75f4..8c3a628980a6 100644 --- a/src/test/javascript/spec/component/localvc/commit-history.component.spec.ts +++ b/src/test/javascript/spec/component/localvc/commit-history.component.spec.ts @@ -8,12 +8,12 @@ import { DueDateStat } from 'app/course/dashboards/due-date-stat.model'; import dayjs from 'dayjs/esm'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { of } from 'rxjs'; -import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { CommitsInfoComponent } from 'app/exercises/programming/shared/commits-info/commits-info.component'; import { MockComponent } from 'ng-mocks'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { MockProgrammingExerciseService } from '../../helpers/mocks/service/mock-programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { HttpResponse } from '@angular/common/http'; describe('CommitHistoryComponent', () => { diff --git a/src/test/javascript/spec/component/localvc/repository-view.component.spec.ts b/src/test/javascript/spec/component/localvc/repository-view.component.spec.ts index fcc2710140c4..5f4fae4014a9 100644 --- a/src/test/javascript/spec/component/localvc/repository-view.component.spec.ts +++ b/src/test/javascript/spec/component/localvc/repository-view.component.spec.ts @@ -13,7 +13,7 @@ import { AccountService } from 'app/core/auth/account.service'; import { DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; import { Observable, of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { DueDateStat } from 'app/course/dashboards/due-date-stat.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; diff --git a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts index 2bdc08914731..7bbd4b2e71a7 100644 --- a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts @@ -12,7 +12,7 @@ import { AssessmentType } from 'app/entities/assessment-type.model'; import { ComplaintResponse } from 'app/entities/complaint-response.model'; import { Complaint } from 'app/entities/complaint.model'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { Exercise } from 'app/entities/exercise.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; @@ -20,7 +20,7 @@ import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { Participation, ParticipationType } from 'app/entities/participation/participation.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { Result } from 'app/entities/result.model'; import { getLatestSubmissionResult } from 'app/entities/submission.model'; import { ModelingAssessmentEditorComponent } from 'app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component'; diff --git a/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts b/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts index f9963b3f1725..ccbc08667bd0 100644 --- a/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts @@ -12,7 +12,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route'; import { Course } from 'app/entities/course.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import dayjs from 'dayjs/esm'; import { TranslateService } from '@ngx-translate/core'; import { MockComponent, MockProvider } from 'ng-mocks'; diff --git a/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts b/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts index a01c3b4bdbd5..e81ad3cbd435 100644 --- a/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts +++ b/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts @@ -6,11 +6,11 @@ import { MockFileUploadExerciseService } from '../helpers/mocks/service/mock-fil import { SubmissionExportButtonComponent } from 'app/exercises/shared/submission-export/submission-export-button.component'; import { MockComponent, MockDirective, MockProvider } from 'ng-mocks'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Course } from 'app/entities/course.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; import { of } from 'rxjs'; diff --git a/src/test/javascript/spec/component/orion/orion-code-editor-instructor-and-editor-container.component.spec.ts b/src/test/javascript/spec/component/orion/orion-code-editor-instructor-and-editor-container.component.spec.ts index 5350df402a29..fc43be446641 100644 --- a/src/test/javascript/spec/component/orion/orion-code-editor-instructor-and-editor-container.component.spec.ts +++ b/src/test/javascript/spec/component/orion/orion-code-editor-instructor-and-editor-container.component.spec.ts @@ -19,7 +19,7 @@ import { MockRouter } from '../../helpers/mocks/mock-router'; import { Router } from '@angular/router'; import { ParticipationService } from 'app/exercises/shared/participation/participation.service'; import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; describe('CodeEditorInstructorAndEditorOrionContainerComponent', () => { let comp: CodeEditorInstructorAndEditorOrionContainerComponent; diff --git a/src/test/javascript/spec/component/orion/orion-exercise-assessment-dashboard.component.spec.ts b/src/test/javascript/spec/component/orion/orion-exercise-assessment-dashboard.component.spec.ts index d5688eb628cf..430f28bee09f 100644 --- a/src/test/javascript/spec/component/orion/orion-exercise-assessment-dashboard.component.spec.ts +++ b/src/test/javascript/spec/component/orion/orion-exercise-assessment-dashboard.component.spec.ts @@ -2,7 +2,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { OrionExerciseAssessmentDashboardComponent } from 'app/orion/assessment/orion-exercise-assessment-dashboard.component'; import { ExerciseType } from 'app/entities/exercise.model'; import { TutorParticipationStatus } from 'app/entities/participation/tutor-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { OrionConnectorService } from 'app/shared/orion/orion-connector.service'; import { BehaviorSubject, of, throwError } from 'rxjs'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; diff --git a/src/test/javascript/spec/component/overview/course-card.component.spec.ts b/src/test/javascript/spec/component/overview/course-card.component.spec.ts index 9c22d764106f..fbe16f160c51 100644 --- a/src/test/javascript/spec/component/overview/course-card.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-card.component.spec.ts @@ -9,7 +9,7 @@ import { Exercise } from 'app/entities/exercise.model'; import { MockComponent, MockDirective, MockModule, MockPipe } from 'ng-mocks'; import dayjs from 'dayjs/esm'; import { SubmissionExerciseType } from 'app/entities/submission.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe'; import { PieChartModule } from '@swimlane/ngx-charts'; import { TranslateDirective } from 'app/shared/language/translate.directive'; diff --git a/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts b/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts index 384e0875b8cd..658cc5b4f7ae 100644 --- a/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts @@ -20,7 +20,7 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Competency, CompetencyProgress } from 'app/entities/competency.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { TextUnit } from 'app/entities/lecture-unit/textUnit.model'; import { HttpResponse } from '@angular/common/http'; import { MockHasAnyAuthorityDirective } from '../../../helpers/mocks/directive/mock-has-any-authority.directive'; diff --git a/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts b/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts index 4b6ccb1ca3f1..60590bae4bde 100644 --- a/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute, Router } from '@angular/router'; import { Course } from 'app/entities/course.model'; import { CourseExamsComponent } from 'app/overview/course-exams/course-exams.component'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ArtemisTestModule } from '../../../test.module'; import dayjs from 'dayjs/esm'; import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; diff --git a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts index 7631c4d81136..b38eefa60f4e 100644 --- a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts @@ -14,7 +14,7 @@ import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { TreeviewModule } from 'app/exercises/programming/shared/code-editor/treeview/treeview.module'; import { CourseCompetenciesComponent } from 'app/overview/course-competencies/course-competencies.component'; diff --git a/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts b/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts index 957b1b6738ce..5fc8684a61cd 100644 --- a/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts +++ b/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts @@ -9,7 +9,7 @@ import { Participation, ParticipationType } from 'app/entities/participation/par import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { Result } from 'app/entities/result.model'; import { TeamAssignmentPayload } from 'app/entities/team.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service'; import { ProgrammingExerciseInstructionComponent } from 'app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component'; import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.service'; @@ -49,11 +49,11 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { MockRouterLinkDirective } from '../../../helpers/mocks/directive/mock-router-link.directive'; import { LtiInitializerComponent } from 'app/overview/exercise-details/lti-initializer.component'; import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { MockCourseManagementService } from '../../../helpers/mocks/service/mock-course-management.service'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { SubmissionPolicyService } from 'app/exercises/programming/manage/services/submission-policy.service'; import { LockRepositoryPolicy } from 'app/entities/submission-policy.model'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; diff --git a/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts b/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts index 1a770b4e5002..99068b63a154 100644 --- a/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts +++ b/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts @@ -9,10 +9,10 @@ import { Exercise, ExerciseMode, ExerciseType } from 'app/entities/exercise.mode import { InitializationState } from 'app/entities/participation/participation.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { QuizBatch, QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { Team } from 'app/entities/team.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; import { ExerciseDetailsStudentActionsComponent } from 'app/overview/exercise-details/exercise-details-student-actions.component'; import { CodeButtonComponent } from 'app/shared/components/code-button/code-button.component'; diff --git a/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts b/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts index 3e18c92b27c0..43b16fc6e6d0 100644 --- a/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts +++ b/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts @@ -20,15 +20,15 @@ import { ComplaintsForTutorComponent } from 'app/complaints/complaints-for-tutor import { UpdatingResultComponent } from 'app/exercises/shared/result/updating-result.component'; import { Submission, SubmissionExerciseType, SubmissionType } from 'app/entities/submission.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { RouterTestingModule } from '@angular/router/testing'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; diff --git a/src/test/javascript/spec/component/participation/participation.component.spec.ts b/src/test/javascript/spec/component/participation/participation.component.spec.ts index 569fc6ab73bb..7c96169e95ff 100644 --- a/src/test/javascript/spec/component/participation/participation.component.spec.ts +++ b/src/test/javascript/spec/component/participation/participation.component.spec.ts @@ -7,7 +7,7 @@ import { ParticipationService } from 'app/exercises/shared/participation/partici import { ParticipationComponent } from 'app/exercises/shared/participation/participation.component'; import { Course } from 'app/entities/course.model'; 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 { of, throwError } from 'rxjs'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import dayjs from 'dayjs/esm'; @@ -31,7 +31,7 @@ import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ArtemisTestModule } from '../../test.module'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { GradeStepsDTO } from 'app/entities/grade-step.model'; import { AlertService } from 'app/core/util/alert.service'; diff --git a/src/test/javascript/spec/component/plagiarism/exercise-update-plagiarism.component.spec.ts b/src/test/javascript/spec/component/plagiarism/exercise-update-plagiarism.component.spec.ts index feeb959ee591..9b85c7b332f4 100644 --- a/src/test/javascript/spec/component/plagiarism/exercise-update-plagiarism.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/exercise-update-plagiarism.component.spec.ts @@ -1,6 +1,6 @@ import { DEFAULT_PLAGIARISM_DETECTION_CONFIG, Exercise, ExerciseType } from 'app/entities/exercise.model'; import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Subject } from 'rxjs'; describe('Exercise Update Plagiarism Component', () => { diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-case-instructor-detail-view.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-case-instructor-detail-view.component.spec.ts index fa2105078290..c66f5a72b3c1 100644 --- a/src/test/javascript/spec/component/plagiarism/plagiarism-case-instructor-detail-view.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/plagiarism-case-instructor-detail-view.component.spec.ts @@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core'; import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase'; import { HttpResponse } from '@angular/common/http'; import { Observable, ReplaySubject, of } from 'rxjs'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/PlagiarismVerdict'; import { MockLocalStorageService } from '../../helpers/mocks/service/mock-local-storage.service'; import { MetisService } from 'app/shared/metis/metis.service'; diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-case-student-detail-view.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-case-student-detail-view.component.spec.ts index 29248886bc42..5b4ecff30533 100644 --- a/src/test/javascript/spec/component/plagiarism/plagiarism-case-student-detail-view.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/plagiarism-case-student-detail-view.component.spec.ts @@ -12,7 +12,7 @@ import { MockLocalStorageService } from '../../helpers/mocks/service/mock-local- import { MetisService } from 'app/shared/metis/metis.service'; import { TranslateService } from '@ngx-translate/core'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/PlagiarismVerdict'; import dayjs from 'dayjs/esm'; import { NotificationService } from 'app/shared/notification/notification.service'; diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts index 6d04c479847c..4a6bda12288c 100644 --- a/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts @@ -8,7 +8,7 @@ import { Observable, of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase'; import { TranslateService } from '@ngx-translate/core'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/PlagiarismVerdict'; import * as DownloadUtil from 'app/shared/util/download.util'; import dayjs from 'dayjs/esm'; diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts index ebb90a9f69a2..55b1e0eb0ea4 100644 --- a/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts @@ -11,8 +11,8 @@ import { ModelingPlagiarismResult } from 'app/exercises/shared/plagiarism/types/ import { PlagiarismStatus } from 'app/exercises/shared/plagiarism/types/PlagiarismStatus'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { TextPlagiarismResult } from 'app/exercises/shared/plagiarism/types/text/TextPlagiarismResult'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-split-view.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-split-view.component.spec.ts index 7c95bd6dacb2..4b06a312d72c 100644 --- a/src/test/javascript/spec/component/plagiarism/plagiarism-split-view.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/plagiarism-split-view.component.spec.ts @@ -7,7 +7,7 @@ import { PlagiarismComparison } from 'app/exercises/shared/plagiarism/types/Plag import { PlagiarismSplitViewComponent } from 'app/exercises/shared/plagiarism/plagiarism-split-view/plagiarism-split-view.component'; import { ExerciseType } from 'app/entities/exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { PlagiarismSubmission } from 'app/exercises/shared/plagiarism/types/PlagiarismSubmission'; import { FromToElement, TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement'; import { PlagiarismMatch, SimpleMatch } from 'app/exercises/shared/plagiarism/types/PlagiarismMatch'; diff --git a/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts b/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts index 225fc1227220..2118d941e1df 100644 --- a/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts @@ -7,9 +7,9 @@ import { TextSubmissionViewerComponent } from 'app/exercises/shared/plagiarism/p import { CodeEditorRepositoryFileService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.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 { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { DomainChange, DomainType, FileType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model'; import { PlagiarismSubmission } from 'app/exercises/shared/plagiarism/types/PlagiarismSubmission'; import { TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement'; diff --git a/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts b/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts index 059cbe0252d6..92350e8377d9 100644 --- a/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts +++ b/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts @@ -14,10 +14,10 @@ import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { RepositoryFileService } from 'app/exercises/shared/result/repository.service'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ProgrammingAssessmentRepoExportButtonComponent } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { ProgrammingAssessmentManualResultService } from 'app/exercises/programming/assess/manual-result/programming-assessment-manual-result.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Complaint } from 'app/entities/complaint.model'; import { ComplaintService } from 'app/complaints/complaint.service'; import { MockRepositoryFileService } from '../../helpers/mocks/service/mock-repository-file.service'; diff --git a/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-button.component.spec.ts b/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-button.component.spec.ts index 28d7a4ff4867..5766fd56beda 100644 --- a/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-button.component.spec.ts +++ b/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-button.component.spec.ts @@ -1,7 +1,7 @@ import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import dayjs from 'dayjs/esm'; import { ArtemisTestModule } from '../../test.module'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockTranslateValuesDirective } from '../../helpers/mocks/directive/mock-translate-values.directive'; diff --git a/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-dialog.component.spec.ts b/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-dialog.component.spec.ts index c137b2e2db37..7f9e8d1d6ed4 100644 --- a/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-dialog.component.spec.ts @@ -6,7 +6,7 @@ import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import dayjs from 'dayjs/esm'; import { ArtemisTestModule } from '../../test.module'; import { ProgrammingAssessmentRepoExportDialogComponent } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { ProgrammingAssessmentRepoExportService } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export.service'; diff --git a/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts index a62e6c9be607..b629be2732b0 100644 --- a/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts @@ -6,7 +6,7 @@ import { ProgrammingExerciseService } from 'app/exercises/programming/manage/ser import { MockProgrammingExerciseService } from '../../helpers/mocks/service/mock-programming-exercise.service'; import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route'; import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router'; -import { BuildPlan } from 'app/entities/build-plan.model'; +import { BuildPlan } from 'app/entities/programming/build-plan.model'; import { of, throwError } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { MockBuildPlanService } from '../../helpers/mocks/service/mock-build-plan.service'; @@ -15,7 +15,7 @@ import { MockComponent } from 'ng-mocks'; import { UpdatingResultComponent } from 'app/exercises/shared/result/updating-result.component'; import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { AlertService } from 'app/core/util/alert.service'; import { MockAlertService } from '../../helpers/mocks/service/mock-alert.service'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; diff --git a/src/test/javascript/spec/component/programming-exercise/category-issues-chart.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/category-issues-chart.component.spec.ts index 3a8cce90d652..17fee925d299 100644 --- a/src/test/javascript/spec/component/programming-exercise/category-issues-chart.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/category-issues-chart.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { CategoryIssuesChartComponent } from 'app/exercises/programming/manage/grading/charts/category-issues-chart.component'; -import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model'; +import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model'; describe('CategoryIssuesChartComponent', () => { let fixture: ComponentFixture; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-configure-grading.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-configure-grading.component.spec.ts index 603c70222109..714f39e19564 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-configure-grading.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-configure-grading.component.spec.ts @@ -7,10 +7,10 @@ import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable'; import { NgbModal, NgbModalRef, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; import { ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model'; -import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model'; -import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; -import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model'; +import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; +import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; +import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; +import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model'; import { CategoryIssuesChartComponent } from 'app/exercises/programming/manage/grading/charts/category-issues-chart.component'; import { ScaCategoryDistributionChartComponent } from 'app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component'; import { TestCaseDistributionChartComponent } from 'app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-create-buttons.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-create-buttons.component.spec.ts index 17f226cd84d6..630029986a67 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-create-buttons.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-create-buttons.component.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing'; import { ExerciseType } from 'app/entities/exercise.model'; import { ArtemisTestModule } from '../../test.module'; import { ProgrammingExerciseComponent } from 'app/exercises/programming/manage/programming-exercise.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { ActivatedRoute, convertToParamMap } from '@angular/router'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts index fdc1d42c64b1..8b59cc5e8c6b 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts @@ -1,16 +1,10 @@ import { TestBed } from '@angular/core/testing'; +import { BuildAction, PlatformAction, ScriptAction } from 'app/entities/programming/build.action'; +import { DockerConfiguration } from 'app/entities/programming/docker.configuration'; +import { WindFile } from 'app/entities/programming/wind.file'; +import { WindMetadata } from 'app/entities/programming/wind.metadata'; import { ArtemisTestModule } from '../../test.module'; -import { - BuildAction, - DockerConfiguration, - PlatformAction, - ProgrammingExercise, - ProgrammingLanguage, - ProjectType, - ScriptAction, - WindFile, - WindMetadata, -} from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { ActivatedRoute, convertToParamMap } from '@angular/router'; import { Course } from 'app/entities/course.model'; import { ProgrammingExerciseCustomAeolusBuildPlanComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts index fe342f5eac56..b2ec21d46f82 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts @@ -1,16 +1,10 @@ import { TestBed } from '@angular/core/testing'; +import { BuildAction, PlatformAction, ScriptAction } from 'app/entities/programming/build.action'; +import { DockerConfiguration } from 'app/entities/programming/docker.configuration'; +import { WindFile } from 'app/entities/programming/wind.file'; +import { WindMetadata } from 'app/entities/programming/wind.metadata'; import { ArtemisTestModule } from '../../test.module'; -import { - BuildAction, - DockerConfiguration, - PlatformAction, - ProgrammingExercise, - ProgrammingLanguage, - ProjectType, - ScriptAction, - WindFile, - WindMetadata, -} from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { ActivatedRoute, convertToParamMap } from '@angular/router'; import { Course } from 'app/entities/course.model'; import { ElementRef, Renderer2 } from '@angular/core'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts index 47ea2df80cb5..8563723b42b8 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts @@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { of, throwError } from 'rxjs'; import { ArtemisTestModule } from '../../test.module'; import { ProgrammingExerciseDetailComponent } from 'app/exercises/programming/manage/programming-exercise-detail.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route'; import { Course } from 'app/entities/course.model'; import { TranslateModule } from '@ngx-translate/core'; @@ -11,7 +11,7 @@ import { StatisticsService } from 'app/shared/statistics-graph/statistics.servic import { ExerciseManagementStatisticsDto } from 'app/exercises/shared/statistics/exercise-management-statistics-dto'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { MockProfileService } from '../../helpers/mocks/service/mock-profile.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; import { MockProgrammingExerciseService } from '../../helpers/mocks/service/mock-programming-exercise.service'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; @@ -24,7 +24,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockProgrammingExerciseGradingService } from '../../helpers/mocks/service/mock-programming-exercise-grading.service'; import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; -import { BuildLogStatisticsDTO } from 'app/entities/build-log-statistics-dto'; +import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto'; import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; import { HttpResponse } from '@angular/common/http'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-selected.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-selected.component.spec.ts index 550e8a533d0c..802cb0180956 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-selected.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-selected.component.spec.ts @@ -7,7 +7,7 @@ import dayjs from 'dayjs/esm'; import { ArtemisTestModule } from '../../test.module'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-editable-instruction.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-editable-instruction.component.spec.ts index 14ced4c71eea..c00bb591678c 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-editable-instruction.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-editable-instruction.component.spec.ts @@ -17,7 +17,7 @@ import { TemplateProgrammingExerciseParticipation } from 'app/entities/participa import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; import { IProgrammingExerciseGradingService, ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; import { Result } from 'app/entities/result.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseInstructionAnalysisComponent } from 'app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.component'; import { ProgrammingExerciseEditableInstructionComponent } from 'app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component'; import { ProgrammingExerciseInstructionComponent } from 'app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts index 4a4bee296170..3cfff55d7749 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts @@ -31,7 +31,7 @@ import { ProgrammingExerciseParticipationService } from 'app/exercises/programmi import { ProgrammingExerciseInstructionTaskStatusComponent } from 'app/exercises/programming/shared/instructions-render/task/programming-exercise-instruction-task-status.component'; import { Result } from 'app/entities/result.model'; import { ProgrammingExerciseInstructionComponent } from 'app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { FeedbackComponent } from 'app/exercises/shared/feedback/feedback.component'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-status.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-status.component.spec.ts index 6f8ec78aa596..0d90f4c63d76 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-status.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-status.component.spec.ts @@ -8,8 +8,8 @@ import { Result } from 'app/entities/result.model'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { triggerChanges } from '../../helpers/utils/general.utils'; import { ProgrammingExerciseInstructorStatusComponent } from 'app/exercises/programming/manage/status/programming-exercise-instructor-status.component'; -import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model'; +import { ProgrammingExercise } 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 { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-submission-state.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-submission-state.component.spec.ts index e1638e73e8e8..0a0bee0d069b 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-submission-state.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-submission-state.component.spec.ts @@ -12,7 +12,7 @@ import { ExerciseSubmissionState, ProgrammingSubmissionService, ProgrammingSubmi import { ProgrammingExerciseInstructorSubmissionStateComponent } from 'app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component'; import { triggerChanges } from '../../helpers/utils/general.utils'; import { BuildRunState, ProgrammingBuildRunService } from 'app/exercises/programming/participate/programming-build-run.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { MockDirective, MockModule, MockPipe } from 'ng-mocks'; import { ProgrammingExerciseTriggerAllButtonComponent } from 'app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts index f488e31968f6..bf9b03e41e6c 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { Course } from 'app/entities/course.model'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts index b9bbd8e9ad28..32c41626803d 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts @@ -4,7 +4,7 @@ import { ArtemisTestModule } from '../../test.module'; import { MockComponent, MockDirective } from 'ng-mocks'; import { ProgrammingExerciseLifecycleComponent } from 'app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseTestScheduleDatePickerComponent } from 'app/exercises/programming/shared/lifecycle/programming-exercise-test-schedule-date-picker.component'; import { NgModel } from '@angular/forms'; import { AssessmentType } from 'app/entities/assessment-type.model'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-re-evaluate-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-re-evaluate-button.component.spec.ts index 9283221d1266..16bd1cdf33b0 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-re-evaluate-button.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-re-evaluate-button.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { Course } from 'app/entities/course.model'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts index ccc542ea3ec5..aa7f5e3e80bb 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts @@ -1,11 +1,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { CheckoutDirectoriesDto } from 'app/entities/checkout-directories-dto'; -import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { CheckoutDirectoriesDto } from 'app/entities/programming/checkout-directories-dto'; +import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { MockComponent } from 'ng-mocks'; import { Subscription, of } from 'rxjs'; -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; import { SimpleChanges } from '@angular/core'; import { ProgrammingExerciseBuildPlanCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component'; import { ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-reset-dialog.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-reset-dialog.component.spec.ts index 6f1c53159b02..596b3dfad522 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-reset-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-reset-dialog.component.spec.ts @@ -6,7 +6,7 @@ import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import dayjs from 'dayjs/esm'; import { ArtemisTestModule } from '../../test.module'; import { ProgrammingExerciseResetDialogComponent } from 'app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { ProgrammingExerciseResetOptions, ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { AlertService } from 'app/core/util/alert.service'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-test-case-passed-builds-charts.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-test-case-passed-builds-charts.component.spec.ts index 18603184899b..b237c4ad56c7 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-test-case-passed-builds-charts.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-test-case-passed-builds-charts.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { TestCasePassedBuildsChartComponent } from 'app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component'; -import { TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; describe('TestCasePassedBuildsChartComponent', () => { let comp: TestCasePassedBuildsChartComponent; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-all-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-all-button.component.spec.ts index 019291c960f3..000cf3dbeb54 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-all-button.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-all-button.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { Course } from 'app/entities/course.model'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-build-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-build-button.component.spec.ts index 5a74d40dec87..c50aa8ffcea1 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-build-button.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-build-button.component.spec.ts @@ -19,7 +19,7 @@ import { ArtemisProgrammingExerciseActionsModule } from 'app/exercises/programmi import { triggerChanges } from '../../helpers/utils/general.utils'; import { InitializationState } from 'app/entities/participation/participation.model'; import { ProgrammingExerciseStudentTriggerBuildButtonComponent } from 'app/exercises/programming/shared/actions/programming-exercise-student-trigger-build-button.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; describe('TriggerBuildButtonSpec', () => { diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts index 5441500fe1a3..093df3a0508f 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts @@ -2,13 +2,14 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin import { DebugElement } from '@angular/core'; import { HttpHeaders, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, UrlSegment } from '@angular/router'; +import { WindFile } from 'app/entities/programming/wind.file'; import { Subject, of, throwError } from 'rxjs'; import dayjs from 'dayjs/esm'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; import { ArtemisTestModule } from '../../test.module'; import { ProgrammingExerciseUpdateComponent } from 'app/exercises/programming/manage/update/programming-exercise-update.component'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise, ProgrammingLanguage, ProjectType, WindFile } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; @@ -62,7 +63,7 @@ import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { ExerciseUpdateNotificationComponent } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.component'; import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component'; import * as Utils from 'app/exercises/shared/course-exercises/course-utils'; -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; import { AlertService, AlertType } from 'app/core/util/alert.service'; import { FormStatusBarComponent } from 'app/forms/form-status-bar/form-status-bar.component'; import { FormFooterComponent } from 'app/forms/form-footer/form-footer.component'; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise.component.spec.ts index 7915f67f8f84..ec6b28b573ab 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise.component.spec.ts @@ -3,7 +3,7 @@ import { HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/ht import { of, throwError } from 'rxjs'; import { ArtemisTestModule } from '../../test.module'; import { ProgrammingExerciseComponent } from 'app/exercises/programming/manage/programming-exercise.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; diff --git a/src/test/javascript/spec/component/programming-exercise/sca-category-distribution-chart.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/sca-category-distribution-chart.component.spec.ts index fb52afff1ebc..863bb75ed2ca 100644 --- a/src/test/javascript/spec/component/programming-exercise/sca-category-distribution-chart.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/sca-category-distribution-chart.component.spec.ts @@ -6,9 +6,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { BarChartModule } from '@swimlane/ngx-charts'; import { TranslateService } from '@ngx-translate/core'; -import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { CategoryIssuesMap } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { CategoryIssuesMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils'; describe('SCA category distribution chart', () => { diff --git a/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-grading-tasks-table.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-grading-tasks-table.component.spec.ts index 760a02a0c910..dea5aea61f5d 100644 --- a/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-grading-tasks-table.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-grading-tasks-table.component.spec.ts @@ -3,8 +3,8 @@ import { ArtemisTestModule } from '../../../test.module'; import { ProgrammingExerciseGradingTasksTableComponent } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component'; import { ProgrammingExerciseTaskService } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task.service'; import { Observable, Subject, of } from 'rxjs'; -import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; import { TranslateService } from '@ngx-translate/core'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; @@ -12,7 +12,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockPipe } from 'ng-mocks'; import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task'; import { ButtonComponent } from 'app/shared/components/button.component'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; describe('ProgrammingExerciseGradingTasksTableComponent', () => { let fixture; diff --git a/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-task.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-task.component.spec.ts index fe23d6eea2d4..2f0c52e95903 100644 --- a/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-task.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-task.component.spec.ts @@ -7,7 +7,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockPipe } from 'ng-mocks'; import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task'; import { ProgrammingExerciseTaskComponent } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component'; -import { Visibility } from 'app/entities/programming-exercise-test-case.model'; +import { Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; import { TestCasePassedBuildsChartComponent } from 'app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component'; import { Subject } from 'rxjs'; diff --git a/src/test/javascript/spec/component/programming-exercise/test-case-distribution-chart.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/test-case-distribution-chart.component.spec.ts index 32a4f2bd9ab9..f022af2d9cd1 100644 --- a/src/test/javascript/spec/component/programming-exercise/test-case-distribution-chart.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/test-case-distribution-chart.component.spec.ts @@ -5,10 +5,10 @@ import { TranslateService } from '@ngx-translate/core'; import { TestCaseDistributionChartComponent } from 'app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component'; import { MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { BarChartModule } from '@swimlane/ngx-charts'; -import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { TestCaseStatsMap } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { TestCaseStatsMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils'; describe('Test case distribution chart', () => { diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-creation-config-mock.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-creation-config-mock.ts index 7879f1f5c0b5..0b99443e2f99 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-creation-config-mock.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-creation-config-mock.ts @@ -1,8 +1,8 @@ import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config'; import { Observable } from 'rxjs'; -import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; /* eslint-disable @typescript-eslint/no-unused-vars */ export const programmingExerciseCreationConfigMock: ProgrammingExerciseCreationConfig = { diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts index ce4ba0bc736f..70c70a17dd5b 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts @@ -9,7 +9,7 @@ import { CheckboxControlValueAccessor, DefaultValueAccessor, NgModel, NumberValu import { DifficultyPickerComponent } from 'app/exercises/shared/difficulty-picker/difficulty-picker.component'; import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component'; import { programmingExerciseCreationConfigMock } from './programming-exercise-creation-config-mock'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { PROFILE_THEIA } from 'app/app.constants'; diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts index e59522cf01aa..8087a70b7cea 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts @@ -4,7 +4,7 @@ import { ActivatedRoute } from '@angular/router'; import { Subject, of } from 'rxjs'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-grading.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { IncludedInOverallScore } from 'app/entities/exercise.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { SubmissionPolicyType } from 'app/entities/submission-policy.model'; diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts index 30259859d720..963ef4c6ff37 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts @@ -6,7 +6,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-information.component'; import { DefaultValueAccessor, NgModel } from '@angular/forms'; import { RemoveKeysPipe } from 'app/shared/pipes/remove-keys.pipe'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { CategorySelectorComponent } from 'app/shared/category-selector/category-selector.component'; import { AddAuxiliaryRepositoryButtonComponent } from 'app/exercises/programming/manage/update/add-auxiliary-repository-button.component'; diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts index 4d21b3741ce6..55eefafd0162 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts @@ -5,7 +5,7 @@ import { of } from 'rxjs'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { CheckboxControlValueAccessor, DefaultValueAccessor, NgModel, NumberValueAccessor, SelectControlValueAccessor } from '@angular/forms'; import { RemoveKeysPipe } from 'app/shared/pipes/remove-keys.pipe'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-language.component'; import { programmingExerciseCreationConfigMock } from './programming-exercise-creation-config-mock'; import { ProgrammingExerciseTheiaComponent } from 'app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component'; diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts index b56a555ea0ff..51ded01756bf 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts @@ -4,7 +4,7 @@ import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-problem.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component'; import { NgModel } from '@angular/forms'; diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/remove-auxiliary-repository-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/remove-auxiliary-repository-button.component.spec.ts index 7cec929c092d..cc205e0a226e 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/remove-auxiliary-repository-button.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/remove-auxiliary-repository-button.component.spec.ts @@ -4,9 +4,9 @@ import { RemoveAuxiliaryRepositoryButtonComponent } from 'app/exercises/programm import { ArtemisTestModule } from '../../../test.module'; import { ButtonComponent } from 'app/shared/components/button.component'; import { MockComponent } from 'ng-mocks'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; -import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model'; +import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model'; describe('RemoveAuxiliaryRepositoryButton', () => { let comp: RemoveAuxiliaryRepositoryButtonComponent; diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/theia/programming-exercise-theia.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/theia/programming-exercise-theia.component.spec.ts index 13f4e23cbbcd..ab3018105eaa 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/theia/programming-exercise-theia.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/theia/programming-exercise-theia.component.spec.ts @@ -4,7 +4,7 @@ import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { RemoveKeysPipe } from 'app/shared/pipes/remove-keys.pipe'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { programmingExerciseCreationConfigMock } from '../programming-exercise-creation-config-mock'; import { ProgrammingExerciseTheiaComponent } from 'app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component'; import { TheiaService } from 'app/exercises/programming/shared/service/theia.service'; diff --git a/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts b/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts index a7e1309fcea0..a93c87bdf3f3 100644 --- a/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts @@ -35,7 +35,7 @@ import { MockRouter } from '../../helpers/mocks/mock-router'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { ArtemisTestModule } from '../../test.module'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { MockProvider } from 'ng-mocks'; import { Duration } from 'app/exercises/quiz/manage/quiz-exercise-interfaces'; import { QuizQuestionListEditComponent } from 'app/exercises/quiz/manage/quiz-question-list-edit.component'; diff --git a/src/test/javascript/spec/component/shared/commits-info-group.component.spec.ts b/src/test/javascript/spec/component/shared/commits-info-group.component.spec.ts index 5765ddfd3f8b..ddcf06c215a2 100644 --- a/src/test/javascript/spec/component/shared/commits-info-group.component.spec.ts +++ b/src/test/javascript/spec/component/shared/commits-info-group.component.spec.ts @@ -4,7 +4,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockPipe } from 'ng-mocks'; import dayjs from 'dayjs/esm'; import { ArtemisTestModule } from '../../test.module'; -import type { CommitInfo } from 'app/entities/programming-submission.model'; +import type { CommitInfo } from 'app/entities/programming/programming-submission.model'; import { CommitsInfoRowComponent } from 'app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { TruncatePipe } from 'app/shared/pipes/truncate.pipe'; diff --git a/src/test/javascript/spec/component/shared/commits-info.component.spec.ts b/src/test/javascript/spec/component/shared/commits-info.component.spec.ts index 0b5dc3c7fae6..3d7c860143ce 100644 --- a/src/test/javascript/spec/component/shared/commits-info.component.spec.ts +++ b/src/test/javascript/spec/component/shared/commits-info.component.spec.ts @@ -7,7 +7,7 @@ import { ArtemisTestModule } from '../../test.module'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockPipe } from 'ng-mocks'; import { of } from 'rxjs'; -import { CommitInfo } from 'app/entities/programming-submission.model'; +import { CommitInfo } from 'app/entities/programming/programming-submission.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { ParticipationType } from 'app/entities/participation/participation.model'; diff --git a/src/test/javascript/spec/component/shared/course-exam-archive-button.component.spec.ts b/src/test/javascript/spec/component/shared/course-exam-archive-button.component.spec.ts index c667429e667b..7093eb87a5d0 100644 --- a/src/test/javascript/spec/component/shared/course-exam-archive-button.component.spec.ts +++ b/src/test/javascript/spec/component/shared/course-exam-archive-button.component.spec.ts @@ -19,7 +19,7 @@ import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.di import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { CourseExamArchiveButtonComponent, CourseExamArchiveState } from 'app/shared/components/course-exam-archive-button/course-exam-archive-button.component'; -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 { AccountService } from 'app/core/auth/account.service'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'; diff --git a/src/test/javascript/spec/component/shared/example-solution.component.spec.ts b/src/test/javascript/spec/component/shared/example-solution.component.spec.ts index 036b0ee9d044..95cc9ddbe47f 100644 --- a/src/test/javascript/spec/component/shared/example-solution.component.spec.ts +++ b/src/test/javascript/spec/component/shared/example-solution.component.spec.ts @@ -11,7 +11,7 @@ import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { ExampleSolutionComponent } from 'app/exercises/shared/example-solution/example-solution.component'; import { ExampleSolutionInfo, ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Exercise } from 'app/entities/exercise.model'; import { HeaderExercisePageWithDetailsComponent } from 'app/exercises/shared/exercise-headers/header-exercise-page-with-details.component'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; diff --git a/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts index 98f536f9dcea..f2123eb7f2b4 100644 --- a/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts +++ b/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts @@ -8,8 +8,8 @@ import { ExerciseType } from 'app/entities/exercise.model'; import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { ParticipationType } from 'app/entities/participation/participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { Result } from 'app/entities/result.model'; import { SubmissionType } from 'app/entities/submission.model'; import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service'; diff --git a/src/test/javascript/spec/component/shared/feedback/standalone-feedback.component.spec.ts b/src/test/javascript/spec/component/shared/feedback/standalone-feedback.component.spec.ts index aa2aa73b8ccb..443d3b40e1a2 100644 --- a/src/test/javascript/spec/component/shared/feedback/standalone-feedback.component.spec.ts +++ b/src/test/javascript/spec/component/shared/feedback/standalone-feedback.component.spec.ts @@ -7,7 +7,7 @@ import { StandaloneFeedbackComponent } from 'app/exercises/shared/feedback/stand import { MockComponent, MockProvider } from 'ng-mocks'; import { FeedbackComponent } from 'app/exercises/shared/feedback/feedback.component'; import { Course } from 'app/entities/course.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; describe('StandaloneFeedbackComponent', () => { diff --git a/src/test/javascript/spec/component/shared/reset-repo-button.component.spec.ts b/src/test/javascript/spec/component/shared/reset-repo-button.component.spec.ts index b1bc40312d47..b910e7893f56 100644 --- a/src/test/javascript/spec/component/shared/reset-repo-button.component.spec.ts +++ b/src/test/javascript/spec/component/shared/reset-repo-button.component.spec.ts @@ -10,7 +10,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Subject } from 'rxjs'; import { ResetRepoButtonComponent } from 'app/shared/components/reset-repo-button/reset-repo-button.component'; import { ParticipationService } from 'app/exercises/shared/participation/participation.service'; diff --git a/src/test/javascript/spec/component/shared/start-practice-mode-button.component.spec.ts b/src/test/javascript/spec/component/shared/start-practice-mode-button.component.spec.ts index d7ac41fb943a..3df720eeefff 100644 --- a/src/test/javascript/spec/component/shared/start-practice-mode-button.component.spec.ts +++ b/src/test/javascript/spec/component/shared/start-practice-mode-button.component.spec.ts @@ -12,7 +12,7 @@ import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle import { StartPracticeModeButtonComponent } from 'app/shared/components/start-practice-mode-button/start-practice-mode-button.component'; import { ExerciseType } from 'app/entities/exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { InitializationState } from 'app/entities/participation/participation.model'; import { Subject } from 'rxjs'; import dayjs from 'dayjs/esm'; diff --git a/src/test/javascript/spec/component/shared/submission-policy-update.component.spec.ts b/src/test/javascript/spec/component/shared/submission-policy-update.component.spec.ts index f416514a047b..05f3eb734dee 100644 --- a/src/test/javascript/spec/component/shared/submission-policy-update.component.spec.ts +++ b/src/test/javascript/spec/component/shared/submission-policy-update.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { LockRepositoryPolicy, SubmissionPenaltyPolicy, SubmissionPolicyType } from 'app/entities/submission-policy.model'; import { SubmissionPolicyUpdateComponent } from 'app/exercises/shared/submission-policy/submission-policy-update.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; diff --git a/src/test/javascript/spec/component/shared/updating-result.component.spec.ts b/src/test/javascript/spec/component/shared/updating-result.component.spec.ts index afa519d2640b..9b8c8b9435e9 100644 --- a/src/test/javascript/spec/component/shared/updating-result.component.spec.ts +++ b/src/test/javascript/spec/component/shared/updating-result.component.spec.ts @@ -8,7 +8,7 @@ import { ProgrammingSubmissionService, ProgrammingSubmissionState } from 'app/ex import { MockProgrammingSubmissionService } from '../../helpers/mocks/service/mock-programming-submission.service'; import { triggerChanges } from '../../helpers/utils/general.utils'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { UpdatingResultComponent } from 'app/exercises/shared/result/updating-result.component'; import { ResultComponent } from 'app/exercises/shared/result/result.component'; import { Result } from 'app/entities/result.model'; diff --git a/src/test/javascript/spec/component/team/team-exercise-search.component.spec.ts b/src/test/javascript/spec/component/team/team-exercise-search.component.spec.ts index 156a40652c68..1083ee4d31fc 100644 --- a/src/test/javascript/spec/component/team/team-exercise-search.component.spec.ts +++ b/src/test/javascript/spec/component/team/team-exercise-search.component.spec.ts @@ -4,7 +4,7 @@ import dayjs from 'dayjs/esm'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { CourseManagementService } from 'app/course/manage/course-management.service'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { TeamExerciseSearchComponent } from 'app/exercises/shared/team/team-exercise-search/team-exercise-search.component'; import { MockCourseManagementService } from '../../helpers/mocks/service/mock-course-management.service'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; diff --git a/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts b/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts index 6c60b40ad95e..6bfb8cf13d4f 100644 --- a/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts +++ b/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts @@ -16,12 +16,12 @@ import { TextResultComponent } from 'app/exercises/text/participate/text-result/ import { SubmissionResultStatusComponent } from 'app/overview/submission-result-status.component'; import { TextEditorComponent } from 'app/exercises/text/participate/text-editor.component'; import { textEditorRoute } from 'app/exercises/text/participate/text-editor.route'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ButtonComponent } from 'app/shared/components/button.component'; import { Result } from 'app/entities/result.model'; import { ComplaintsFormComponent } from 'app/complaints/form/complaints-form.component'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service'; import { MockTextSubmissionService } from '../../helpers/mocks/service/mock-text-submission.service'; import { Language } from 'app/entities/course.model'; diff --git a/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts b/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts index 355bed4320fa..28bd19ff7ed4 100644 --- a/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts +++ b/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts @@ -8,9 +8,9 @@ import { AssessmentInstructionsComponent } from 'app/assessment/assessment-instr import { ExampleSubmission } from 'app/entities/example-submission.model'; import { Feedback, FeedbackCorrectionErrorType } from 'app/entities/feedback.model'; import { Result } from 'app/entities/result.model'; -import { TextBlock } from 'app/entities/text-block.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { TutorParticipationService } from 'app/exercises/shared/dashboards/tutor/tutor-participation.service'; import { ExampleSubmissionService } from 'app/exercises/shared/example-submission/example-submission.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; @@ -27,7 +27,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { of, throwError } from 'rxjs'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { ArtemisTestModule } from '../../test.module'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { UnreferencedFeedbackComponent } from 'app/exercises/shared/unreferenced-feedback/unreferenced-feedback.component'; import { AlertService } from 'app/core/util/alert.service'; import { DebugElement } from '@angular/core'; diff --git a/src/test/javascript/spec/component/text-exercise/text-exercise-detail.component.spec.ts b/src/test/javascript/spec/component/text-exercise/text-exercise-detail.component.spec.ts index 8289a221fc91..b95a4cd7242a 100644 --- a/src/test/javascript/spec/component/text-exercise/text-exercise-detail.component.spec.ts +++ b/src/test/javascript/spec/component/text-exercise/text-exercise-detail.component.spec.ts @@ -6,7 +6,7 @@ import { ArtemisTestModule } from '../../test.module'; import { TextExerciseDetailComponent } from 'app/exercises/text/manage/text-exercise/text-exercise-detail.component'; import { Course } from 'app/entities/course.model'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route'; import { TranslateService } from '@ngx-translate/core'; diff --git a/src/test/javascript/spec/component/text-exercise/text-exercise-row-buttons.component.spec.ts b/src/test/javascript/spec/component/text-exercise/text-exercise-row-buttons.component.spec.ts index 53a691f7182d..acbd27f05fb4 100644 --- a/src/test/javascript/spec/component/text-exercise/text-exercise-row-buttons.component.spec.ts +++ b/src/test/javascript/spec/component/text-exercise/text-exercise-row-buttons.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { ArtemisTestModule } from '../../test.module'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { TextExerciseRowButtonsComponent } from 'app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; import { EventManager } from 'app/core/util/event-manager.service'; diff --git a/src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts b/src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts index 88eff4e9d26f..78fea1728c50 100644 --- a/src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts @@ -5,7 +5,7 @@ import { ActivatedRoute, UrlSegment } from '@angular/router'; import { ArtemisTestModule } from '../../test.module'; import { TextExerciseUpdateComponent } from 'app/exercises/text/manage/text-exercise/text-exercise-update.component'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; @@ -13,7 +13,7 @@ import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-act import { Course } from 'app/entities/course.model'; import dayjs from 'dayjs/esm'; import { Subject, of, throwError } from 'rxjs'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { TranslateService } from '@ngx-translate/core'; import { MockProvider } from 'ng-mocks'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; diff --git a/src/test/javascript/spec/component/text-exercise/text-exercise.component.spec.ts b/src/test/javascript/spec/component/text-exercise/text-exercise.component.spec.ts index 2f47ef5e53c6..771035e33ff7 100644 --- a/src/test/javascript/spec/component/text-exercise/text-exercise.component.spec.ts +++ b/src/test/javascript/spec/component/text-exercise/text-exercise.component.spec.ts @@ -8,7 +8,7 @@ import { ActivatedRoute, convertToParamMap } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { ArtemisTestModule } from '../../test.module'; import { TextExerciseComponent } from 'app/exercises/text/manage/text-exercise/text-exercise.component'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { Course } from 'app/entities/course.model'; diff --git a/src/test/javascript/spec/component/text-result/text-result.component.spec.ts b/src/test/javascript/spec/component/text-result/text-result.component.spec.ts index 579efafdff29..8fd19cfd4d3b 100644 --- a/src/test/javascript/spec/component/text-result/text-result.component.spec.ts +++ b/src/test/javascript/spec/component/text-result/text-result.component.spec.ts @@ -9,9 +9,9 @@ import { TextResultComponent } from 'app/exercises/text/participate/text-result/ import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { Result } from 'app/entities/result.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Feedback } from 'app/entities/feedback.model'; -import { TextBlock } from 'app/entities/text-block.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; import { TextResultBlock } from 'app/exercises/text/participate/text-result/text-result-block'; import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model'; import { faCheck, faCircle, faTimes } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/test/javascript/spec/component/text-submission-assessment/manual-textblock-selection.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/manual-textblock-selection.component.spec.ts index bf1801eb0362..5887bcf83e4e 100644 --- a/src/test/javascript/spec/component/text-submission-assessment/manual-textblock-selection.component.spec.ts +++ b/src/test/javascript/spec/component/text-submission-assessment/manual-textblock-selection.component.spec.ts @@ -4,11 +4,11 @@ import { ManualTextblockSelectionComponent } from 'app/exercises/text/assess/man import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component'; import { MockComponent, MockProvider } from 'ng-mocks'; import { By } from '@angular/platform-browser'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { ManualTextSelectionComponent, wordSelection } from 'app/exercises/text/shared/manual-text-selection/manual-text-selection.component'; import { SubmissionExerciseType, SubmissionType } from 'app/entities/submission.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; -import { TextBlock } from 'app/entities/text-block.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { TextBlock } from 'app/entities/text/text-block.model'; import { TextSelectDirective } from 'app/exercises/text/shared/text-select.directive'; describe('ManualTextblockSelectionComponent', () => { diff --git a/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts index 1ddc5bf27049..27816633072e 100644 --- a/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts +++ b/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TextAssessmentAreaComponent } from 'app/exercises/text/assess/text-assessment-area/text-assessment-area.component'; import { ArtemisTestModule } from '../../test.module'; import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { By } from '@angular/platform-browser'; import { MockComponent, MockDirective } from 'ng-mocks'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; diff --git a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts index e1027d236097..1a550e93428c 100644 --- a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts +++ b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts @@ -10,10 +10,10 @@ import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/text import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component'; import { ExerciseType } from 'app/entities/exercise.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ParticipationType } from 'app/entities/participation/participation.model'; import { SubmissionExerciseType, SubmissionType, getLatestSubmissionResult } from 'app/entities/submission.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; import dayjs from 'dayjs/esm'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; @@ -22,7 +22,7 @@ import { ConfirmIconComponent } from 'app/shared/confirm-icon/confirm-icon.compo import { Course } from 'app/entities/course.model'; import { ManualTextblockSelectionComponent } from 'app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; -import { TextBlock, TextBlockType } from 'app/entities/text-block.model'; +import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { ComplaintResponse } from 'app/entities/complaint-response.model'; import { AlertService } from 'app/core/util/alert.service'; @@ -45,7 +45,7 @@ import { AssessmentAfterComplaint } from 'app/complaints/complaints-for-tutor/co import { TextAssessmentBaseComponent } from 'app/exercises/text/assess/text-assessment-base.component'; import { AthenaService } from 'app/assessment/athena.service'; import { MockAthenaService } from '../../helpers/mocks/service/mock-athena-service'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('TextSubmissionAssessmentComponent', () => { diff --git a/src/test/javascript/spec/component/text-submission-assessment/textblock-assessment-card.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/textblock-assessment-card.component.spec.ts index a11f7b7f6692..4cce34baf424 100644 --- a/src/test/javascript/spec/component/text-submission-assessment/textblock-assessment-card.component.spec.ts +++ b/src/test/javascript/spec/component/text-submission-assessment/textblock-assessment-card.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component'; import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { By } from '@angular/platform-browser'; import { MockComponent, MockDirective, MockProvider } from 'ng-mocks'; import { FaLayersComponent } from '@fortawesome/angular-fontawesome'; @@ -10,8 +10,8 @@ import { GradingInstruction } from 'app/exercises/shared/structured-grading-crit import { AssessmentCorrectionRoundBadgeComponent } from 'app/assessment/unreferenced-feedback-detail/assessment-correction-round-badge/assessment-correction-round-badge.component'; import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; import { FeedbackType } from 'app/entities/feedback.model'; -import { TextBlockType } from 'app/entities/text-block.model'; -import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model'; +import { TextBlockType } from 'app/entities/text/text-block.model'; +import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service'; import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; diff --git a/src/test/javascript/spec/component/text-submission-assessment/textblock-feedback-editor.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/textblock-feedback-editor.component.spec.ts index 6c08b06ec59a..2405cc4cfd97 100644 --- a/src/test/javascript/spec/component/text-submission-assessment/textblock-feedback-editor.component.spec.ts +++ b/src/test/javascript/spec/component/text-submission-assessment/textblock-feedback-editor.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component'; import { Feedback, FeedbackCorrectionErrorType, FeedbackType } from 'app/entities/feedback.model'; -import { TextBlock, TextBlockType } from 'app/entities/text-block.model'; +import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model'; import { ConfirmIconComponent } from 'app/shared/confirm-icon/confirm-icon.component'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { NgbModal, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; @@ -16,7 +16,7 @@ import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal. import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockTranslateService, TranslateTestingModule } from '../../helpers/mocks/service/mock-translate.service'; -import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { NgModel } from '@angular/forms'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { TextblockFeedbackDropdownComponent } from 'app/exercises/text/assess/textblock-feedback-editor/dropdown/textblock-feedback-dropdown.component'; diff --git a/src/test/javascript/spec/component/text/manual-text-selection.component.spec.ts b/src/test/javascript/spec/component/text/manual-text-selection.component.spec.ts index db879a19b482..478418b4d8a2 100644 --- a/src/test/javascript/spec/component/text/manual-text-selection.component.spec.ts +++ b/src/test/javascript/spec/component/text/manual-text-selection.component.spec.ts @@ -1,15 +1,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTestModule } from '../../test.module'; import { ManualTextSelectionComponent } from 'app/exercises/text/shared/manual-text-selection/manual-text-selection.component'; -import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { FeedbackType } from 'app/entities/feedback.model'; -import { TextBlock, TextBlockType } from 'app/entities/text-block.model'; +import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model'; import { MockProvider } from 'ng-mocks'; import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service'; import { ActivatedRoute } from '@angular/router'; import { SubmissionExerciseType, SubmissionType } from 'app/entities/submission.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { TextBlockRefGroup } from 'app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component'; describe('ManualTextSelectionComponent', () => { diff --git a/src/test/javascript/spec/component/tutor-leaderboard/tutor-leaderboard.component.spec.ts b/src/test/javascript/spec/component/tutor-leaderboard/tutor-leaderboard.component.spec.ts index 95b4a23b2f3a..d8ca84cd934d 100644 --- a/src/test/javascript/spec/component/tutor-leaderboard/tutor-leaderboard.component.spec.ts +++ b/src/test/javascript/spec/component/tutor-leaderboard/tutor-leaderboard.component.spec.ts @@ -11,7 +11,7 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { MockRouter } from '../../helpers/mocks/mock-router'; import { Course } from 'app/entities/course.model'; import { Exercise } from 'app/entities/exercise.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; describe('TutorLeaderboardComponent', () => { diff --git a/src/test/javascript/spec/component/utils/exercise.utils.spec.ts b/src/test/javascript/spec/component/utils/exercise.utils.spec.ts index e993f54bce3f..bc08c615408c 100644 --- a/src/test/javascript/spec/component/utils/exercise.utils.spec.ts +++ b/src/test/javascript/spec/component/utils/exercise.utils.spec.ts @@ -1,5 +1,5 @@ import dayjs from 'dayjs/esm'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { areManualResultsAllowed, diff --git a/src/test/javascript/spec/component/utils/programming-exercise.utils.spec.ts b/src/test/javascript/spec/component/utils/programming-exercise.utils.spec.ts index b0ec0a41a247..6556bc8c2ac9 100644 --- a/src/test/javascript/spec/component/utils/programming-exercise.utils.spec.ts +++ b/src/test/javascript/spec/component/utils/programming-exercise.utils.spec.ts @@ -1,6 +1,6 @@ import { SubmissionExerciseType, SubmissionType } from 'app/entities/submission.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Participation, ParticipationType } from 'app/entities/participation/participation.model'; import { createBuildPlanUrl, diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-build-plan.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-build-plan.service.ts index 6f921f925cc8..eb4e1c7f8a91 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-build-plan.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-build-plan.service.ts @@ -1,5 +1,5 @@ import { of } from 'rxjs'; -import { BuildPlan } from 'app/entities/build-plan.model'; +import { BuildPlan } from 'app/entities/programming/build-plan.model'; export class MockBuildPlanService { getBuildPlan = (exerciseId: number) => of({}); diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-code-editor-build-log.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-code-editor-build-log.service.ts index 6c4fdb3e1a95..75e162c1440c 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-code-editor-build-log.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-code-editor-build-log.service.ts @@ -1,5 +1,5 @@ import { of } from 'rxjs'; -import { BuildLogEntry } from 'app/entities/build-log.model'; +import { BuildLogEntry } from 'app/entities/programming/build-log.model'; import { IBuildLogService } from 'app/exercises/programming/shared/service/build-log.service'; export class MockCodeEditorBuildLogService implements IBuildLogService { diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-course-exercise.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-course-exercise.service.ts index a84c3d6f75b5..f35a7271cc77 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-course-exercise.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-course-exercise.service.ts @@ -1,6 +1,6 @@ import { of } from 'rxjs'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; export class MockCourseExerciseService { startExercise = () => of({} as StudentParticipation); diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-course-management.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-course-management.service.ts index ebcdaacd8f50..888c7b981944 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-course-management.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-course-management.service.ts @@ -2,7 +2,7 @@ import { HttpResponse } from '@angular/common/http'; import { User } from 'app/core/user/user.model'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { Course, CourseGroup } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { EntityArrayResponseType } from 'app/course/manage/course-management.service'; export class MockCourseManagementService { diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-exam-checklist.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-exam-checklist.service.ts index ce82ec8995bf..aaca1b66625f 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-exam-checklist.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-exam-checklist.service.ts @@ -1,5 +1,5 @@ -import { Exam } from 'app/entities/exam.model'; -import { ExamChecklist } from 'app/entities/exam-checklist.model'; +import { Exam } from 'app/entities/exam/exam.model'; +import { ExamChecklist } from 'app/entities/exam/exam-checklist.model'; import { of } from 'rxjs'; export class MockExamChecklistService { diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-exam-management.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-exam-management.service.ts index b63e816d8969..face7704e776 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-exam-management.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-exam-management.service.ts @@ -1,6 +1,6 @@ import { Observable, of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; export class MockExamManagementService { findAllCurrentAndUpcomingExams() { diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-ide-build-and-test.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-ide-build-and-test.service.ts index a50b88c16229..e61332e5c35c 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-ide-build-and-test.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-ide-build-and-test.service.ts @@ -1,5 +1,5 @@ import { of } from 'rxjs'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; export class MockIdeBuildAndTestService { listenOnBuildOutputAndForwardChanges = (exercise: ProgrammingExercise) => of(); diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-grading.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-grading.service.ts index cd93e0dd444c..b48ecc16b192 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-grading.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-grading.service.ts @@ -1,12 +1,12 @@ import { BehaviorSubject, Observable, of } from 'rxjs'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { IProgrammingExerciseGradingService, ProgrammingExerciseTestCaseUpdate, StaticCodeAnalysisCategoryUpdate, } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; -import { StaticCodeAnalysisCategory } from 'app/entities/static-code-analysis-category.model'; -import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { StaticCodeAnalysisCategory } from 'app/entities/programming/static-code-analysis-category.model'; +import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; export class MockProgrammingExerciseGradingService implements IProgrammingExerciseGradingService { private testCaseSubject = new BehaviorSubject(undefined); diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-participation.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-participation.service.ts index 6b0fb6ea0d78..8525ad43dc80 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-participation.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-participation.service.ts @@ -2,7 +2,7 @@ import { of } from 'rxjs'; import { IProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { Result } from 'app/entities/result.model'; -import { CommitInfo } from 'app/entities/programming-submission.model'; +import { CommitInfo } from 'app/entities/programming/programming-submission.model'; export class MockProgrammingExerciseParticipationService implements IProgrammingExerciseParticipationService { getLatestResultWithFeedback = (participationId: number, withSubmission: boolean) => of({} as Result); diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise.service.ts index d897194809fd..b164cc8e700c 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise.service.ts @@ -1,7 +1,7 @@ import { of } from 'rxjs'; import { ProgrammingExerciseInstructorRepositoryType } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { Participation } from 'app/entities/participation/participation.model'; -import { ProgrammingLanguage } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; export class MockProgrammingExerciseService { updateProblemStatement = (exerciseId: number, problemStatement: string) => of(); diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts index fa1e00fdfe28..5f830bdf013d 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts @@ -8,7 +8,7 @@ import { StudentWithTeam } from 'app/entities/team.model'; import { Course } from 'app/entities/course.model'; import { TeamSearchUser } from 'app/entities/team-search-user.model'; import { User } from 'app/core/user/user.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { TeamAssignmentConfig } from 'app/entities/team-assignment-config.model'; import { TeamService } from 'app/exercises/shared/team/team.service'; import dayjs from 'dayjs/esm'; diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-text-submission.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-text-submission.service.ts index 99dcd86c9c2d..dcea849439c1 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-text-submission.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-text-submission.service.ts @@ -1,5 +1,5 @@ import { Observable, of } from 'rxjs'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { HttpResponse } from '@angular/common/http'; type EntityResponseType = HttpResponse; diff --git a/src/test/javascript/spec/helpers/sample/iris-sample-data.ts b/src/test/javascript/spec/helpers/sample/iris-sample-data.ts index f82327cfaae8..4e348a67d615 100644 --- a/src/test/javascript/spec/helpers/sample/iris-sample-data.ts +++ b/src/test/javascript/spec/helpers/sample/iris-sample-data.ts @@ -1,6 +1,6 @@ import dayjs from 'dayjs/esm'; import { ExerciseType } from 'app/entities/exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { IrisAssistantMessage, IrisSender, IrisUserMessage } from 'app/entities/iris/iris-message.model'; import { IrisMessageContentType, IrisTextMessageContent } from 'app/entities/iris/iris-content-type.model'; import { IrisSession } from 'app/entities/iris/iris-session.model'; diff --git a/src/test/javascript/spec/helpers/sample/metis-sample-data.ts b/src/test/javascript/spec/helpers/sample/metis-sample-data.ts index a6d3e1db5eb0..ce2136c46028 100644 --- a/src/test/javascript/spec/helpers/sample/metis-sample-data.ts +++ b/src/test/javascript/spec/helpers/sample/metis-sample-data.ts @@ -13,7 +13,7 @@ import { Conversation, ConversationType } from 'app/entities/metis/conversation/ import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model'; import { Slide } from 'app/entities/lecture-unit/slide.model'; import { Channel, ChannelDTO, ChannelSubType } from 'app/entities/metis/conversation/channel.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase'; import { LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model'; diff --git a/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts b/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts index 637ea5b8baad..d8f9e0bb8126 100644 --- a/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts +++ b/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts @@ -29,7 +29,7 @@ import { GuidedTourMapping } from 'app/guided-tour/guided-tour-setting.model'; import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { MockWebsocketService } from '../../helpers/mocks/service/mock-websocket.service'; import { Participation } from 'app/entities/participation/participation.model'; -import { BuildLogEntryArray } from 'app/entities/build-log.model'; +import { BuildLogEntryArray } from 'app/entities/programming/build-log.model'; import { CodeEditorConflictStateService } from 'app/exercises/programming/shared/code-editor/service/code-editor-conflict-state.service'; import { ResultService } from 'app/exercises/shared/result/result.service'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; @@ -41,7 +41,7 @@ import { } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; import { Feedback } from 'app/entities/feedback.model'; import { DomainService } from 'app/exercises/programming/shared/code-editor/service/code-editor-domain.service'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { MockActivatedRouteWithSubjects } from '../../helpers/mocks/activated-route/mock-activated-route-with-subjects'; import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; @@ -51,7 +51,7 @@ import { MockCodeEditorRepositoryFileService } from '../../helpers/mocks/service import { MockCodeEditorBuildLogService } from '../../helpers/mocks/service/mock-code-editor-build-log.service'; import { CodeEditorContainerComponent } from 'app/exercises/programming/shared/code-editor/container/code-editor-container.component'; import { omit } from 'lodash-es'; -import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { CodeEditorGridComponent } from 'app/exercises/programming/shared/code-editor/layout/code-editor-grid.component'; import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { CodeEditorActionsComponent } from 'app/exercises/programming/shared/code-editor/actions/code-editor-actions.component'; diff --git a/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts b/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts index a793a859f204..294c3d3a9a4e 100644 --- a/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts +++ b/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts @@ -27,7 +27,7 @@ import { DomainService } from 'app/exercises/programming/shared/code-editor/serv import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; import { Result } from 'app/entities/result.model'; import { ParticipationService } from 'app/exercises/shared/participation/participation.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model'; import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; import { MockActivatedRouteWithSubjects } from '../../helpers/mocks/activated-route/mock-activated-route-with-subjects'; diff --git a/src/test/javascript/spec/integration/code-editor/code-editor-student.integration.spec.ts b/src/test/javascript/spec/integration/code-editor/code-editor-student.integration.spec.ts index 11036e23a71d..dabf4a7e1d34 100644 --- a/src/test/javascript/spec/integration/code-editor/code-editor-student.integration.spec.ts +++ b/src/test/javascript/spec/integration/code-editor/code-editor-student.integration.spec.ts @@ -28,7 +28,7 @@ import { } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service'; import { Feedback } from 'app/entities/feedback.model'; import { CodeEditorStudentContainerComponent } from 'app/exercises/programming/participate/code-editor-student-container.component'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { MockActivatedRouteWithSubjects } from '../../helpers/mocks/activated-route/mock-activated-route-with-subjects'; import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; diff --git a/src/test/javascript/spec/service/athena.service.spec.ts b/src/test/javascript/spec/service/athena.service.spec.ts index 98de7b17fe9c..099b679ee249 100644 --- a/src/test/javascript/spec/service/athena.service.spec.ts +++ b/src/test/javascript/spec/service/athena.service.spec.ts @@ -8,8 +8,8 @@ import { of } from 'rxjs'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { Exercise } from 'app/entities/exercise.model'; import { ModelingFeedbackSuggestion, ProgrammingFeedbackSuggestion, TextFeedbackSuggestion } from 'app/entities/feedback-suggestion.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; diff --git a/src/test/javascript/spec/service/build-log.service.spec.ts b/src/test/javascript/spec/service/build-log.service.spec.ts index 9a8639c3159d..0582e9ff369b 100644 --- a/src/test/javascript/spec/service/build-log.service.spec.ts +++ b/src/test/javascript/spec/service/build-log.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service'; -import { BuildLogEntry, BuildLogType } from 'app/entities/build-log.model'; +import { BuildLogEntry, BuildLogType } from 'app/entities/programming/build-log.model'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; describe('Build Log Service', () => { diff --git a/src/test/javascript/spec/service/chart-category-filter.spec.ts b/src/test/javascript/spec/service/chart-category-filter.spec.ts index 533442313bc8..aa4a25ed8bbb 100644 --- a/src/test/javascript/spec/service/chart-category-filter.spec.ts +++ b/src/test/javascript/spec/service/chart-category-filter.spec.ts @@ -5,7 +5,7 @@ import { DueDateStat } from 'app/course/dashboards/due-date-stat.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import dayjs from 'dayjs/esm'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { InitializationState } from 'app/entities/participation/participation.model'; diff --git a/src/test/javascript/spec/service/course-exercise.service.spec.ts b/src/test/javascript/spec/service/course-exercise.service.spec.ts index e31154c07dd5..d123760c6d25 100644 --- a/src/test/javascript/spec/service/course-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/course-exercise.service.spec.ts @@ -7,8 +7,8 @@ import { Exercise } from 'app/entities/exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import dayjs from 'dayjs/esm'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { take } from 'rxjs/operators'; diff --git a/src/test/javascript/spec/service/exam-checklist.service.spec.ts b/src/test/javascript/spec/service/exam-checklist.service.spec.ts index 89286e0d0d9c..be298e2651d3 100644 --- a/src/test/javascript/spec/service/exam-checklist.service.spec.ts +++ b/src/test/javascript/spec/service/exam-checklist.service.spec.ts @@ -1,8 +1,8 @@ import { HttpResponse } from '@angular/common/http'; import { TestBed } from '@angular/core/testing'; import { Course } from 'app/entities/course.model'; -import { ExamChecklist } from 'app/entities/exam-checklist.model'; -import { Exam } from 'app/entities/exam.model'; +import { ExamChecklist } from 'app/entities/exam/exam-checklist.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { MockProvider } from 'ng-mocks'; import { of, take } from 'rxjs'; import { ArtemisTestModule } from '../test.module'; diff --git a/src/test/javascript/spec/service/exam-import-paging.service.spec.ts b/src/test/javascript/spec/service/exam-import-paging.service.spec.ts index 34299aa2e1ba..091acf0bc0c0 100644 --- a/src/test/javascript/spec/service/exam-import-paging.service.spec.ts +++ b/src/test/javascript/spec/service/exam-import-paging.service.spec.ts @@ -6,7 +6,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { take } from 'rxjs/operators'; import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExamImportPagingService } from 'app/exam/manage/exams/exam-import/exam-import-paging.service'; describe('Exam Import Paging Service', () => { diff --git a/src/test/javascript/spec/service/exam-participation.service.spec.ts b/src/test/javascript/spec/service/exam-participation.service.spec.ts index 8a06fa6654d6..56d0aa53bef8 100644 --- a/src/test/javascript/spec/service/exam-participation.service.spec.ts +++ b/src/test/javascript/spec/service/exam-participation.service.spec.ts @@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { take } from 'rxjs/operators'; import dayjs from 'dayjs/esm'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; @@ -11,10 +11,10 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { ArtemisTestModule } from '../test.module'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Course } from 'app/entities/course.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; import { getLatestSubmissionResult } from 'app/entities/submission.model'; import { StudentExamWithGradeDTO, StudentResult } from 'app/exam/exam-scores/exam-score-dtos.model'; diff --git a/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts b/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts index 27bb4130c2ab..d1eee71bc343 100644 --- a/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts +++ b/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts @@ -8,7 +8,7 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; import { ExampleSubmissionImportPagingService } from 'app/exercises/shared/example-submission/example-submission-import/example-submission-import-paging.service'; import { Exercise } from 'app/entities/exercise.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; describe('Example Submission Import Paging Service', () => { let service: ExampleSubmissionImportPagingService; diff --git a/src/test/javascript/spec/service/example-submission.service.spec.ts b/src/test/javascript/spec/service/example-submission.service.spec.ts index 506871654bf2..60addda81875 100644 --- a/src/test/javascript/spec/service/example-submission.service.spec.ts +++ b/src/test/javascript/spec/service/example-submission.service.spec.ts @@ -6,7 +6,7 @@ import { ArtemisTestModule } from '../test.module'; import { ExampleSubmissionService } from 'app/exercises/shared/example-submission/example-submission.service'; import { ExampleSubmission } from 'app/entities/example-submission.model'; import { Exercise } from 'app/entities/exercise.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; import { Feedback } from 'app/entities/feedback.model'; import { Submission, getLatestSubmissionResult } from 'app/entities/submission.model'; diff --git a/src/test/javascript/spec/service/exercise-hint.service.spec.ts b/src/test/javascript/spec/service/exercise-hint.service.spec.ts index cdff311a6fcc..74a6c5e84bb9 100644 --- a/src/test/javascript/spec/service/exercise-hint.service.spec.ts +++ b/src/test/javascript/spec/service/exercise-hint.service.spec.ts @@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { HttpResponse } from '@angular/common/http'; import { take } from 'rxjs/operators'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model'; import { MockExerciseService } from '../helpers/mocks/service/mock-exercise.service'; import { ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service'; diff --git a/src/test/javascript/spec/service/exercise-update-warning.service.spec.ts b/src/test/javascript/spec/service/exercise-update-warning.service.spec.ts index 55ad42c88d49..75be64c26763 100644 --- a/src/test/javascript/spec/service/exercise-update-warning.service.spec.ts +++ b/src/test/javascript/spec/service/exercise-update-warning.service.spec.ts @@ -5,7 +5,7 @@ import { GradingCriterion } from 'app/exercises/shared/structured-grading-criter import { Exercise } from 'app/entities/exercise.model'; import { ExerciseUpdateWarningComponent } from 'app/exercises/shared/exercise-update-warning/exercise-update-warning.component'; import { Component } from '@angular/core'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import dayjs from 'dayjs/esm'; describe('Exercise Update Warning Service', () => { diff --git a/src/test/javascript/spec/service/exercise.service.spec.ts b/src/test/javascript/spec/service/exercise.service.spec.ts index 8e58498bef7a..415078a437e1 100644 --- a/src/test/javascript/spec/service/exercise.service.spec.ts +++ b/src/test/javascript/spec/service/exercise.service.spec.ts @@ -5,7 +5,7 @@ import { TranslateService } from '@ngx-translate/core'; import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; import { InitializationState } from 'app/entities/participation/participation.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import type { EntityResponseType, ExerciseDetailsType } from 'app/exercises/shared/exercise/exercise.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import dayjs from 'dayjs/esm'; @@ -15,7 +15,7 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; 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 { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { MockProvider } from 'ng-mocks'; import { SafeHtml } from '@angular/platform-browser'; diff --git a/src/test/javascript/spec/service/external-submission.service.spec.ts b/src/test/javascript/spec/service/external-submission.service.spec.ts index b3d34c736e50..b7b7c6701e8b 100644 --- a/src/test/javascript/spec/service/external-submission.service.spec.ts +++ b/src/test/javascript/spec/service/external-submission.service.spec.ts @@ -7,7 +7,7 @@ import { Result } from 'app/entities/result.model'; import { User } from 'app/core/user/user.model'; import { EntityResponseType, ResultService } from 'app/exercises/shared/result/result.service'; import dayjs from 'dayjs/esm'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; describe('External Submission Service', () => { let httpMock: HttpTestingController; diff --git a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts index 9a1d199c32be..89c6a7755334 100644 --- a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts +++ b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts @@ -1,4 +1,4 @@ -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { FeedbackGroup } from 'app/exercises/shared/feedback/group/feedback-group'; import { ProgrammingFeedbackItemService } from 'app/exercises/shared/feedback/item/programming-feedback-item.service'; import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER, SUBMISSION_POLICY_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model'; diff --git a/src/test/javascript/spec/service/orion/orion-build-and-test.service.spec.ts b/src/test/javascript/spec/service/orion/orion-build-and-test.service.spec.ts index eb6b7f555eff..53394a7bbd27 100644 --- a/src/test/javascript/spec/service/orion/orion-build-and-test.service.spec.ts +++ b/src/test/javascript/spec/service/orion/orion-build-and-test.service.spec.ts @@ -5,13 +5,13 @@ import { MockProgrammingSubmissionService } from '../../helpers/mocks/service/mo import { Result } from 'app/entities/result.model'; import { BehaviorSubject, of } from 'rxjs'; import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service'; import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service'; import { MockCodeEditorBuildLogService } from '../../helpers/mocks/service/mock-code-editor-build-log.service'; import { OrionBuildAndTestService } from 'app/shared/orion/orion-build-and-test.service'; import { OrionConnectorService } from 'app/shared/orion/orion-connector.service'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { ArtemisTestModule } from '../../test.module'; import { SubmissionService } from 'app/exercises/shared/submission/submission.service'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; diff --git a/src/test/javascript/spec/service/orion/orion-connector.service.spec.ts b/src/test/javascript/spec/service/orion/orion-connector.service.spec.ts index 6fb2c239ff92..5a5f05943019 100644 --- a/src/test/javascript/spec/service/orion/orion-connector.service.spec.ts +++ b/src/test/javascript/spec/service/orion/orion-connector.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { OrionConnectorService } from 'app/shared/orion/orion-connector.service'; import { ArtemisTestModule } from '../../test.module'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; diff --git a/src/test/javascript/spec/service/participation.service.spec.ts b/src/test/javascript/spec/service/participation.service.spec.ts index aef90fe10869..0d405cbfb018 100644 --- a/src/test/javascript/spec/service/participation.service.spec.ts +++ b/src/test/javascript/spec/service/participation.service.spec.ts @@ -14,7 +14,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockRouter } from '../helpers/mocks/mock-router'; import { Router } from '@angular/router'; import { Course } from 'app/entities/course.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; describe('Participation Service', () => { let service: ParticipationService; diff --git a/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts b/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts index d72b46099546..134bdc518fee 100644 --- a/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts +++ b/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service'; import { take } from 'rxjs/operators'; import { ExerciseType } from 'app/entities/exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { PlagiarismStatus } from 'app/exercises/shared/plagiarism/types/PlagiarismStatus'; import { PlagiarismComparison } from 'app/exercises/shared/plagiarism/types/PlagiarismComparison'; import { TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement'; diff --git a/src/test/javascript/spec/service/profile.service.spec.ts b/src/test/javascript/spec/service/profile.service.spec.ts index 00296fdba322..cc833e61a7f6 100644 --- a/src/test/javascript/spec/service/profile.service.spec.ts +++ b/src/test/javascript/spec/service/profile.service.spec.ts @@ -7,7 +7,7 @@ import { MockRouter } from '../helpers/mocks/mock-router'; import { Router } from '@angular/router'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; -import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model'; +import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model'; import { BrowserFingerprintService } from 'app/shared/fingerprint/browser-fingerprint.service'; describe('ProfileService', () => { diff --git a/src/test/javascript/spec/service/programming-exercise-grading.service.spec.ts b/src/test/javascript/spec/service/programming-exercise-grading.service.spec.ts index 5d27d8f339af..6396a81e6dff 100644 --- a/src/test/javascript/spec/service/programming-exercise-grading.service.spec.ts +++ b/src/test/javascript/spec/service/programming-exercise-grading.service.spec.ts @@ -5,7 +5,7 @@ import { MockWebsocketService } from '../helpers/mocks/service/mock-websocket.se import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; import { MockHttpService } from '../helpers/mocks/service/mock-http.service'; -import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model'; import { Result } from 'app/entities/result.model'; import { HttpClient } from '@angular/common/http'; diff --git a/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts b/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts index 9571cadd5392..b45536f41584 100644 --- a/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts +++ b/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts @@ -4,14 +4,14 @@ import { ArtemisTestModule } from '../test.module'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { AlertService } from 'app/core/util/alert.service'; import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { Course } from 'app/entities/course.model'; -import { ProgrammingExerciseGradingStatistics, TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model'; +import { ProgrammingExerciseGradingStatistics, TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model'; import { MockProvider } from 'ng-mocks'; import { MockProgrammingExerciseGradingService } from '../helpers/mocks/service/mock-programming-exercise-grading.service'; import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task'; import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model'; -import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType, Visibility } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; import { firstValueFrom, of } from 'rxjs'; describe('ProgrammingExerciseTask Service', () => { diff --git a/src/test/javascript/spec/service/programming-exercise.service.spec.ts b/src/test/javascript/spec/service/programming-exercise.service.spec.ts index fd2ab5d925e7..70d9a94a1eb7 100644 --- a/src/test/javascript/spec/service/programming-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/programming-exercise.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { TranslateService } from '@ngx-translate/core'; import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; @@ -10,7 +10,7 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv import { ArtemisTestModule } from '../test.module'; import dayjs from 'dayjs/esm'; import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { Result } from 'app/entities/result.model'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../helpers/mocks/service/mock-account.service'; diff --git a/src/test/javascript/spec/service/programming-submission.service.spec.ts b/src/test/javascript/spec/service/programming-submission.service.spec.ts index 74e4bf5c7326..6259bcaf65d9 100644 --- a/src/test/javascript/spec/service/programming-submission.service.spec.ts +++ b/src/test/javascript/spec/service/programming-submission.service.spec.ts @@ -10,7 +10,7 @@ import { } from 'app/exercises/programming/participate/programming-submission.service'; import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service'; import { Result } from 'app/entities/result.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { Submission } from 'app/entities/submission.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { MockParticipationWebsocketService } from '../helpers/mocks/service/mock-participation-websocket.service'; diff --git a/src/test/javascript/spec/service/result.service.spec.ts b/src/test/javascript/spec/service/result.service.spec.ts index 00e6ff3ea277..8afb25f538cd 100644 --- a/src/test/javascript/spec/service/result.service.spec.ts +++ b/src/test/javascript/spec/service/result.service.spec.ts @@ -5,7 +5,7 @@ import { TranslateService } from '@ngx-translate/core'; import { MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; import dayjs from 'dayjs/esm'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { EntityResponseType, ResultService } from 'app/exercises/shared/result/result.service'; import { ResultWithPointsPerGradingCriterion } from 'app/entities/result-with-points-per-grading-criterion.model'; import { Result } from 'app/entities/result.model'; @@ -19,7 +19,7 @@ import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../helpers/mocks/service/mock-account.service'; import { SubmissionService } from 'app/exercises/shared/submission/submission.service'; import { AssessmentType } from 'app/entities/assessment-type.model'; -import { ProgrammingSubmission } from 'app/entities/programming-submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; import { FeedbackType, NON_GRADED_FEEDBACK_SUGGESTION_IDENTIFIER, diff --git a/src/test/javascript/spec/service/submission-policy.service.spec.ts b/src/test/javascript/spec/service/submission-policy.service.spec.ts index 01ee9af19dba..60c5f139df52 100644 --- a/src/test/javascript/spec/service/submission-policy.service.spec.ts +++ b/src/test/javascript/spec/service/submission-policy.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { SubmissionPolicyService } from 'app/exercises/programming/manage/services/submission-policy.service'; import { LockRepositoryPolicy, SubmissionPolicyType } from 'app/entities/submission-policy.model'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { take } from 'rxjs/operators'; describe('Submission Policy Service', () => { diff --git a/src/test/javascript/spec/service/submission-version.service.spec.ts b/src/test/javascript/spec/service/submission-version.service.spec.ts index a9f9570f2207..380659aabf58 100644 --- a/src/test/javascript/spec/service/submission-version.service.spec.ts +++ b/src/test/javascript/spec/service/submission-version.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ArtemisTestModule } from '../test.module'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import dayjs from 'dayjs/esm'; import { SubmissionVersionService } from 'app/exercises/shared/submission-version/submission-version.service'; diff --git a/src/test/javascript/spec/service/submission.service.spec.ts b/src/test/javascript/spec/service/submission.service.spec.ts index 3ceaff266c5e..276aa8be2498 100644 --- a/src/test/javascript/spec/service/submission.service.spec.ts +++ b/src/test/javascript/spec/service/submission.service.spec.ts @@ -7,7 +7,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; import { TranslateService } from '@ngx-translate/core'; import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { HttpResponse } from '@angular/common/http'; diff --git a/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts b/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts index c7d1a8d53878..111bc06bc06c 100644 --- a/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts +++ b/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed, fakeAsync } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service'; import { FeedbackType } from 'app/entities/feedback.model'; -import { TextBlockType } from 'app/entities/text-block.model'; +import { TextBlockType } from 'app/entities/text/text-block.model'; import { TranslateService } from '@ngx-translate/core'; import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service'; diff --git a/src/test/javascript/spec/service/text-assessment.service.spec.ts b/src/test/javascript/spec/service/text-assessment.service.spec.ts index 4cdfb552a3f9..63ae92c49ffb 100644 --- a/src/test/javascript/spec/service/text-assessment.service.spec.ts +++ b/src/test/javascript/spec/service/text-assessment.service.spec.ts @@ -1,18 +1,18 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; import { Result } from 'app/entities/result.model'; -import { TextAssessmentEvent } from 'app/entities/text-assesment-event.model'; +import { TextAssessmentEvent } from 'app/entities/text/text-assesment-event.model'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../helpers/mocks/service/mock-account.service'; import { ExerciseType } from 'app/entities/exercise.model'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ComplaintResponse } from 'app/entities/complaint-response.model'; -import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { NewStudentParticipationResolver, StudentParticipationResolver } from 'app/exercises/text/assess/text-submission-assessment.route'; import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service'; import { of } from 'rxjs'; diff --git a/src/test/javascript/spec/service/text-exercise.service.spec.ts b/src/test/javascript/spec/service/text-exercise.service.spec.ts index 675dbd3b8aa0..5557d381a1e9 100644 --- a/src/test/javascript/spec/service/text-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/text-exercise.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { Course } from 'app/entities/course.model'; import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; diff --git a/src/test/javascript/spec/service/text-submission.service.spec.ts b/src/test/javascript/spec/service/text-submission.service.spec.ts index 3fe80d04c135..d21d44eda72c 100644 --- a/src/test/javascript/spec/service/text-submission.service.spec.ts +++ b/src/test/javascript/spec/service/text-submission.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { take } from 'rxjs/operators'; import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../helpers/mocks/service/mock-account.service'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; diff --git a/src/test/playwright/e2e/exam/ExamAssessment.spec.ts b/src/test/playwright/e2e/exam/ExamAssessment.spec.ts index 1e5ce60aa8d5..3bfee439d546 100644 --- a/src/test/playwright/e2e/exam/ExamAssessment.spec.ts +++ b/src/test/playwright/e2e/exam/ExamAssessment.spec.ts @@ -6,7 +6,7 @@ import { Page, expect } from '@playwright/test'; import javaPartiallySuccessful from '../../fixtures/exercise/programming/java/partially_successful/submission.json'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Commands } from '../../support/commands'; import { ExamAPIRequests } from '../../support/requests/ExamAPIRequests'; import { ExamExerciseGroupCreationPage } from '../../support/pageobjects/exam/ExamExerciseGroupCreationPage'; diff --git a/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts b/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts index 5895880ab49e..757665204a13 100644 --- a/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts +++ b/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts @@ -4,7 +4,7 @@ import { Course } from 'app/entities/course.model'; import { dayjsToString, generateUUID, trimDate } from '../../support/utils'; import dayjs from 'dayjs'; import { expect } from '@playwright/test'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; /* * Common primitives diff --git a/src/test/playwright/e2e/exam/ExamManagement.spec.ts b/src/test/playwright/e2e/exam/ExamManagement.spec.ts index 743541cd5edb..a91b64b7f764 100644 --- a/src/test/playwright/e2e/exam/ExamManagement.spec.ts +++ b/src/test/playwright/e2e/exam/ExamManagement.spec.ts @@ -3,7 +3,7 @@ import { admin, instructor, studentOne } from '../../support/users'; import { generateUUID, newBrowserPage } from '../../support/utils'; import { test } from '../../support/fixtures'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { Commands } from '../../support/commands'; import { CourseManagementAPIRequests } from '../../support/requests/CourseManagementAPIRequests'; diff --git a/src/test/playwright/e2e/exam/ExamParticipation.spec.ts b/src/test/playwright/e2e/exam/ExamParticipation.spec.ts index 8264232513e2..a27ffe2c25ab 100644 --- a/src/test/playwright/e2e/exam/ExamParticipation.spec.ts +++ b/src/test/playwright/e2e/exam/ExamParticipation.spec.ts @@ -5,7 +5,7 @@ import { admin, instructor, studentFour, studentOne, studentThree, studentTwo, t import { generateUUID } from '../../support/utils'; import javaAllSuccessfulSubmission from '../../fixtures/exercise/programming/java/all_successful/submission.json'; import dayjs from 'dayjs'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { expect } from '@playwright/test'; import { ExamStartEndPage } from '../../support/pageobjects/exam/ExamStartEndPage'; import { Commands } from '../../support/commands'; diff --git a/src/test/playwright/e2e/exam/ExamResults.spec.ts b/src/test/playwright/e2e/exam/ExamResults.spec.ts index 676e02c2e686..874a49e23089 100644 --- a/src/test/playwright/e2e/exam/ExamResults.spec.ts +++ b/src/test/playwright/e2e/exam/ExamResults.spec.ts @@ -1,5 +1,5 @@ import { test } from '../../support/fixtures'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { Commands } from '../../support/commands'; import { admin, instructor, studentOne, tutor } from '../../support/users'; import { Course } from 'app/entities/course.model'; diff --git a/src/test/playwright/e2e/exam/ExamTestRun.spec.ts b/src/test/playwright/e2e/exam/ExamTestRun.spec.ts index 732bbc4f1290..42e873ca2427 100644 --- a/src/test/playwright/e2e/exam/ExamTestRun.spec.ts +++ b/src/test/playwright/e2e/exam/ExamTestRun.spec.ts @@ -1,7 +1,7 @@ import dayjs from 'dayjs'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import javaBuildErrorSubmission from '../../fixtures/exercise/programming/java/build_error/submission.json'; import { Exercise, ExerciseType } from '../../support/constants'; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts index 71ee1df974ec..d3f340fcb917 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts @@ -1,7 +1,7 @@ import dayjs from 'dayjs'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { admin } from '../../../support/users'; import { dayjsToString, generateUUID, trimDate } from '../../../support/utils'; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts index 931b80bace33..9fc0bdb9cf5e 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts @@ -1,5 +1,5 @@ import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { admin, instructor, studentOne } from '../../../support/users'; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts index 4231108de78b..c66d2966576f 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts @@ -1,7 +1,7 @@ import dayjs from 'dayjs'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import javaAllSuccessfulSubmission from '../../../fixtures/exercise/programming/java/all_successful/submission.json'; import javaBuildErrorSubmission from '../../../fixtures/exercise/programming/java/build_error/submission.json'; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts index 12ae9b246554..1699d5539c22 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts @@ -1,5 +1,5 @@ import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { UserCredentials, admin, studentOne, studentThree, studentTwo, users } from '../../../support/users'; import { generateUUID } from '../../../support/utils'; import { Exercise, ExerciseType } from '../../../support/constants'; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts index 90cce7420bee..66b13ff3af12 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts @@ -1,5 +1,5 @@ import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import javaBuildErrorSubmission from '../../../fixtures/exercise/programming/java/build_error/submission.json'; import { Exercise, ExerciseType } from '../../../support/constants'; diff --git a/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts b/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts index d08d08717ca7..8290457c32b9 100644 --- a/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts +++ b/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts @@ -2,9 +2,9 @@ import dayjs from 'dayjs'; import { Course } from 'app/entities/course.model'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import javaPartiallySuccessfulSubmission from '../../fixtures/exercise/programming/java/partially_successful/submission.json'; import multipleChoiceQuizTemplate from '../../fixtures/exercise/quiz/multiple_choice/template.json'; @@ -13,7 +13,7 @@ import { generateUUID } from '../../support/utils'; import { test } from '../../support/fixtures'; import { expect } from '@playwright/test'; import { Fixtures } from '../../fixtures/fixtures'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts index 199c19c87306..ba4e95fbb241 100644 --- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts +++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts @@ -1,7 +1,7 @@ import dayjs from 'dayjs'; import { Course } from 'app/entities/course.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseAssessmentType } from '../../../support/constants'; import { admin, instructor, studentOne, tutor } from '../../../support/users'; diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts index 51e6c7bb0bc2..e3a69adabc20 100644 --- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts +++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts @@ -1,5 +1,5 @@ import { Course } from 'app/entities/course.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { admin, instructor, studentFour, studentOne, studentThree, studentTwo, tutor } from '../../../support/users'; import { test } from '../../../support/fixtures'; diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts index f0540dc21dc3..0a36076081ea 100644 --- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts +++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts @@ -1,5 +1,5 @@ import { Course } from 'app/entities/course.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import javaAllSuccessfulSubmission from '../../../fixtures/exercise/programming/java/all_successful/submission.json'; import javaBuildErrorSubmission from '../../../fixtures/exercise/programming/java/build_error/submission.json'; diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts index ffeb96adc4d5..c11dac9b557e 100644 --- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts +++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts @@ -1,5 +1,5 @@ import { Course } from 'app/entities/course.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import javaScaSubmission from '../../../fixtures/exercise/programming/java/static_code_analysis/submission.json'; import { admin, studentOne } from '../../../support/users'; diff --git a/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts index 61228fd2ef67..ed4b9a076c42 100644 --- a/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts +++ b/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts @@ -1,5 +1,5 @@ import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { admin, instructor, studentOne, tutor } from '../../../support/users'; import { test } from '../../../support/fixtures'; diff --git a/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts index 56ab3c12e168..5bf800e36484 100644 --- a/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts +++ b/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts @@ -1,12 +1,12 @@ import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { test } from '../../../support/fixtures'; import { admin } from '../../../support/users'; import { generateUUID } from '../../../support/utils'; import dayjs from 'dayjs'; import { expect } from '@playwright/test'; import { ExampleSubmission } from 'app/entities/example-submission.model'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; test.describe('Text exercise management', () => { let course: Course; diff --git a/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts b/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts index d476578e779c..b2ac84ef3284 100644 --- a/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts +++ b/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts @@ -1,11 +1,11 @@ import { Course } from 'app/entities/course.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import { admin, studentOne } from '../../../support/users'; import { test } from '../../../support/fixtures'; import { Fixtures } from '../../../fixtures/fixtures'; import { expect } from '@playwright/test'; -import { TextSubmission } from 'app/entities/text-submission.model'; +import { TextSubmission } from 'app/entities/text/text-submission.model'; test.describe('Text exercise participation', () => { let course: Course; diff --git a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts index 2c060438098e..58d3557d19f3 100644 --- a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts +++ b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts @@ -1,5 +1,5 @@ import { Page } from '@playwright/test'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { ExamAPIRequests } from '../../requests/ExamAPIRequests'; import { ExerciseAPIRequests } from '../../requests/ExerciseAPIRequests'; import multipleChoiceTemplate from '../../../fixtures/exercise/quiz/multiple_choice/template.json'; @@ -8,7 +8,7 @@ import { generateUUID } from '../../utils'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { Exercise } from 'app/entities/exercise.model'; -import { Visibility } from 'app/entities/programming-exercise-test-case.model'; +import { Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; export class ExamExerciseGroupCreationPage { private readonly page: Page; diff --git a/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts b/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts index cdec2ee5d8dc..e07b9e42f486 100644 --- a/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts +++ b/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts @@ -1,6 +1,6 @@ import { Page, expect } from '@playwright/test'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { AdditionalData, ExerciseType } from '../../constants'; import { UserCredentials } from '../../users'; import { OnlineEditorPage, ProgrammingExerciseSubmission } from '../exercises/programming/OnlineEditorPage'; diff --git a/src/test/playwright/support/pageobjects/exam/ExamTestRunPage.ts b/src/test/playwright/support/pageobjects/exam/ExamTestRunPage.ts index a5e3891f5ef7..d741796fe898 100644 --- a/src/test/playwright/support/pageobjects/exam/ExamTestRunPage.ts +++ b/src/test/playwright/support/pageobjects/exam/ExamTestRunPage.ts @@ -1,6 +1,6 @@ import { Page } from '@playwright/test'; import { Course } from 'app/entities/course.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { UserCredentials } from '../../users'; import { Commands } from '../../commands'; import { ExamStartEndPage } from './ExamStartEndPage'; diff --git a/src/test/playwright/support/requests/CourseManagementAPIRequests.ts b/src/test/playwright/support/requests/CourseManagementAPIRequests.ts index 3b04f8571785..3003ec91e760 100644 --- a/src/test/playwright/support/requests/CourseManagementAPIRequests.ts +++ b/src/test/playwright/support/requests/CourseManagementAPIRequests.ts @@ -8,7 +8,7 @@ import lectureTemplate from '../../fixtures/lecture/template.json'; import { BASE_API, COURSE_ADMIN_BASE, COURSE_BASE, Exercise } from '../constants'; import { UserCredentials } from '../users'; import { Commands } from '../commands'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; /** * A class which encapsulates all API requests related to course management. diff --git a/src/test/playwright/support/requests/ExamAPIRequests.ts b/src/test/playwright/support/requests/ExamAPIRequests.ts index be8175b5a711..c250415fb2db 100644 --- a/src/test/playwright/support/requests/ExamAPIRequests.ts +++ b/src/test/playwright/support/requests/ExamAPIRequests.ts @@ -1,6 +1,6 @@ import { Course } from 'app/entities/course.model'; import dayjs from 'dayjs'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { dayjsToString, generateUUID, titleLowercase } from '../utils'; import examTemplate from '../../fixtures/exam/template.json'; import { Page } from '@playwright/test'; diff --git a/src/test/playwright/support/requests/ExerciseAPIRequests.ts b/src/test/playwright/support/requests/ExerciseAPIRequests.ts index 9b7bc73ace71..2fac212a5d73 100644 --- a/src/test/playwright/support/requests/ExerciseAPIRequests.ts +++ b/src/test/playwright/support/requests/ExerciseAPIRequests.ts @@ -4,7 +4,7 @@ import { Page } from 'playwright-core'; import { Course } from 'app/entities/course.model'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; -import { TextExercise } from 'app/entities/text-exercise.model'; +import { TextExercise } from 'app/entities/text/text-exercise.model'; import fileUploadExerciseTemplate from '../../fixtures/exercise/file-upload/template.json'; import modelingExerciseSubmissionTemplate from '../../fixtures/exercise/modeling/submission.json'; @@ -34,16 +34,16 @@ import { } from '../constants'; import { dayjsToString, generateUUID, titleLowercase } from '../utils'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; -import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { Participation } from 'app/entities/participation/participation.model'; -import { Exam } from 'app/entities/exam.model'; +import { Exam } from 'app/entities/exam/exam.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { Team } from 'app/entities/team.model'; import { TeamAssignmentConfig } from 'app/entities/team-assignment-config.model'; import { ProgrammingExerciseSubmission } from '../pageobjects/exercises/programming/OnlineEditorPage'; import { Fixtures } from '../../fixtures/fixtures'; -import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model'; +import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model'; type PatchProgrammingExerciseTestVisibilityDto = { id: number;