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.

Sign up for GitHub

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

Adaptive learning: Fix import all competencies with relations #9713

Merged
merged 4 commits into from
Nov 10, 2024
Merged

Adaptive learning: Fix import all competencies with relations #9713

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
748fbb0
fix import all competencies
MaximilianAnzinger Nov 8, 2024
ead2678
Merge branch 'develop' into bugfix/fix-import-all-competencies-of-oth…
krusche Nov 10, 2024
28e13d2
Merge branch 'develop' into bugfix/fix-import-all-competencies-of-oth…
krusche Nov 10, 2024
5137aa6
fix client test by making sure the array is always initialized
krusche Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...pp/app/course/competencies/competency-management/competency-management-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { ArtemisMarkdownModule } from 'app/shared/markdown.module';
export class CompetencyManagementTableComponent implements OnInit, OnDestroy {
@Input() courseId: number;
@Input() courseCompetencies: CourseCompetency[];
@Input() allCompetencies: CourseCompetency[];
@Input() competencyType: CourseCompetencyType;
@Input() standardizedCompetenciesEnabled: boolean;

Expand Down Expand Up @@ -95,6 +96,7 @@ export class CompetencyManagementTableComponent implements OnInit, OnDestroy {
updateDataAfterImportAll(res: Array<CompetencyWithTailRelationDTO>) {
const importedCompetencies = res.map((dto) => dto.competency).filter((element): element is CourseCompetency => !!element);
this.courseCompetencies.push(...importedCompetencies);
this.allCompetencies.push(...importedCompetencies);
}

/**
Expand Down
2 changes: 2 additions & 0 deletions ...webapp/app/course/competencies/competency-management/competency-management.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ <h2 class="m-0" jhiTranslate="artemisApp.competency.manage.title"></h2>
[courseId]="courseId"
[courseCompetencies]="competencies"
[competencyType]="CourseCompetencyType.COMPETENCY"
[allCompetencies]="courseCompetencies"
[standardizedCompetenciesEnabled]="standardizedCompetenciesEnabled"
(competencyDeleted)="onRemoveCompetency($event)"
/>
<jhi-competency-management-table
[courseId]="courseId"
[courseCompetencies]="prerequisites"
[competencyType]="CourseCompetencyType.PREREQUISITE"
[allCompetencies]="courseCompetencies"
[standardizedCompetenciesEnabled]="standardizedCompetenciesEnabled"
(competencyDeleted)="onRemoveCompetency($event)"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/course/competencies/competency.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class CompetencyService extends CourseCompetencyService {

importAll(courseId: number, sourceCourseId: number, importRelations: boolean) {
return this.httpClient.post<Array<CompetencyWithTailRelationDTO>>(
`${this.resourceURL}/courses/${courseId}/competencies/import-all/${sourceCourseId}`,
`${this.resourceURL}/courses/${courseId}/competencies/import-all`,
{
importExercises: false,
importRelations: importRelations,
Expand Down
Loading