From 4ac5ffcb4951df86ca062ab0aace87143ffa1a01 Mon Sep 17 00:00:00 2001 From: Andrew Cain Date: Fri, 10 Nov 2023 15:01:45 +1100 Subject: [PATCH 1/5] fix: correct broken learning outcome alignment text --- .../task-outcomes-card/task-outcomes-card.tpl.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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
From 32440f53193b3e0b6a9a14b61d7ae6fd2d304aa2 Mon Sep 17 00:00:00 2001 From: Andrew Cain Date: Fri, 10 Nov 2023 15:02:52 +1100 Subject: [PATCH 2/5] chore(release): 7.0.16 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b31e5ab00..3a7b86224 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ 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.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 7d572fc14..816aa96a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "doubtfire", - "version": "7.0.15", + "version": "7.0.16", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "doubtfire", - "version": "7.0.15", + "version": "7.0.16", "license": "AGPL-3.0", "dependencies": { "@angular/animations": "^14.2.4", diff --git a/package.json b/package.json index c3f6718cf..f3a111fe6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doubtfire", - "version": "7.0.15", + "version": "7.0.16", "homepage": "http://github.com/doubtfire-lms/", "description": "Learning and feedback tool.", "license": "AGPL-3.0", From cbc3da864a8772ee15d74884e24a8d416b840e80 Mon Sep 17 00:00:00 2001 From: maddernd Date: Fri, 1 Dec 2023 07:57:56 +1100 Subject: [PATCH 3/5] refactor: change-the-wording-of-fail-tasks changed the wording on tasks from fail to needs improvement refactor --- src/app/api/models/task-status.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts index c8b64e4e7..2e196136b 100644 --- a/src/app/api/models/task-status.ts +++ b/src/app/api/models/task-status.ts @@ -181,7 +181,7 @@ export class TaskStatus { ["discuss", "Discuss"], ["demonstrate", "Demonstrate"], ["complete", "Complete"], - ["fail", "Fail"], + ["fail", "Needs Improvement"], ["time_exceeded", "Time Exceeded"], ]); From d5d2e9fd2101dedc35965bb96ec6d2fee9eda416 Mon Sep 17 00:00:00 2001 From: Andrew Cain Date: Fri, 1 Dec 2023 16:43:55 +1100 Subject: [PATCH 4/5] chore(release): 7.0.17 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a7b86224..1cbf11f32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ 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) diff --git a/package-lock.json b/package-lock.json index 816aa96a2..47115a3f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "doubtfire", - "version": "7.0.16", + "version": "7.0.17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "doubtfire", - "version": "7.0.16", + "version": "7.0.17", "license": "AGPL-3.0", "dependencies": { "@angular/animations": "^14.2.4", diff --git a/package.json b/package.json index f3a111fe6..5423800ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doubtfire", - "version": "7.0.16", + "version": "7.0.17", "homepage": "http://github.com/doubtfire-lms/", "description": "Learning and feedback tool.", "license": "AGPL-3.0", From f90eef7f7cd5289c60b77345d1905894384e6442 Mon Sep 17 00:00:00 2001 From: Andrew Cain Date: Wed, 27 Dec 2023 09:45:01 +1100 Subject: [PATCH 5/5] fix: ensure teaching staff loaded before units in a teaching period --- .../teaching-period-unit-import.dialog.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 52ec584b6..6836dfdbe 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}`);