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: Omit competency taxonomy icon on dashboard if no taxonomy is set #8809

Merged
merged 2 commits into from
Jun 18, 2024
Merged

Adaptive learning: Omit competency taxonomy icon on dashboard if no taxonomy is set #8809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501956f
fix translation
MaximilianAnzinger Jun 17, 2024
bbdc067
remove icon if taxonomy not set
MaximilianAnzinger Jun 18, 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
14 changes: 8 additions & 6 deletions ...n/webapp/app/course/competencies/competency-accordion/competency-accordion.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
(click)="toggle()"
>
<h4 class="fw-medium mb-0 py-2 col-sm-6 d-flex gap-2">
<fa-icon
[icon]="getIcon(competency.taxonomy)"
[fixedWidth]="true"
[ngbTooltip]="'artemisApp.competency.taxonomies.' + competency.taxonomy | artemisTranslate"
container="body"
/>
@if (competency.taxonomy) {
<fa-icon
[icon]="getIcon(competency.taxonomy)"
[fixedWidth]="true"
[ngbTooltip]="'artemisApp.competency.taxonomies.' + competency.taxonomy | artemisTranslate"
container="body"
/>
}
{{ competency.title }}
</h4>
<div class="w-100 d-flex align-items-center gap-4">
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/entities/student-metrics.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class CompetencyInformation {
public id: number;
public title: string;
public description: string;
public taxonomy: CompetencyTaxonomy;
public taxonomy?: CompetencyTaxonomy;
MaximilianAnzinger marked this conversation as resolved.
Show resolved Hide resolved
public softDueDate?: dayjs.Dayjs;
public optional: boolean;
public masteryThreshold: number;
Expand Down
Loading