Merge branch '7.0.x' into add-tii-integration

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)
 
 

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",

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}`);

src/app/api/models/task-status.ts

@@ -151,18 +151,18 @@ export class TaskStatus {
   ]);
 
   public static readonly STATUS_LABELS = new Map<TaskStatusEnum, string>([
-    ['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<TaskStatusEnum, string>([

src/app/projects/states/dashboard/directives/task-dashboard/directives/task-outcomes-card/task-outcomes-card.tpl.html

@@ -14,8 +14,8 @@ <h4>Intended Learning Outcomes</h4>
       <heading>
         <div>
           <h4>
-            <strong>{{alignment.ilo.abbreviation}}</strong>
-            <small>{{alignment.ilo.name}}</small>
+            <strong>{{alignment.learningOutcome.abbreviation}}</strong>
+            <small>{{alignment.learningOutcome.name}}</small>
           </h4>
           <p>{{alignment.label}} Click to expand</p>
         </div><!--/alignment-label-->
@@ -30,7 +30,7 @@ <h4>
         <div class="panel-body">
           <p>
             <h5>Outcome Description</h5>
-            <div class="markdown-to-html" ng-bind-html="alignment.ilo.description | markdown | to_trusted"></div>
+            <div class="markdown-to-html" ng-bind-html="alignment.learningOutcome.description | markdown | to_trusted"></div>
           </p>
           <p>
             <h5>Rationale</h5>