diff --git a/CHANGELOG.md b/CHANGELOG.md index b31e5ab00..1cbf11f32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [7.0.17](https://github.com/macite/doubtfire-deploy/compare/v7.0.16...v7.0.17) (2023-12-01) + +### [7.0.16](https://github.com/macite/doubtfire-deploy/compare/v7.0.15...v7.0.16) (2023-11-10) + + +### Bug Fixes + +* correct broken learning outcome alignment text ([4ac5ffc](https://github.com/macite/doubtfire-deploy/commit/4ac5ffcb4951df86ca062ab0aace87143ffa1a01)) + ### [7.0.15](https://github.com/macite/doubtfire-deploy/compare/v7.0.14...v7.0.15) (2023-06-20) diff --git a/package-lock.json b/package-lock.json index 87e462bb0..6a4d3bfeb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "doubtfire", - "version": "7.0.15", + "version": "7.0.17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "doubtfire", - "version": "7.0.15", + "version": "7.0.17", "license": "AGPL-3.0", "dependencies": { "@angular/animations": "^17.0.1", diff --git a/package.json b/package.json index eaad0b6be..2e16719cd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doubtfire", - "version": "7.0.15", + "version": "7.0.17", "homepage": "http://github.com/doubtfire-lms/", "description": "Learning and feedback tool.", "license": "AGPL-3.0", diff --git a/src/app/admin/states/teaching-periods/teaching-period-unit-import/teaching-period-unit-import.dialog.ts b/src/app/admin/states/teaching-periods/teaching-period-unit-import/teaching-period-unit-import.dialog.ts index 402c0799f..2925b4b59 100644 --- a/src/app/admin/states/teaching-periods/teaching-period-unit-import/teaching-period-unit-import.dialog.ts +++ b/src/app/admin/states/teaching-periods/teaching-period-unit-import/teaching-period-unit-import.dialog.ts @@ -83,12 +83,12 @@ export class TeachingPeriodUnitImportDialogComponent implements OnInit { // Load all teaching staff this.userService.getTutors().subscribe((staff) => { - // Load all units now we have the staff - this.loadAllUnits(); - this.teachingStaff = staff .filter((s) => ['Convenor', 'Admin'].includes(s.systemRole)) .sort((a, b) => a.name.localeCompare(b.name)); + + // Load all units now we have the staff + this.loadAllUnits(); }); } @@ -201,7 +201,7 @@ export class TeachingPeriodUnitImportDialogComponent implements OnInit { next: (newUnit: Unit) => { unitToImport.done = true; // Employ the convenor - if (unitToImport.convenor && unitToImport.convenor != newUnit.mainConvenorUser) { + if (unitToImport.convenor && unitToImport.convenor !== newUnit.mainConvenorUser) { newUnit.addStaff(unitToImport.convenor, 'Convenor').subscribe({ next: (newRole) => { console.log(`Employed ${unitToImport.convenor.name} in ${newUnit.code}`); diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts index 0ab0f8f2d..98083e169 100644 --- a/src/app/api/models/task-status.ts +++ b/src/app/api/models/task-status.ts @@ -151,18 +151,18 @@ export class TaskStatus { ]); public static readonly STATUS_LABELS = new Map([ - ['ready_for_feedback', 'Ready for Feedback'], - ['not_started', 'Not Started'], - ['working_on_it', 'Working On It'], - ['need_help', 'Need Help'], - ['redo', 'Redo'], - ['feedback_exceeded', 'Feedback Exceeded'], - ['fix_and_resubmit', 'Resubmit'], - ['discuss', 'Discuss'], - ['demonstrate', 'Demonstrate'], - ['complete', 'Complete'], - ['fail', 'Fail'], - ['time_exceeded', 'Time Exceeded'], + ["ready_for_feedback", "Ready for Feedback"], + ["not_started", "Not Started"], + ["working_on_it", "Working On It"], + ["need_help", "Need Help"], + ["redo", "Redo"], + ["feedback_exceeded", "Feedback Exceeded"], + ["fix_and_resubmit", "Resubmit"], + ["discuss", "Discuss"], + ["demonstrate", "Demonstrate"], + ["complete", "Complete"], + ["fail", "Needs Improvement"], + ["time_exceeded", "Time Exceeded"], ]); public static readonly STATUS_ICONS = new Map([ diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html index 54b66ae11..91ea82738 100644 --- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html +++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html @@ -14,8 +14,8 @@

Intended Learning Outcomes

- {{alignment.ilo.abbreviation}} - {{alignment.ilo.name}} + {{alignment.learningOutcome.abbreviation}} + {{alignment.learningOutcome.name}}

{{alignment.label}} Click to expand

@@ -30,7 +30,7 @@

Outcome Description
-
+

Rationale