Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Development: Remove Course Management/LTI modules #10184

Open
wants to merge 25 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
15a38f9
remove course management module
tobias-lippert Jan 21, 2025
46e0b84
remove lti module
tobias-lippert Jan 21, 2025
0485c2d
remove list of complaints module
tobias-lippert Jan 21, 2025
0959529
remove plagiarism-cases-instructor-view.module.ts
tobias-lippert Jan 21, 2025
890a401
remove grading system module
tobias-lippert Jan 21, 2025
93e26a4
remove grading system module usage everywhere and usage of team module
tobias-lippert Jan 21, 2025
caaecce
remove team module
tobias-lippert Jan 21, 2025
8ed940d
remove feature overview module
tobias-lippert Jan 21, 2025
d75573f
Merge branch 'develop' into chore/remove-course-management-lti-modules
tobias-lippert Jan 21, 2025
fe19bd1
Merge branch 'refs/heads/develop' into chore/remove-course-management…
tobias-lippert Jan 27, 2025
ec6f42c
remove more modules and modify routes. exercise breadcumbs not working
tobias-lippert Jan 27, 2025
dbc0aa1
fix routing for exercise management
tobias-lippert Jan 27, 2025
fb04067
fix redirect routing
tobias-lippert Jan 27, 2025
82da39b
delete more modules related to course management
tobias-lippert Jan 27, 2025
c457294
fix compilation error
tobias-lippert Jan 27, 2025
ed02b03
fix exercise scores and participation routing
tobias-lippert Jan 27, 2025
6e213cc
fix file upload assessment route
tobias-lippert Jan 27, 2025
0c16070
fix routings for exercise assessments
tobias-lippert Jan 27, 2025
a4598d7
Merge branch 'develop' into chore/remove-course-management-lti-modules
tobias-lippert Jan 28, 2025
acfd0df
Merge branch 'develop' into chore/remove-course-management-lti-modules
tobias-lippert Jan 31, 2025
e267215
remove more modules
tobias-lippert Jan 31, 2025
1a70bad
remove more modules
tobias-lippert Jan 31, 2025
a9fbd17
fix tests
tobias-lippert Jan 31, 2025
fcb9ba5
fix dateTimePicker missing module
tobias-lippert Feb 2, 2025
566bd66
Merge branch 'develop' into chore/remove-course-management-lti-modules
tobias-lippert Feb 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import { convertDateFromServer } from 'app/utils/date.utils';
import { Subject } from 'rxjs';
import { HttpResponse } from '@angular/common/http';
import { CleanupServiceExecutionRecordDTO, DataCleanupService } from 'app/admin/cleanup-service/data-cleanup.service';
import { FormDateTimePickerModule } from 'app/shared/date-time-picker/date-time-picker.module';
import { ArtemisSharedModule } from 'app/shared/shared.module';
import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { CleanupOperationModalComponent } from 'app/admin/cleanup-service/cleanup-operation-modal.component';
import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';

@Component({
selector: 'jhi-cleanup-service',
templateUrl: './cleanup-service.component.html',
imports: [FormDateTimePickerModule, ArtemisSharedModule, ArtemisSharedComponentModule],
imports: [ArtemisSharedModule, ArtemisSharedComponentModule, FormDateTimePickerComponent],
})
export class CleanupServiceComponent implements OnInit {
private dialogErrorSource = new Subject<string>();
Expand Down
2 changes: 2 additions & 0 deletions src/main/webapp/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { ArtemisSharedModule } from 'app/shared/shared.module';
import { UserSettingsModule } from 'app/shared/user-settings/user-settings.module';
import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
import { provideNgxWebstorage, withLocalStorage, withNgxWebstorageConfig, withSessionStorage } from 'ngx-webstorage';
import { OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';

export function initOrionConnector(connector: OrionConnectorService) {
return () => OrionConnectorService.initConnector(connector);
Expand All @@ -49,6 +50,7 @@ export const appConfig: ApplicationConfig = {
RouterModule,
ScrollingModule,
UserSettingsModule,
OwlNativeDateTimeModule,
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
Expand Down
30 changes: 9 additions & 21 deletions src/main/webapp/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ const routes: Routes = [
// ===== TEAM ====
{
path: 'course-management/:courseId/exercises/:exerciseId/teams',
loadChildren: () => import('./exercises/shared/team/team.module').then((m) => m.ArtemisTeamModule),
loadChildren: () => import('./exercises/shared/team/team.route').then((m) => m.teamRoute),
},
{
path: 'courses/:courseId/exercises/:exerciseId/teams',
loadChildren: () => import('./exercises/shared/team/team.module').then((m) => m.ArtemisTeamModule),
loadChildren: () => import('./exercises/shared/team/team.route').then((m) => m.teamRoute),
},
// ===== ACCOUNT ====
{
Expand Down Expand Up @@ -130,25 +130,13 @@ const routes: Routes = [
// ===== COURSE MANAGEMENT =====
{
path: 'course-management',
loadChildren: () => import('./course/manage/course-management.module').then((m) => m.ArtemisCourseManagementModule),
loadChildren: () => import('./course/manage/course-management.route').then((m) => m.courseManagementState),
},
{
path: 'course-management/:courseId/programming-exercises/:exerciseId/code-editor',
loadChildren: () => import('./exercises/programming/manage/code-editor/code-editor-management.module').then((m) => m.ArtemisCodeEditorManagementModule),
},
{
path: 'course-management/:courseId/text-exercises/:exerciseId',
loadChildren: () => import('./exercises/text/assess/text-submission-assessment.module').then((m) => m.ArtemisTextSubmissionAssessmentModule),
},
{
path: 'course-management/:courseId/text-exercises/:exerciseId/example-submissions/:exampleSubmissionId',
loadChildren: () => import('./exercises/text/manage/example-text-submission/example-text-submission.module').then((m) => m.ArtemisExampleTextSubmissionModule),
},
{
path: 'course-management/:courseId/programming-exercises/:exerciseId',
loadChildren: () =>
import('./exercises/programming/manage/programming-exercise-management-routing.module').then((m) => m.ArtemisProgrammingExerciseManagementRoutingModule),
loadChildren: () => import('./exercises/programming/manage/code-editor/code-editor-management-routes').then((m) => m.routes),
},

{
path: 'courses',
loadChildren: () => import('./overview/courses.module').then((m) => m.ArtemisCoursesModule),
Expand All @@ -161,7 +149,7 @@ const routes: Routes = [
// ===== GRADING SYSTEM =====
{
path: 'courses/:courseId/grading-system',
loadChildren: () => import('./grading-system/grading-system.module').then((m) => m.GradingSystemModule),
loadChildren: () => import('./grading-system/grading-system.route').then((m) => m.gradingSystemState),
},

{
Expand All @@ -187,19 +175,19 @@ const routes: Routes = [
},
{
path: 'courses/:courseId/exams/:examId/grading-system',
loadChildren: () => import('./grading-system/grading-system.module').then((m) => m.GradingSystemModule),
loadChildren: () => import('./grading-system/grading-system.route').then((m) => m.gradingSystemState),
},
{
path: 'courses/:courseId/exams/:examId/exercises/:exerciseId/repository',
loadChildren: () => import('./exercises/programming/participate/programming-repository-routing.module').then((m) => m.ArtemisProgrammingRepositoryRoutingModule),
},
{
path: 'features',
loadChildren: () => import('./feature-overview/feature-overview.module').then((m) => m.FeatureOverviewModule),
loadChildren: () => import('./feature-overview/feature-overview.route').then((m) => m.featureOverviewState),
},
{
path: 'lti',
loadChildren: () => import('./lti/lti.module').then((m) => m.ArtemisLtiModule),
loadChildren: () => import('./lti/lti.route').then((m) => m.ltiLaunchState),
},
{
path: 'about-iris',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { CourseManagementResolve } from 'app/course/manage/course-management-res

export const assessmentLocksRoute: Routes = [
{
path: ':courseId/exams/:examId/assessment-locks',
path: 'exams/:examId/assessment-locks',
loadComponent: () => import('./assessment-locks.component').then((m) => m.AssessmentLocksComponent),
resolve: {
course: CourseManagementResolve,
Expand All @@ -18,7 +18,7 @@ export const assessmentLocksRoute: Routes = [
canActivate: [UserRouteAccessService],
},
{
path: ':courseId/assessment-locks',
path: 'assessment-locks',
loadComponent: () => import('./assessment-locks.component').then((m) => m.AssessmentLocksComponent),
resolve: {
course: CourseManagementResolve,
Expand Down
54 changes: 0 additions & 54 deletions src/main/webapp/app/assessment/assessment-shared.module.ts

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { CourseManagementResolve } from 'app/course/manage/course-management-res

export const listOfComplaintsRoute: Routes = [
{
path: ':courseId/complaints',
path: 'complaints',
loadComponent: () => import('app/complaints/list-of-complaints/list-of-complaints.component').then((m) => m.ListOfComplaintsComponent),
resolve: {
course: CourseManagementResolve,
Expand All @@ -22,7 +22,7 @@ export const listOfComplaintsRoute: Routes = [
canActivate: [UserRouteAccessService],
},
{
path: ':courseId/exams/:examId/complaints',
path: 'exams/:examId/complaints',
loadComponent: () => import('app/complaints/list-of-complaints/list-of-complaints.component').then((m) => m.ListOfComplaintsComponent),
resolve: {
course: CourseManagementResolve,
Expand All @@ -36,7 +36,7 @@ export const listOfComplaintsRoute: Routes = [
},
...exerciseTypes.map((exerciseType) => {
return {
path: ':courseId/' + exerciseType + '-exercises/:exerciseId/complaints',
path: exerciseType + '-exercises/:exerciseId/complaints',
component: ListOfComplaintsComponent,
data: {
authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
Expand All @@ -47,7 +47,7 @@ export const listOfComplaintsRoute: Routes = [
};
}),
{
path: ':courseId/more-feedback-requests',
path: 'more-feedback-requests',
loadComponent: () => import('app/complaints/list-of-complaints/list-of-complaints.component').then((m) => m.ListOfComplaintsComponent),
resolve: {
course: CourseManagementResolve,
Expand All @@ -61,7 +61,7 @@ export const listOfComplaintsRoute: Routes = [
},
...exerciseTypes.map((exerciseType) => {
return {
path: ':courseId/' + exerciseType + '-exercises/:exerciseId/more-feedback-requests',
path: exerciseType + '-exercises/:exerciseId/more-feedback-requests',
component: ListOfComplaintsComponent,
data: {
authorities: [Authority.ADMIN, Authority.INSTRUCTOR, Authority.EDITOR, Authority.TA],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { CompetencyCardComponent } from 'app/course/competencies/competency-card
import { CompetenciesPopoverComponent } from './competencies-popover/competencies-popover.component';
import { NgxGraphModule } from '@swimlane/ngx-graph';
import { CompetencyRingsComponent } from 'app/course/competencies/competency-rings/competency-rings.component';
import { FormDateTimePickerModule } from 'app/shared/date-time-picker/date-time-picker.module';
import { NgbAccordionModule, NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { CompetencyRecommendationDetailComponent } from 'app/course/competencies/generate-competencies/competency-recommendation-detail.component';
import { CourseDescriptionFormComponent } from 'app/course/competencies/generate-competencies/course-description-form.component';
Expand All @@ -31,7 +30,6 @@ import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown
NgbModule,
ArtemisSharedComponentModule,
RouterModule,
FormDateTimePickerModule,
NgbAccordionModule,
ArtemisMarkdownModule,
IrisModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms';
import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { faCalendarAlt, faCircleXmark, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
import { FormDateTimePickerModule } from 'app/shared/date-time-picker/date-time-picker.module';
import { ArtemisSharedModule } from 'app/shared/shared.module';

export class CourseCompetencyImportSettings {
Expand All @@ -17,7 +16,7 @@ export class CourseCompetencyImportSettings {

@Component({
selector: 'jhi-import-course-competencies-settings',
imports: [FormDateTimePickerModule, FormsModule, CommonModule, FontAwesomeModule, OwlDateTimeModule, OwlNativeDateTimeModule, ArtemisSharedModule],
imports: [FormsModule, CommonModule, FontAwesomeModule, OwlDateTimeModule, OwlNativeDateTimeModule, ArtemisSharedModule],
templateUrl: './import-course-competencies-settings.component.html',
styleUrl: './import-course-competencies-settings.component.scss',
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ import { CompetencyTaxonomy, CourseCompetency, CourseCompetencyValidators, DEFAU
import { faQuestionCircle, faTimes } from '@fortawesome/free-solid-svg-icons';
import { CourseCompetencyFormData } from 'app/course/competencies/forms/course-competency-form.component';
import { ArtemisSharedModule } from 'app/shared/shared.module';
import { FormDateTimePickerModule } from 'app/shared/date-time-picker/date-time-picker.module';
import { ArtemisMarkdownModule } from 'app/shared/markdown.module';
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
import { ArtemisCompetenciesModule } from 'app/course/competencies/competency.module';
import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
import { merge } from 'rxjs';
import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
import { DateTimePickerType } from 'app/shared/date-time-picker/date-time-picker.component';
import { DateTimePickerType, FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';
import { ArtemisFormsModule } from 'app/forms/artemis-forms.module';

@Component({
Expand All @@ -22,14 +21,14 @@ import { ArtemisFormsModule } from 'app/forms/artemis-forms.module';
styleUrls: ['./common-course-competency-form.component.scss'],
imports: [
ArtemisSharedModule,
FormDateTimePickerModule,
ArtemisMarkdownModule,
NgbDropdownModule,
ArtemisFormsModule,
ReactiveFormsModule,
ArtemisCompetenciesModule,
ArtemisSharedComponentModule,
ArtemisMarkdownEditorModule,
FormDateTimePickerComponent,
],
})
export class CommonCourseCompetencyFormComponent implements OnInit, OnChanges {
Expand Down

This file was deleted.

Loading
Loading