From ec7524aaae040794de76521363c2d885a0425db0 Mon Sep 17 00:00:00 2001
From: Bahnschrift <kbeckett@outlook.com.au>
Date: Fri, 31 May 2024 12:56:24 +1000
Subject: [PATCH 001/776] fix: marking shortcuts no longer conflict with common
 browser shortcuts

---
 .../staff-task-list.component.ts              | 12 ++++-----
 .../states/tasks/inbox/inbox.component.ts     | 26 +++++++++++++++----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 95b498af20..5e427de56e 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -123,26 +123,26 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     }
   }
   ngOnDestroy(): void {
-    this.hotkeys.removeShortcuts('meta.shift.arrowdown');
-    this.hotkeys.removeShortcuts('meta.shift.arrowup');
+    this.hotkeys.removeShortcuts('alt.shift.arrowdown');
+    this.hotkeys.removeShortcuts('alt.shift.arrowup');
   }
 
   ngOnInit(): void {
     const registeredHotkeys = this.hotkeys.getHotkeys().map((hotkey) => hotkey.keys);
 
-    if (!registeredHotkeys.includes('meta.shift.arrowdown')) {
+    if (!registeredHotkeys.includes('alt.shift..arrowdown')) {
       this.hotkeys
         .addShortcut({
-          keys: 'meta.shift.arrowdown',
+          keys: 'alt.shift.arrowdown',
           description: 'Select next task',
         })
         .subscribe(() => this.nextTask());
     }
 
-    if (!registeredHotkeys.includes('meta.shift.arrowup')) {
+    if (!registeredHotkeys.includes('alt.shift.arrowup')) {
       this.hotkeys
         .addShortcut({
-          keys: 'meta.shift.arrowup',
+          keys: 'alt.shift.arrowup',
           description: 'Select previous task',
         })
         .subscribe(() => this.previousTask());
diff --git a/src/app/units/states/tasks/inbox/inbox.component.ts b/src/app/units/states/tasks/inbox/inbox.component.ts
index 79b4cfe355..ff7865da78 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.ts
+++ b/src/app/units/states/tasks/inbox/inbox.component.ts
@@ -19,6 +19,7 @@ import {SelectedTaskService} from 'src/app/projects/states/dashboard/selected-ta
 import {HotkeysService, HotkeysHelpComponent} from '@ngneat/hotkeys';
 import {MatDialog} from '@angular/material/dialog';
 import {UserService} from 'src/app/api/services/user.service';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 
 @Component({
   selector: 'f-inbox',
@@ -58,6 +59,7 @@ export class InboxComponent implements OnInit, AfterViewInit {
     private router: UIRouter,
     public dialog: MatDialog,
     private userService: UserService,
+    private constants: DoubtfireConstants,
   ) {
     this.selectedTask.currentPdfUrl$.subscribe((url) => {
       this.visiblePdfUrl = url;
@@ -76,7 +78,7 @@ export class InboxComponent implements OnInit, AfterViewInit {
         const ref = this.dialog.open(HotkeysHelpComponent, {
           // width: '250px',
         });
-        ref.componentInstance.title = 'Formatif Marking Shortcuts';
+        ref.componentInstance.title = `${this.constants.ExternalName.value} Marking Shortcuts`;
         ref.componentInstance.dismiss.subscribe(() => ref.close());
       });
     }
@@ -85,18 +87,32 @@ export class InboxComponent implements OnInit, AfterViewInit {
   ngOnInit(): void {
     this.hotkeys
       .addShortcut({
-        keys: 'control.c',
-        description: 'Mark selected task as complete',
+        keys: 'alt.shift.r',
+        description: 'Mark selected task as redo',
       })
-      .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('complete'));
+      .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('redo'));
 
     this.hotkeys
       .addShortcut({
-        keys: 'control.f',
+        keys: 'alt.shift.f',
         description: 'Mark selected task as fix',
       })
       .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('fix_and_resubmit'));
 
+    this.hotkeys
+      .addShortcut({
+        keys: 'alt.shift.c',
+        description: 'Mark selected task as complete',
+      })
+      .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('complete'));
+
+    this.hotkeys
+      .addShortcut({
+        keys: 'alt.shift.d',
+        description: 'Mark selected task as discuss',
+      })
+      .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('discuss'));
+
     this.dragMoveAudited$ = this.dragMove$.pipe(
       withLatestFrom(this.inboxStartSize$),
       auditTime(30),

From 6445f9f998db70fbe9b9abf723dc17fd298b5d2f Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 5 Jun 2024 12:04:12 +1000
Subject: [PATCH 002/776] fix: ensure download blob supports 206 responses

---
 .../common/file-downloader/file-downloader.ts | 112 ++++++++++++++++--
 1 file changed, 103 insertions(+), 9 deletions(-)

diff --git a/src/app/common/file-downloader/file-downloader.ts b/src/app/common/file-downloader/file-downloader.ts
index ba49cd64da..031e26d191 100644
--- a/src/app/common/file-downloader/file-downloader.ts
+++ b/src/app/common/file-downloader/file-downloader.ts
@@ -2,28 +2,122 @@ import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Inject, Injectable } from '@angular/core';
 import { alertService } from 'src/app/ajs-upgraded-providers';
 
+interface FileDownloaderData {
+  url: string,
+  response: HttpResponse<Blob>,
+  success: (url: string, response: HttpResponse<Blob>) => void,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  failure: (error: any) => void,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  binaryData: Blob[],
+}
+
 @Injectable({
   providedIn: 'root',
 })
 export class FileDownloaderService {
-  constructor(private httpClient: HttpClient, @Inject(alertService) private alerts: any) {}
+  constructor(
+    private httpClient: HttpClient,
+    @Inject(alertService) private alerts: any,
+  ) {}
+
+  private processPartialBlob(data: FileDownloaderData) {
+    // We now need to ask for the next part of the file
+    const range = data.response.headers.get('Content-Range');
+    if (range) {
+      // The range header is in the format "bytes start-end/totalSize"
+      const parts = range.split('/');
+
+      // Split into the range and the total size
+      if (parts.length === 2) {
+        // Parse the total size and the range
+        const totalSize = parseInt(parts[1], 10);
+
+        // Extract the range after the "bytes" part
+        const contentRange = parts[0].split(' ')[1];
+
+        // Extract the parts of the range
+        const contentRangeParts = contentRange.split('-');
+
+        // If we have two parts, we have a valid range and size
+        if (contentRangeParts.length === 2) {
+          const start = parseInt(contentRangeParts[0], 10);
+          const end = parseInt(contentRangeParts[1], 10);
+
+          // Check the start is the same as the length of the binary data received
+          if (start !== data.binaryData.map((value) => value.size).reduce((pv, cv) => pv + cv, 0)) {
+            console.log('Error: start != oldLen');
+            this.alerts.add('danger', 'Error downloading file part received out of order');
+          }
+          data.binaryData.push(data.response.body);
+
+          // If the end is less than the total size, we need to request the next part
+          if (end + 1 < totalSize) {
+            const rangeHeader = {Range: `bytes=${end + 1}-${totalSize}`};
+            this.httpClient
+              .get(data.url, {responseType: 'blob', observe: 'response', headers: rangeHeader})
+              .subscribe({
+                next: (response2) => {
+                  data.response = response2;
+                  this.processHttpResponse(data);
+                },
+                error: (error) => {
+                  if (data.failure) data.failure(error);
+                },
+              });
+            return;
+          } else {
+            // we have all of the data, so we can report success
+            this.reportSuccess(data);
+          }
+        }
+      }
+    } else {
+      // no range... so we can't do anything!
+      console.log('Error reading response from server - no range with 206 response');
+      if (data.failure) data.failure('Unable to read data from server');
+    }
+  }
+
+  private processHttpResponse(data: FileDownloaderData) {
+    // Check if we have a partial content response
+    if (data.response.status === 206) {
+      this.processPartialBlob(data);
+    } else {
+      // Save the binary data we have received so far
+      data.binaryData.push(data.response.body);
+      this.reportSuccess(data);
+    }
+  }
+
+  private reportSuccess(data: FileDownloaderData) {
+    const resourceUrl: string = window.URL.createObjectURL(
+      new Blob(data.binaryData, {type: data.response.body.type}),
+    );
+    data.success(resourceUrl, data.response);
+  }
 
   public downloadBlob(
     url: string,
     success: (url: string, response: HttpResponse<Blob>) => void,
-    failure: (error: any) => void
+    failure: (error: any) => void,
   ) {
-    this.httpClient.get(url, { responseType: 'blob', observe: 'response' }).subscribe({
+    // Declare binary data outside of the subscription so that it can be accessed in the second requests when partial content is returned
+    const binaryData = [];
+
+    this.httpClient.get(url, {responseType: 'blob', observe: 'response'}).subscribe({
       next: (response) => {
-        const binaryData = [];
-        binaryData.push(response.body);
-        // response.headers.get('content-type')
-        const resourceUrl: string = window.URL.createObjectURL(new Blob(binaryData, { type: response.body.type }));
-        success(resourceUrl, response);
+        this.processHttpResponse({
+          url: url,
+          response: response,
+          success: success,
+          failure: failure,
+          binaryData: binaryData,
+        });
       },
       error: (error) => {
         if (failure) failure(error);
-      }
+      },
     });
   }
 

From c241f0ee348ce32bc4a3da9f92b306e9c664a7e9 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 5 Jun 2024 12:04:21 +1000
Subject: [PATCH 003/776] chore(release): 7.0.24

---
 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 6d4d8b3c44..fb26e47aa1 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.24](https://github.com/macite/doubtfire-deploy/compare/v7.0.23...v7.0.24) (2024-06-05)
+
+
+### Bug Fixes
+
+* ensure download blob supports 206 responses ([6445f9f](https://github.com/macite/doubtfire-deploy/commit/6445f9f998db70fbe9b9abf723dc17fd298b5d2f))
+
 ### [7.0.23](https://github.com/macite/doubtfire-deploy/compare/v7.0.22...v7.0.23) (2024-06-04)
 
 
diff --git a/package-lock.json b/package-lock.json
index 69d1ed0912..8cd4e2f7e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "7.0.23",
+  "version": "7.0.24",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "7.0.23",
+      "version": "7.0.24",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^14.2.4",
diff --git a/package.json b/package.json
index 2a179c703c..3eed4ceaef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "7.0.23",
+  "version": "7.0.24",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 8eba913ec4462e1c252a8a698b4b6de67c4ec25f Mon Sep 17 00:00:00 2001
From: maddernd <87599686+maddernd@users.noreply.github.com>
Date: Sun, 10 Sep 2023 12:21:51 +1000
Subject: [PATCH 004/776] feat: add new Numbas Feature

Added new Numbas Service to the frontend as part of Integration

Changed by: Daniel Maddern
---
 src/app/api/services/numbas.service.ts | 66 ++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 src/app/api/services/numbas.service.ts

diff --git a/src/app/api/services/numbas.service.ts b/src/app/api/services/numbas.service.ts
new file mode 100644
index 0000000000..a0dc765644
--- /dev/null
+++ b/src/app/api/services/numbas.service.ts
@@ -0,0 +1,66 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
+import { Observable, throwError } from 'rxjs';
+import { catchError, map, retry } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NumbasService {
+  private readonly API_URL = 'http://localhost:3000/api/numbas_api';
+
+  constructor(private http: HttpClient) {}
+
+  fetchResource(unitId: string, taskId: string, resourcePath: string): Observable<any> {
+    const resourceUrl = `${this.API_URL}/${unitId}/${taskId}/${resourcePath}`;
+    const resourceMimeType = this.getMimeType(resourcePath);
+
+    return this.http.get(resourceUrl, { responseType: 'blob' }).pipe(
+      retry(3),  // Retrying up to 3 times before failing
+      map((blob) => new Blob([blob], { type: resourceMimeType })),
+      catchError((error: HttpErrorResponse) => {
+        console.error('Error fetching Numbas resource:', error);
+        return throwError('Error fetching Numbas resource.');
+      })
+    );
+  }
+
+  getMimeType(resourcePath: string): string {
+    const extension = resourcePath.split('.').pop()?.toLowerCase();
+    const mimeTypeMap: { [key: string]: string } = {
+      'html': 'text/html',
+      'css': 'text/css',
+      'js': 'application/javascript',
+      'json': 'application/json',
+      'png': 'image/png',
+      'jpg': 'image/jpeg',
+      'gif': 'image/gif',
+      'svg': 'image/svg+xml'
+    };
+
+    return mimeTypeMap[extension || ''] || 'text/plain';
+  }
+  uploadTest(unitId: string, taskId: string, file: File): Observable<any> {
+    const uploadUrl = `${this.API_URL}/uploadNumbasTest`;
+    const formData = new FormData();
+
+    formData.append('file', file);
+    formData.append('unit_code', unitId);
+    formData.append('task_definition_id', taskId);
+
+    const httpOptions = {
+      headers: new HttpHeaders({
+        // You might need to set some headers here depending on your backend requirements
+        'Accept': 'application/json'
+      })
+    };
+
+    return this.http.post(uploadUrl, formData, httpOptions).pipe(
+      retry(3),
+      catchError((error: HttpErrorResponse) => {
+        console.error('Error uploading Numbas test:', error);
+        return throwError('Error uploading Numbas test.');
+      })
+    );
+  }
+}

From 6f1ac4e4c1a78115c426838bce350bce286e44f0 Mon Sep 17 00:00:00 2001
From: maddernd <87599686+maddernd@users.noreply.github.com>
Date: Mon, 11 Sep 2023 17:11:47 +1000
Subject: [PATCH 005/776] feat: add new Numbas Feature

adjusted lint on edit-profile-component.spec.ts

Changed by: Daniel Maddern
---
 src/app/account/edit-profile/edit-profile.component.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/account/edit-profile/edit-profile.component.spec.ts b/src/app/account/edit-profile/edit-profile.component.spec.ts
index 189015c5a9..e15f8e5820 100644
--- a/src/app/account/edit-profile/edit-profile.component.spec.ts
+++ b/src/app/account/edit-profile/edit-profile.component.spec.ts
@@ -7,7 +7,7 @@ describe('EditProfileComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [EditProfileComponent]
+      declarations: [EditProfileComponent],
     }).compileComponents();
 
     fixture = TestBed.createComponent(EditProfileComponent);

From cee13b727b35f804fc16070885f0e57c422c9982 Mon Sep 17 00:00:00 2001
From: maddernd <87599686+maddernd@users.noreply.github.com>
Date: Tue, 12 Sep 2023 08:54:37 +1000
Subject: [PATCH 006/776] feat: numbas-test-numbas-service

Added numbas service and numbas service test

daniel
---
 src/app/api/services/numbas.service.ts        | 29 ++++++++-
 .../api/services/spec/numbas.service.spec.ts  | 65 +++++++++++++++++++
 2 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 src/app/api/services/spec/numbas.service.spec.ts

diff --git a/src/app/api/services/numbas.service.ts b/src/app/api/services/numbas.service.ts
index a0dc765644..663c778f04 100644
--- a/src/app/api/services/numbas.service.ts
+++ b/src/app/api/services/numbas.service.ts
@@ -2,21 +2,30 @@ import { Injectable } from '@angular/core';
 import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map, retry } from 'rxjs/operators';
+import API_URL from 'src/app/config/constants/apiURL';
 
 @Injectable({
   providedIn: 'root'
 })
 export class NumbasService {
-  private readonly API_URL = 'http://localhost:3000/api/numbas_api';
+  private readonly API_URL = `${API_URL}/numbas_api`;
 
   constructor(private http: HttpClient) {}
 
+  /**
+   * Fetches a specified resource for a given unit and task.
+   *
+   * @param unitId - The ID of the unit
+   * @param taskId - The ID of the task
+   * @param resourcePath - Path to the desired resource
+   * @returns An Observable with the Blob of the fetched resource
+   */
   fetchResource(unitId: string, taskId: string, resourcePath: string): Observable<any> {
     const resourceUrl = `${this.API_URL}/${unitId}/${taskId}/${resourcePath}`;
     const resourceMimeType = this.getMimeType(resourcePath);
 
     return this.http.get(resourceUrl, { responseType: 'blob' }).pipe(
-      retry(3),  // Retrying up to 3 times before failing
+      retry(3),
       map((blob) => new Blob([blob], { type: resourceMimeType })),
       catchError((error: HttpErrorResponse) => {
         console.error('Error fetching Numbas resource:', error);
@@ -25,6 +34,12 @@ export class NumbasService {
     );
   }
 
+  /**
+   * Determines the MIME type of a resource based on its extension.
+   *
+   * @param resourcePath - Path of the resource
+   * @returns MIME type string corresponding to the resource's extension
+   */
   getMimeType(resourcePath: string): string {
     const extension = resourcePath.split('.').pop()?.toLowerCase();
     const mimeTypeMap: { [key: string]: string } = {
@@ -40,6 +55,15 @@ export class NumbasService {
 
     return mimeTypeMap[extension || ''] || 'text/plain';
   }
+
+  /**
+   * Uploads a Numbas test file for a given unit and task.
+   *
+   * @param unitId - The ID of the unit
+   * @param taskId - The ID of the task
+   * @param file - File object representing the Numbas test to be uploaded
+   * @returns An Observable with the response from the server
+   */
   uploadTest(unitId: string, taskId: string, file: File): Observable<any> {
     const uploadUrl = `${this.API_URL}/uploadNumbasTest`;
     const formData = new FormData();
@@ -50,7 +74,6 @@ export class NumbasService {
 
     const httpOptions = {
       headers: new HttpHeaders({
-        // You might need to set some headers here depending on your backend requirements
         'Accept': 'application/json'
       })
     };
diff --git a/src/app/api/services/spec/numbas.service.spec.ts b/src/app/api/services/spec/numbas.service.spec.ts
new file mode 100644
index 0000000000..7ef1530473
--- /dev/null
+++ b/src/app/api/services/spec/numbas.service.spec.ts
@@ -0,0 +1,65 @@
+import { TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { NumbasService } from '../numbas.service';
+import { HttpRequest } from '@angular/common/http';
+
+describe('NumbasService', () => {
+  let numbasService: NumbasService;
+  let httpMock: HttpTestingController;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [NumbasService],
+    });
+
+    numbasService = TestBed.inject(NumbasService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  it('should fetch resource as expected', fakeAsync(() => {
+    const dummyBlob = new Blob(['dummy blob'], { type: 'text/html' });
+
+    const unitId = 'sampleUnitId';
+    const taskId = 'sampleTaskId';
+    const resourcePath = 'sampleResource.html';
+
+    numbasService.fetchResource(unitId, taskId, resourcePath).subscribe((blob) => {
+      expect(blob.size).toBe(dummyBlob.size);
+      expect(blob.type).toBe(dummyBlob.type);
+    });
+
+    const req = httpMock.expectOne(`http://localhost:3000/api/numbas_api/${unitId}/${taskId}/${resourcePath}`);
+    expect(req.request.method).toBe('GET');
+
+    req.flush(dummyBlob);
+
+    tick();
+  }));
+
+  it('should upload test as expected', fakeAsync(() => {
+    const dummyResponse = { success: true, message: 'File uploaded successfully' };
+
+    const unitId = 'sampleUnitId';
+    const taskId = 'sampleTaskId';
+    const file = new File(['dummy content'], 'sample.txt', { type: 'text/plain' });
+
+    numbasService.uploadTest(unitId, taskId, file).subscribe((response) => {
+      expect(response).toEqual(dummyResponse);
+    });
+
+    const req = httpMock.expectOne(`http://localhost:3000/api/numbas_api/uploadNumbasTest`);
+    expect(req.request.method).toBe('POST');
+
+    req.flush(dummyResponse);
+
+    tick();
+  }));
+
+});
+
+

From 8d3e3fd362a408e49fb1539f474e9e171830f5eb Mon Sep 17 00:00:00 2001
From: maddernd <87599686+maddernd@users.noreply.github.com>
Date: Tue, 12 Sep 2023 11:20:15 +1000
Subject: [PATCH 007/776] test: add numbas service test file

added a spec test file for numbas service

daniel
---
 src/app/api/services/spec/numbas.service.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/api/services/spec/numbas.service.spec.ts b/src/app/api/services/spec/numbas.service.spec.ts
index 7ef1530473..a29b13e149 100644
--- a/src/app/api/services/spec/numbas.service.spec.ts
+++ b/src/app/api/services/spec/numbas.service.spec.ts
@@ -3,6 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { NumbasService } from '../numbas.service';
 import { HttpRequest } from '@angular/common/http';
 
+
 describe('NumbasService', () => {
   let numbasService: NumbasService;
   let httpMock: HttpTestingController;

From 471d34486f2582e95aac84469187f087277cc079 Mon Sep 17 00:00:00 2001
From: maddernd <87599686+maddernd@users.noreply.github.com>
Date: Thu, 14 Sep 2023 09:29:45 +1000
Subject: [PATCH 008/776] feat: added numbas-lms service code

added the lms service code and functionality

Added by Daniel
---
 src/app/api/services/numbas-lms.service.ts | 248 +++++++++++++++++++++
 1 file changed, 248 insertions(+)
 create mode 100644 src/app/api/services/numbas-lms.service.ts

diff --git a/src/app/api/services/numbas-lms.service.ts b/src/app/api/services/numbas-lms.service.ts
new file mode 100644
index 0000000000..268c158484
--- /dev/null
+++ b/src/app/api/services/numbas-lms.service.ts
@@ -0,0 +1,248 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { BehaviorSubject, Observable, throwError } from 'rxjs';
+import { TaskService } from './task.service';
+import { UserService } from './user.service';
+import API_URL from 'src/app/config/constants/apiURL';
+
+declare let pipwerks: any;
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NumbasLmsService {
+
+  private readonly apiBaseUrl = `${API_URL}/savetests`;;
+
+  private defaultValues: { [key: string]: string } = {
+    'cmi.completion_status': 'not attempted',
+    'cmi.entry': 'ab-initio',
+    'numbas.user_role': 'learner',
+    'numbas.duration_extension.units': 'seconds',
+    'cmi.mode': 'normal',
+    'cmi.undefinedlearner_response': '1',
+    'cmi.undefinedresult' : '0'
+
+  };
+
+  private testId: number = 0;
+  private taskId: number;
+  private learnerId: string;
+  initializationComplete$ = new BehaviorSubject<boolean>(false);
+
+  private scormErrors: { [key: string]: string } = {
+    "0": "No error",
+    "101": "General exception",
+  };
+
+  dataStore: { [key: string]: any } = this.getDefaultDataStore();
+
+  constructor(
+    private http: HttpClient,
+    private taskService: TaskService,
+    private userService: UserService
+) {
+    pipwerks.SCORM.version = "2004";
+    console.log(`SCORM version is set to: ${pipwerks.SCORM.version}`);
+    this.learnerId = this.userService.currentUser.studentId;
+  }
+
+  getDefaultDataStore() {
+    // Use spread operator to merge defaultValues into the dataStore
+    return {
+      ...this.defaultValues,
+      pass_status: false,
+      completed: false,
+    };
+  }
+
+  Initialize(mode: 'attempt' | 'review' = 'attempt'): string {
+    console.log('Initialize() function called');
+    const examName = 'test Exam Name 1';
+    let xhr = new XMLHttpRequest();
+    if (mode === 'review') {
+      this.SetValue('cmi.mode', 'review');
+
+      xhr.open("GET", `${this.apiBaseUrl}/completed-latest`, false);
+      xhr.send();
+      console.log(xhr.responseText);
+
+      if (xhr.status !== 200) {
+          console.error('Error fetching latest completed test result:', xhr.statusText);
+          return 'false';
+      }
+
+      try {
+          const completedTest = JSON.parse(xhr.responseText);
+          const parsedExamData = JSON.parse(completedTest.data.exam_data || '{}');
+
+          // Set entire suspendData string to cmi.suspend_data
+          this.SetValue('cmi.suspend_data', JSON.stringify(parsedExamData));
+
+          // Use SetValue to set parsedExamData values to dataStore
+          Object.keys(parsedExamData).forEach(key => {
+            this.SetValue(key, parsedExamData[key]);
+          });
+
+          this.SetValue('cmi.entry', 'RO');
+          this.SetValue('cmi.mode', 'review');
+
+          console.log('Latest completed test data:', completedTest);
+          return 'true';
+
+      } catch (error) {
+          console.error('Error:', error);
+          return 'false';
+      }
+    }
+
+    xhr.open("GET", `${this.apiBaseUrl}/latest`, false);
+    xhr.send();
+    console.log(xhr.responseText);
+
+    if (xhr.status !== 200) {
+      console.error('Error fetching latest test result:', xhr.statusText);
+      return 'false';
+    }
+
+    let latestTest;
+    try {
+        latestTest = JSON.parse(xhr.responseText);
+        console.log('Latest test result:', latestTest);
+        this.testId = latestTest.data.id;
+
+        if (latestTest.data['cmi_entry'] === 'ab-initio') {
+            console.log("starting new test");
+            this.SetValue('cmi.learner_id', this.learnerId);
+            this.dataStore['name'] = examName;
+            this.dataStore['attempt_number'] = latestTest.data['attempt_number'];
+            console.log(this.dataStore);
+      } else if (latestTest.data['cmi_entry'] === 'resume') {
+            console.log("resuming test");
+            const parsedExamData = JSON.parse(latestTest.data.exam_data || '{}');
+
+            this.dataStore = JSON.parse(JSON.stringify(parsedExamData));
+
+            console.log(this.dataStore);
+        }
+
+        this.initializationComplete$.next(true);
+
+        console.log("finished initlizing");
+        return 'true';
+    } catch (error) {
+        console.error('Error:', error);
+        return 'false';
+    }
+}
+
+
+
+  isTestCompleted(): boolean {
+    return this.dataStore?.['completed'] || false;
+  }
+
+  private resetDataStore() {
+    this.dataStore = this.getDefaultDataStore();
+  }
+
+  Terminate(): string {
+    console.log('Terminate Called');
+    const examResult = this.dataStore["cmi.score.raw"];
+    const status = this.GetValue("cmi.completion_status");
+    this.dataStore['completed'] = true;
+    const currentAttemptNumber = this.dataStore['attempt_number'] || 0;
+    const ExamName = this.dataStore['name'];
+    this.SetValue('cmi.entry', 'RO');
+    const cmientry = this.GetValue('cmi.entry');
+    const data = {
+      task_id: this.taskId,
+      name: ExamName,
+      attempt_number: currentAttemptNumber,
+      pass_status: status === 'passed',
+      exam_data: JSON.stringify(this.dataStore),
+      completed: true,
+      exam_result: examResult,
+      cmi_entry: cmientry
+    };
+
+    const xhr = new XMLHttpRequest();
+    if (this.testId) {
+      xhr.open("PUT", `${this.apiBaseUrl}/${this.testId}`, false);
+    } else {
+      xhr.open("POST", this.apiBaseUrl, false);
+    }
+    xhr.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+    xhr.send(JSON.stringify(data));
+
+    if (xhr.status !== 200) {
+      console.error('Error sending test data:', xhr.statusText);
+      return 'false';
+    }
+    this.resetDataStore();
+    return 'true';
+  }
+
+  GetValue(element: string): string {
+    return this.dataStore[element] || '';
+  }
+
+  SetValue(element: string, value: any): string {
+    if (element.startsWith('cmi.')) {
+      this.dataStore[element] = value;
+    }
+    return 'true';
+  }
+//function to save the state of the exam.
+Commit(): string {
+  if (!this.initializationComplete$.getValue()) {
+      console.warn('Initialization not complete. Cannot commit.');
+      return 'false';
+  }
+
+  // Set cmi.entry to 'resume' before committing dataStore
+  this.dataStore['cmi.entry'] = 'resume';
+  if (!this.isTestCompleted()) {
+    this.dataStore['cmi.exit'] = 'suspend';
+  }
+  console.log("Committing dataStore:", this.dataStore);
+
+  // Directly stringify the dataStore
+  const jsonData = JSON.stringify(this.dataStore);
+
+  // Use XHR to send the request
+  const xhr = new XMLHttpRequest();
+  xhr.open('PUT', `${this.apiBaseUrl}/${this.testId}/suspend`, true);
+  xhr.setRequestHeader('Content-Type', 'application/json');
+
+  xhr.onload = () => {
+      if (xhr.status >= 200 && xhr.status < 400) {
+          console.log('Suspend data saved successfully.');
+      } else {
+          console.error('Error saving suspend data:', xhr.responseText);
+      }
+  };
+
+  xhr.onerror = () => {
+      console.error('Request failed.');
+  };
+
+  xhr.send(jsonData);
+  return 'true';
+}
+
+  // Placeholder methods for SCORM error handling
+  GetLastError(): string {
+    //console.log('Get Last Error called');
+    return "0";
+  }
+
+  GetErrorString(errorCode: string): string {
+    return '';
+  }
+
+  GetDiagnostic(errorCode: string): string {
+    //console.log('Get Diagnoistic called');
+    return '';
+  }
+}

From 5d9d2c185fcf65f01a5a2630338b58324e1c49b8 Mon Sep 17 00:00:00 2001
From: maddernd <87599686+maddernd@users.noreply.github.com>
Date: Thu, 14 Sep 2023 09:35:31 +1000
Subject: [PATCH 009/776] test: added numbas-lms spec test

added the spec test basic version for numbas-lms service

Added by Daniel
---
 .../services/spec/numbas-lms.service.spec.ts  | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 src/app/api/services/spec/numbas-lms.service.spec.ts

diff --git a/src/app/api/services/spec/numbas-lms.service.spec.ts b/src/app/api/services/spec/numbas-lms.service.spec.ts
new file mode 100644
index 0000000000..f456d5a894
--- /dev/null
+++ b/src/app/api/services/spec/numbas-lms.service.spec.ts
@@ -0,0 +1,88 @@
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { NumbasLmsService } from '../numbas-lms.service';
+import { TaskService } from '../task.service';
+import { UserService } from '../user.service';
+import { of } from 'rxjs';
+
+describe('NumbasLmsService', () => {
+  let service: NumbasLmsService;
+  let httpTestingController: HttpTestingController;
+  let mockUserService: Partial<UserService>;
+  let mockTaskService: Partial<TaskService>;
+
+  const mockUserData = {
+    currentUser: { studentId: '12345' }
+  };
+
+  beforeEach(() => {
+    mockUserService = {
+      currentUser: mockUserData.currentUser
+    };
+
+    mockTaskService = {
+      // you can add mocked methods if needed for the TaskService
+    };
+
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        NumbasLmsService,
+        { provide: UserService, useValue: mockUserService },
+        { provide: TaskService, useValue: mockTaskService }
+      ]
+    });
+
+    service = TestBed.inject(NumbasLmsService);
+    httpTestingController = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpTestingController.verify();
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should initialize with default values', () => {
+    expect(service.GetValue('cmi.completion_status')).toBe('not attempted');
+    expect(service.GetValue('cmi.entry')).toBe('ab-initio');
+  });
+
+  describe('Initialize function', () => {
+
+    it('should handle review mode and get latest completed test result', () => {
+      const mockResponse = {
+        data: {
+          exam_data: JSON.stringify({ someData: 'value' })
+        }
+      };
+
+      service.Initialize('review');
+      const req = httpTestingController.expectOne(`${service['apiBaseUrl']}/completed-latest`);
+      expect(req.request.method).toEqual('GET');
+      req.flush(mockResponse);
+
+      expect(service.GetValue('cmi.suspend_data')).toEqual(JSON.stringify({ someData: 'value' }));
+    });
+
+    it('should handle attempt mode and get latest test result', () => {
+      const mockResponse = {
+        data: {
+          id: 1,
+          cmi_entry: 'ab-initio',
+          attempt_number: 2
+        }
+      };
+
+      service.Initialize('attempt');
+      const req = httpTestingController.expectOne(`${service['apiBaseUrl']}/latest`);
+      expect(req.request.method).toEqual('GET');
+      req.flush(mockResponse);
+
+      expect(service.GetValue('cmi.learner_id')).toBe('12345');
+    });
+  });
+
+});

From 316abc775eeba6ca846c7c742bc88bec61d05a5e Mon Sep 17 00:00:00 2001
From: maddernd <87599686+maddernd@users.noreply.github.com>
Date: Thu, 14 Sep 2023 13:14:48 +1000
Subject: [PATCH 010/776] fix: adjusted edit profile accidental change

removed the addtional comma added into this component

daniel
---
 src/app/account/edit-profile/edit-profile.component.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/account/edit-profile/edit-profile.component.spec.ts b/src/app/account/edit-profile/edit-profile.component.spec.ts
index e15f8e5820..189015c5a9 100644
--- a/src/app/account/edit-profile/edit-profile.component.spec.ts
+++ b/src/app/account/edit-profile/edit-profile.component.spec.ts
@@ -7,7 +7,7 @@ describe('EditProfileComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [EditProfileComponent],
+      declarations: [EditProfileComponent]
     }).compileComponents();
 
     fixture = TestBed.createComponent(EditProfileComponent);

From edbd536e73ace8b6b4cced1481c809fd36524dce Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 5 Mar 2024 23:38:23 +1100
Subject: [PATCH 011/776] feat: add Numbas test upload section and reorder
 editor sections

---
 .../task-definition-editor.component.html     | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 5bbf1e64e5..bd2c7ec65d 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -104,6 +104,24 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
       </div>
     </div>
 
+    <div class="w-full">
+      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Upload Numbas test</h3>
+      <p class="font-normal text-gray-700">Upload the corresponding Numbas test</p>
+      <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+        <f-task-definition-numbas [taskDefinition]="taskDefinition"></f-task-definition-numbas>
+      </div>
+    </div>
+  </div>
+
+  <div class="flex mt-10">
+    <div class="mr-6">
+      <div
+        class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+      >
+        7
+      </div>
+    </div>
+
     <div class="w-full">
       <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
         Task assessment automation
@@ -123,7 +141,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
       <div
         class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
       >
-        7
+        8
       </div>
     </div>
 

From 4ecaee8ad1c0caed9a5d848066a173000989f79b Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 5 Mar 2024 23:39:46 +1100
Subject: [PATCH 012/776] feat: add Numbas upload component and related
 functions to task-definition model

---
 src/app/api/models/task-definition.ts         | 19 +++++
 src/app/doubtfire-angular.module.ts           |  2 +
 .../task-definition-numbas.component.html     | 18 +++++
 .../task-definition-numbas.component.scss     |  0
 .../task-definition-numbas.component.ts       | 69 +++++++++++++++++++
 5 files changed, 108 insertions(+)
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.scss
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 1b49a2e856..b5c4f5155a 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -31,6 +31,7 @@ export class TaskDefinition extends Entity {
   groupSet: GroupSet = null;
   hasTaskSheet: boolean;
   hasTaskResources: boolean;
+  hasNumbasTest: boolean;
   hasTaskAssessmentResources: boolean;
   isGraded: boolean;
   maxQualityPts: number;
@@ -152,6 +153,13 @@ export class TaskDefinition extends Entity {
     }`;
   }
 
+  public getNumbasTestUrl(asAttachment: boolean = false) {
+    const constants = AppInjector.get(DoubtfireConstants);
+    return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/numbas_test.json${
+      asAttachment ? '?as_attachment=true' : ''
+    }`;
+  }
+
   public get targetGradeText(): string {
     return Grade.GRADES[this.targetGrade];
   }
@@ -176,6 +184,12 @@ export class TaskDefinition extends Entity {
     }/task_resources`;
   }
 
+  public get numbasTestUploadUrl(): string {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
+      this.id
+    }/numbas_test`;
+  }
+
   public get taskAssessmentResourcesUploadUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
       this.id
@@ -198,6 +212,11 @@ export class TaskDefinition extends Entity {
     return httpClient.delete(this.taskResourcesUploadUrl).pipe(tap(() => (this.hasTaskResources = false)));
   }
 
+  public deleteNumbasTest(): Observable<any> {
+    const httpClient = AppInjector.get(HttpClient);
+    return httpClient.delete(this.numbasTestUploadUrl).pipe(tap(() => (this.hasNumbasTest = false)));
+  }
+
   public deleteTaskAssessmentResources(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
     return httpClient
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 9284745988..a50478b800 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -203,6 +203,7 @@ import {TaskDefinitionUploadComponent} from './units/states/edit/directives/unit
 import {TaskDefinitionOptionsComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component';
 import {TaskDefinitionResourcesComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component';
 import {TaskDefinitionOverseerComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component';
+import {TaskDefinitionNumbasComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component';
 import {UnitAnalyticsComponent} from './units/states/analytics/unit-analytics-route.component';
 import {FileDropComponent} from './common/file-drop/file-drop.component';
 import {UnitTaskEditorComponent} from './units/states/edit/directives/unit-tasks-editor/unit-task-editor.component';
@@ -262,6 +263,7 @@ import {GradeService} from './common/services/grade.service';
     TaskDefinitionOptionsComponent,
     TaskDefinitionResourcesComponent,
     TaskDefinitionOverseerComponent,
+    TaskDefinitionNumbasComponent,
     UnitAnalyticsComponent,
     StudentTutorialSelectComponent,
     StudentCampusSelectComponent,
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
new file mode 100644
index 0000000000..70367a462d
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
@@ -0,0 +1,18 @@
+<div class="basis-1/2 flex flex-col">
+  <f-file-drop
+    mode="event"
+    (filesDropped)="uploadNumbasTest($event)"
+    accept="application/zip"
+    [desiredFileName]="'Numbas zip'"
+  />
+  @if (taskDefinition.hasNumbasTest) {
+    <div class="flex flex-row gap-4 pt-4">
+      <button mat-flat-button color="warn" (click)="removeNumbasTest()" class="flex-grow me-4">
+        Delete Numbas Zip
+      </button>
+      <button mat-flat-button color="accent" (click)="downloadNumbasTest()" class="flex-grow ms-4">
+        Download Numbas Zip
+      </button>
+    </div>
+  }
+</div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
new file mode 100644
index 0000000000..596f2933ca
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
@@ -0,0 +1,69 @@
+import { Component, Inject, Input } from '@angular/core';
+import { alertService } from 'src/app/ajs-upgraded-providers';
+import { TaskDefinition } from 'src/app/api/models/task-definition';
+import { Unit } from 'src/app/api/models/unit';
+import { TaskDefinitionService } from 'src/app/api/services/task-definition.service';
+import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
+
+@Component({
+  selector: 'f-task-definition-numbas',
+  templateUrl: 'task-definition-numbas.component.html',
+  styleUrls: ['task-definition-numbas.component.scss'],
+})
+export class TaskDefinitionNumbasComponent {
+  @Input() taskDefinition: TaskDefinition;
+
+  constructor(
+    private fileDownloaderService: FileDownloaderService,
+    @Inject(alertService) private alerts: any,
+    private taskDefinitionService: TaskDefinitionService
+  ) {}
+
+  public get unit(): Unit {
+    return this.taskDefinition?.unit;
+  }
+
+  public downloadNumbasTest() {
+    this.fileDownloaderService.downloadFile(
+      this.taskDefinition.getNumbasTestUrl(true),
+      this.taskDefinition.name + '-Numbas.zip',
+    );
+  }
+
+  public removeNumbasTest() {
+    this.taskDefinition.deleteNumbasTest().subscribe({
+      next: () => this.alerts.add('success', 'Deleted Numbas test', 2000),
+      error: (message) => this.alerts.add('danger', message, 6000),
+    });
+  }
+
+  public uploadNumbasTest(files: FileList) {
+    const validFiles = Array.from(files as ArrayLike<File>).filter((f) => f.type === 'application/zip');
+    if (validFiles.length > 0) {
+      const file = validFiles[0];
+      // Temporary until Numbas backend is fixed: save uploaded file to local Downloads folder
+      this.saveZipFile(file);
+      this.taskDefinition.hasNumbasTest = true;
+      // this.taskDefinitionService.uploadNumbasTest(this.taskDefinition, file).subscribe({
+      //   next: () => this.alerts.add('success', 'Uploaded Numbas test', 2000),
+      //   error: (message) => this.alerts.add('danger', message, 6000),
+      // });
+    } else {
+      this.alerts.add('danger', 'Please drop a ZIP to upload for this task', 6000);
+    }
+  }
+
+  private saveZipFile(zipData) {
+    const blob = new Blob([zipData], {type: 'application/zip'});
+
+    // Create an anchor element and set its href to the blob URL
+    const link = document.createElement('a');
+    link.href = URL.createObjectURL(blob);
+    link.download = 'numbas.zip';
+
+    // Append the link to the document, trigger the download, then remove the link
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  }
+}

From 7e52ad5e5759291d7d61805070ec482eb49c90be Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:01:00 +1100
Subject: [PATCH 013/776] feat: insert Numbas test rules options in the task
 editor

---
 src/app/api/models/task-definition.ts         |  9 ++-
 .../task-definition-numbas.component.html     | 58 ++++++++++++++-----
 .../task-definition-numbas.component.ts       |  2 +-
 3 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index b5c4f5155a..9d19d5d1b7 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -31,7 +31,12 @@ export class TaskDefinition extends Entity {
   groupSet: GroupSet = null;
   hasTaskSheet: boolean;
   hasTaskResources: boolean;
-  hasNumbasTest: boolean;
+  hasEnabledNumbasTest: boolean;
+  hasUploadedNumbasTest: boolean;
+  hasUnlimitedRetriesForNumbas: boolean;
+  hasTimeDelayForNumbas: boolean;
+  isNumbasRestrictedTo1Attempt: boolean;
+  numbasTimeDelay: string = 'no delay';
   hasTaskAssessmentResources: boolean;
   isGraded: boolean;
   maxQualityPts: number;
@@ -214,7 +219,7 @@ export class TaskDefinition extends Entity {
 
   public deleteNumbasTest(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
-    return httpClient.delete(this.numbasTestUploadUrl).pipe(tap(() => (this.hasNumbasTest = false)));
+    return httpClient.delete(this.numbasTestUploadUrl).pipe(tap(() => (this.hasUploadedNumbasTest = false)));
   }
 
   public deleteTaskAssessmentResources(): Observable<any> {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
index 70367a462d..bd657d847b 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
@@ -1,18 +1,44 @@
-<div class="basis-1/2 flex flex-col">
-  <f-file-drop
-    mode="event"
-    (filesDropped)="uploadNumbasTest($event)"
-    accept="application/zip"
-    [desiredFileName]="'Numbas zip'"
-  />
-  @if (taskDefinition.hasNumbasTest) {
-    <div class="flex flex-row gap-4 pt-4">
-      <button mat-flat-button color="warn" (click)="removeNumbasTest()" class="flex-grow me-4">
-        Delete Numbas Zip
-      </button>
-      <button mat-flat-button color="accent" (click)="downloadNumbasTest()" class="flex-grow ms-4">
-        Download Numbas Zip
-      </button>
-    </div>
+<div class="flex flex-col gap-4">
+  <mat-checkbox matInput required [(ngModel)]="taskDefinition.hasEnabledNumbasTest">
+    Enable Numbas Test
+  </mat-checkbox>
+
+  <div class="basis-1/2 flex flex-col">
+    <f-file-drop
+      mode="event"
+      (filesDropped)="uploadNumbasTest($event)"
+      accept="application/zip"
+      [desiredFileName]="'Numbas zip'"
+    />
+    @if (taskDefinition.hasUploadedNumbasTest) {
+      <div class="flex flex-row gap-4 pt-4">
+        <button mat-flat-button color="warn" (click)="removeNumbasTest()" class="flex-grow me-4">
+          Delete Numbas Zip
+        </button>
+        <button mat-flat-button color="accent" (click)="downloadNumbasTest()" class="flex-grow ms-4">
+          Download Numbas Zip
+        </button>
+      </div>
+    }
+  </div>
+
+  <div class="flex flex-row items-center">
+    <span> Select test rules: </span>
+    <mat-checkbox matInput [(ngModel)]="taskDefinition.hasUnlimitedRetriesForNumbas">Unlimited retries</mat-checkbox>
+    <mat-checkbox matInput [(ngModel)]="taskDefinition.hasTimeDelayForNumbas">Time delay</mat-checkbox>
+    <mat-checkbox matInput [(ngModel)]="taskDefinition.isNumbasRestrictedTo1Attempt">Restrict to 1 attempt</mat-checkbox>
+  </div>
+
+  @if (taskDefinition.hasTimeDelayForNumbas) {
+    <mat-form-field appearance="outline">
+      <mat-label>Time delay</mat-label>
+      <mat-select [(ngModel)]="taskDefinition.numbasTimeDelay">
+        <mat-option value="no delay">No delay</mat-option>
+        <mat-option value="30 min">30 min</mat-option>
+        <mat-option value="2 hours">2 hours</mat-option>
+        <mat-option value="1 day">1 day</mat-option>
+        <mat-option value="see tutor">See tutor</mat-option>
+      </mat-select>
+    </mat-form-field>
   }
 </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
index 596f2933ca..b36218bd10 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
@@ -43,7 +43,7 @@ export class TaskDefinitionNumbasComponent {
       const file = validFiles[0];
       // Temporary until Numbas backend is fixed: save uploaded file to local Downloads folder
       this.saveZipFile(file);
-      this.taskDefinition.hasNumbasTest = true;
+      this.taskDefinition.hasUploadedNumbasTest = true;
       // this.taskDefinitionService.uploadNumbasTest(this.taskDefinition, file).subscribe({
       //   next: () => this.alerts.add('success', 'Uploaded Numbas test', 2000),
       //   error: (message) => this.alerts.add('danger', message, 6000),

From 2c7dab555fc9a226b980a8dae96f5738bf517b1b Mon Sep 17 00:00:00 2001
From: ublefo <90136978+ublefo@users.noreply.github.com>
Date: Thu, 21 Mar 2024 14:46:53 +1100
Subject: [PATCH 014/776] feat: implement numbas test data upload in task
 definition service

renamed api endpoint to reduce confusion between components
---
 src/app/api/models/task-definition.ts         |  4 +--
 .../api/services/task-definition.service.ts   |  6 +++++
 .../task-definition-numbas.component.ts       | 26 ++++---------------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 9d19d5d1b7..e575b40677 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -160,7 +160,7 @@ export class TaskDefinition extends Entity {
 
   public getNumbasTestUrl(asAttachment: boolean = false) {
     const constants = AppInjector.get(DoubtfireConstants);
-    return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/numbas_test.json${
+    return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/numbas_data.json${
       asAttachment ? '?as_attachment=true' : ''
     }`;
   }
@@ -192,7 +192,7 @@ export class TaskDefinition extends Entity {
   public get numbasTestUploadUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
       this.id
-    }/numbas_test`;
+    }/numbas_data`;
   }
 
   public get taskAssessmentResourcesUploadUrl(): string {
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 13a1dd2797..f9f14fb10d 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -128,4 +128,10 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
     formData.append('file', file);
     return AppInjector.get(HttpClient).post<boolean>(taskDefinition.taskAssessmentResourcesUploadUrl, formData);
   }
+
+  public uploadNumbasData(taskDefinition: TaskDefinition, file: File): Observable<boolean> {
+    const formData = new FormData();
+    formData.append('file', file);
+    return AppInjector.get(HttpClient).post<boolean>(taskDefinition.numbasTestUploadUrl, formData);
+  }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
index b36218bd10..3c18b31743 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
@@ -41,29 +41,13 @@ export class TaskDefinitionNumbasComponent {
     const validFiles = Array.from(files as ArrayLike<File>).filter((f) => f.type === 'application/zip');
     if (validFiles.length > 0) {
       const file = validFiles[0];
-      // Temporary until Numbas backend is fixed: save uploaded file to local Downloads folder
-      this.saveZipFile(file);
+      this.taskDefinitionService.uploadNumbasData(this.taskDefinition, file).subscribe({
+        next: () => this.alerts.add('success', 'Uploaded Numbas test data', 2000),
+        error: (message) => this.alerts.add('danger', message, 6000),
+      });
       this.taskDefinition.hasUploadedNumbasTest = true;
-      // this.taskDefinitionService.uploadNumbasTest(this.taskDefinition, file).subscribe({
-      //   next: () => this.alerts.add('success', 'Uploaded Numbas test', 2000),
-      //   error: (message) => this.alerts.add('danger', message, 6000),
-      // });
     } else {
-      this.alerts.add('danger', 'Please drop a ZIP to upload for this task', 6000);
+      this.alerts.add('danger', 'Please drop a zip file to upload Numbas test data for this task', 6000);
     }
   }
-
-  private saveZipFile(zipData) {
-    const blob = new Blob([zipData], {type: 'application/zip'});
-
-    // Create an anchor element and set its href to the blob URL
-    const link = document.createElement('a');
-    link.href = URL.createObjectURL(blob);
-    link.download = 'numbas.zip';
-
-    // Append the link to the document, trigger the download, then remove the link
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
-  }
 }

From ff28e4802b86dc22be339cc196ef82ade67934f7 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 22 Mar 2024 13:31:21 +1100
Subject: [PATCH 015/776] feat: add Numbas config options to task def service
 keys

---
 src/app/api/services/task-definition.service.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index f9f14fb10d..903d3c73f9 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -93,6 +93,12 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskSheet',
       'hasTaskResources',
       'hasTaskAssessmentResources',
+      'hasEnabledNumbasTest',
+      'hasUploadedNumbasTest',
+      'hasUnlimitedRetriesForNumbas',
+      'hasTimeDelayForNumbas',
+      'isNumbasRestrictedTo1Attempt',
+      'numbasTimeDelay',
       'isGraded',
       'maxQualityPts',
       'overseerImageId',
@@ -103,7 +109,8 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'id',
       'hasTaskSheet',
       'hasTaskResources',
-      'hasTaskAssessmentResources'
+      'hasTaskAssessmentResources',
+      'hasUploadedNumbasTest'
     );
   }
 

From 821feb93a8a40d095ef4f50adedbfd9216278fa9 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 22 Mar 2024 14:29:06 +1100
Subject: [PATCH 016/776] fix: show delete and download buttons in editor when
 Numbas test exists

---
 src/app/api/models/task-definition.ts                         | 4 ++--
 src/app/api/services/task-definition.service.ts               | 4 ++--
 .../task-definition-numbas.component.html                     | 2 +-
 .../task-definition-numbas.component.ts                       | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index e575b40677..81b2793d1f 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -32,7 +32,7 @@ export class TaskDefinition extends Entity {
   hasTaskSheet: boolean;
   hasTaskResources: boolean;
   hasEnabledNumbasTest: boolean;
-  hasUploadedNumbasTest: boolean;
+  hasNumbasData: boolean;
   hasUnlimitedRetriesForNumbas: boolean;
   hasTimeDelayForNumbas: boolean;
   isNumbasRestrictedTo1Attempt: boolean;
@@ -219,7 +219,7 @@ export class TaskDefinition extends Entity {
 
   public deleteNumbasTest(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
-    return httpClient.delete(this.numbasTestUploadUrl).pipe(tap(() => (this.hasUploadedNumbasTest = false)));
+    return httpClient.delete(this.numbasTestUploadUrl).pipe(tap(() => (this.hasNumbasData = false)));
   }
 
   public deleteTaskAssessmentResources(): Observable<any> {
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 903d3c73f9..a64649b9d9 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -94,7 +94,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskResources',
       'hasTaskAssessmentResources',
       'hasEnabledNumbasTest',
-      'hasUploadedNumbasTest',
+      'hasNumbasData',
       'hasUnlimitedRetriesForNumbas',
       'hasTimeDelayForNumbas',
       'isNumbasRestrictedTo1Attempt',
@@ -110,7 +110,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskSheet',
       'hasTaskResources',
       'hasTaskAssessmentResources',
-      'hasUploadedNumbasTest'
+      'hasNumbasData'
     );
   }
 
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
index bd657d847b..38beb3ab78 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
@@ -10,7 +10,7 @@
       accept="application/zip"
       [desiredFileName]="'Numbas zip'"
     />
-    @if (taskDefinition.hasUploadedNumbasTest) {
+    @if (taskDefinition.hasNumbasData) {
       <div class="flex flex-row gap-4 pt-4">
         <button mat-flat-button color="warn" (click)="removeNumbasTest()" class="flex-grow me-4">
           Delete Numbas Zip
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
index 3c18b31743..878ec25319 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
@@ -45,7 +45,6 @@ export class TaskDefinitionNumbasComponent {
         next: () => this.alerts.add('success', 'Uploaded Numbas test data', 2000),
         error: (message) => this.alerts.add('danger', message, 6000),
       });
-      this.taskDefinition.hasUploadedNumbasTest = true;
     } else {
       this.alerts.add('danger', 'Please drop a zip file to upload Numbas test data for this task', 6000);
     }

From 077c462c3222cce3849a6524a19cf45b0d319a29 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 22 Mar 2024 15:05:01 +1100
Subject: [PATCH 017/776] refactor: remove redundant Numbas upload method

---
 src/app/api/services/numbas.service.ts | 31 --------------------------
 1 file changed, 31 deletions(-)

diff --git a/src/app/api/services/numbas.service.ts b/src/app/api/services/numbas.service.ts
index 663c778f04..0fb41fdcc5 100644
--- a/src/app/api/services/numbas.service.ts
+++ b/src/app/api/services/numbas.service.ts
@@ -55,35 +55,4 @@ export class NumbasService {
 
     return mimeTypeMap[extension || ''] || 'text/plain';
   }
-
-  /**
-   * Uploads a Numbas test file for a given unit and task.
-   *
-   * @param unitId - The ID of the unit
-   * @param taskId - The ID of the task
-   * @param file - File object representing the Numbas test to be uploaded
-   * @returns An Observable with the response from the server
-   */
-  uploadTest(unitId: string, taskId: string, file: File): Observable<any> {
-    const uploadUrl = `${this.API_URL}/uploadNumbasTest`;
-    const formData = new FormData();
-
-    formData.append('file', file);
-    formData.append('unit_code', unitId);
-    formData.append('task_definition_id', taskId);
-
-    const httpOptions = {
-      headers: new HttpHeaders({
-        'Accept': 'application/json'
-      })
-    };
-
-    return this.http.post(uploadUrl, formData, httpOptions).pipe(
-      retry(3),
-      catchError((error: HttpErrorResponse) => {
-        console.error('Error uploading Numbas test:', error);
-        return throwError('Error uploading Numbas test.');
-      })
-    );
-  }
 }

From 0b15b1c38b8f09a30f53bb42dccd1971109bce01 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:33:16 +1100
Subject: [PATCH 018/776] fix: hide config options if numbas test is disabled

---
 .../task-definition-numbas.component.html     | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
index 38beb3ab78..3786ea90a3 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
@@ -22,23 +22,25 @@
     }
   </div>
 
-  <div class="flex flex-row items-center">
-    <span> Select test rules: </span>
-    <mat-checkbox matInput [(ngModel)]="taskDefinition.hasUnlimitedRetriesForNumbas">Unlimited retries</mat-checkbox>
-    <mat-checkbox matInput [(ngModel)]="taskDefinition.hasTimeDelayForNumbas">Time delay</mat-checkbox>
-    <mat-checkbox matInput [(ngModel)]="taskDefinition.isNumbasRestrictedTo1Attempt">Restrict to 1 attempt</mat-checkbox>
-  </div>
+  @if (taskDefinition.hasEnabledNumbasTest) {
+    <div class="flex flex-row items-center">
+      <span> Select test rules: </span>
+      <mat-checkbox matInput [(ngModel)]="taskDefinition.hasUnlimitedRetriesForNumbas">Unlimited retries</mat-checkbox>
+      <mat-checkbox matInput [(ngModel)]="taskDefinition.hasTimeDelayForNumbas">Time delay</mat-checkbox>
+      <mat-checkbox matInput [(ngModel)]="taskDefinition.isNumbasRestrictedTo1Attempt">Restrict to 1 attempt</mat-checkbox>
+    </div>
 
-  @if (taskDefinition.hasTimeDelayForNumbas) {
-    <mat-form-field appearance="outline">
-      <mat-label>Time delay</mat-label>
-      <mat-select [(ngModel)]="taskDefinition.numbasTimeDelay">
-        <mat-option value="no delay">No delay</mat-option>
-        <mat-option value="30 min">30 min</mat-option>
-        <mat-option value="2 hours">2 hours</mat-option>
-        <mat-option value="1 day">1 day</mat-option>
-        <mat-option value="see tutor">See tutor</mat-option>
-      </mat-select>
-    </mat-form-field>
+    @if (taskDefinition.hasTimeDelayForNumbas) {
+      <mat-form-field appearance="outline">
+        <mat-label>Time delay</mat-label>
+        <mat-select [(ngModel)]="taskDefinition.numbasTimeDelay">
+          <mat-option value="no delay">No delay</mat-option>
+          <mat-option value="30 min">30 min</mat-option>
+          <mat-option value="2 hours">2 hours</mat-option>
+          <mat-option value="1 day">1 day</mat-option>
+          <mat-option value="see tutor">See tutor</mat-option>
+        </mat-select>
+      </mat-form-field>
+    }
   }
 </div>

From 6e96584e7f0efba22b6f3b64ad1bcbfcbf31ee0f Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 23 Mar 2024 00:03:29 +1100
Subject: [PATCH 019/776] refactor: replace Numbas config checkboxes with input
 fields

---
 src/app/api/models/task-definition.ts         |  4 +---
 .../api/services/task-definition.service.ts   |  4 +---
 .../task-definition-numbas.component.html     | 24 +++++++++++--------
 .../task-definition-numbas.component.ts       |  3 +++
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 81b2793d1f..7d012fb2b0 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -33,10 +33,8 @@ export class TaskDefinition extends Entity {
   hasTaskResources: boolean;
   hasEnabledNumbasTest: boolean;
   hasNumbasData: boolean;
-  hasUnlimitedRetriesForNumbas: boolean;
-  hasTimeDelayForNumbas: boolean;
-  isNumbasRestrictedTo1Attempt: boolean;
   numbasTimeDelay: string = 'no delay';
+  numbasAttemptLimit: number = 0;
   hasTaskAssessmentResources: boolean;
   isGraded: boolean;
   maxQualityPts: number;
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index a64649b9d9..3724b29b16 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -95,10 +95,8 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskAssessmentResources',
       'hasEnabledNumbasTest',
       'hasNumbasData',
-      'hasUnlimitedRetriesForNumbas',
-      'hasTimeDelayForNumbas',
-      'isNumbasRestrictedTo1Attempt',
       'numbasTimeDelay',
+      'numbasAttemptLimit',
       'isGraded',
       'maxQualityPts',
       'overseerImageId',
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
index 3786ea90a3..712f01547a 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
@@ -23,15 +23,8 @@
   </div>
 
   @if (taskDefinition.hasEnabledNumbasTest) {
-    <div class="flex flex-row items-center">
-      <span> Select test rules: </span>
-      <mat-checkbox matInput [(ngModel)]="taskDefinition.hasUnlimitedRetriesForNumbas">Unlimited retries</mat-checkbox>
-      <mat-checkbox matInput [(ngModel)]="taskDefinition.hasTimeDelayForNumbas">Time delay</mat-checkbox>
-      <mat-checkbox matInput [(ngModel)]="taskDefinition.isNumbasRestrictedTo1Attempt">Restrict to 1 attempt</mat-checkbox>
-    </div>
-
-    @if (taskDefinition.hasTimeDelayForNumbas) {
-      <mat-form-field appearance="outline">
+    <div class="flex-grow flex flex-row gap-4 pt-4">
+      <mat-form-field appearance="outline" class="basis-1/2">
         <mat-label>Time delay</mat-label>
         <mat-select [(ngModel)]="taskDefinition.numbasTimeDelay">
           <mat-option value="no delay">No delay</mat-option>
@@ -41,6 +34,17 @@
           <mat-option value="see tutor">See tutor</mat-option>
         </mat-select>
       </mat-form-field>
-    }
+      <mat-form-field appearance="outline" class="basis-1/2">
+        <mat-label>Attempt Limit</mat-label>
+        <input
+          matInput
+          min="0"
+          max="100"
+          type="number"
+          [(value)]="taskDefinition.numbasAttemptLimit"
+          [formControl]="scoreControl"
+        />
+      </mat-form-field>
+    </div>
   }
 </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
index 878ec25319..6a26501ba3 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
@@ -1,4 +1,5 @@
 import { Component, Inject, Input } from '@angular/core';
+import { FormControl, Validators } from '@angular/forms';
 import { alertService } from 'src/app/ajs-upgraded-providers';
 import { TaskDefinition } from 'src/app/api/models/task-definition';
 import { Unit } from 'src/app/api/models/unit';
@@ -19,6 +20,8 @@ export class TaskDefinitionNumbasComponent {
     private taskDefinitionService: TaskDefinitionService
   ) {}
 
+  public scoreControl = new FormControl('', [Validators.max(100), Validators.min(0)]);
+
   public get unit(): Unit {
     return this.taskDefinition?.unit;
   }

From 7c1734b137ac369b3b605b38749c845df38b9a78 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 17 Dec 2023 21:28:21 +1100
Subject: [PATCH 020/776] feat: add numbas component

---
 .../numbas-component.component.html           |  4 +
 .../numbas-component.component.scss           |  0
 .../numbas-component.component.spec.ts        | 23 ++++++
 .../numbas-component.component.ts             | 77 +++++++++++++++++++
 src/app/doubtfire-angular.module.ts           |  6 ++
 5 files changed, 110 insertions(+)
 create mode 100644 src/app/common/numbas-component/numbas-component.component.html
 create mode 100644 src/app/common/numbas-component/numbas-component.component.scss
 create mode 100644 src/app/common/numbas-component/numbas-component.component.spec.ts
 create mode 100644 src/app/common/numbas-component/numbas-component.component.ts

diff --git a/src/app/common/numbas-component/numbas-component.component.html b/src/app/common/numbas-component/numbas-component.component.html
new file mode 100644
index 0000000000..438dbc6d19
--- /dev/null
+++ b/src/app/common/numbas-component/numbas-component.component.html
@@ -0,0 +1,4 @@
+<h2>Run Numbas Test</h2>
+<button (click)="launchNumbasTest()">Launch Numbas Test</button>
+<button (click)="removeNumbasTest()">Remove Numbas Test</button>
+<button (click)="reviewTest()">Review Numbas Test</button>
diff --git a/src/app/common/numbas-component/numbas-component.component.scss b/src/app/common/numbas-component/numbas-component.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/common/numbas-component/numbas-component.component.spec.ts b/src/app/common/numbas-component/numbas-component.component.spec.ts
new file mode 100644
index 0000000000..31dad5e305
--- /dev/null
+++ b/src/app/common/numbas-component/numbas-component.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NumbasComponent } from './numbas-component.component';
+
+describe('NumbasComponent', () => {
+  let component: NumbasComponent;
+  let fixture: ComponentFixture<NumbasComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ NumbasComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(NumbasComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
new file mode 100644
index 0000000000..7a4fa96b9c
--- /dev/null
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -0,0 +1,77 @@
+import { Component, OnInit } from '@angular/core';
+import { NumbasService } from 'src/app/api/services/numbas.service';
+import { NumbasLmsService } from 'src/app/api/services/numbas-lms.service';
+
+declare global {
+  interface Window { API_1484_11: any; }
+}
+
+@Component({
+  selector: 'numbas-component',
+  templateUrl: './numbas-component.component.html'
+})
+export class NumbasComponent implements OnInit {
+  currentMode: 'attempt' | 'review' = 'attempt';
+  constructor(
+    private numbasService: NumbasService,
+    private lmsService: NumbasLmsService
+  ) {}
+
+  ngOnInit(): void {
+    this.interceptIframeRequests();
+
+    window.API_1484_11 =  {
+      Initialize: () => this.lmsService.Initialize(this.currentMode),
+      Terminate: () => this.lmsService.Terminate(),
+      GetValue: (element: string) => this.lmsService.GetValue(element),
+      SetValue: (element: string, value: string) => this.lmsService.SetValue(element, value),
+      Commit: () => this.lmsService.Commit(),
+      GetLastError: () => this.lmsService.GetLastError(),
+      GetErrorString: (errorCode: string) => this.lmsService.GetErrorString(errorCode),
+      GetDiagnostic: (errorCode: string) => this.lmsService.GetDiagnostic(errorCode)
+    };
+  }
+
+  launchNumbasTest(mode: 'attempt' | 'review' = 'attempt'): void {
+    this.currentMode = mode;
+    const iframe = document.createElement('iframe');
+    iframe.src = 'http://localhost:4201/api/numbas_api/index.html';
+    iframe.style.width = '100%';
+    iframe.style.height = '800px';
+    document.body.appendChild(iframe);
+  }
+  setReviewMode(): void {
+    this.reviewTest();
+  }
+
+  removeNumbasTest(): void {
+    const iframe = document.getElementsByTagName('iframe')[0];
+    iframe?.parentNode?.removeChild(iframe);
+  }
+  reviewTest(): void {
+    this.launchNumbasTest('review');
+  }
+
+  interceptIframeRequests(): void {
+    const originalOpen = XMLHttpRequest.prototype.open;
+    const numbasService = this.numbasService;
+    XMLHttpRequest.prototype.open = function (this: XMLHttpRequest, method: string, url: string | URL, async: boolean = true, username?: string | null, password?: string | null) {
+      if (typeof url === 'string' && url.startsWith('/api/numbas_api/')) {
+        const resourcePath = url.replace('/api/numbas_api/', '');
+        this.abort();
+        numbasService.fetchResource('1', '1', resourcePath).subscribe(
+          (resourceData) => {
+            if (this.onload) {
+              this.onload.call(this, resourceData);
+            }
+          },
+          (error) => {
+            console.error('Error fetching Numbas resource:', error);
+          }
+        );
+      } else {
+        originalOpen.call(this, method, url, async, username, password);
+      }
+    };
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index a50478b800..d15c23b234 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -225,6 +225,9 @@ import {FTaskSheetViewComponent} from './units/states/tasks/viewer/directives/f-
 import {TasksViewerComponent} from './units/states/tasks/tasks-viewer/tasks-viewer.component';
 import {UnitCodeComponent} from './common/unit-code/unit-code.component';
 import {GradeService} from './common/services/grade.service';
+import {NumbasComponent} from './common/numbas-component/numbas-component.component';
+import {NumbasService} from './api/services/numbas.service';
+import {NumbasLmsService} from './api/services/numbas-lms.service';
 
 @NgModule({
   // Components we declare
@@ -327,6 +330,7 @@ import {GradeService} from './common/services/grade.service';
     FUsersComponent,
     FTaskBadgeComponent,
     FUnitsComponent,
+    NumbasComponent,
   ],
   // Services we provide
   providers: [
@@ -398,6 +402,8 @@ import {GradeService} from './common/services/grade.service';
     TasksForInboxSearchPipe,
     IsActiveUnitRole,
     CreateNewUnitModal,
+    NumbasService,
+    NumbasLmsService,
     provideLottieOptions({
       player: () => player,
     }),

From e61295c50006dbc89cfc0639bb3c68a09a3cda9d Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 23 Mar 2024 00:15:06 +1100
Subject: [PATCH 021/776] feat: add Numbas test section on ready for feedback

---
 .../numbas-component.component.html            |  1 -
 .../numbas-component.component.ts              |  2 +-
 .../upload-submission-modal.coffee             |  2 +-
 .../upload-submission-modal.tpl.html           | 18 ++++++++++++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/app/common/numbas-component/numbas-component.component.html b/src/app/common/numbas-component/numbas-component.component.html
index 438dbc6d19..0f0f2eb14c 100644
--- a/src/app/common/numbas-component/numbas-component.component.html
+++ b/src/app/common/numbas-component/numbas-component.component.html
@@ -1,4 +1,3 @@
-<h2>Run Numbas Test</h2>
 <button (click)="launchNumbasTest()">Launch Numbas Test</button>
 <button (click)="removeNumbasTest()">Remove Numbas Test</button>
 <button (click)="reviewTest()">Review Numbas Test</button>
diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
index 7a4fa96b9c..2e5cff929e 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -7,7 +7,7 @@ declare global {
 }
 
 @Component({
-  selector: 'numbas-component',
+  selector: 'f-numbas-component',
   templateUrl: './numbas-component.component.html'
 })
 export class NumbasComponent implements OnInit {
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index b9c9ebd2b9..9fea8fbad9 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -100,7 +100,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
   # States functionality
   states = {
     # All possible states
-    all: ['group', 'files', 'alignment', 'comments', 'uploading']
+    all: ['group', 'numbas', 'files', 'alignment', 'comments', 'uploading']
     # Only states which are shown (populated in initialise)
     shown: []
     # The currently active state (set in initialise)
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 9caab7897e..edd0fda105 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -43,6 +43,24 @@ <h4>
         </group-member-contribution-assigner><!--/group-member-contribution-->
       </div><!--/card-group-->
     </div><!--/state-group-->
+    <div
+      class="state state-numbas"
+      ng-class="{'state-hidden-left': isHidden('numbas').left,
+                 'state-hidden-right': isHidden('numbas').right}">
+      <div class="card card-default">
+        <div class="card-heading">
+          <h4>
+            Attempt Numbas Test
+          </h4>
+          <span ng-hide="submissionType == 'need_help'">
+            Complete the Numbas test first to proceed to upload evidence of your task completion.
+          </span>
+        </div>
+        <div class="card-body">
+          <f-numbas-component></f-numbas-component>
+        </div>
+      </div>
+    </div>
     <div class="state state-files" ng-class="{'state-hidden-left': isHidden('files').left,
                  'state-hidden-right': isHidden('files').right,
                  'state-files-uploading': uploader.isUploading}">

From 56e1a5de44ee275f9544b77909b7472f1020c2c3 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 23 Mar 2024 17:36:52 +1100
Subject: [PATCH 022/776] fix: show previously configured Numbas attempt limit

---
 .../task-definition-numbas.component.html                   | 6 +++---
 .../task-definition-numbas.component.ts                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
index 712f01547a..7ff44a6049 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
@@ -35,14 +35,14 @@
         </mat-select>
       </mat-form-field>
       <mat-form-field appearance="outline" class="basis-1/2">
-        <mat-label>Attempt Limit</mat-label>
+        <mat-label>Attempt limit</mat-label>
         <input
           matInput
           min="0"
           max="100"
           type="number"
-          [(value)]="taskDefinition.numbasAttemptLimit"
-          [formControl]="scoreControl"
+          [(ngModel)]="taskDefinition.numbasAttemptLimit"
+          [formControl]="attemptLimitControl"
         />
       </mat-form-field>
     </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
index 6a26501ba3..6588453430 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
@@ -20,7 +20,7 @@ export class TaskDefinitionNumbasComponent {
     private taskDefinitionService: TaskDefinitionService
   ) {}
 
-  public scoreControl = new FormControl('', [Validators.max(100), Validators.min(0)]);
+  public attemptLimitControl = new FormControl('', [Validators.max(100), Validators.min(0)]);
 
   public get unit(): Unit {
     return this.taskDefinition?.unit;

From 0afa7197293c90a154c1716db91ecadae3677d53 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 24 Mar 2024 13:41:29 +1100
Subject: [PATCH 023/776] feat: change Numbas time delay config to enable
 incremental delays

---
 src/app/api/models/task-definition.ts               |  2 +-
 src/app/api/services/task-definition.service.ts     |  2 +-
 .../task-definition-numbas.component.html           | 13 +++----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 7d012fb2b0..a669b2fe36 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -33,7 +33,7 @@ export class TaskDefinition extends Entity {
   hasTaskResources: boolean;
   hasEnabledNumbasTest: boolean;
   hasNumbasData: boolean;
-  numbasTimeDelay: string = 'no delay';
+  hasNumbasTimeDelay: boolean;
   numbasAttemptLimit: number = 0;
   hasTaskAssessmentResources: boolean;
   isGraded: boolean;
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 3724b29b16..6047af0546 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -95,7 +95,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskAssessmentResources',
       'hasEnabledNumbasTest',
       'hasNumbasData',
-      'numbasTimeDelay',
+      'hasNumbasTimeDelay',
       'numbasAttemptLimit',
       'isGraded',
       'maxQualityPts',
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
index 7ff44a6049..e0021065aa 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
@@ -24,16 +24,9 @@
 
   @if (taskDefinition.hasEnabledNumbasTest) {
     <div class="flex-grow flex flex-row gap-4 pt-4">
-      <mat-form-field appearance="outline" class="basis-1/2">
-        <mat-label>Time delay</mat-label>
-        <mat-select [(ngModel)]="taskDefinition.numbasTimeDelay">
-          <mat-option value="no delay">No delay</mat-option>
-          <mat-option value="30 min">30 min</mat-option>
-          <mat-option value="2 hours">2 hours</mat-option>
-          <mat-option value="1 day">1 day</mat-option>
-          <mat-option value="see tutor">See tutor</mat-option>
-        </mat-select>
-      </mat-form-field>
+      <mat-checkbox class="basis-1/2" matInput required [(ngModel)]="taskDefinition.hasNumbasTimeDelay">
+        Enable incremental time delays between test attempts
+      </mat-checkbox>
       <mat-form-field appearance="outline" class="basis-1/2">
         <mat-label>Attempt limit</mat-label>
         <input

From 17af5b7fe9e1fbc8e5f18e2fece6e029b017408c Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 27 Mar 2024 23:48:29 +1100
Subject: [PATCH 024/776] feat: show launch button on ready for feedback if
 Numbas test is enabled for the task

---
 .../common/numbas-component/numbas-component.component.html | 6 +++---
 src/app/doubtfire-angularjs.module.ts                       | 4 ++++
 .../upload-submission-modal/upload-submission-modal.coffee  | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/common/numbas-component/numbas-component.component.html b/src/app/common/numbas-component/numbas-component.component.html
index 0f0f2eb14c..dba53ea116 100644
--- a/src/app/common/numbas-component/numbas-component.component.html
+++ b/src/app/common/numbas-component/numbas-component.component.html
@@ -1,3 +1,3 @@
-<button (click)="launchNumbasTest()">Launch Numbas Test</button>
-<button (click)="removeNumbasTest()">Remove Numbas Test</button>
-<button (click)="reviewTest()">Review Numbas Test</button>
+<button class="btn btn-default" (click)="launchNumbasTest()">
+  <i class="fa fa-check-square-o"></i> Launch Numbas Test
+</button>
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 868e381213..317094dc2e 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -225,6 +225,8 @@ import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {MarkedPipe} from './common/pipes/marked.pipe';
 import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
+import {NumbasComponent} from './common/numbas-component/numbas-component.component';
+
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
   'doubtfire.sessions',
@@ -440,6 +442,8 @@ DoubtfireAngularJSModule.directive(
 );
 DoubtfireAngularJSModule.directive('fUnits', downgradeComponent({component: FUnitsComponent}));
 
+DoubtfireAngularJSModule.directive('fNumbasComponent', downgradeComponent({component: NumbasComponent}));
+
 // Global configuration
 DoubtfireAngularJSModule.directive(
   'taskCommentsViewer',
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index 9fea8fbad9..485843f780 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -128,6 +128,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       removed.push('group') if !isRFF || !task.isGroupTask()
       removed.push('alignment') if !isRFF || !task.unit.ilos.length > 0
       removed.push('comments') if isTestSubmission
+      removed.push('numbas') if !task.definition.hasEnabledNumbasTest
       removed
     # Initialises the states
     initialise: ->

From 097df7960d34a8c905ee495b8c6c8b8843e43b36 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 28 Mar 2024 13:02:02 +1100
Subject: [PATCH 025/776] feat: add Numbas test attempt model

---
 src/app/api/models/test-attempt.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/app/api/models/test-attempt.ts

diff --git a/src/app/api/models/test-attempt.ts b/src/app/api/models/test-attempt.ts
new file mode 100644
index 0000000000..77e4af1724
--- /dev/null
+++ b/src/app/api/models/test-attempt.ts
@@ -0,0 +1,14 @@
+import { Entity } from "ngx-entity-service";
+
+export class TestAttempt extends Entity {
+  id: number;
+  name: string;
+  attemptNumber: number;
+  passStatus: boolean;
+  examData: string;
+  completed: boolean;
+  cmiEntry: string;
+  examResult: string;
+  attemptedAt: Date;
+  associatedTaskId: number;
+}

From d47b8edc745660801984346c4fa67d6bb371f4cb Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 28 Mar 2024 13:02:56 +1100
Subject: [PATCH 026/776] fix: integrate Numbas services well with the existing
 system

---
 src/app/api/services/numbas-lms.service.ts    | 144 +++++++++---------
 src/app/api/services/numbas.service.ts        |  10 +-
 .../numbas-component.component.ts             |  49 +++---
 .../upload-submission-modal.tpl.html          |   2 +-
 4 files changed, 110 insertions(+), 95 deletions(-)

diff --git a/src/app/api/services/numbas-lms.service.ts b/src/app/api/services/numbas-lms.service.ts
index 268c158484..caf3ad8d6f 100644
--- a/src/app/api/services/numbas-lms.service.ts
+++ b/src/app/api/services/numbas-lms.service.ts
@@ -1,9 +1,10 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Input } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { BehaviorSubject, Observable, throwError } from 'rxjs';
 import { TaskService } from './task.service';
 import { UserService } from './user.service';
 import API_URL from 'src/app/config/constants/apiURL';
+import { Task } from '../models/task';
 
 declare let pipwerks: any;
 
@@ -12,7 +13,7 @@ declare let pipwerks: any;
 })
 export class NumbasLmsService {
 
-  private readonly apiBaseUrl = `${API_URL}/savetests`;;
+  private readonly apiBaseUrl = `${API_URL}/test_attempts`;
 
   private defaultValues: { [key: string]: string } = {
     'cmi.completion_status': 'not attempted',
@@ -22,7 +23,6 @@ export class NumbasLmsService {
     'cmi.mode': 'normal',
     'cmi.undefinedlearner_response': '1',
     'cmi.undefinedresult' : '0'
-
   };
 
   private testId: number = 0;
@@ -41,12 +41,16 @@ export class NumbasLmsService {
     private http: HttpClient,
     private taskService: TaskService,
     private userService: UserService
-) {
+  ) {
     pipwerks.SCORM.version = "2004";
     console.log(`SCORM version is set to: ${pipwerks.SCORM.version}`);
     this.learnerId = this.userService.currentUser.studentId;
   }
 
+  setTask(task: Task) {
+    this.taskId = task.id;
+  }
+
   getDefaultDataStore() {
     // Use spread operator to merge defaultValues into the dataStore
     return {
@@ -63,40 +67,39 @@ export class NumbasLmsService {
     if (mode === 'review') {
       this.SetValue('cmi.mode', 'review');
 
-      xhr.open("GET", `${this.apiBaseUrl}/completed-latest`, false);
+      xhr.open("GET", `${this.apiBaseUrl}/completed-latest?task_id=${this.taskId}`, false);
       xhr.send();
       console.log(xhr.responseText);
 
       if (xhr.status !== 200) {
-          console.error('Error fetching latest completed test result:', xhr.statusText);
-          return 'false';
+        console.error('Error fetching latest completed test result:', xhr.statusText);
+        return 'false';
       }
 
       try {
-          const completedTest = JSON.parse(xhr.responseText);
-          const parsedExamData = JSON.parse(completedTest.data.exam_data || '{}');
+        const completedTest = JSON.parse(xhr.responseText);
+        const parsedExamData = JSON.parse(completedTest.data.exam_data || '{}');
 
-          // Set entire suspendData string to cmi.suspend_data
-          this.SetValue('cmi.suspend_data', JSON.stringify(parsedExamData));
+        // Set entire suspendData string to cmi.suspend_data
+        this.SetValue('cmi.suspend_data', JSON.stringify(parsedExamData));
 
-          // Use SetValue to set parsedExamData values to dataStore
-          Object.keys(parsedExamData).forEach(key => {
-            this.SetValue(key, parsedExamData[key]);
-          });
+        // Use SetValue to set parsedExamData values to dataStore
+        Object.keys(parsedExamData).forEach(key => {
+          this.SetValue(key, parsedExamData[key]);
+        });
 
-          this.SetValue('cmi.entry', 'RO');
-          this.SetValue('cmi.mode', 'review');
-
-          console.log('Latest completed test data:', completedTest);
-          return 'true';
+        this.SetValue('cmi.entry', 'RO');
+        this.SetValue('cmi.mode', 'review');
 
+        console.log('Latest completed test data:', completedTest);
+        return 'true';
       } catch (error) {
-          console.error('Error:', error);
-          return 'false';
+        console.error('Error:', error);
+        return 'false';
       }
     }
 
-    xhr.open("GET", `${this.apiBaseUrl}/latest`, false);
+    xhr.open("GET", `${this.apiBaseUrl}/latest?task_id=${this.taskId}`, false);
     xhr.send();
     console.log(xhr.responseText);
 
@@ -107,36 +110,34 @@ export class NumbasLmsService {
 
     let latestTest;
     try {
-        latestTest = JSON.parse(xhr.responseText);
-        console.log('Latest test result:', latestTest);
-        this.testId = latestTest.data.id;
-
-        if (latestTest.data['cmi_entry'] === 'ab-initio') {
-            console.log("starting new test");
-            this.SetValue('cmi.learner_id', this.learnerId);
-            this.dataStore['name'] = examName;
-            this.dataStore['attempt_number'] = latestTest.data['attempt_number'];
-            console.log(this.dataStore);
+      latestTest = JSON.parse(xhr.responseText);
+      console.log('Latest test result:', latestTest);
+      this.testId = latestTest.data.id;
+
+      if (latestTest.data['cmi_entry'] === 'ab-initio') {
+        console.log("starting new test");
+        this.SetValue('cmi.learner_id', this.learnerId);
+        this.dataStore['name'] = examName;
+        this.dataStore['attempt_number'] = latestTest.data['attempt_number'];
+        console.log(this.dataStore);
       } else if (latestTest.data['cmi_entry'] === 'resume') {
-            console.log("resuming test");
-            const parsedExamData = JSON.parse(latestTest.data.exam_data || '{}');
+        console.log("resuming test");
+        const parsedExamData = JSON.parse(latestTest.data.exam_data || '{}');
 
-            this.dataStore = JSON.parse(JSON.stringify(parsedExamData));
+        this.dataStore = JSON.parse(JSON.stringify(parsedExamData));
 
-            console.log(this.dataStore);
-        }
+        console.log(this.dataStore);
+      }
 
-        this.initializationComplete$.next(true);
+      this.initializationComplete$.next(true);
 
-        console.log("finished initlizing");
-        return 'true';
+      console.log("finished initlizing");
+      return 'true';
     } catch (error) {
-        console.error('Error:', error);
-        return 'false';
+      console.error('Error:', error);
+      return 'false';
     }
-}
-
-
+  }
 
   isTestCompleted(): boolean {
     return this.dataStore?.['completed'] || false;
@@ -193,43 +194,44 @@ export class NumbasLmsService {
     }
     return 'true';
   }
-//function to save the state of the exam.
-Commit(): string {
-  if (!this.initializationComplete$.getValue()) {
+
+  //function to save the state of the exam.
+  Commit(): string {
+    if (!this.initializationComplete$.getValue()) {
       console.warn('Initialization not complete. Cannot commit.');
       return 'false';
-  }
+    }
 
-  // Set cmi.entry to 'resume' before committing dataStore
-  this.dataStore['cmi.entry'] = 'resume';
-  if (!this.isTestCompleted()) {
-    this.dataStore['cmi.exit'] = 'suspend';
-  }
-  console.log("Committing dataStore:", this.dataStore);
+    // Set cmi.entry to 'resume' before committing dataStore
+    this.dataStore['cmi.entry'] = 'resume';
+    if (!this.isTestCompleted()) {
+      this.dataStore['cmi.exit'] = 'suspend';
+    }
+    console.log("Committing dataStore:", this.dataStore);
 
-  // Directly stringify the dataStore
-  const jsonData = JSON.stringify(this.dataStore);
+    // Directly stringify the dataStore
+    const jsonData = JSON.stringify(this.dataStore);
 
-  // Use XHR to send the request
-  const xhr = new XMLHttpRequest();
-  xhr.open('PUT', `${this.apiBaseUrl}/${this.testId}/suspend`, true);
-  xhr.setRequestHeader('Content-Type', 'application/json');
+    // Use XHR to send the request
+    const xhr = new XMLHttpRequest();
+    xhr.open('PUT', `${this.apiBaseUrl}/${this.testId}/exam_data`, true);
+    xhr.setRequestHeader('Content-Type', 'application/json');
 
-  xhr.onload = () => {
+    xhr.onload = () => {
       if (xhr.status >= 200 && xhr.status < 400) {
-          console.log('Suspend data saved successfully.');
+        console.log('Suspend data saved successfully.');
       } else {
-          console.error('Error saving suspend data:', xhr.responseText);
+        console.error('Error saving suspend data:', xhr.responseText);
       }
-  };
+    };
 
-  xhr.onerror = () => {
+    xhr.onerror = () => {
       console.error('Request failed.');
-  };
+    };
 
-  xhr.send(jsonData);
-  return 'true';
-}
+    xhr.send(jsonData);
+    return 'true';
+  }
 
   // Placeholder methods for SCORM error handling
   GetLastError(): string {
diff --git a/src/app/api/services/numbas.service.ts b/src/app/api/services/numbas.service.ts
index 0fb41fdcc5..d9d4a2a8bb 100644
--- a/src/app/api/services/numbas.service.ts
+++ b/src/app/api/services/numbas.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map, retry } from 'rxjs/operators';
 import API_URL from 'src/app/config/constants/apiURL';
@@ -8,20 +8,18 @@ import API_URL from 'src/app/config/constants/apiURL';
   providedIn: 'root'
 })
 export class NumbasService {
-  private readonly API_URL = `${API_URL}/numbas_api`;
-
   constructor(private http: HttpClient) {}
 
   /**
    * Fetches a specified resource for a given unit and task.
    *
    * @param unitId - The ID of the unit
-   * @param taskId - The ID of the task
+   * @param taskDefId - The ID of the task definition
    * @param resourcePath - Path to the desired resource
    * @returns An Observable with the Blob of the fetched resource
    */
-  fetchResource(unitId: string, taskId: string, resourcePath: string): Observable<any> {
-    const resourceUrl = `${this.API_URL}/${unitId}/${taskId}/${resourcePath}`;
+  fetchResource(unitId: number, taskDefId: number, resourcePath: string): Observable<any> {
+    const resourceUrl = `${API_URL}/units/${unitId}/task_definitions/${taskDefId}/numbas_data/${resourcePath}`;
     const resourceMimeType = this.getMimeType(resourcePath);
 
     return this.http.get(resourceUrl, { responseType: 'blob' }).pipe(
diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
index 2e5cff929e..2c16411ea6 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -1,6 +1,8 @@
-import { Component, OnInit } from '@angular/core';
-import { NumbasService } from 'src/app/api/services/numbas.service';
+import { Component, Input, OnChanges } from '@angular/core';
+import { Task } from 'src/app/api/models/task';
+import { Unit } from 'src/app/api/models/unit';
 import { NumbasLmsService } from 'src/app/api/services/numbas-lms.service';
+import { NumbasService } from 'src/app/api/services/numbas.service';
 
 declare global {
   interface Window { API_1484_11: any; }
@@ -10,36 +12,46 @@ declare global {
   selector: 'f-numbas-component',
   templateUrl: './numbas-component.component.html'
 })
-export class NumbasComponent implements OnInit {
+export class NumbasComponent implements OnChanges {
+  @Input() task: Task;
+  unit: Unit;
+
   currentMode: 'attempt' | 'review' = 'attempt';
+
   constructor(
     private numbasService: NumbasService,
     private lmsService: NumbasLmsService
   ) {}
 
-  ngOnInit(): void {
-    this.interceptIframeRequests();
+  ngOnChanges(): void {
+    if (this.task) {
+      this.lmsService.setTask(this.task);
+      this.unit = this.task.unit;
 
-    window.API_1484_11 =  {
-      Initialize: () => this.lmsService.Initialize(this.currentMode),
-      Terminate: () => this.lmsService.Terminate(),
-      GetValue: (element: string) => this.lmsService.GetValue(element),
-      SetValue: (element: string, value: string) => this.lmsService.SetValue(element, value),
-      Commit: () => this.lmsService.Commit(),
-      GetLastError: () => this.lmsService.GetLastError(),
-      GetErrorString: (errorCode: string) => this.lmsService.GetErrorString(errorCode),
-      GetDiagnostic: (errorCode: string) => this.lmsService.GetDiagnostic(errorCode)
-    };
+      this.interceptIframeRequests();
+
+      window.API_1484_11 =  {
+        Initialize: () => this.lmsService.Initialize(this.currentMode),
+        Terminate: () => this.lmsService.Terminate(),
+        GetValue: (element: string) => this.lmsService.GetValue(element),
+        SetValue: (element: string, value: string) => this.lmsService.SetValue(element, value),
+        Commit: () => this.lmsService.Commit(),
+        GetLastError: () => this.lmsService.GetLastError(),
+        GetErrorString: (errorCode: string) => this.lmsService.GetErrorString(errorCode),
+        GetDiagnostic: (errorCode: string) => this.lmsService.GetDiagnostic(errorCode)
+      };
+    }
   }
 
   launchNumbasTest(mode: 'attempt' | 'review' = 'attempt'): void {
     this.currentMode = mode;
     const iframe = document.createElement('iframe');
-    iframe.src = 'http://localhost:4201/api/numbas_api/index.html';
+    iframe.src = 'http://localhost:4200/api/numbas_api/index.html';
     iframe.style.width = '100%';
     iframe.style.height = '800px';
     document.body.appendChild(iframe);
   }
+
   setReviewMode(): void {
     this.reviewTest();
   }
@@ -48,6 +60,7 @@ export class NumbasComponent implements OnInit {
     const iframe = document.getElementsByTagName('iframe')[0];
     iframe?.parentNode?.removeChild(iframe);
   }
+
   reviewTest(): void {
     this.launchNumbasTest('review');
   }
@@ -55,11 +68,13 @@ export class NumbasComponent implements OnInit {
   interceptIframeRequests(): void {
     const originalOpen = XMLHttpRequest.prototype.open;
     const numbasService = this.numbasService;
+    const unitId = this.unit.id;
+    const taskDefId = this.task.definition.id;
     XMLHttpRequest.prototype.open = function (this: XMLHttpRequest, method: string, url: string | URL, async: boolean = true, username?: string | null, password?: string | null) {
       if (typeof url === 'string' && url.startsWith('/api/numbas_api/')) {
         const resourcePath = url.replace('/api/numbas_api/', '');
         this.abort();
-        numbasService.fetchResource('1', '1', resourcePath).subscribe(
+        numbasService.fetchResource(unitId, taskDefId, resourcePath).subscribe(
           (resourceData) => {
             if (this.onload) {
               this.onload.call(this, resourceData);
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index edd0fda105..d6636d914e 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -57,7 +57,7 @@ <h4>
           </span>
         </div>
         <div class="card-body">
-          <f-numbas-component></f-numbas-component>
+          <f-numbas-component task="task"></f-numbas-component>
         </div>
       </div>
     </div>

From c9c2fbe10db156512946355f3cabfe54461f0eba Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 9 Apr 2024 10:44:09 +1000
Subject: [PATCH 027/776] fix: show Numbas button component and modify iframe
 request

---
 src/app/api/services/numbas-lms.service.ts    |  4 --
 .../numbas-component.component.ts             | 69 +++++++------------
 .../upload-submission-modal.tpl.html          |  6 +-
 3 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/src/app/api/services/numbas-lms.service.ts b/src/app/api/services/numbas-lms.service.ts
index caf3ad8d6f..de5a25bcc9 100644
--- a/src/app/api/services/numbas-lms.service.ts
+++ b/src/app/api/services/numbas-lms.service.ts
@@ -6,8 +6,6 @@ import { UserService } from './user.service';
 import API_URL from 'src/app/config/constants/apiURL';
 import { Task } from '../models/task';
 
-declare let pipwerks: any;
-
 @Injectable({
   providedIn: 'root'
 })
@@ -42,8 +40,6 @@ export class NumbasLmsService {
     private taskService: TaskService,
     private userService: UserService
   ) {
-    pipwerks.SCORM.version = "2004";
-    console.log(`SCORM version is set to: ${pipwerks.SCORM.version}`);
     this.learnerId = this.userService.currentUser.studentId;
   }
 
diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
index 2c16411ea6..1193adcc19 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -1,5 +1,6 @@
-import { Component, Input, OnChanges } from '@angular/core';
+import { Component, Input, OnInit, Renderer2 } from '@angular/core';
 import { Task } from 'src/app/api/models/task';
+import { TaskDefinition } from 'src/app/api/models/task-definition';
 import { Unit } from 'src/app/api/models/unit';
 import { NumbasLmsService } from 'src/app/api/services/numbas-lms.service';
 import { NumbasService } from 'src/app/api/services/numbas.service';
@@ -12,69 +13,51 @@ declare global {
   selector: 'f-numbas-component',
   templateUrl: './numbas-component.component.html'
 })
-export class NumbasComponent implements OnChanges {
+export class NumbasComponent implements OnInit {
   @Input() task: Task;
-  unit: Unit;
+  @Input() unit: Unit;
+  @Input() taskDef: TaskDefinition;
 
   currentMode: 'attempt' | 'review' = 'attempt';
 
   constructor(
     private numbasService: NumbasService,
-    private lmsService: NumbasLmsService
-  ) {}
+    private lmsService: NumbasLmsService,
+    private renderer: Renderer2
+  ) { }
 
-  ngOnChanges(): void {
-    if (this.task) {
-      this.lmsService.setTask(this.task);
-      this.unit = this.task.unit;
+  ngOnInit(): void {
+    this.interceptIframeRequests();
 
-      this.interceptIframeRequests();
-
-      window.API_1484_11 =  {
-        Initialize: () => this.lmsService.Initialize(this.currentMode),
-        Terminate: () => this.lmsService.Terminate(),
-        GetValue: (element: string) => this.lmsService.GetValue(element),
-        SetValue: (element: string, value: string) => this.lmsService.SetValue(element, value),
-        Commit: () => this.lmsService.Commit(),
-        GetLastError: () => this.lmsService.GetLastError(),
-        GetErrorString: (errorCode: string) => this.lmsService.GetErrorString(errorCode),
-        GetDiagnostic: (errorCode: string) => this.lmsService.GetDiagnostic(errorCode)
-      };
-    }
+    window.API_1484_11 =  {
+      Initialize: () => this.lmsService.Initialize(this.currentMode),
+      Terminate: () => this.lmsService.Terminate(),
+      GetValue: (element: string) => this.lmsService.GetValue(element),
+      SetValue: (element: string, value: string) => this.lmsService.SetValue(element, value),
+      Commit: () => this.lmsService.Commit(),
+      GetLastError: () => this.lmsService.GetLastError(),
+      GetErrorString: (errorCode: string) => this.lmsService.GetErrorString(errorCode),
+      GetDiagnostic: (errorCode: string) => this.lmsService.GetDiagnostic(errorCode)
+    };
   }
 
   launchNumbasTest(mode: 'attempt' | 'review' = 'attempt'): void {
     this.currentMode = mode;
-    const iframe = document.createElement('iframe');
-    iframe.src = 'http://localhost:4200/api/numbas_api/index.html';
-    iframe.style.width = '100%';
-    iframe.style.height = '800px';
-    document.body.appendChild(iframe);
-  }
-
-  setReviewMode(): void {
-    this.reviewTest();
-  }
-
-  removeNumbasTest(): void {
-    const iframe = document.getElementsByTagName('iframe')[0];
-    iframe?.parentNode?.removeChild(iframe);
-  }
-
-  reviewTest(): void {
-    this.launchNumbasTest('review');
+    const iframe = this.renderer.createElement('iframe');
+    this.renderer.setAttribute(iframe, 'src', 'http://localhost:3000/api/numbas_api/units/1/task_definitions/1/numbas_data/index.html');
+    this.renderer.setStyle(iframe, 'width', '100%');
+    this.renderer.setStyle(iframe, 'height', '800px');
+    this.renderer.appendChild(document.body, iframe);
   }
 
   interceptIframeRequests(): void {
     const originalOpen = XMLHttpRequest.prototype.open;
     const numbasService = this.numbasService;
-    const unitId = this.unit.id;
-    const taskDefId = this.task.definition.id;
     XMLHttpRequest.prototype.open = function (this: XMLHttpRequest, method: string, url: string | URL, async: boolean = true, username?: string | null, password?: string | null) {
       if (typeof url === 'string' && url.startsWith('/api/numbas_api/')) {
         const resourcePath = url.replace('/api/numbas_api/', '');
         this.abort();
-        numbasService.fetchResource(unitId, taskDefId, resourcePath).subscribe(
+        numbasService.fetchResource(1, 1, resourcePath).subscribe(
           (resourceData) => {
             if (this.onload) {
               this.onload.call(this, resourceData);
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index d6636d914e..cd207a3637 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -57,7 +57,11 @@ <h4>
           </span>
         </div>
         <div class="card-body">
-          <f-numbas-component task="task"></f-numbas-component>
+          <f-numbas-component
+            task="task"
+            unit="task.unit"
+            taskDef="task.definition">
+          </f-numbas-component>
         </div>
       </div>
     </div>

From f53befd82b52bba24bc8c593a9266c11f9155d32 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 9 Apr 2024 12:23:02 +1000
Subject: [PATCH 028/776] fix: show Numbas iframe on top of other elements

---
 .../numbas-component.component.ts             | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
index 1193adcc19..d2b8bea626 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, Renderer2 } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { Task } from 'src/app/api/models/task';
 import { TaskDefinition } from 'src/app/api/models/task-definition';
 import { Unit } from 'src/app/api/models/unit';
@@ -23,13 +23,12 @@ export class NumbasComponent implements OnInit {
   constructor(
     private numbasService: NumbasService,
     private lmsService: NumbasLmsService,
-    private renderer: Renderer2
-  ) { }
+  ) {}
 
   ngOnInit(): void {
     this.interceptIframeRequests();
 
-    window.API_1484_11 =  {
+    window.API_1484_11 = {
       Initialize: () => this.lmsService.Initialize(this.currentMode),
       Terminate: () => this.lmsService.Terminate(),
       GetValue: (element: string) => this.lmsService.GetValue(element),
@@ -43,11 +42,20 @@ export class NumbasComponent implements OnInit {
 
   launchNumbasTest(mode: 'attempt' | 'review' = 'attempt'): void {
     this.currentMode = mode;
-    const iframe = this.renderer.createElement('iframe');
-    this.renderer.setAttribute(iframe, 'src', 'http://localhost:3000/api/numbas_api/units/1/task_definitions/1/numbas_data/index.html');
-    this.renderer.setStyle(iframe, 'width', '100%');
-    this.renderer.setStyle(iframe, 'height', '800px');
-    this.renderer.appendChild(document.body, iframe);
+    const iframe = document.createElement('iframe');
+    iframe.src = 'http://example.org';
+    iframe.style.position = 'fixed';
+    iframe.style.top = '0';
+    iframe.style.left = '0';
+    iframe.style.width = '100%';
+    iframe.style.height = '100%';
+    iframe.style.zIndex = '9999'; // Set a high z-index value
+
+    // Get the topmost element in the document
+    var topElement = document.documentElement.firstChild;
+
+    // Replace the top element with the iframe
+    document.documentElement.replaceChild(iframe, topElement);
   }
 
   interceptIframeRequests(): void {

From 3df59dcc58f021ef16d81938d1d05473818bc75e Mon Sep 17 00:00:00 2001
From: ublefo <90136978+ublefo@users.noreply.github.com>
Date: Tue, 9 Apr 2024 16:28:28 +1000
Subject: [PATCH 029/776] fix: update numbas api path

---
 src/app/api/services/numbas.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/api/services/numbas.service.ts b/src/app/api/services/numbas.service.ts
index d9d4a2a8bb..6f2f750bf0 100644
--- a/src/app/api/services/numbas.service.ts
+++ b/src/app/api/services/numbas.service.ts
@@ -19,7 +19,7 @@ export class NumbasService {
    * @returns An Observable with the Blob of the fetched resource
    */
   fetchResource(unitId: number, taskDefId: number, resourcePath: string): Observable<any> {
-    const resourceUrl = `${API_URL}/units/${unitId}/task_definitions/${taskDefId}/numbas_data/${resourcePath}`;
+    const resourceUrl = `${API_URL}/numbas_api/${taskDefId}/numbas_data/${resourcePath}`;
     const resourceMimeType = this.getMimeType(resourcePath);
 
     return this.http.get(resourceUrl, { responseType: 'blob' }).pipe(

From bee0a0bb1eb905c964caf7888419effe70553520 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 10 Apr 2024 11:58:40 +1000
Subject: [PATCH 030/776] fix: show correct Numbas test from the task def with
 all assets loaded

---
 src/app/api/services/numbas.service.ts        |  5 ++-
 .../numbas-component.component.ts             | 33 ++++++++++---------
 .../upload-submission-modal.tpl.html          |  6 +---
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/app/api/services/numbas.service.ts b/src/app/api/services/numbas.service.ts
index 6f2f750bf0..f8812f1ac7 100644
--- a/src/app/api/services/numbas.service.ts
+++ b/src/app/api/services/numbas.service.ts
@@ -13,13 +13,12 @@ export class NumbasService {
   /**
    * Fetches a specified resource for a given unit and task.
    *
-   * @param unitId - The ID of the unit
    * @param taskDefId - The ID of the task definition
    * @param resourcePath - Path to the desired resource
    * @returns An Observable with the Blob of the fetched resource
    */
-  fetchResource(unitId: number, taskDefId: number, resourcePath: string): Observable<any> {
-    const resourceUrl = `${API_URL}/numbas_api/${taskDefId}/numbas_data/${resourcePath}`;
+  fetchResource(taskDefId: number, resourcePath: string): Observable<any> {
+    const resourceUrl = `${API_URL}/numbas_api/${taskDefId}/${resourcePath}`;
     const resourceMimeType = this.getMimeType(resourcePath);
 
     return this.http.get(resourceUrl, { responseType: 'blob' }).pipe(
diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
index d2b8bea626..529a64b9ae 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -1,7 +1,5 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, OnChanges, SimpleChanges } from '@angular/core';
 import { Task } from 'src/app/api/models/task';
-import { TaskDefinition } from 'src/app/api/models/task-definition';
-import { Unit } from 'src/app/api/models/unit';
 import { NumbasLmsService } from 'src/app/api/services/numbas-lms.service';
 import { NumbasService } from 'src/app/api/services/numbas.service';
 
@@ -11,12 +9,11 @@ declare global {
 
 @Component({
   selector: 'f-numbas-component',
-  templateUrl: './numbas-component.component.html'
+  templateUrl: './numbas-component.component.html',
+  styleUrls: ['numbas-component.component.scss'],
 })
-export class NumbasComponent implements OnInit {
+export class NumbasComponent implements OnInit, OnChanges {
   @Input() task: Task;
-  @Input() unit: Unit;
-  @Input() taskDef: TaskDefinition;
 
   currentMode: 'attempt' | 'review' = 'attempt';
 
@@ -40,32 +37,38 @@ export class NumbasComponent implements OnInit {
     };
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.task) {
+      this.task = changes.task.currentValue;
+      this.lmsService.setTask(this.task);
+    }
+  }
+
   launchNumbasTest(mode: 'attempt' | 'review' = 'attempt'): void {
     this.currentMode = mode;
+
     const iframe = document.createElement('iframe');
-    iframe.src = 'http://example.org';
+    iframe.src = `http://localhost:3000/api/numbas_api/${this.task.taskDefId}/index.html`;
+
     iframe.style.position = 'fixed';
     iframe.style.top = '0';
     iframe.style.left = '0';
     iframe.style.width = '100%';
     iframe.style.height = '100%';
-    iframe.style.zIndex = '9999'; // Set a high z-index value
-
-    // Get the topmost element in the document
-    var topElement = document.documentElement.firstChild;
+    iframe.style.zIndex = '9999';
 
-    // Replace the top element with the iframe
-    document.documentElement.replaceChild(iframe, topElement);
+    document.body.appendChild(iframe);
   }
 
   interceptIframeRequests(): void {
     const originalOpen = XMLHttpRequest.prototype.open;
     const numbasService = this.numbasService;
+    const taskDefId = this.task.taskDefId;
     XMLHttpRequest.prototype.open = function (this: XMLHttpRequest, method: string, url: string | URL, async: boolean = true, username?: string | null, password?: string | null) {
       if (typeof url === 'string' && url.startsWith('/api/numbas_api/')) {
         const resourcePath = url.replace('/api/numbas_api/', '');
         this.abort();
-        numbasService.fetchResource(1, 1, resourcePath).subscribe(
+        numbasService.fetchResource(taskDefId, resourcePath).subscribe(
           (resourceData) => {
             if (this.onload) {
               this.onload.call(this, resourceData);
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index cd207a3637..0b99e7eb8f 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -57,11 +57,7 @@ <h4>
           </span>
         </div>
         <div class="card-body">
-          <f-numbas-component
-            task="task"
-            unit="task.unit"
-            taskDef="task.definition">
-          </f-numbas-component>
+          <f-numbas-component [task]="task"></f-numbas-component>
         </div>
       </div>
     </div>

From 64b1bfb2918993e58a6659948d9621fc7d0b8ba4 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 13 Apr 2024 21:56:47 +1000
Subject: [PATCH 031/776] fix: use modal for Numbas and enable authentication

---
 src/app/ajs-upgraded-providers.ts             |  7 ++
 src/app/api/services/numbas.service.ts        | 55 --------------
 .../api/services/spec/numbas.service.spec.ts  | 66 ----------------
 .../numbas-component.component.html           |  7 +-
 .../numbas-component.component.scss           | 17 +++++
 .../numbas-component.component.ts             | 76 ++++++-------------
 .../numbas-modal.component.ts                 | 20 +++++
 src/app/doubtfire-angular.module.ts           |  4 +-
 src/app/doubtfire-angularjs.module.ts         |  2 +
 .../upload-submission-modal.coffee            |  5 +-
 .../upload-submission-modal.tpl.html          |  6 +-
 11 files changed, 83 insertions(+), 182 deletions(-)
 delete mode 100644 src/app/api/services/numbas.service.ts
 delete mode 100644 src/app/api/services/spec/numbas.service.spec.ts
 create mode 100644 src/app/common/numbas-component/numbas-modal.component.ts

diff --git a/src/app/ajs-upgraded-providers.ts b/src/app/ajs-upgraded-providers.ts
index 795869225d..9d5b0f0203 100644
--- a/src/app/ajs-upgraded-providers.ts
+++ b/src/app/ajs-upgraded-providers.ts
@@ -18,6 +18,7 @@ export const rootScope = new InjectionToken('$rootScope');
 export const calendarModal = new InjectionToken('CalendarModal');
 export const aboutDoubtfireModal = new InjectionToken('AboutDoubtfireModal');
 export const plagiarismReportModal = new InjectionToken('PlagiarismReportModal');
+export const numbasModal = new InjectionToken('NumbasModal');
 
 // Define a provider for the above injection token...
 // It will get the service from AngularJS via the factory
@@ -116,3 +117,9 @@ export const UnitStudentEnrolmentModalProvider = {
   useFactory: (i) => i.get('UnitStudentEnrolmentModal'),
   deps: ['$injector'],
 };
+
+export const numbasModalProvider = {
+  provide: numbasModal,
+  useFactory: (i) => i.get('NumbasModal'),
+  deps: ['$injector'],
+};
\ No newline at end of file
diff --git a/src/app/api/services/numbas.service.ts b/src/app/api/services/numbas.service.ts
deleted file mode 100644
index f8812f1ac7..0000000000
--- a/src/app/api/services/numbas.service.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpClient, HttpErrorResponse } from '@angular/common/http';
-import { Observable, throwError } from 'rxjs';
-import { catchError, map, retry } from 'rxjs/operators';
-import API_URL from 'src/app/config/constants/apiURL';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class NumbasService {
-  constructor(private http: HttpClient) {}
-
-  /**
-   * Fetches a specified resource for a given unit and task.
-   *
-   * @param taskDefId - The ID of the task definition
-   * @param resourcePath - Path to the desired resource
-   * @returns An Observable with the Blob of the fetched resource
-   */
-  fetchResource(taskDefId: number, resourcePath: string): Observable<any> {
-    const resourceUrl = `${API_URL}/numbas_api/${taskDefId}/${resourcePath}`;
-    const resourceMimeType = this.getMimeType(resourcePath);
-
-    return this.http.get(resourceUrl, { responseType: 'blob' }).pipe(
-      retry(3),
-      map((blob) => new Blob([blob], { type: resourceMimeType })),
-      catchError((error: HttpErrorResponse) => {
-        console.error('Error fetching Numbas resource:', error);
-        return throwError('Error fetching Numbas resource.');
-      })
-    );
-  }
-
-  /**
-   * Determines the MIME type of a resource based on its extension.
-   *
-   * @param resourcePath - Path of the resource
-   * @returns MIME type string corresponding to the resource's extension
-   */
-  getMimeType(resourcePath: string): string {
-    const extension = resourcePath.split('.').pop()?.toLowerCase();
-    const mimeTypeMap: { [key: string]: string } = {
-      'html': 'text/html',
-      'css': 'text/css',
-      'js': 'application/javascript',
-      'json': 'application/json',
-      'png': 'image/png',
-      'jpg': 'image/jpeg',
-      'gif': 'image/gif',
-      'svg': 'image/svg+xml'
-    };
-
-    return mimeTypeMap[extension || ''] || 'text/plain';
-  }
-}
diff --git a/src/app/api/services/spec/numbas.service.spec.ts b/src/app/api/services/spec/numbas.service.spec.ts
deleted file mode 100644
index a29b13e149..0000000000
--- a/src/app/api/services/spec/numbas.service.spec.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { TestBed, fakeAsync, tick } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { NumbasService } from '../numbas.service';
-import { HttpRequest } from '@angular/common/http';
-
-
-describe('NumbasService', () => {
-  let numbasService: NumbasService;
-  let httpMock: HttpTestingController;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [NumbasService],
-    });
-
-    numbasService = TestBed.inject(NumbasService);
-    httpMock = TestBed.inject(HttpTestingController);
-  });
-
-  afterEach(() => {
-    httpMock.verify();
-  });
-
-  it('should fetch resource as expected', fakeAsync(() => {
-    const dummyBlob = new Blob(['dummy blob'], { type: 'text/html' });
-
-    const unitId = 'sampleUnitId';
-    const taskId = 'sampleTaskId';
-    const resourcePath = 'sampleResource.html';
-
-    numbasService.fetchResource(unitId, taskId, resourcePath).subscribe((blob) => {
-      expect(blob.size).toBe(dummyBlob.size);
-      expect(blob.type).toBe(dummyBlob.type);
-    });
-
-    const req = httpMock.expectOne(`http://localhost:3000/api/numbas_api/${unitId}/${taskId}/${resourcePath}`);
-    expect(req.request.method).toBe('GET');
-
-    req.flush(dummyBlob);
-
-    tick();
-  }));
-
-  it('should upload test as expected', fakeAsync(() => {
-    const dummyResponse = { success: true, message: 'File uploaded successfully' };
-
-    const unitId = 'sampleUnitId';
-    const taskId = 'sampleTaskId';
-    const file = new File(['dummy content'], 'sample.txt', { type: 'text/plain' });
-
-    numbasService.uploadTest(unitId, taskId, file).subscribe((response) => {
-      expect(response).toEqual(dummyResponse);
-    });
-
-    const req = httpMock.expectOne(`http://localhost:3000/api/numbas_api/uploadNumbasTest`);
-    expect(req.request.method).toBe('POST');
-
-    req.flush(dummyResponse);
-
-    tick();
-  }));
-
-});
-
-
diff --git a/src/app/common/numbas-component/numbas-component.component.html b/src/app/common/numbas-component/numbas-component.component.html
index dba53ea116..d562f02239 100644
--- a/src/app/common/numbas-component/numbas-component.component.html
+++ b/src/app/common/numbas-component/numbas-component.component.html
@@ -1,3 +1,4 @@
-<button class="btn btn-default" (click)="launchNumbasTest()">
-  <i class="fa fa-check-square-o"></i> Launch Numbas Test
-</button>
+<div mat-dialog-content>
+  <iframe [src]="iframeSrc"></iframe>
+  <button mat-dialog-close mat-stroked-button color="warn" (click)="removeNumbasTest()">Exit</button>
+</div>
\ No newline at end of file
diff --git a/src/app/common/numbas-component/numbas-component.component.scss b/src/app/common/numbas-component/numbas-component.component.scss
index e69de29bb2..5e24cc5d9e 100644
--- a/src/app/common/numbas-component/numbas-component.component.scss
+++ b/src/app/common/numbas-component/numbas-component.component.scss
@@ -0,0 +1,17 @@
+.mat-dialog-content {
+  position: relative;
+}
+
+iframe {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 95%;
+}
+
+button {
+  position: absolute;
+  bottom: 20px;
+  right: 20px;
+}
\ No newline at end of file
diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
index 529a64b9ae..6c8369ab77 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input, OnInit, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, OnInit, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { Task } from 'src/app/api/models/task';
 import { NumbasLmsService } from 'src/app/api/services/numbas-lms.service';
-import { NumbasService } from 'src/app/api/services/numbas.service';
+import { UserService } from 'src/app/api/services/user.service';
+import { AppInjector } from 'src/app/app-injector';
+import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
 
 declare global {
   interface Window { API_1484_11: any; }
@@ -10,20 +14,29 @@ declare global {
 @Component({
   selector: 'f-numbas-component',
   templateUrl: './numbas-component.component.html',
-  styleUrls: ['numbas-component.component.scss'],
+  styleUrls: ['./numbas-component.component.scss'],
 })
-export class NumbasComponent implements OnInit, OnChanges {
-  @Input() task: Task;
-
+export class NumbasComponent implements OnInit {
+  task: Task;
   currentMode: 'attempt' | 'review' = 'attempt';
+  iframeSrc: SafeResourceUrl;
 
   constructor(
-    private numbasService: NumbasService,
+    private dialogRef: MatDialogRef<NumbasComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: { task: Task, mode: 'attempt' | 'review' },
     private lmsService: NumbasLmsService,
+    private userService: UserService,
+    private sanitizer: DomSanitizer
   ) {}
 
   ngOnInit(): void {
-    this.interceptIframeRequests();
+    this.task = this.data.task;
+    this.lmsService.setTask(this.task);
+
+    this.currentMode = this.data.mode;
+
+    const user = this.userService.currentUser;
+    this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(`${AppInjector.get(DoubtfireConstants).API_URL}/numbas_api/${this.task.taskDefId}/${user.authenticationToken}/${user.username}/index.html`);
 
     window.API_1484_11 = {
       Initialize: () => this.lmsService.Initialize(this.currentMode),
@@ -37,50 +50,7 @@ export class NumbasComponent implements OnInit, OnChanges {
     };
   }
 
-  ngOnChanges(changes: SimpleChanges): void {
-    if (changes.task) {
-      this.task = changes.task.currentValue;
-      this.lmsService.setTask(this.task);
-    }
-  }
-
-  launchNumbasTest(mode: 'attempt' | 'review' = 'attempt'): void {
-    this.currentMode = mode;
-
-    const iframe = document.createElement('iframe');
-    iframe.src = `http://localhost:3000/api/numbas_api/${this.task.taskDefId}/index.html`;
-
-    iframe.style.position = 'fixed';
-    iframe.style.top = '0';
-    iframe.style.left = '0';
-    iframe.style.width = '100%';
-    iframe.style.height = '100%';
-    iframe.style.zIndex = '9999';
-
-    document.body.appendChild(iframe);
-  }
-
-  interceptIframeRequests(): void {
-    const originalOpen = XMLHttpRequest.prototype.open;
-    const numbasService = this.numbasService;
-    const taskDefId = this.task.taskDefId;
-    XMLHttpRequest.prototype.open = function (this: XMLHttpRequest, method: string, url: string | URL, async: boolean = true, username?: string | null, password?: string | null) {
-      if (typeof url === 'string' && url.startsWith('/api/numbas_api/')) {
-        const resourcePath = url.replace('/api/numbas_api/', '');
-        this.abort();
-        numbasService.fetchResource(taskDefId, resourcePath).subscribe(
-          (resourceData) => {
-            if (this.onload) {
-              this.onload.call(this, resourceData);
-            }
-          },
-          (error) => {
-            console.error('Error fetching Numbas resource:', error);
-          }
-        );
-      } else {
-        originalOpen.call(this, method, url, async, username, password);
-      }
-    };
+  removeNumbasTest(): void {
+    this.dialogRef.close();
   }
 }
diff --git a/src/app/common/numbas-component/numbas-modal.component.ts b/src/app/common/numbas-component/numbas-modal.component.ts
new file mode 100644
index 0000000000..73b2122c17
--- /dev/null
+++ b/src/app/common/numbas-component/numbas-modal.component.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { NumbasComponent } from './numbas-component.component';
+import { Task } from 'src/app/api/models/task';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class NumbasModal {
+  constructor(public dialog: MatDialog) { }
+  
+  public show(task: Task, mode: 'attempt' | 'review'): void {
+    let dialogRef: MatDialogRef<NumbasComponent, any>;
+
+    dialogRef = this.dialog.open(NumbasComponent, {
+      data: { task, mode },
+      width: '95%', height: '90%'
+    });
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index d15c23b234..48f54027d1 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -226,7 +226,7 @@ import {TasksViewerComponent} from './units/states/tasks/tasks-viewer/tasks-view
 import {UnitCodeComponent} from './common/unit-code/unit-code.component';
 import {GradeService} from './common/services/grade.service';
 import {NumbasComponent} from './common/numbas-component/numbas-component.component';
-import {NumbasService} from './api/services/numbas.service';
+import {NumbasModal} from './common/numbas-component/numbas-modal.component';
 import {NumbasLmsService} from './api/services/numbas-lms.service';
 
 @NgModule({
@@ -402,7 +402,7 @@ import {NumbasLmsService} from './api/services/numbas-lms.service';
     TasksForInboxSearchPipe,
     IsActiveUnitRole,
     CreateNewUnitModal,
-    NumbasService,
+    NumbasModal,
     NumbasLmsService,
     provideLottieOptions({
       player: () => player,
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 317094dc2e..b88fbeb298 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -226,6 +226,7 @@ import {MarkedPipe} from './common/pipes/marked.pipe';
 import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
 import {NumbasComponent} from './common/numbas-component/numbas-component.component';
+import {NumbasModal} from './common/numbas-component/numbas-modal.component';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -308,6 +309,7 @@ DoubtfireAngularJSModule.factory(
   downgradeInjectable(EditProfileDialogService),
 );
 DoubtfireAngularJSModule.factory('CreateNewUnitModal', downgradeInjectable(CreateNewUnitModal));
+DoubtfireAngularJSModule.factory('NumbasModal', downgradeInjectable(NumbasModal));
 
 // directive -> component
 DoubtfireAngularJSModule.directive(
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index 485843f780..68d742362e 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -32,7 +32,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
 
   UploadSubmissionModal
 )
-.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, newTaskService, newProjectService, task, reuploadEvidence, outcomeService, PrivacyPolicy) ->
+.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, NumbasModal, newTaskService, newProjectService, task, reuploadEvidence, outcomeService, PrivacyPolicy) ->
   $scope.privacyPolicy = PrivacyPolicy
   # Expose task to scope
   $scope.task = task
@@ -155,6 +155,9 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
     previous: states.previous
   }
 
+  $scope.launchNumbasDialog = ->
+    NumbasModal.show $scope.task, 'attempt'
+
   # Whether or not we should disable this button
   $scope.shouldDisableBtn = {
     next: ->
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 0b99e7eb8f..0527aadd40 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -52,12 +52,14 @@ <h4>
           <h4>
             Attempt Numbas Test
           </h4>
-          <span ng-hide="submissionType == 'need_help'">
+          <span>
             Complete the Numbas test first to proceed to upload evidence of your task completion.
           </span>
         </div>
         <div class="card-body">
-          <f-numbas-component [task]="task"></f-numbas-component>
+          <button class="btn btn-default" ng-click="launchNumbasDialog(); $dismiss()">
+            <i class="fa fa-check-square-o"></i> Launch Numbas Test
+          </button>
         </div>
       </div>
     </div>

From bcaa8af150aaf68b5cf5fb07ad9cb72037212d5d Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 26 Apr 2024 22:10:46 +1000
Subject: [PATCH 032/776] fix: add accepted Numbas file types

---
 .../task-definition-numbas.component.ts                       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
index 6588453430..f6687a4af9 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
@@ -41,7 +41,9 @@ export class TaskDefinitionNumbasComponent {
   }
 
   public uploadNumbasTest(files: FileList) {
-    const validFiles = Array.from(files as ArrayLike<File>).filter((f) => f.type === 'application/zip');
+    console.log(Array.from(files).map(f => f.type));
+    const validMimeTypes = ['application/zip', 'application/x-zip-compressed', 'multipart/x-zip'];
+    const validFiles = Array.from(files as ArrayLike<File>).filter(f => validMimeTypes.includes(f.type));
     if (validFiles.length > 0) {
       const file = validFiles[0];
       this.taskDefinitionService.uploadNumbasData(this.taskDefinition, file).subscribe({

From 5d0606c56eaeb929d5873cae7038ce729581512c Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 30 Apr 2024 11:30:07 +1000
Subject: [PATCH 033/776] fix: initialise SCORM API wrapper before iframe loads

---
 .../numbas-component/numbas-component.component.ts    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
index 6c8369ab77..488c0a6333 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -3,7 +3,6 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { Task } from 'src/app/api/models/task';
 import { NumbasLmsService } from 'src/app/api/services/numbas-lms.service';
-import { UserService } from 'src/app/api/services/user.service';
 import { AppInjector } from 'src/app/app-injector';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
 
@@ -25,7 +24,6 @@ export class NumbasComponent implements OnInit {
     private dialogRef: MatDialogRef<NumbasComponent>,
     @Inject(MAT_DIALOG_DATA) public data: { task: Task, mode: 'attempt' | 'review' },
     private lmsService: NumbasLmsService,
-    private userService: UserService,
     private sanitizer: DomSanitizer
   ) {}
 
@@ -33,11 +31,6 @@ export class NumbasComponent implements OnInit {
     this.task = this.data.task;
     this.lmsService.setTask(this.task);
 
-    this.currentMode = this.data.mode;
-
-    const user = this.userService.currentUser;
-    this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(`${AppInjector.get(DoubtfireConstants).API_URL}/numbas_api/${this.task.taskDefId}/${user.authenticationToken}/${user.username}/index.html`);
-
     window.API_1484_11 = {
       Initialize: () => this.lmsService.Initialize(this.currentMode),
       Terminate: () => this.lmsService.Terminate(),
@@ -48,6 +41,10 @@ export class NumbasComponent implements OnInit {
       GetErrorString: (errorCode: string) => this.lmsService.GetErrorString(errorCode),
       GetDiagnostic: (errorCode: string) => this.lmsService.GetDiagnostic(errorCode)
     };
+
+    this.currentMode = this.data.mode;
+
+    this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(`${AppInjector.get(DoubtfireConstants).API_URL}/numbas_api/${this.task.taskDefId}/index.html`);
   }
 
   removeNumbasTest(): void {

From 2810ce65d423a137600d621a98bf27dbc221921c Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 30 Apr 2024 11:32:29 +1000
Subject: [PATCH 034/776] fix: retrieve test attempt data correctly

---
 src/app/api/services/numbas-lms.service.ts | 29 ++++++++--------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/app/api/services/numbas-lms.service.ts b/src/app/api/services/numbas-lms.service.ts
index de5a25bcc9..a24c8d31ed 100644
--- a/src/app/api/services/numbas-lms.service.ts
+++ b/src/app/api/services/numbas-lms.service.ts
@@ -1,7 +1,5 @@
-import { Injectable, Input } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { BehaviorSubject, Observable, throwError } from 'rxjs';
-import { TaskService } from './task.service';
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
 import { UserService } from './user.service';
 import API_URL from 'src/app/config/constants/apiURL';
 import { Task } from '../models/task';
@@ -10,7 +8,6 @@ import { Task } from '../models/task';
   providedIn: 'root'
 })
 export class NumbasLmsService {
-
   private readonly apiBaseUrl = `${API_URL}/test_attempts`;
 
   private defaultValues: { [key: string]: string } = {
@@ -35,11 +32,7 @@ export class NumbasLmsService {
 
   dataStore: { [key: string]: any } = this.getDefaultDataStore();
 
-  constructor(
-    private http: HttpClient,
-    private taskService: TaskService,
-    private userService: UserService
-  ) {
+  constructor(private userService: UserService) {
     this.learnerId = this.userService.currentUser.studentId;
   }
 
@@ -74,7 +67,7 @@ export class NumbasLmsService {
 
       try {
         const completedTest = JSON.parse(xhr.responseText);
-        const parsedExamData = JSON.parse(completedTest.data.exam_data || '{}');
+        const parsedExamData = JSON.parse(completedTest.exam_data || '{}');
 
         // Set entire suspendData string to cmi.suspend_data
         this.SetValue('cmi.suspend_data', JSON.stringify(parsedExamData));
@@ -108,17 +101,17 @@ export class NumbasLmsService {
     try {
       latestTest = JSON.parse(xhr.responseText);
       console.log('Latest test result:', latestTest);
-      this.testId = latestTest.data.id;
+      this.testId = latestTest.id;
 
-      if (latestTest.data['cmi_entry'] === 'ab-initio') {
+      if (latestTest['cmi_entry'] === 'ab-initio') {
         console.log("starting new test");
         this.SetValue('cmi.learner_id', this.learnerId);
         this.dataStore['name'] = examName;
-        this.dataStore['attempt_number'] = latestTest.data['attempt_number'];
+        this.dataStore['attempt_number'] = latestTest['attempt_number'];
         console.log(this.dataStore);
-      } else if (latestTest.data['cmi_entry'] === 'resume') {
+      } else if (latestTest['cmi_entry'] === 'resume') {
         console.log("resuming test");
-        const parsedExamData = JSON.parse(latestTest.data.exam_data || '{}');
+        const parsedExamData = JSON.parse(latestTest.exam_data || '{}');
 
         this.dataStore = JSON.parse(JSON.stringify(parsedExamData));
 
@@ -127,7 +120,7 @@ export class NumbasLmsService {
 
       this.initializationComplete$.next(true);
 
-      console.log("finished initlizing");
+      console.log("finished initializing");
       return 'true';
     } catch (error) {
       console.error('Error:', error);
@@ -153,7 +146,7 @@ export class NumbasLmsService {
     this.SetValue('cmi.entry', 'RO');
     const cmientry = this.GetValue('cmi.entry');
     const data = {
-      task_id: this.taskId,
+      id: this.taskId,
       name: ExamName,
       attempt_number: currentAttemptNumber,
       pass_status: status === 'passed',

From e46214dd59d86014bb04d1c31f3a3bf21240e32b Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 30 Apr 2024 13:02:50 +1000
Subject: [PATCH 035/776] fix: send task id with numbas completed attempt data

---
 src/app/api/services/numbas-lms.service.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/api/services/numbas-lms.service.ts b/src/app/api/services/numbas-lms.service.ts
index a24c8d31ed..40ce0942b3 100644
--- a/src/app/api/services/numbas-lms.service.ts
+++ b/src/app/api/services/numbas-lms.service.ts
@@ -69,7 +69,7 @@ export class NumbasLmsService {
         const completedTest = JSON.parse(xhr.responseText);
         const parsedExamData = JSON.parse(completedTest.exam_data || '{}');
 
-        // Set entire suspendData string to cmi.suspend_data
+        // Set entire parsedExamData string to cmi.suspend_data
         this.SetValue('cmi.suspend_data', JSON.stringify(parsedExamData));
 
         // Use SetValue to set parsedExamData values to dataStore
@@ -146,14 +146,14 @@ export class NumbasLmsService {
     this.SetValue('cmi.entry', 'RO');
     const cmientry = this.GetValue('cmi.entry');
     const data = {
-      id: this.taskId,
       name: ExamName,
       attempt_number: currentAttemptNumber,
       pass_status: status === 'passed',
       exam_data: JSON.stringify(this.dataStore),
       completed: true,
       exam_result: examResult,
-      cmi_entry: cmientry
+      cmi_entry: cmientry,
+      task_id: this.taskId
     };
 
     const xhr = new XMLHttpRequest();

From 84646dcf7b28c65c8c28f046197d08d3325795be Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 5 May 2024 16:33:19 +1000
Subject: [PATCH 036/776] refactor: modify numbas files to match PoC

---
 src/app/api/services/numbas-lms.service.ts    | 38 +++++++++----------
 .../services/spec/numbas-lms.service.spec.ts  |  2 +-
 .../numbas-component.component.ts             |  2 +
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/app/api/services/numbas-lms.service.ts b/src/app/api/services/numbas-lms.service.ts
index 40ce0942b3..6479a6ed93 100644
--- a/src/app/api/services/numbas-lms.service.ts
+++ b/src/app/api/services/numbas-lms.service.ts
@@ -17,7 +17,7 @@ export class NumbasLmsService {
     'numbas.duration_extension.units': 'seconds',
     'cmi.mode': 'normal',
     'cmi.undefinedlearner_response': '1',
-    'cmi.undefinedresult' : '0'
+    'cmi.undefinedresult': '0'
   };
 
   private testId: number = 0;
@@ -67,14 +67,14 @@ export class NumbasLmsService {
 
       try {
         const completedTest = JSON.parse(xhr.responseText);
-        const parsedExamData = JSON.parse(completedTest.exam_data || '{}');
+        let parsedSuspendData = JSON.parse(completedTest.data.suspend_data || '{}');
 
-        // Set entire parsedExamData string to cmi.suspend_data
-        this.SetValue('cmi.suspend_data', JSON.stringify(parsedExamData));
+        // Set entire suspendData string to cmi.suspend_data
+        this.SetValue('cmi.suspend_data', JSON.stringify(parsedSuspendData));
 
-        // Use SetValue to set parsedExamData values to dataStore
-        Object.keys(parsedExamData).forEach(key => {
-          this.SetValue(key, parsedExamData[key]);
+        // Use SetValue to set parsedSuspendData values to dataStore
+        Object.keys(parsedSuspendData).forEach(key => {
+          this.SetValue(key, parsedSuspendData[key]);
         });
 
         this.SetValue('cmi.entry', 'RO');
@@ -101,19 +101,19 @@ export class NumbasLmsService {
     try {
       latestTest = JSON.parse(xhr.responseText);
       console.log('Latest test result:', latestTest);
-      this.testId = latestTest.id;
+      this.testId = latestTest.data.id;
 
-      if (latestTest['cmi_entry'] === 'ab-initio') {
+      if (latestTest.data['cmi_entry'] === 'ab-initio') {
         console.log("starting new test");
         this.SetValue('cmi.learner_id', this.learnerId);
         this.dataStore['name'] = examName;
-        this.dataStore['attempt_number'] = latestTest['attempt_number'];
+        this.dataStore['attempt_number'] = latestTest.data['attempt_number'];
         console.log(this.dataStore);
-      } else if (latestTest['cmi_entry'] === 'resume') {
+      } else if (latestTest.data['cmi_entry'] === 'resume') {
         console.log("resuming test");
-        const parsedExamData = JSON.parse(latestTest.exam_data || '{}');
+        let parsedSuspendData = JSON.parse(latestTest.data.suspend_data || '{}');
 
-        this.dataStore = JSON.parse(JSON.stringify(parsedExamData));
+        this.dataStore = JSON.parse(JSON.stringify(parsedSuspendData));
 
         console.log(this.dataStore);
       }
@@ -149,7 +149,7 @@ export class NumbasLmsService {
       name: ExamName,
       attempt_number: currentAttemptNumber,
       pass_status: status === 'passed',
-      exam_data: JSON.stringify(this.dataStore),
+      suspend_data: JSON.stringify(this.dataStore),
       completed: true,
       exam_result: examResult,
       cmi_entry: cmientry,
@@ -184,7 +184,7 @@ export class NumbasLmsService {
     return 'true';
   }
 
-  //function to save the state of the exam.
+  // Saves the state of the exam.
   Commit(): string {
     if (!this.initializationComplete$.getValue()) {
       console.warn('Initialization not complete. Cannot commit.');
@@ -198,12 +198,9 @@ export class NumbasLmsService {
     }
     console.log("Committing dataStore:", this.dataStore);
 
-    // Directly stringify the dataStore
-    const jsonData = JSON.stringify(this.dataStore);
-
     // Use XHR to send the request
     const xhr = new XMLHttpRequest();
-    xhr.open('PUT', `${this.apiBaseUrl}/${this.testId}/exam_data`, true);
+    xhr.open('PUT', `${this.apiBaseUrl}/${this.testId}/suspend`, true);
     xhr.setRequestHeader('Content-Type', 'application/json');
 
     xhr.onload = () => {
@@ -218,7 +215,8 @@ export class NumbasLmsService {
       console.error('Request failed.');
     };
 
-    xhr.send(jsonData);
+    const requestData = { suspend_data: this.dataStore };
+    xhr.send(JSON.stringify(requestData));
     return 'true';
   }
 
diff --git a/src/app/api/services/spec/numbas-lms.service.spec.ts b/src/app/api/services/spec/numbas-lms.service.spec.ts
index f456d5a894..7d29ef75e0 100644
--- a/src/app/api/services/spec/numbas-lms.service.spec.ts
+++ b/src/app/api/services/spec/numbas-lms.service.spec.ts
@@ -55,7 +55,7 @@ describe('NumbasLmsService', () => {
     it('should handle review mode and get latest completed test result', () => {
       const mockResponse = {
         data: {
-          exam_data: JSON.stringify({ someData: 'value' })
+          suspend_data: JSON.stringify({ someData: 'value' })
         }
       };
 
diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
index 488c0a6333..f5453e0dcc 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -48,6 +48,8 @@ export class NumbasComponent implements OnInit {
   }
 
   removeNumbasTest(): void {
+    const iframe = document.getElementsByTagName('iframe')[0];
+    iframe?.parentNode?.removeChild(iframe);
     this.dialogRef.close();
   }
 }

From 48a31da1442f1e14f497c614053d9002c9f2631b Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 7 May 2024 03:00:27 +1000
Subject: [PATCH 037/776] feat: display numbas task comments

---
 src/app/api/models/task.ts                    |  6 +++
 src/app/doubtfire-angular.module.ts           |  2 +
 .../numbas-comment.component.html             | 10 ++++
 .../numbas-comment.component.scss             | 51 +++++++++++++++++++
 .../numbas-comment.component.ts               | 21 ++++++++
 .../task-comments-viewer.component.html       |  8 +++
 .../task-comments-viewer.component.scss       |  2 +-
 .../task-comments-viewer.component.ts         |  6 ++-
 8 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.html
 create mode 100644 src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.scss
 create mode 100644 src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2aa167adfd..403165cfee 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -507,6 +507,12 @@ export class Task extends Entity {
     );
   }
 
+  public get numbasEnabled(): boolean {
+    return (
+      this.definition.hasEnabledNumbasTest && this.definition.hasNumbasData
+    );
+  }
+
   public submissionUrl(asAttachment: boolean = false): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/projects/${
       this.project.id
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 48f54027d1..c634965f6f 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -228,6 +228,7 @@ import {GradeService} from './common/services/grade.service';
 import {NumbasComponent} from './common/numbas-component/numbas-component.component';
 import {NumbasModal} from './common/numbas-component/numbas-modal.component';
 import {NumbasLmsService} from './api/services/numbas-lms.service';
+import {NumbasCommentComponent} from './tasks/task-comments-viewer/numbas-comment/numbas-comment.component';
 
 @NgModule({
   // Components we declare
@@ -331,6 +332,7 @@ import {NumbasLmsService} from './api/services/numbas-lms.service';
     FTaskBadgeComponent,
     FUnitsComponent,
     NumbasComponent,
+    NumbasCommentComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.html b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.html
new file mode 100644
index 0000000000..d87863bee8
--- /dev/null
+++ b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.html
@@ -0,0 +1,10 @@
+<div fxLayout="row" fxLayoutAlign="space-evenly center">
+  <div fxLayout="column" fxLayoutAlign="space-around center">
+    <div>
+      <hr class="hr-text" data-content="Numbas Summary" />
+      <div class="markdown-to-html" [innerHTML]="comment.text"></div>
+      <button mat-button (click)="reviewNumbasTest()">Review test</button>
+      <hr class="hr-fade" />
+    </div>
+  </div>
+</div>
diff --git a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.scss b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.scss
new file mode 100644
index 0000000000..31df73023a
--- /dev/null
+++ b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.scss
@@ -0,0 +1,51 @@
+div {
+  width: 100%;
+}
+
+p {
+  color: #2c2c2c;
+  text-align: center;
+}
+
+hr {
+  width: 100%;
+}
+
+.hr-fade {
+  background: linear-gradient(to right, transparent, #9696969d, transparent);
+  width: 100%;
+  margin-top: 1px;
+}
+
+.hr-text {
+  margin: 0;
+  line-height: 1em;
+  position: relative;
+  outline: 0;
+  border: 0;
+  color: black;
+  text-align: center;
+  height: 1.5em;
+  opacity: 0.8;
+  &:before {
+    content: "";
+    background: linear-gradient(to right, transparent, #9696969d, transparent);
+    position: absolute;
+    left: 0;
+    top: 50%;
+    width: 100%;
+    height: 1px;
+  }
+  &:after {
+    content: attr(data-content);
+    position: relative;
+    display: inline-block;
+    color: black;
+
+    padding: 0 0.5em;
+    line-height: 1.5em;
+
+    color: #9696969d;
+    background-color: #fff;
+  }
+}
diff --git a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
new file mode 100644
index 0000000000..eed512fe19
--- /dev/null
+++ b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { Task, TaskComment } from 'src/app/api/models/doubtfire-model';
+import { NumbasModal } from 'src/app/common/numbas-component/numbas-modal.component';
+
+@Component({
+  selector: 'numbas-comment',
+  templateUrl: './numbas-comment.component.html',
+  styleUrls: ['./numbas-comment.component.scss'],
+})
+export class NumbasCommentComponent implements OnInit {
+  @Input() task: Task;
+  @Input() comment: TaskComment;
+
+  constructor(private modalService: NumbasModal) {}
+
+  ngOnInit() {}
+
+  reviewNumbasTest() {
+    this.modalService.show(this.task, 'review');
+  }
+}
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index d104df63af..cd18eda9ba 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -72,6 +72,14 @@
                 ></app-task-assessment-comment>
               </div>
 
+              <div *ngSwitchCase="'numbas'" class="comment-numbas">
+                <numbas-comment
+                  [task]="task"
+                  [comment]="comment"
+                  *ngIf="numbasEnabled"
+                ></numbas-comment>
+              </div>
+
               <div class="bubble" [ngClass]="commentClasses(comment)">
                 <a
                   (click)="scrollToComment(comment.originalComment.id)"
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
index 0ee9fbb91c..993c2be6f2 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
@@ -144,7 +144,7 @@ $comment-inner-border-radius: 4px;
     width: 100%;
   }
 
-  .comment-container .comment-assessment {
+  .comment-container .comment-assessment, .comment-container .comment-numbas {
     width: 100%;
   }
 
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 1abfa9934d..7436cd7d79 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -98,6 +98,10 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
     return this.constants.IsOverseerEnabled.value;
   }
 
+  get numbasEnabled(): boolean {
+    return this.task.numbasEnabled;
+  }
+
   uploadFiles(event) {
     [...event].forEach((file) => {
       if (
@@ -150,7 +154,7 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
   }
 
   shouldShowAuthorIcon(commentType: string) {
-    return !(commentType === 'extension' || commentType === 'status' || commentType == 'assessment');
+    return !(commentType === 'extension' || commentType === 'status' || commentType == 'assessment' || commentType == 'numbas');
   }
 
   commentClasses(comment: TaskComment): object {

From 0652b56f69eb850c2dfb43be54d07beb4c4eb469 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 7 May 2024 07:10:54 +1000
Subject: [PATCH 038/776] feat: add test attempt service and minor numbas
 related changes

---
 src/app/api/models/test-attempt.ts                 | 14 +++++++++++---
 src/app/api/services/numbas-lms.service.ts         | 12 ++++++------
 src/app/api/services/task-comment.service.ts       |  2 +-
 src/app/doubtfire-angular.module.ts                |  2 ++
 src/app/doubtfire-angularjs.module.ts              |  2 ++
 .../upload-submission-modal.coffee                 |  2 +-
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/app/api/models/test-attempt.ts b/src/app/api/models/test-attempt.ts
index 77e4af1724..e6f2e5d61d 100644
--- a/src/app/api/models/test-attempt.ts
+++ b/src/app/api/models/test-attempt.ts
@@ -1,14 +1,22 @@
 import { Entity } from "ngx-entity-service";
+import { Task } from "./task";
 
 export class TestAttempt extends Entity {
-  id: number;
+  public id: number;
   name: string;
   attemptNumber: number;
   passStatus: boolean;
-  examData: string;
+  suspendData: string;
   completed: boolean;
   cmiEntry: string;
   examResult: string;
   attemptedAt: Date;
-  associatedTaskId: number;
+  taskId: number;
+
+  task: Task;
+
+  constructor(task: Task) {
+    super();
+    this.task = task;
+  }
 }
diff --git a/src/app/api/services/numbas-lms.service.ts b/src/app/api/services/numbas-lms.service.ts
index 6479a6ed93..59d94e0526 100644
--- a/src/app/api/services/numbas-lms.service.ts
+++ b/src/app/api/services/numbas-lms.service.ts
@@ -21,7 +21,7 @@ export class NumbasLmsService {
   };
 
   private testId: number = 0;
-  private taskId: number;
+  private task: Task;
   private learnerId: string;
   initializationComplete$ = new BehaviorSubject<boolean>(false);
 
@@ -37,7 +37,7 @@ export class NumbasLmsService {
   }
 
   setTask(task: Task) {
-    this.taskId = task.id;
+    this.task = task;
   }
 
   getDefaultDataStore() {
@@ -56,7 +56,7 @@ export class NumbasLmsService {
     if (mode === 'review') {
       this.SetValue('cmi.mode', 'review');
 
-      xhr.open("GET", `${this.apiBaseUrl}/completed-latest?task_id=${this.taskId}`, false);
+      xhr.open("GET", `${this.apiBaseUrl}/completed-latest?task_id=${this.task.id}`, false);
       xhr.send();
       console.log(xhr.responseText);
 
@@ -88,7 +88,7 @@ export class NumbasLmsService {
       }
     }
 
-    xhr.open("GET", `${this.apiBaseUrl}/latest?task_id=${this.taskId}`, false);
+    xhr.open("GET", `${this.apiBaseUrl}/latest?task_id=${this.task.id}`, false);
     xhr.send();
     console.log(xhr.responseText);
 
@@ -139,7 +139,7 @@ export class NumbasLmsService {
   Terminate(): string {
     console.log('Terminate Called');
     const examResult = this.dataStore["cmi.score.raw"];
-    const status = this.GetValue("cmi.completion_status");
+    const status = this.GetValue("cmi.success_status");
     this.dataStore['completed'] = true;
     const currentAttemptNumber = this.dataStore['attempt_number'] || 0;
     const ExamName = this.dataStore['name'];
@@ -153,7 +153,7 @@ export class NumbasLmsService {
       completed: true,
       exam_result: examResult,
       cmi_entry: cmientry,
-      task_id: this.taskId
+      task_id: this.task.id
     };
 
     const xhr = new XMLHttpRequest();
diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index 9e646be77d..e3c80797a4 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -145,7 +145,7 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
     const opts: RequestOptions<TaskComment> = { endpointFormat: this.commentEndpointFormat };
 
     // Based on the comment type - add to the body and configure the end point
-    if (commentType === 'text') {
+    if (commentType === 'text' || commentType === 'numbas') {
       body.append('comment', data);
     } else if (commentType === 'discussion') {
       opts.endpointFormat = this.discussionEndpointFormat;
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index c634965f6f..e1f4d2356f 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -229,6 +229,7 @@ import {NumbasComponent} from './common/numbas-component/numbas-component.compon
 import {NumbasModal} from './common/numbas-component/numbas-modal.component';
 import {NumbasLmsService} from './api/services/numbas-lms.service';
 import {NumbasCommentComponent} from './tasks/task-comments-viewer/numbas-comment/numbas-comment.component';
+import {TestAttemptService} from './api/services/test-attempt.service';
 
 @NgModule({
   // Components we declare
@@ -406,6 +407,7 @@ import {NumbasCommentComponent} from './tasks/task-comments-viewer/numbas-commen
     CreateNewUnitModal,
     NumbasModal,
     NumbasLmsService,
+    TestAttemptService,
     provideLottieOptions({
       player: () => player,
     }),
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index b88fbeb298..fa817ced4e 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -227,6 +227,7 @@ import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
 import {NumbasComponent} from './common/numbas-component/numbas-component.component';
 import {NumbasModal} from './common/numbas-component/numbas-modal.component';
+import {TestAttemptService} from './api/services/test-attempt.service';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -310,6 +311,7 @@ DoubtfireAngularJSModule.factory(
 );
 DoubtfireAngularJSModule.factory('CreateNewUnitModal', downgradeInjectable(CreateNewUnitModal));
 DoubtfireAngularJSModule.factory('NumbasModal', downgradeInjectable(NumbasModal));
+DoubtfireAngularJSModule.factory('testAttemptService', downgradeInjectable(TestAttemptService));
 
 // directive -> component
 DoubtfireAngularJSModule.directive(
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index 68d742362e..f9552b3567 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -128,7 +128,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       removed.push('group') if !isRFF || !task.isGroupTask()
       removed.push('alignment') if !isRFF || !task.unit.ilos.length > 0
       removed.push('comments') if isTestSubmission
-      removed.push('numbas') if !task.definition.hasEnabledNumbasTest
+      removed.push('numbas') if !isRFF || !task.definition.hasEnabledNumbasTest
       removed
     # Initialises the states
     initialise: ->

From a576f484bc434728eab9632c022bccf1ed26cb01 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 7 May 2024 07:11:52 +1000
Subject: [PATCH 039/776] feat: add test attempt service

---
 src/app/api/services/test-attempt.service.ts | 40 ++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/app/api/services/test-attempt.service.ts

diff --git a/src/app/api/services/test-attempt.service.ts b/src/app/api/services/test-attempt.service.ts
new file mode 100644
index 0000000000..094f2baa0c
--- /dev/null
+++ b/src/app/api/services/test-attempt.service.ts
@@ -0,0 +1,40 @@
+import { Injectable } from "@angular/core";
+import { EntityService } from "ngx-entity-service";
+import { TestAttempt } from "../models/test-attempt";
+import { HttpClient } from "@angular/common/http";
+import API_URL from "src/app/config/constants/apiURL";
+import { Task } from "../models/task";
+import { Observable } from "rxjs";
+import { AppInjector } from "src/app/app-injector";
+import { DoubtfireConstants } from "src/app/config/constants/doubtfire-constants";
+
+@Injectable()
+export class TestAttemptService extends EntityService<TestAttempt> {
+  protected readonly endpointFormat = '/test_attempts?id=:id:';
+
+  constructor(httpClient: HttpClient) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys(
+      'id',
+      'name',
+      'attemptNumber',
+      'passStatus',
+      'suspendData',
+      'completed',
+      'cmiEntry',
+      'examResult',
+      'attemptedAt',
+      'taskId'
+    );
+  }
+
+  public createInstanceFrom(json: object, other?: any): TestAttempt {
+    return new TestAttempt(other as Task);
+  }
+
+  public getLatestCompletedTestAttempt(task: Task): Observable<TestAttempt> {
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/test_attempts/completed-latest?task_id=${task.id}`;
+    return AppInjector.get(HttpClient).get<TestAttempt>(url);
+  }
+}
\ No newline at end of file

From 2b1dcfc717eb770dd623c62ac99d8d961d1c3124 Mon Sep 17 00:00:00 2001
From: ublefo <90136978+ublefo@users.noreply.github.com>
Date: Tue, 7 May 2024 16:29:44 +1000
Subject: [PATCH 040/776] fix: ensure counters are incremented after object
 creation

---
 src/app/api/services/numbas-lms.service.ts | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/app/api/services/numbas-lms.service.ts b/src/app/api/services/numbas-lms.service.ts
index 59d94e0526..5593fba3f0 100644
--- a/src/app/api/services/numbas-lms.service.ts
+++ b/src/app/api/services/numbas-lms.service.ts
@@ -13,16 +13,16 @@ export class NumbasLmsService {
   private defaultValues: { [key: string]: string } = {
     'cmi.completion_status': 'not attempted',
     'cmi.entry': 'ab-initio',
+    'cmi.objectives._count': '0',
+    'cmi.interactions._count': '0',
     'numbas.user_role': 'learner',
-    'numbas.duration_extension.units': 'seconds',
     'cmi.mode': 'normal',
-    'cmi.undefinedlearner_response': '1',
-    'cmi.undefinedresult': '0'
   };
 
   private testId: number = 0;
   private task: Task;
-  private learnerId: string;
+  private readonly learnerId: string;
+  private readonly learnerName: string;
   initializationComplete$ = new BehaviorSubject<boolean>(false);
 
   private scormErrors: { [key: string]: string } = {
@@ -33,7 +33,9 @@ export class NumbasLmsService {
   dataStore: { [key: string]: any } = this.getDefaultDataStore();
 
   constructor(private userService: UserService) {
-    this.learnerId = this.userService.currentUser.studentId;
+    const user = this.userService.currentUser;
+    this.learnerId = user.studentId;
+    this.learnerName = user.firstName + user.lastName;
   }
 
   setTask(task: Task) {
@@ -106,6 +108,7 @@ export class NumbasLmsService {
       if (latestTest.data['cmi_entry'] === 'ab-initio') {
         console.log("starting new test");
         this.SetValue('cmi.learner_id', this.learnerId);
+        this.SetValue('cmi.learner_name', this.learnerName);
         this.dataStore['name'] = examName;
         this.dataStore['attempt_number'] = latestTest.data['attempt_number'];
         console.log(this.dataStore);
@@ -178,9 +181,17 @@ export class NumbasLmsService {
   }
 
   SetValue(element: string, value: any): string {
-    if (element.startsWith('cmi.')) {
-      this.dataStore[element] = value;
+    console.log(`SetValue:`, element, value);
+    this.dataStore[element] = value;
+    if (element.match('cmi.interactions.\\d+.id')) {
+      console.log('Incrementing cmi.interactions._count');
+      this.dataStore['cmi.interactions._count']++;
     }
+    if (element.match('cmi.objectives.\\d+.id')) {
+      console.log('Incrementing cmi.objectives._count');
+      this.dataStore['cmi.objectives._count']++;
+    }
+    // console.log("dataStore after value set:", this.dataStore);
     return 'true';
   }
 

From aa20a273f6a4e8e0f597da164adb330deaff470c Mon Sep 17 00:00:00 2001
From: ublefo <90136978+ublefo@users.noreply.github.com>
Date: Tue, 7 May 2024 23:20:13 +1000
Subject: [PATCH 041/776] refactor: rename scorm service

---
 .../{numbas-lms.service.ts => scorm-lms.service.ts}       | 2 +-
 src/app/api/services/spec/numbas-lms.service.spec.ts      | 8 ++++----
 .../common/numbas-component/numbas-component.component.ts | 4 ++--
 src/app/doubtfire-angular.module.ts                       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename src/app/api/services/{numbas-lms.service.ts => scorm-lms.service.ts} (99%)

diff --git a/src/app/api/services/numbas-lms.service.ts b/src/app/api/services/scorm-lms.service.ts
similarity index 99%
rename from src/app/api/services/numbas-lms.service.ts
rename to src/app/api/services/scorm-lms.service.ts
index 5593fba3f0..bd7b5f1085 100644
--- a/src/app/api/services/numbas-lms.service.ts
+++ b/src/app/api/services/scorm-lms.service.ts
@@ -7,7 +7,7 @@ import { Task } from '../models/task';
 @Injectable({
   providedIn: 'root'
 })
-export class NumbasLmsService {
+export class ScormLmsService {
   private readonly apiBaseUrl = `${API_URL}/test_attempts`;
 
   private defaultValues: { [key: string]: string } = {
diff --git a/src/app/api/services/spec/numbas-lms.service.spec.ts b/src/app/api/services/spec/numbas-lms.service.spec.ts
index 7d29ef75e0..f38d5fc080 100644
--- a/src/app/api/services/spec/numbas-lms.service.spec.ts
+++ b/src/app/api/services/spec/numbas-lms.service.spec.ts
@@ -1,12 +1,12 @@
 import { TestBed } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { NumbasLmsService } from '../numbas-lms.service';
+import { ScormLmsService } from '../scorm-lms.service';
 import { TaskService } from '../task.service';
 import { UserService } from '../user.service';
 import { of } from 'rxjs';
 
 describe('NumbasLmsService', () => {
-  let service: NumbasLmsService;
+  let service: ScormLmsService;
   let httpTestingController: HttpTestingController;
   let mockUserService: Partial<UserService>;
   let mockTaskService: Partial<TaskService>;
@@ -27,13 +27,13 @@ describe('NumbasLmsService', () => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule],
       providers: [
-        NumbasLmsService,
+        ScormLmsService,
         { provide: UserService, useValue: mockUserService },
         { provide: TaskService, useValue: mockTaskService }
       ]
     });
 
-    service = TestBed.inject(NumbasLmsService);
+    service = TestBed.inject(ScormLmsService);
     httpTestingController = TestBed.inject(HttpTestingController);
   });
 
diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/numbas-component/numbas-component.component.ts
index f5453e0dcc..2f977ef60c 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/numbas-component/numbas-component.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { Task } from 'src/app/api/models/task';
-import { NumbasLmsService } from 'src/app/api/services/numbas-lms.service';
+import { ScormLmsService } from 'src/app/api/services/scorm-lms.service';
 import { AppInjector } from 'src/app/app-injector';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
 
@@ -23,7 +23,7 @@ export class NumbasComponent implements OnInit {
   constructor(
     private dialogRef: MatDialogRef<NumbasComponent>,
     @Inject(MAT_DIALOG_DATA) public data: { task: Task, mode: 'attempt' | 'review' },
-    private lmsService: NumbasLmsService,
+    private lmsService: ScormLmsService,
     private sanitizer: DomSanitizer
   ) {}
 
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index e1f4d2356f..e5b2e1b2a7 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -227,7 +227,7 @@ import {UnitCodeComponent} from './common/unit-code/unit-code.component';
 import {GradeService} from './common/services/grade.service';
 import {NumbasComponent} from './common/numbas-component/numbas-component.component';
 import {NumbasModal} from './common/numbas-component/numbas-modal.component';
-import {NumbasLmsService} from './api/services/numbas-lms.service';
+import {ScormLmsService} from './api/services/scorm-lms.service';
 import {NumbasCommentComponent} from './tasks/task-comments-viewer/numbas-comment/numbas-comment.component';
 import {TestAttemptService} from './api/services/test-attempt.service';
 
@@ -406,7 +406,7 @@ import {TestAttemptService} from './api/services/test-attempt.service';
     IsActiveUnitRole,
     CreateNewUnitModal,
     NumbasModal,
-    NumbasLmsService,
+    ScormLmsService,
     TestAttemptService,
     provideLottieOptions({
       player: () => player,

From fdd5667d1744f5ad135bba946a8d2daee6648605 Mon Sep 17 00:00:00 2001
From: ublefo <90136978+ublefo@users.noreply.github.com>
Date: Wed, 8 May 2024 22:08:12 +1000
Subject: [PATCH 042/776] refactor: generalize scorm player components and
 services

---
 src/app/ajs-upgraded-providers.ts             | 10 +++---
 ...ms.service.ts => scorm-adapter.service.ts} |  8 ++---
 ....spec.ts => scorm-adapter.service.spec.ts} | 11 +++---
 .../scorm-player-modal.component.ts}          | 10 +++---
 .../scorm-player.component.html}              |  4 +--
 .../scorm-player.component.scss}              |  0
 .../scorm-player.component.spec.ts}           | 12 +++----
 .../scorm-player.component.ts}                | 36 ++++++++++---------
 src/app/doubtfire-angular.module.ts           | 12 +++----
 src/app/doubtfire-angularjs.module.ts         | 11 +++---
 .../upload-submission-modal.coffee            | 11 +++---
 .../upload-submission-modal.tpl.html          |  8 ++---
 .../numbas-comment.component.ts               |  4 +--
 13 files changed, 71 insertions(+), 66 deletions(-)
 rename src/app/api/services/{scorm-lms.service.ts => scorm-adapter.service.ts} (97%)
 rename src/app/api/services/spec/{numbas-lms.service.spec.ts => scorm-adapter.service.spec.ts} (91%)
 rename src/app/common/{numbas-component/numbas-modal.component.ts => scorm-player/scorm-player-modal.component.ts} (64%)
 rename src/app/common/{numbas-component/numbas-component.component.html => scorm-player/scorm-player.component.html} (74%)
 rename src/app/common/{numbas-component/numbas-component.component.scss => scorm-player/scorm-player.component.scss} (100%)
 rename src/app/common/{numbas-component/numbas-component.component.spec.ts => scorm-player/scorm-player.component.spec.ts} (51%)
 rename src/app/common/{numbas-component/numbas-component.component.ts => scorm-player/scorm-player.component.ts} (50%)

diff --git a/src/app/ajs-upgraded-providers.ts b/src/app/ajs-upgraded-providers.ts
index 9d5b0f0203..f114da1c79 100644
--- a/src/app/ajs-upgraded-providers.ts
+++ b/src/app/ajs-upgraded-providers.ts
@@ -18,7 +18,7 @@ export const rootScope = new InjectionToken('$rootScope');
 export const calendarModal = new InjectionToken('CalendarModal');
 export const aboutDoubtfireModal = new InjectionToken('AboutDoubtfireModal');
 export const plagiarismReportModal = new InjectionToken('PlagiarismReportModal');
-export const numbasModal = new InjectionToken('NumbasModal');
+export const scormPlayerModal = new InjectionToken('ScormPlayerModal');
 
 // Define a provider for the above injection token...
 // It will get the service from AngularJS via the factory
@@ -118,8 +118,8 @@ export const UnitStudentEnrolmentModalProvider = {
   deps: ['$injector'],
 };
 
-export const numbasModalProvider = {
-  provide: numbasModal,
-  useFactory: (i) => i.get('NumbasModal'),
+export const ScormPlayerModalProvider = {
+  provide: scormPlayerModal,
+  useFactory: (i) => i.get('ScormPlayerModal'),
   deps: ['$injector'],
-};
\ No newline at end of file
+};
diff --git a/src/app/api/services/scorm-lms.service.ts b/src/app/api/services/scorm-adapter.service.ts
similarity index 97%
rename from src/app/api/services/scorm-lms.service.ts
rename to src/app/api/services/scorm-adapter.service.ts
index bd7b5f1085..3202331804 100644
--- a/src/app/api/services/scorm-lms.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -7,7 +7,7 @@ import { Task } from '../models/task';
 @Injectable({
   providedIn: 'root'
 })
-export class ScormLmsService {
+export class ScormAdapterService {
   private readonly apiBaseUrl = `${API_URL}/test_attempts`;
 
   private defaultValues: { [key: string]: string } = {
@@ -207,7 +207,7 @@ export class ScormLmsService {
     if (!this.isTestCompleted()) {
       this.dataStore['cmi.exit'] = 'suspend';
     }
-    console.log("Committing dataStore:", this.dataStore);
+    console.log("Committing DataModel:", this.dataStore);
 
     // Use XHR to send the request
     const xhr = new XMLHttpRequest();
@@ -216,9 +216,9 @@ export class ScormLmsService {
 
     xhr.onload = () => {
       if (xhr.status >= 200 && xhr.status < 400) {
-        console.log('Suspend data saved successfully.');
+        console.log('DataModel saved successfully.');
       } else {
-        console.error('Error saving suspend data:', xhr.responseText);
+        console.error('Error saving DataModel:', xhr.responseText);
       }
     };
 
diff --git a/src/app/api/services/spec/numbas-lms.service.spec.ts b/src/app/api/services/spec/scorm-adapter.service.spec.ts
similarity index 91%
rename from src/app/api/services/spec/numbas-lms.service.spec.ts
rename to src/app/api/services/spec/scorm-adapter.service.spec.ts
index f38d5fc080..5d3a52caac 100644
--- a/src/app/api/services/spec/numbas-lms.service.spec.ts
+++ b/src/app/api/services/spec/scorm-adapter.service.spec.ts
@@ -1,12 +1,11 @@
 import { TestBed } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { ScormLmsService } from '../scorm-lms.service';
+import { ScormAdapterService } from '../scorm-adapter.service';
 import { TaskService } from '../task.service';
 import { UserService } from '../user.service';
-import { of } from 'rxjs';
 
-describe('NumbasLmsService', () => {
-  let service: ScormLmsService;
+describe('ScormAdapterService', () => {
+  let service: ScormAdapterService;
   let httpTestingController: HttpTestingController;
   let mockUserService: Partial<UserService>;
   let mockTaskService: Partial<TaskService>;
@@ -27,13 +26,13 @@ describe('NumbasLmsService', () => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule],
       providers: [
-        ScormLmsService,
+        ScormAdapterService,
         { provide: UserService, useValue: mockUserService },
         { provide: TaskService, useValue: mockTaskService }
       ]
     });
 
-    service = TestBed.inject(ScormLmsService);
+    service = TestBed.inject(ScormAdapterService);
     httpTestingController = TestBed.inject(HttpTestingController);
   });
 
diff --git a/src/app/common/numbas-component/numbas-modal.component.ts b/src/app/common/scorm-player/scorm-player-modal.component.ts
similarity index 64%
rename from src/app/common/numbas-component/numbas-modal.component.ts
rename to src/app/common/scorm-player/scorm-player-modal.component.ts
index 73b2122c17..443add9bed 100644
--- a/src/app/common/numbas-component/numbas-modal.component.ts
+++ b/src/app/common/scorm-player/scorm-player-modal.component.ts
@@ -1,18 +1,18 @@
 import { Injectable } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
-import { NumbasComponent } from './numbas-component.component';
+import { ScormPlayerComponent } from './scorm-player.component';
 import { Task } from 'src/app/api/models/task';
 
 @Injectable({
   providedIn: 'root',
 })
-export class NumbasModal {
+export class ScormPlayerModal {
   constructor(public dialog: MatDialog) { }
-  
+
   public show(task: Task, mode: 'attempt' | 'review'): void {
-    let dialogRef: MatDialogRef<NumbasComponent, any>;
+    let dialogRef: MatDialogRef<ScormPlayerComponent, any>;
 
-    dialogRef = this.dialog.open(NumbasComponent, {
+    dialogRef = this.dialog.open(ScormPlayerComponent, {
       data: { task, mode },
       width: '95%', height: '90%'
     });
diff --git a/src/app/common/numbas-component/numbas-component.component.html b/src/app/common/scorm-player/scorm-player.component.html
similarity index 74%
rename from src/app/common/numbas-component/numbas-component.component.html
rename to src/app/common/scorm-player/scorm-player.component.html
index d562f02239..5089ad9de3 100644
--- a/src/app/common/numbas-component/numbas-component.component.html
+++ b/src/app/common/scorm-player/scorm-player.component.html
@@ -1,4 +1,4 @@
 <div mat-dialog-content>
   <iframe [src]="iframeSrc"></iframe>
-  <button mat-dialog-close mat-stroked-button color="warn" (click)="removeNumbasTest()">Exit</button>
-</div>
\ No newline at end of file
+  <button mat-dialog-close mat-stroked-button color="warn" (click)="close()">Exit</button>
+</div>
diff --git a/src/app/common/numbas-component/numbas-component.component.scss b/src/app/common/scorm-player/scorm-player.component.scss
similarity index 100%
rename from src/app/common/numbas-component/numbas-component.component.scss
rename to src/app/common/scorm-player/scorm-player.component.scss
diff --git a/src/app/common/numbas-component/numbas-component.component.spec.ts b/src/app/common/scorm-player/scorm-player.component.spec.ts
similarity index 51%
rename from src/app/common/numbas-component/numbas-component.component.spec.ts
rename to src/app/common/scorm-player/scorm-player.component.spec.ts
index 31dad5e305..7980df7c3c 100644
--- a/src/app/common/numbas-component/numbas-component.component.spec.ts
+++ b/src/app/common/scorm-player/scorm-player.component.spec.ts
@@ -1,18 +1,18 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { NumbasComponent } from './numbas-component.component';
+import { ScormPlayerComponent } from './scorm-player.component';
 
-describe('NumbasComponent', () => {
-  let component: NumbasComponent;
-  let fixture: ComponentFixture<NumbasComponent>;
+describe('ScormPlayerComponent', () => {
+  let component: ScormPlayerComponent;
+  let fixture: ComponentFixture<ScormPlayerComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ NumbasComponent ]
+      declarations: [ ScormPlayerComponent ]
     })
     .compileComponents();
 
-    fixture = TestBed.createComponent(NumbasComponent);
+    fixture = TestBed.createComponent(ScormPlayerComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/src/app/common/numbas-component/numbas-component.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
similarity index 50%
rename from src/app/common/numbas-component/numbas-component.component.ts
rename to src/app/common/scorm-player/scorm-player.component.ts
index 2f977ef60c..7ed98b3cfe 100644
--- a/src/app/common/numbas-component/numbas-component.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { Task } from 'src/app/api/models/task';
-import { ScormLmsService } from 'src/app/api/services/scorm-lms.service';
+import { ScormAdapterService } from 'src/app/api/services/scorm-adapter.service';
 import { AppInjector } from 'src/app/app-injector';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
 
@@ -11,35 +11,35 @@ declare global {
 }
 
 @Component({
-  selector: 'f-numbas-component',
-  templateUrl: './numbas-component.component.html',
-  styleUrls: ['./numbas-component.component.scss'],
+  selector: 'f-scorm-player',
+  templateUrl: './scorm-player.component.html',
+  styleUrls: ['./scorm-player.component.scss'],
 })
-export class NumbasComponent implements OnInit {
+export class ScormPlayerComponent implements OnInit {
   task: Task;
   currentMode: 'attempt' | 'review' = 'attempt';
   iframeSrc: SafeResourceUrl;
 
   constructor(
-    private dialogRef: MatDialogRef<NumbasComponent>,
+    private dialogRef: MatDialogRef<ScormPlayerComponent>,
     @Inject(MAT_DIALOG_DATA) public data: { task: Task, mode: 'attempt' | 'review' },
-    private lmsService: ScormLmsService,
+    private scormAdapter: ScormAdapterService,
     private sanitizer: DomSanitizer
   ) {}
 
   ngOnInit(): void {
     this.task = this.data.task;
-    this.lmsService.setTask(this.task);
+    this.scormAdapter.setTask(this.task);
 
     window.API_1484_11 = {
-      Initialize: () => this.lmsService.Initialize(this.currentMode),
-      Terminate: () => this.lmsService.Terminate(),
-      GetValue: (element: string) => this.lmsService.GetValue(element),
-      SetValue: (element: string, value: string) => this.lmsService.SetValue(element, value),
-      Commit: () => this.lmsService.Commit(),
-      GetLastError: () => this.lmsService.GetLastError(),
-      GetErrorString: (errorCode: string) => this.lmsService.GetErrorString(errorCode),
-      GetDiagnostic: (errorCode: string) => this.lmsService.GetDiagnostic(errorCode)
+      Initialize: () => this.scormAdapter.Initialize(this.currentMode),
+      Terminate: () => this.scormAdapter.Terminate(),
+      GetValue: (element: string) => this.scormAdapter.GetValue(element),
+      SetValue: (element: string, value: string) => this.scormAdapter.SetValue(element, value),
+      Commit: () => this.scormAdapter.Commit(),
+      GetLastError: () => this.scormAdapter.GetLastError(),
+      GetErrorString: (errorCode: string) => this.scormAdapter.GetErrorString(errorCode),
+      GetDiagnostic: (errorCode: string) => this.scormAdapter.GetDiagnostic(errorCode)
     };
 
     this.currentMode = this.data.mode;
@@ -47,7 +47,9 @@ export class NumbasComponent implements OnInit {
     this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(`${AppInjector.get(DoubtfireConstants).API_URL}/numbas_api/${this.task.taskDefId}/index.html`);
   }
 
-  removeNumbasTest(): void {
+  close(): void {
+    console.log('SCORM player closing, commiting DataModel!');
+    this.scormAdapter.Commit();
     const iframe = document.getElementsByTagName('iframe')[0];
     iframe?.parentNode?.removeChild(iframe);
     this.dialogRef.close();
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index e5b2e1b2a7..23145ccaea 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -72,6 +72,7 @@ import {
   gradeTaskModalProvider,
   uploadSubmissionModalProvider,
   ConfirmationModalProvider,
+  ScormPlayerModalProvider,
 } from './ajs-upgraded-providers';
 import {
   TaskCommentComposerComponent,
@@ -225,9 +226,8 @@ import {FTaskSheetViewComponent} from './units/states/tasks/viewer/directives/f-
 import {TasksViewerComponent} from './units/states/tasks/tasks-viewer/tasks-viewer.component';
 import {UnitCodeComponent} from './common/unit-code/unit-code.component';
 import {GradeService} from './common/services/grade.service';
-import {NumbasComponent} from './common/numbas-component/numbas-component.component';
-import {NumbasModal} from './common/numbas-component/numbas-modal.component';
-import {ScormLmsService} from './api/services/scorm-lms.service';
+import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
+import {ScormAdapterService} from './api/services/scorm-adapter.service';
 import {NumbasCommentComponent} from './tasks/task-comments-viewer/numbas-comment/numbas-comment.component';
 import {TestAttemptService} from './api/services/test-attempt.service';
 
@@ -332,7 +332,7 @@ import {TestAttemptService} from './api/services/test-attempt.service';
     FUsersComponent,
     FTaskBadgeComponent,
     FUnitsComponent,
-    NumbasComponent,
+    ScormPlayerComponent,
     NumbasCommentComponent,
   ],
   // Services we provide
@@ -405,8 +405,8 @@ import {TestAttemptService} from './api/services/test-attempt.service';
     TasksForInboxSearchPipe,
     IsActiveUnitRole,
     CreateNewUnitModal,
-    NumbasModal,
-    ScormLmsService,
+    ScormPlayerModalProvider,
+    ScormAdapterService,
     TestAttemptService,
     provideLottieOptions({
       player: () => player,
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index fa817ced4e..3cd6555bd8 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -225,8 +225,8 @@ import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {MarkedPipe} from './common/pipes/marked.pipe';
 import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
-import {NumbasComponent} from './common/numbas-component/numbas-component.component';
-import {NumbasModal} from './common/numbas-component/numbas-modal.component';
+import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
+import {ScormPlayerModal} from './common/scorm-player/scorm-player-modal.component';
 import {TestAttemptService} from './api/services/test-attempt.service';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
@@ -310,7 +310,7 @@ DoubtfireAngularJSModule.factory(
   downgradeInjectable(EditProfileDialogService),
 );
 DoubtfireAngularJSModule.factory('CreateNewUnitModal', downgradeInjectable(CreateNewUnitModal));
-DoubtfireAngularJSModule.factory('NumbasModal', downgradeInjectable(NumbasModal));
+DoubtfireAngularJSModule.factory('ScormPlayerModal', downgradeInjectable(ScormPlayerModal));
 DoubtfireAngularJSModule.factory('testAttemptService', downgradeInjectable(TestAttemptService));
 
 // directive -> component
@@ -446,7 +446,10 @@ DoubtfireAngularJSModule.directive(
 );
 DoubtfireAngularJSModule.directive('fUnits', downgradeComponent({component: FUnitsComponent}));
 
-DoubtfireAngularJSModule.directive('fNumbasComponent', downgradeComponent({component: NumbasComponent}));
+DoubtfireAngularJSModule.directive(
+  'fScormPlayerComponent',
+  downgradeComponent({component: ScormPlayerComponent}),
+);
 
 // Global configuration
 DoubtfireAngularJSModule.directive(
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index f9552b3567..6a17bd558c 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -32,7 +32,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
 
   UploadSubmissionModal
 )
-.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, NumbasModal, newTaskService, newProjectService, task, reuploadEvidence, outcomeService, PrivacyPolicy) ->
+.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, ScormPlayerModal, newTaskService, newProjectService, task, reuploadEvidence, outcomeService, PrivacyPolicy) ->
   $scope.privacyPolicy = PrivacyPolicy
   # Expose task to scope
   $scope.task = task
@@ -100,7 +100,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
   # States functionality
   states = {
     # All possible states
-    all: ['group', 'numbas', 'files', 'alignment', 'comments', 'uploading']
+    all: ['group', 'scorm-assessment', 'files', 'alignment', 'comments', 'uploading']
     # Only states which are shown (populated in initialise)
     shown: []
     # The currently active state (set in initialise)
@@ -128,7 +128,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       removed.push('group') if !isRFF || !task.isGroupTask()
       removed.push('alignment') if !isRFF || !task.unit.ilos.length > 0
       removed.push('comments') if isTestSubmission
-      removed.push('numbas') if !isRFF || !task.definition.hasEnabledNumbasTest
+      removed.push('scorm-assessment') if !isRFF || !task.definition.hasEnabledNumbasTest
       removed
     # Initialises the states
     initialise: ->
@@ -155,8 +155,9 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
     previous: states.previous
   }
 
-  $scope.launchNumbasDialog = ->
-    NumbasModal.show $scope.task, 'attempt'
+  $scope.launchScormPlayer = ->
+    console.clear()
+    ScormPlayerModal.show $scope.task, 'attempt'
 
   # Whether or not we should disable this button
   $scope.shouldDisableBtn = {
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 0527aadd40..8b6c89bea3 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -44,9 +44,9 @@ <h4>
       </div><!--/card-group-->
     </div><!--/state-group-->
     <div
-      class="state state-numbas"
-      ng-class="{'state-hidden-left': isHidden('numbas').left,
-                 'state-hidden-right': isHidden('numbas').right}">
+      class="state state-scorm-assessment"
+      ng-class="{'state-hidden-left': isHidden('scorm-assessment').left,
+                 'state-hidden-right': isHidden('scorm-assessment').right}">
       <div class="card card-default">
         <div class="card-heading">
           <h4>
@@ -57,7 +57,7 @@ <h4>
           </span>
         </div>
         <div class="card-body">
-          <button class="btn btn-default" ng-click="launchNumbasDialog(); $dismiss()">
+          <button class="btn btn-default" ng-click="launchScormPlayer(); $dismiss()">
             <i class="fa fa-check-square-o"></i> Launch Numbas Test
           </button>
         </div>
diff --git a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
index eed512fe19..650a110d0f 100644
--- a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { Task, TaskComment } from 'src/app/api/models/doubtfire-model';
-import { NumbasModal } from 'src/app/common/numbas-component/numbas-modal.component';
+import { ScormPlayerModal } from 'src/app/common/scorm-player/scorm-player-modal.component';
 
 @Component({
   selector: 'numbas-comment',
@@ -11,7 +11,7 @@ export class NumbasCommentComponent implements OnInit {
   @Input() task: Task;
   @Input() comment: TaskComment;
 
-  constructor(private modalService: NumbasModal) {}
+  constructor(private modalService: ScormPlayerModal) {}
 
   ngOnInit() {}
 

From 226d9193251fb675c92bec8265508477857a4ec9 Mon Sep 17 00:00:00 2001
From: ublefo <90136978+ublefo@users.noreply.github.com>
Date: Wed, 8 May 2024 22:29:37 +1000
Subject: [PATCH 043/776] fix: use nullish coalescing when retrieving data from
 the datamodel

also disallow dismissing modal to ensure datamodel is committed
---
 src/app/api/services/scorm-adapter.service.ts          | 10 +++++-----
 .../scorm-player/scorm-player-modal.component.ts       |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index 3202331804..22c0205a33 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -69,7 +69,7 @@ export class ScormAdapterService {
 
       try {
         const completedTest = JSON.parse(xhr.responseText);
-        let parsedSuspendData = JSON.parse(completedTest.data.suspend_data || '{}');
+        let parsedSuspendData = JSON.parse(completedTest.data.suspend_data ?? '{}');
 
         // Set entire suspendData string to cmi.suspend_data
         this.SetValue('cmi.suspend_data', JSON.stringify(parsedSuspendData));
@@ -114,7 +114,7 @@ export class ScormAdapterService {
         console.log(this.dataStore);
       } else if (latestTest.data['cmi_entry'] === 'resume') {
         console.log("resuming test");
-        let parsedSuspendData = JSON.parse(latestTest.data.suspend_data || '{}');
+        let parsedSuspendData = JSON.parse(latestTest.data.suspend_data ?? '{}');
 
         this.dataStore = JSON.parse(JSON.stringify(parsedSuspendData));
 
@@ -132,7 +132,7 @@ export class ScormAdapterService {
   }
 
   isTestCompleted(): boolean {
-    return this.dataStore?.['completed'] || false;
+    return this.dataStore?.['completed'] ?? false;
   }
 
   private resetDataStore() {
@@ -144,7 +144,7 @@ export class ScormAdapterService {
     const examResult = this.dataStore["cmi.score.raw"];
     const status = this.GetValue("cmi.success_status");
     this.dataStore['completed'] = true;
-    const currentAttemptNumber = this.dataStore['attempt_number'] || 0;
+    const currentAttemptNumber = this.dataStore['attempt_number'] ?? 0;
     const ExamName = this.dataStore['name'];
     this.SetValue('cmi.entry', 'RO');
     const cmientry = this.GetValue('cmi.entry');
@@ -177,7 +177,7 @@ export class ScormAdapterService {
   }
 
   GetValue(element: string): string {
-    return this.dataStore[element] || '';
+    return this.dataStore[element] ?? '';
   }
 
   SetValue(element: string, value: any): string {
diff --git a/src/app/common/scorm-player/scorm-player-modal.component.ts b/src/app/common/scorm-player/scorm-player-modal.component.ts
index 443add9bed..190e7bf570 100644
--- a/src/app/common/scorm-player/scorm-player-modal.component.ts
+++ b/src/app/common/scorm-player/scorm-player-modal.component.ts
@@ -14,7 +14,8 @@ export class ScormPlayerModal {
 
     dialogRef = this.dialog.open(ScormPlayerComponent, {
       data: { task, mode },
-      width: '95%', height: '90%'
+      width: '95%', height: '90%',
+      disableClose: true,
     });
   }
 }

From 20472257c87711955b79008fa3cb7517151a4424 Mon Sep 17 00:00:00 2001
From: ublefo <90136978+ublefo@users.noreply.github.com>
Date: Thu, 9 May 2024 06:18:20 +1000
Subject: [PATCH 044/776] refactor: separate out scorm datamodel and player
 context

---
 src/app/api/models/doubtfire-model.ts         |   2 +
 src/app/api/models/scorm-datamodel.ts         |  58 ++++++
 src/app/api/models/scorm-player-context.ts    |  33 +++
 src/app/api/services/scorm-adapter.service.ts | 190 +++++++++---------
 .../scorm-player/scorm-player.component.ts    |   4 +-
 5 files changed, 193 insertions(+), 94 deletions(-)
 create mode 100644 src/app/api/models/scorm-datamodel.ts
 create mode 100644 src/app/api/models/scorm-player-context.ts

diff --git a/src/app/api/models/doubtfire-model.ts b/src/app/api/models/doubtfire-model.ts
index 3cb4911083..baca2f22d2 100644
--- a/src/app/api/models/doubtfire-model.ts
+++ b/src/app/api/models/doubtfire-model.ts
@@ -32,6 +32,8 @@ export * from './task-comment/discussion-comment';
 export * from '../services/task-outcome-alignment.service';
 export * from './task-similarity';
 export * from './tii-action';
+export * from './scorm-datamodel';
+export * from './scorm-player-context';
 
 // Users -- are students or staff
 export * from './user/user';
diff --git a/src/app/api/models/scorm-datamodel.ts b/src/app/api/models/scorm-datamodel.ts
new file mode 100644
index 0000000000..e9d105f3c7
--- /dev/null
+++ b/src/app/api/models/scorm-datamodel.ts
@@ -0,0 +1,58 @@
+export class ScormDataModel {
+  initState: {[key: string]: string} = {
+    'cmi.completion_status': 'not attempted',
+    'cmi.entry': 'ab-initio',
+    'cmi.objectives._count': '0',
+    'cmi.interactions._count': '0',
+    'cmi.mode': 'normal',
+  };
+
+  dataModel: {[key: string]: any} = {};
+  readonly msgPrefix = 'SCORM DataModel: ';
+
+  constructor() {
+    this.dataModel = {};
+  }
+
+  public init() {
+    console.log(this.msgPrefix + 'initializing DataModel with default values');
+    this.dataModel = this.initState;
+  }
+
+  public restore(dataModel: {[key: string]: any} = {}) {
+    console.log(this.msgPrefix + 'restoring DataModel with provided data');
+    this.dataModel = dataModel;
+  }
+
+  public get(key: string): string {
+    return this.dataModel[key] ?? '';
+  }
+
+  public dump(): {[key: string]: any} {
+    return this.dataModel;
+  }
+
+  public set(key: string, value: any): string {
+    console.log(this.msgPrefix + 'set: ', key, value);
+    this.dataModel[key] = value;
+    if (key.match('cmi.interactions.\\d+.id')) {
+      const interactionPath = key.match('cmi.interactions.\\d+');
+      const objectivesCounterForInteraction = interactionPath.toString() + '.objectives._count';
+      console.log('Incrementing cmi.interactions._count');
+      this.dataModel['cmi.interactions._count']++;
+      console.log(`Initializing ${objectivesCounterForInteraction}`);
+      this.dataModel[objectivesCounterForInteraction] = 0;
+    }
+    if (key.match('cmi.interactions.\\d+.objectives.\\d+.id')) {
+      const interactionPath = key.match('cmi.interactions.\\d+.objectives');
+      const objectivesCounterForInteraction = interactionPath.toString() + '._count';
+      console.log(`Incrementing ${objectivesCounterForInteraction}`);
+      this.dataModel[objectivesCounterForInteraction.toString()]++;
+    }
+    if (key.match('cmi.objectives.\\d+.id')) {
+      console.log('Incrementing cmi.objectives._count');
+      this.dataModel['cmi.objectives._count']++;
+    }
+    return 'true';
+  }
+}
diff --git a/src/app/api/models/scorm-player-context.ts b/src/app/api/models/scorm-player-context.ts
new file mode 100644
index 0000000000..5f1c4bd3ba
--- /dev/null
+++ b/src/app/api/models/scorm-player-context.ts
@@ -0,0 +1,33 @@
+import { Task, User } from 'src/app/api/models/doubtfire-model';
+
+export class ScormPlayerContext {
+  task: Task;
+  mode: 'browse' | 'normal' | 'review';
+  user: User;
+  attemptNumber: number;
+  attemptId: number;
+  learnerName: string;
+  learnerId: number;
+
+  constructor(user: User) {
+    this.user = user;
+    this.learnerId = user.id;
+    this.learnerName = user.firstName + ' ' + user.lastName;
+  }
+
+  public setTask(task: Task): void {
+    this.task = task;
+  }
+
+  public setMode(mode: 'browse' | 'normal' | 'review'): void {
+    this.mode = mode;
+  }
+
+  public setAttemptNumber(attemptNumber: number = 1): void {
+    this.attemptNumber = attemptNumber;
+  }
+
+  public setAttemptId(attemptId: number): void {
+    this.attemptId = attemptId;
+  }
+}
diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index 22c0205a33..6c5353746b 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -2,63 +2,76 @@ import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { UserService } from './user.service';
 import API_URL from 'src/app/config/constants/apiURL';
-import { Task } from '../models/task';
+import { Task, ScormDataModel, ScormPlayerContext } from 'src/app/api/models/doubtfire-model';
 
 @Injectable({
   providedIn: 'root'
 })
 export class ScormAdapterService {
   private readonly apiBaseUrl = `${API_URL}/test_attempts`;
+  private dataModel: ScormDataModel;
+  private playerContext: ScormPlayerContext;
 
-  private defaultValues: { [key: string]: string } = {
-    'cmi.completion_status': 'not attempted',
-    'cmi.entry': 'ab-initio',
-    'cmi.objectives._count': '0',
-    'cmi.interactions._count': '0',
-    'numbas.user_role': 'learner',
-    'cmi.mode': 'normal',
-  };
-
-  private testId: number = 0;
-  private task: Task;
-  private readonly learnerId: string;
-  private readonly learnerName: string;
   initializationComplete$ = new BehaviorSubject<boolean>(false);
 
-  private scormErrors: { [key: string]: string } = {
-    "0": "No error",
-    "101": "General exception",
+  private scormErrorCodes: {[key: string]: string} = {
+    '0': 'No Error',
+    '101': 'General Exception',
+    '102': 'General Initialization Failure',
+    '103': 'Already Initialized',
+    '104': 'Content Instance Terminated',
+    '111': 'General Termination Failure',
+    '112': 'Termination Before Initialization',
+    '113': 'Termination After Termination',
+    '122': 'Retrieve Data Before Initialization',
+    '123': 'Retrieve Data After Termination',
+    '132': 'Store Data Before Initialization',
+    '133': 'Store Data After Termination',
+    '142': 'Commit Before Initialization',
+    '143': 'Commit After Termination',
+    '201': 'General Argument Error',
+    '301': 'General Get Failure',
+    '351': 'General Set Failure',
+    '391': 'General Commit Failure',
+    '401': 'Undefined Data Model Element',
+    '402': 'Unimplemented Data Model Element',
+    '403': 'Data Model Element Value Not Initialized',
+    '404': 'Data Model Element Is Read Only',
+    '405': 'Data Model Element Is Write Only',
+    '406': 'Data Model Element Type Mismatch',
+    '407': 'Data Model Element Value Out Of Range',
+    '408': 'Data Model Dependency Not Established',
   };
 
-  dataStore: { [key: string]: any } = this.getDefaultDataStore();
-
   constructor(private userService: UserService) {
-    const user = this.userService.currentUser;
-    this.learnerId = user.studentId;
-    this.learnerName = user.firstName + user.lastName;
+    this.dataModel = new ScormDataModel();
+    this.playerContext = new ScormPlayerContext(this.userService.currentUser);
   }
 
   setTask(task: Task) {
-    this.task = task;
+    this.playerContext.setTask(task);
   }
 
-  getDefaultDataStore() {
-    // Use spread operator to merge defaultValues into the dataStore
-    return {
-      ...this.defaultValues,
-      pass_status: false,
-      completed: false,
-    };
-  }
+  // getDefaultDataStore() {
+  //   // Use spread operator to merge defaultValues into the dataStore
+  //   return {
+  //     ...this.defaultValues,
+  //     pass_status: false,
+  //     completed: false,
+  //   };
+  // }
 
   Initialize(mode: 'attempt' | 'review' = 'attempt'): string {
     console.log('Initialize() function called');
-    const examName = 'test Exam Name 1';
-    let xhr = new XMLHttpRequest();
+    const xhr = new XMLHttpRequest();
     if (mode === 'review') {
       this.SetValue('cmi.mode', 'review');
 
-      xhr.open("GET", `${this.apiBaseUrl}/completed-latest?task_id=${this.task.id}`, false);
+      xhr.open(
+        'GET',
+        `${this.apiBaseUrl}/completed-latest?task_id=${this.playerContext.task.id}`,
+        false,
+      );
       xhr.send();
       console.log(xhr.responseText);
 
@@ -69,15 +82,17 @@ export class ScormAdapterService {
 
       try {
         const completedTest = JSON.parse(xhr.responseText);
-        let parsedSuspendData = JSON.parse(completedTest.data.suspend_data ?? '{}');
+        const parsedDataModel = JSON.parse(completedTest.data.suspend_data ?? '{}');
 
         // Set entire suspendData string to cmi.suspend_data
-        this.SetValue('cmi.suspend_data', JSON.stringify(parsedSuspendData));
+        this.SetValue('cmi.suspend_data', JSON.stringify(parsedDataModel));
 
-        // Use SetValue to set parsedSuspendData values to dataStore
-        Object.keys(parsedSuspendData).forEach(key => {
-          this.SetValue(key, parsedSuspendData[key]);
-        });
+        // // Use SetValue to set parsedSuspendData values to dataStore
+        // Object.keys(parsedDataModel).forEach((key) => {
+        //   this.SetValue(key, parsedDataModel[key]);
+        // });
+
+        this.dataModel.restore(parsedDataModel);
 
         this.SetValue('cmi.entry', 'RO');
         this.SetValue('cmi.mode', 'review');
@@ -90,7 +105,7 @@ export class ScormAdapterService {
       }
     }
 
-    xhr.open("GET", `${this.apiBaseUrl}/latest?task_id=${this.task.id}`, false);
+    xhr.open('GET', `${this.apiBaseUrl}/latest?task_id=${this.playerContext.task.id}`, false);
     xhr.send();
     console.log(xhr.responseText);
 
@@ -103,27 +118,27 @@ export class ScormAdapterService {
     try {
       latestTest = JSON.parse(xhr.responseText);
       console.log('Latest test result:', latestTest);
-      this.testId = latestTest.data.id;
+      this.playerContext.attemptId = latestTest.data.id;
 
       if (latestTest.data['cmi_entry'] === 'ab-initio') {
-        console.log("starting new test");
-        this.SetValue('cmi.learner_id', this.learnerId);
-        this.SetValue('cmi.learner_name', this.learnerName);
-        this.dataStore['name'] = examName;
-        this.dataStore['attempt_number'] = latestTest.data['attempt_number'];
-        console.log(this.dataStore);
-      } else if (latestTest.data['cmi_entry'] === 'resume') {
-        console.log("resuming test");
-        let parsedSuspendData = JSON.parse(latestTest.data.suspend_data ?? '{}');
+        console.log('starting new test');
+        this.dataModel.init();
+        this.SetValue('cmi.learner_id', this.playerContext.learnerId);
+        this.SetValue('cmi.learner_name', this.playerContext.learnerName);
 
-        this.dataStore = JSON.parse(JSON.stringify(parsedSuspendData));
+        this.dataModel.set('attempt_number', latestTest.data['attempt_number']);
+        console.log(this.dataModel.dump());
+      } else if (latestTest.data['cmi_entry'] === 'resume') {
+        console.log('resuming test');
+        const restoredDataModel = JSON.parse(latestTest.data.suspend_data ?? '{}');
+        this.dataModel.restore(JSON.parse(JSON.stringify(restoredDataModel)));
 
-        console.log(this.dataStore);
+        console.log(this.dataModel.dump());
       }
 
       this.initializationComplete$.next(true);
 
-      console.log("finished initializing");
+      console.log('finished initializing');
       return 'true';
     } catch (error) {
       console.error('Error:', error);
@@ -131,67 +146,56 @@ export class ScormAdapterService {
     }
   }
 
-  isTestCompleted(): boolean {
-    return this.dataStore?.['completed'] ?? false;
-  }
-
-  private resetDataStore() {
-    this.dataStore = this.getDefaultDataStore();
-  }
+  // isTestCompleted(): boolean {
+  //   return this.dataModel.get('completed') ?? false;
+  // }
 
   Terminate(): string {
     console.log('Terminate Called');
-    const examResult = this.dataStore["cmi.score.raw"];
-    const status = this.GetValue("cmi.success_status");
-    this.dataStore['completed'] = true;
-    const currentAttemptNumber = this.dataStore['attempt_number'] ?? 0;
-    const ExamName = this.dataStore['name'];
-    this.SetValue('cmi.entry', 'RO');
-    const cmientry = this.GetValue('cmi.entry');
+    const examResult = this.dataModel.get('cmi.score.raw');
+    const status = this.dataModel.get('cmi.success_status');
+    this.dataModel.set('completed', true);
+    const currentAttemptNumber = this.dataModel.get('attempt_number') ?? 0;
+    const ExamName = this.dataModel.get('name');
+    this.dataModel.set('cmi.entry', 'RO');
+    const cmientry = this.dataModel.get('cmi.entry');
     const data = {
       name: ExamName,
       attempt_number: currentAttemptNumber,
       pass_status: status === 'passed',
-      suspend_data: JSON.stringify(this.dataStore),
+      suspend_data: JSON.stringify(this.dataModel.dump()),
       completed: true,
       exam_result: examResult,
       cmi_entry: cmientry,
-      task_id: this.task.id
+      task_id: this.playerContext.task.id
     };
 
     const xhr = new XMLHttpRequest();
-    if (this.testId) {
-      xhr.open("PUT", `${this.apiBaseUrl}/${this.testId}`, false);
+    if (this.playerContext.attemptId) {
+      xhr.open('PUT', `${this.apiBaseUrl}/${this.playerContext.attemptId}`, false);
     } else {
-      xhr.open("POST", this.apiBaseUrl, false);
+      xhr.open('POST', this.apiBaseUrl, false);
     }
-    xhr.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+    xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
     xhr.send(JSON.stringify(data));
 
     if (xhr.status !== 200) {
       console.error('Error sending test data:', xhr.statusText);
       return 'false';
     }
-    this.resetDataStore();
+    this.dataModel.init();
     return 'true';
   }
 
   GetValue(element: string): string {
-    return this.dataStore[element] ?? '';
+    const value = this.dataModel.get(element);
+    console.log(`GetValue:`, element, value);
+    return value;
   }
 
   SetValue(element: string, value: any): string {
     console.log(`SetValue:`, element, value);
-    this.dataStore[element] = value;
-    if (element.match('cmi.interactions.\\d+.id')) {
-      console.log('Incrementing cmi.interactions._count');
-      this.dataStore['cmi.interactions._count']++;
-    }
-    if (element.match('cmi.objectives.\\d+.id')) {
-      console.log('Incrementing cmi.objectives._count');
-      this.dataStore['cmi.objectives._count']++;
-    }
-    // console.log("dataStore after value set:", this.dataStore);
+    this.dataModel.set(element, value);
     return 'true';
   }
 
@@ -203,15 +207,15 @@ export class ScormAdapterService {
     }
 
     // Set cmi.entry to 'resume' before committing dataStore
-    this.dataStore['cmi.entry'] = 'resume';
-    if (!this.isTestCompleted()) {
-      this.dataStore['cmi.exit'] = 'suspend';
-    }
-    console.log("Committing DataModel:", this.dataStore);
+    this.dataModel.set('cmi.entry', 'resume');
+    // if (!this.isTestCompleted()) {
+    //   this.dataModel.set('cmi.exit', 'suspend');
+    // }
+    console.log('Committing DataModel:', this.dataModel.dump());
 
     // Use XHR to send the request
     const xhr = new XMLHttpRequest();
-    xhr.open('PUT', `${this.apiBaseUrl}/${this.testId}/suspend`, true);
+    xhr.open('PUT', `${this.apiBaseUrl}/${this.playerContext.attemptId}/suspend`, true);
     xhr.setRequestHeader('Content-Type', 'application/json');
 
     xhr.onload = () => {
@@ -226,7 +230,7 @@ export class ScormAdapterService {
       console.error('Request failed.');
     };
 
-    const requestData = { suspend_data: this.dataStore };
+    const requestData = { suspend_data: this.dataModel.dump() };
     xhr.send(JSON.stringify(requestData));
     return 'true';
   }
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index 7ed98b3cfe..428f6869b7 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
-import { Task } from 'src/app/api/models/task';
+import { Task, ScormDataModel, ScormPlayerContext } from 'src/app/api/models/doubtfire-model';
 import { ScormAdapterService } from 'src/app/api/services/scorm-adapter.service';
 import { AppInjector } from 'src/app/app-injector';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
@@ -16,6 +16,8 @@ declare global {
   styleUrls: ['./scorm-player.component.scss'],
 })
 export class ScormPlayerComponent implements OnInit {
+  context: ScormPlayerContext;
+
   task: Task;
   currentMode: 'attempt' | 'review' = 'attempt';
   iframeSrc: SafeResourceUrl;

From b0863c7cf9319862b224705b50a238d2fabc5ec9 Mon Sep 17 00:00:00 2001
From: ublefo <90136978+ublefo@users.noreply.github.com>
Date: Sun, 12 May 2024 08:43:22 +1000
Subject: [PATCH 045/776] refactor: rewrite test attempt code

---
 src/app/api/models/scorm-datamodel.ts         |  24 +-
 src/app/api/models/scorm-player-context.ts    |  69 +++-
 src/app/api/models/task-definition.ts         |  14 +-
 src/app/api/models/task.ts                    |   2 +-
 src/app/api/services/scorm-adapter.service.ts | 350 +++++++++---------
 src/app/api/services/task-comment.service.ts  |   2 +-
 .../api/services/task-definition.service.ts   |  10 +-
 .../scorm-player-modal.component.ts           |  15 +-
 .../scorm-player/scorm-player.component.ts    |  41 +-
 .../upload-submission-modal.coffee            |   2 +-
 .../numbas-comment.component.ts               |   6 +-
 .../task-comments-viewer.component.html       |   2 +-
 .../task-comments-viewer.component.scss       |   2 +-
 .../task-definition-numbas.component.html     |  10 +-
 14 files changed, 289 insertions(+), 260 deletions(-)

diff --git a/src/app/api/models/scorm-datamodel.ts b/src/app/api/models/scorm-datamodel.ts
index e9d105f3c7..9454db78f6 100644
--- a/src/app/api/models/scorm-datamodel.ts
+++ b/src/app/api/models/scorm-datamodel.ts
@@ -1,12 +1,4 @@
 export class ScormDataModel {
-  initState: {[key: string]: string} = {
-    'cmi.completion_status': 'not attempted',
-    'cmi.entry': 'ab-initio',
-    'cmi.objectives._count': '0',
-    'cmi.interactions._count': '0',
-    'cmi.mode': 'normal',
-  };
-
   dataModel: {[key: string]: any} = {};
   readonly msgPrefix = 'SCORM DataModel: ';
 
@@ -14,17 +6,13 @@ export class ScormDataModel {
     this.dataModel = {};
   }
 
-  public init() {
-    console.log(this.msgPrefix + 'initializing DataModel with default values');
-    this.dataModel = this.initState;
-  }
-
-  public restore(dataModel: {[key: string]: any} = {}) {
+  public restore(dataModel: string) {
     console.log(this.msgPrefix + 'restoring DataModel with provided data');
-    this.dataModel = dataModel;
+    this.dataModel = JSON.parse(dataModel);
   }
 
   public get(key: string): string {
+    // console.log(`SCORM DataModel: get ${key} ${this.dataModel[key]}`);
     return this.dataModel[key] ?? '';
   }
 
@@ -33,23 +21,27 @@ export class ScormDataModel {
   }
 
   public set(key: string, value: any): string {
-    console.log(this.msgPrefix + 'set: ', key, value);
+    // console.log(this.msgPrefix + 'set: ', key, value);
     this.dataModel[key] = value;
     if (key.match('cmi.interactions.\\d+.id')) {
+      // cmi.interactions._count must be incremented after a new interaction is crated
       const interactionPath = key.match('cmi.interactions.\\d+');
       const objectivesCounterForInteraction = interactionPath.toString() + '.objectives._count';
       console.log('Incrementing cmi.interactions._count');
       this.dataModel['cmi.interactions._count']++;
+      // cmi.interactions.n.objectives._count must be initialized after an interaction is created
       console.log(`Initializing ${objectivesCounterForInteraction}`);
       this.dataModel[objectivesCounterForInteraction] = 0;
     }
     if (key.match('cmi.interactions.\\d+.objectives.\\d+.id')) {
       const interactionPath = key.match('cmi.interactions.\\d+.objectives');
       const objectivesCounterForInteraction = interactionPath.toString() + '._count';
+      // cmi.interactions.n.objectives._count must be incremented after objective creation
       console.log(`Incrementing ${objectivesCounterForInteraction}`);
       this.dataModel[objectivesCounterForInteraction.toString()]++;
     }
     if (key.match('cmi.objectives.\\d+.id')) {
+      // cmi.objectives._count must be incremented after a new objective is crated
       console.log('Incrementing cmi.objectives._count');
       this.dataModel['cmi.objectives._count']++;
     }
diff --git a/src/app/api/models/scorm-player-context.ts b/src/app/api/models/scorm-player-context.ts
index 5f1c4bd3ba..f3b3b8a13f 100644
--- a/src/app/api/models/scorm-player-context.ts
+++ b/src/app/api/models/scorm-player-context.ts
@@ -1,9 +1,56 @@
-import { Task, User } from 'src/app/api/models/doubtfire-model';
+import {Task, User} from 'src/app/api/models/doubtfire-model';
+
+type DataModelState = 'Uninitialized' | 'Initialized' | 'Terminated';
+
+type DataModelError = Record<number, string>;
+const CMIErrorCodes: DataModelError = {
+  0: 'No Error',
+  101: 'General Exception',
+  102: 'General Initialization Failure',
+  103: 'Already Initialized',
+  104: 'Content Instance Terminated',
+  111: 'General Termination Failure',
+  112: 'Termination Before Initialization',
+  113: 'Termination After Termination',
+  122: 'Retrieve Data Before Initialization',
+  123: 'Retrieve Data After Termination',
+  132: 'Store Data Before Initialization',
+  133: 'Store Data After Termination',
+  142: 'Commit Before Initialization',
+  143: 'Commit After Termination',
+  201: 'General Argument Error',
+  301: 'General Get Failure',
+  351: 'General Set Failure',
+  391: 'General Commit Failure',
+  401: 'Undefined Data Model Element',
+  402: 'Unimplemented Data Model Element',
+  403: 'Data Model Element Value Not Initialized',
+  404: 'Data Model Element Is Read Only',
+  405: 'Data Model Element Is Write Only',
+  406: 'Data Model Element Type Mismatch',
+  407: 'Data Model Element Value Out Of Range',
+  408: 'Data Model Dependency Not Established',
+};
 
 export class ScormPlayerContext {
-  task: Task;
   mode: 'browse' | 'normal' | 'review';
+  state: DataModelState;
+
+  private _errorCode: number;
+  get errorCode() {
+    return this._errorCode;
+  }
+  set errorCode(value: number) {
+    this._errorCode = value;
+  }
+
+  getErrorMessage(value: string): string {
+    return CMIErrorCodes[value];
+  }
+
+  task: Task;
   user: User;
+
   attemptNumber: number;
   attemptId: number;
   learnerName: string;
@@ -13,21 +60,7 @@ export class ScormPlayerContext {
     this.user = user;
     this.learnerId = user.id;
     this.learnerName = user.firstName + ' ' + user.lastName;
-  }
-
-  public setTask(task: Task): void {
-    this.task = task;
-  }
-
-  public setMode(mode: 'browse' | 'normal' | 'review'): void {
-    this.mode = mode;
-  }
-
-  public setAttemptNumber(attemptNumber: number = 1): void {
-    this.attemptNumber = attemptNumber;
-  }
-
-  public setAttemptId(attemptId: number): void {
-    this.attemptId = attemptId;
+    this.state = 'Uninitialized';
+    this.errorCode = 0;
   }
 }
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index a669b2fe36..985b810137 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -31,10 +31,10 @@ export class TaskDefinition extends Entity {
   groupSet: GroupSet = null;
   hasTaskSheet: boolean;
   hasTaskResources: boolean;
-  hasEnabledNumbasTest: boolean;
-  hasNumbasData: boolean;
-  hasNumbasTimeDelay: boolean;
-  numbasAttemptLimit: number = 0;
+  scormEnabled: boolean;
+  hasScormData: boolean;
+  scormTimeDelayEnabled: boolean;
+  scormAttemptLimit: number = 0;
   hasTaskAssessmentResources: boolean;
   isGraded: boolean;
   maxQualityPts: number;
@@ -158,7 +158,7 @@ export class TaskDefinition extends Entity {
 
   public getNumbasTestUrl(asAttachment: boolean = false) {
     const constants = AppInjector.get(DoubtfireConstants);
-    return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/numbas_data.json${
+    return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/scorm_data.json${
       asAttachment ? '?as_attachment=true' : ''
     }`;
   }
@@ -190,7 +190,7 @@ export class TaskDefinition extends Entity {
   public get numbasTestUploadUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
       this.id
-    }/numbas_data`;
+    }/scorm_data`;
   }
 
   public get taskAssessmentResourcesUploadUrl(): string {
@@ -217,7 +217,7 @@ export class TaskDefinition extends Entity {
 
   public deleteNumbasTest(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
-    return httpClient.delete(this.numbasTestUploadUrl).pipe(tap(() => (this.hasNumbasData = false)));
+    return httpClient.delete(this.numbasTestUploadUrl).pipe(tap(() => (this.hasScormData = false)));
   }
 
   public deleteTaskAssessmentResources(): Observable<any> {
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 403165cfee..3803d325b6 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -509,7 +509,7 @@ export class Task extends Entity {
 
   public get numbasEnabled(): boolean {
     return (
-      this.definition.hasEnabledNumbasTest && this.definition.hasNumbasData
+      this.definition.scormEnabled && this.definition.hasScormData
     );
   }
 
diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index 6c5353746b..8886121031 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -1,222 +1,212 @@
-import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
-import { UserService } from './user.service';
+import {Injectable} from '@angular/core';
+import {UserService} from './user.service';
 import API_URL from 'src/app/config/constants/apiURL';
-import { Task, ScormDataModel, ScormPlayerContext } from 'src/app/api/models/doubtfire-model';
+import {Task, ScormDataModel, ScormPlayerContext} from 'src/app/api/models/doubtfire-model';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ScormAdapterService {
   private readonly apiBaseUrl = `${API_URL}/test_attempts`;
   private dataModel: ScormDataModel;
-  private playerContext: ScormPlayerContext;
-
-  initializationComplete$ = new BehaviorSubject<boolean>(false);
-
-  private scormErrorCodes: {[key: string]: string} = {
-    '0': 'No Error',
-    '101': 'General Exception',
-    '102': 'General Initialization Failure',
-    '103': 'Already Initialized',
-    '104': 'Content Instance Terminated',
-    '111': 'General Termination Failure',
-    '112': 'Termination Before Initialization',
-    '113': 'Termination After Termination',
-    '122': 'Retrieve Data Before Initialization',
-    '123': 'Retrieve Data After Termination',
-    '132': 'Store Data Before Initialization',
-    '133': 'Store Data After Termination',
-    '142': 'Commit Before Initialization',
-    '143': 'Commit After Termination',
-    '201': 'General Argument Error',
-    '301': 'General Get Failure',
-    '351': 'General Set Failure',
-    '391': 'General Commit Failure',
-    '401': 'Undefined Data Model Element',
-    '402': 'Unimplemented Data Model Element',
-    '403': 'Data Model Element Value Not Initialized',
-    '404': 'Data Model Element Is Read Only',
-    '405': 'Data Model Element Is Write Only',
-    '406': 'Data Model Element Type Mismatch',
-    '407': 'Data Model Element Value Out Of Range',
-    '408': 'Data Model Dependency Not Established',
-  };
+  private context: ScormPlayerContext;
+  private xhr: XMLHttpRequest;
 
   constructor(private userService: UserService) {
     this.dataModel = new ScormDataModel();
-    this.playerContext = new ScormPlayerContext(this.userService.currentUser);
+    this.context = new ScormPlayerContext(this.userService.currentUser);
+    this.xhr = new XMLHttpRequest();
   }
 
-  setTask(task: Task) {
-    this.playerContext.setTask(task);
+  set task(task: Task) {
+    this.context.task = task;
   }
 
-  // getDefaultDataStore() {
-  //   // Use spread operator to merge defaultValues into the dataStore
-  //   return {
-  //     ...this.defaultValues,
-  //     pass_status: false,
-  //     completed: false,
-  //   };
-  // }
-
-  Initialize(mode: 'attempt' | 'review' = 'attempt'): string {
-    console.log('Initialize() function called');
-    const xhr = new XMLHttpRequest();
-    if (mode === 'review') {
-      this.SetValue('cmi.mode', 'review');
-
-      xhr.open(
-        'GET',
-        `${this.apiBaseUrl}/completed-latest?task_id=${this.playerContext.task.id}`,
-        false,
-      );
-      xhr.send();
-      console.log(xhr.responseText);
+  get state() {
+    return this.context.state;
+  }
 
-      if (xhr.status !== 200) {
-        console.error('Error fetching latest completed test result:', xhr.statusText);
-        return 'false';
-      }
+  destroy() {
+    this.dataModel = new ScormDataModel();
+    this.context.state = 'Uninitialized';
+  }
 
-      try {
-        const completedTest = JSON.parse(xhr.responseText);
-        const parsedDataModel = JSON.parse(completedTest.data.suspend_data ?? '{}');
+  Initialize(): string {
+    console.log('API_1484_11: Initialize');
+
+    // TODO: error handling and reporting
+    switch (this.context.state) {
+      case 'Initialized':
+        this.context.errorCode = 103;
+        console.log('Already Initialized');
+        break;
+      case 'Terminated':
+        this.context.errorCode = 104;
+        console.log('Content Instance Terminated');
+        break;
+    }
 
-        // Set entire suspendData string to cmi.suspend_data
-        this.SetValue('cmi.suspend_data', JSON.stringify(parsedDataModel));
+    // TODO: move this part into the player component
+    this.xhr.open('GET', `${this.apiBaseUrl}/${this.context.task.id}/latest`, false);
 
-        // // Use SetValue to set parsedSuspendData values to dataStore
-        // Object.keys(parsedDataModel).forEach((key) => {
-        //   this.SetValue(key, parsedDataModel[key]);
-        // });
+    let noTestFound = false;
+    let startNewTest = false;
 
-        this.dataModel.restore(parsedDataModel);
+    this.xhr.onload = () => {
+      if (this.xhr.status >= 200 && this.xhr.status < 400) {
+        console.log('Retrieved the latest attempt.');
+      } else if (this.xhr.status == 404) {
+        console.log('Not found.');
+        noTestFound = true;
+      } else {
+        console.error('Error saving DataModel:', this.xhr.responseText);
+      }
+    };
 
-        this.SetValue('cmi.entry', 'RO');
-        this.SetValue('cmi.mode', 'review');
+    this.xhr.send();
+    console.log(this.xhr.responseText);
 
-        console.log('Latest completed test data:', completedTest);
-        return 'true';
-      } catch (error) {
-        console.error('Error:', error);
-        return 'false';
+    if (!noTestFound) {
+      const latestSession = JSON.parse(this.xhr.responseText);
+      console.log('Latest exam session:', latestSession);
+      this.context.attemptId = latestSession.id;
+      if (latestSession.completion_status) {
+        startNewTest = true;
       }
+    } else {
+      startNewTest = true;
     }
 
-    xhr.open('GET', `${this.apiBaseUrl}/latest?task_id=${this.playerContext.task.id}`, false);
-    xhr.send();
-    console.log(xhr.responseText);
-
-    if (xhr.status !== 200) {
-      console.error('Error fetching latest test result:', xhr.statusText);
-      return 'false';
+    if (!startNewTest) {
+      this.xhr.open(
+        'PATCH',
+        `${this.apiBaseUrl}/${this.context.task.id}/session/${this.context.attemptId}`,
+        false,
+      );
+      this.xhr.send();
+      console.log(this.xhr.responseText);
+
+      const currentSession = JSON.parse(this.xhr.responseText);
+      console.log('Current exam session:', currentSession);
+      this.context.attemptId = currentSession.id;
+      this.dataModel.restore(currentSession.cmi_datamodel);
+      console.log(this.dataModel.dump());
+    } else {
+      this.xhr.open('POST', `${this.apiBaseUrl}/${this.context.task.id}/session`, false);
+      this.xhr.send();
+      console.log(this.xhr.responseText);
+
+      const currentSession = JSON.parse(this.xhr.responseText);
+      console.log('Current exam session:', currentSession);
+      this.context.attemptId = currentSession.id;
+      this.dataModel.restore(currentSession.cmi_datamodel);
+      console.log(this.dataModel.dump());
     }
 
-    let latestTest;
-    try {
-      latestTest = JSON.parse(xhr.responseText);
-      console.log('Latest test result:', latestTest);
-      this.playerContext.attemptId = latestTest.data.id;
-
-      if (latestTest.data['cmi_entry'] === 'ab-initio') {
-        console.log('starting new test');
-        this.dataModel.init();
-        this.SetValue('cmi.learner_id', this.playerContext.learnerId);
-        this.SetValue('cmi.learner_name', this.playerContext.learnerName);
-
-        this.dataModel.set('attempt_number', latestTest.data['attempt_number']);
-        console.log(this.dataModel.dump());
-      } else if (latestTest.data['cmi_entry'] === 'resume') {
-        console.log('resuming test');
-        const restoredDataModel = JSON.parse(latestTest.data.suspend_data ?? '{}');
-        this.dataModel.restore(JSON.parse(JSON.stringify(restoredDataModel)));
-
-        console.log(this.dataModel.dump());
-      }
-
-      this.initializationComplete$.next(true);
-
-      console.log('finished initializing');
-      return 'true';
-    } catch (error) {
-      console.error('Error:', error);
-      return 'false';
-    }
+    this.context.state = 'Initialized';
+    return 'true';
   }
 
-  // isTestCompleted(): boolean {
-  //   return this.dataModel.get('completed') ?? false;
-  // }
-
   Terminate(): string {
-    console.log('Terminate Called');
-    const examResult = this.dataModel.get('cmi.score.raw');
-    const status = this.dataModel.get('cmi.success_status');
-    this.dataModel.set('completed', true);
-    const currentAttemptNumber = this.dataModel.get('attempt_number') ?? 0;
-    const ExamName = this.dataModel.get('name');
-    this.dataModel.set('cmi.entry', 'RO');
-    const cmientry = this.dataModel.get('cmi.entry');
-    const data = {
-      name: ExamName,
-      attempt_number: currentAttemptNumber,
-      pass_status: status === 'passed',
-      suspend_data: JSON.stringify(this.dataModel.dump()),
-      completed: true,
-      exam_result: examResult,
-      cmi_entry: cmientry,
-      task_id: this.playerContext.task.id
-    };
-
-    const xhr = new XMLHttpRequest();
-    if (this.playerContext.attemptId) {
-      xhr.open('PUT', `${this.apiBaseUrl}/${this.playerContext.attemptId}`, false);
-    } else {
-      xhr.open('POST', this.apiBaseUrl, false);
+    console.log('API_1484_11: Terminate');
+
+    // TODO: error handling and reporting
+    switch (this.context.state) {
+      case 'Uninitialized':
+        this.context.errorCode = 112;
+        console.log('Termination Before Initialization');
+        break;
+      case 'Terminated':
+        this.context.errorCode = 113;
+        console.log('Termination After Termination');
+        break;
     }
-    xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
-    xhr.send(JSON.stringify(data));
 
-    if (xhr.status !== 200) {
-      console.error('Error sending test data:', xhr.statusText);
-      return 'false';
-    }
-    this.dataModel.init();
+    this.xhr.open(
+      'PATCH',
+      `${this.apiBaseUrl}/${this.context.task.id}/session/${this.context.attemptId}`,
+      false,
+    );
+    this.xhr.setRequestHeader('Content-Type', 'application/json');
+    const requestData = {
+      terminated: true,
+    };
+    this.xhr.send(JSON.stringify(requestData));
+    console.log(this.xhr.responseText);
+
+    // all done, clearing datamodel and setting state to terminated
+    this.dataModel = new ScormDataModel();
+    this.context.state = 'Terminated';
     return 'true';
   }
 
   GetValue(element: string): string {
     const value = this.dataModel.get(element);
-    console.log(`GetValue:`, element, value);
+
+    // TODO: error reporting
+    // TODO: can't get until init is done
+    switch (this.context.state) {
+      case 'Uninitialized':
+        this.context.errorCode = 122;
+        console.log('Retrieve Data Before Initialization');
+        break;
+      case 'Terminated':
+        this.context.errorCode = 123;
+        console.log('Retrieve Data After Termination');
+        break;
+    }
+
+    console.log(`API_1484_11: GetValue:`, element, value);
     return value;
   }
 
   SetValue(element: string, value: any): string {
-    console.log(`SetValue:`, element, value);
+    console.log(`API_1484_11: SetValue:`, element, value);
+
+    // TODO: error reporting
+    // TODO: can't set until init is done
+    switch (this.context.state) {
+      case 'Uninitialized':
+        this.context.errorCode = 132;
+        console.log('Store Data Before Initialization');
+        break;
+      case 'Terminated':
+        this.context.errorCode = 133;
+        console.log('Store Data After Termination');
+        break;
+    }
+
     this.dataModel.set(element, value);
     return 'true';
   }
 
-  // Saves the state of the exam.
   Commit(): string {
-    if (!this.initializationComplete$.getValue()) {
-      console.warn('Initialization not complete. Cannot commit.');
-      return 'false';
+    console.log('API_1484_11: Commit');
+
+    // TODO: error reporting
+    // TODO: can't commit until init is done
+    switch (this.context.state) {
+      case 'Uninitialized':
+        this.context.errorCode = 142;
+        console.log('Commit Before Initialization');
+        break;
+      case 'Terminated':
+        this.context.errorCode = 143;
+        console.log('Commit After Termination');
+        break;
     }
 
-    // Set cmi.entry to 'resume' before committing dataStore
-    this.dataModel.set('cmi.entry', 'resume');
-    // if (!this.isTestCompleted()) {
-    //   this.dataModel.set('cmi.exit', 'suspend');
-    // }
-    console.log('Committing DataModel:', this.dataModel.dump());
-
-    // Use XHR to send the request
     const xhr = new XMLHttpRequest();
-    xhr.open('PUT', `${this.apiBaseUrl}/${this.playerContext.attemptId}/suspend`, true);
+    xhr.open(
+      'PATCH',
+      `${this.apiBaseUrl}/${this.context.task.id}/session/${this.context.attemptId}`,
+      true,
+    );
     xhr.setRequestHeader('Content-Type', 'application/json');
+    const requestData = {
+      cmi_datamodel: JSON.stringify(this.dataModel.dump()),
+    };
+    xhr.send(JSON.stringify(requestData));
 
     xhr.onload = () => {
       if (xhr.status >= 200 && xhr.status < 400) {
@@ -230,23 +220,27 @@ export class ScormAdapterService {
       console.error('Request failed.');
     };
 
-    const requestData = { suspend_data: this.dataModel.dump() };
-    xhr.send(JSON.stringify(requestData));
+    this.context.errorCode = 0;
     return 'true';
   }
 
-  // Placeholder methods for SCORM error handling
   GetLastError(): string {
-    //console.log('Get Last Error called');
-    return "0";
+    const lastError = this.context.errorCode.toString();
+    if (lastError !== '0') {
+      console.log(`API_1484_11: GetLastError: ${lastError}`);
+    }
+    return lastError;
   }
 
   GetErrorString(errorCode: string): string {
-    return '';
+    const errorString = this.context.getErrorMessage(errorCode);
+    console.log(`API_1484_11: GetErrorString:`, errorCode, errorString);
+    return errorString;
   }
 
   GetDiagnostic(errorCode: string): string {
-    //console.log('Get Diagnoistic called');
-    return '';
+    // TODO: implement this
+    console.log(`API_1484_11: GetDiagnostic:`, errorCode);
+    return 'GetDiagnostic is currently not implemented';
   }
 }
diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index e3c80797a4..5f034b870d 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -145,7 +145,7 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
     const opts: RequestOptions<TaskComment> = { endpointFormat: this.commentEndpointFormat };
 
     // Based on the comment type - add to the body and configure the end point
-    if (commentType === 'text' || commentType === 'numbas') {
+    if (commentType === 'text' || commentType === 'scorm') {
       body.append('comment', data);
     } else if (commentType === 'discussion') {
       opts.endpointFormat = this.discussionEndpointFormat;
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 6047af0546..a738626884 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -93,10 +93,10 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskSheet',
       'hasTaskResources',
       'hasTaskAssessmentResources',
-      'hasEnabledNumbasTest',
-      'hasNumbasData',
-      'hasNumbasTimeDelay',
-      'numbasAttemptLimit',
+      'scormEnabled',
+      'hasScormData',
+      'scormTimeDelayEnabled',
+      'scormAttemptLimit',
       'isGraded',
       'maxQualityPts',
       'overseerImageId',
@@ -108,7 +108,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskSheet',
       'hasTaskResources',
       'hasTaskAssessmentResources',
-      'hasNumbasData'
+      'hasScormData'
     );
   }
 
diff --git a/src/app/common/scorm-player/scorm-player-modal.component.ts b/src/app/common/scorm-player/scorm-player-modal.component.ts
index 190e7bf570..2fb4630263 100644
--- a/src/app/common/scorm-player/scorm-player-modal.component.ts
+++ b/src/app/common/scorm-player/scorm-player-modal.component.ts
@@ -1,20 +1,21 @@
-import { Injectable } from '@angular/core';
-import { MatDialog, MatDialogRef } from '@angular/material/dialog';
-import { ScormPlayerComponent } from './scorm-player.component';
-import { Task } from 'src/app/api/models/task';
+import {Injectable} from '@angular/core';
+import {MatDialog, MatDialogRef} from '@angular/material/dialog';
+import {ScormPlayerComponent} from './scorm-player.component';
+import {Task} from 'src/app/api/models/task';
 
 @Injectable({
   providedIn: 'root',
 })
 export class ScormPlayerModal {
-  constructor(public dialog: MatDialog) { }
+  constructor(public dialog: MatDialog) {}
 
   public show(task: Task, mode: 'attempt' | 'review'): void {
     let dialogRef: MatDialogRef<ScormPlayerComponent, any>;
 
     dialogRef = this.dialog.open(ScormPlayerComponent, {
-      data: { task, mode },
-      width: '95%', height: '90%',
+      data: {task, mode},
+      width: '95%',
+      height: '90%',
       disableClose: true,
     });
   }
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index 428f6869b7..1b89e36bae 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -1,13 +1,15 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
-import { Task, ScormDataModel, ScormPlayerContext } from 'src/app/api/models/doubtfire-model';
-import { ScormAdapterService } from 'src/app/api/services/scorm-adapter.service';
-import { AppInjector } from 'src/app/app-injector';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {Component, OnInit, Inject} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
+import {Task, ScormPlayerContext} from 'src/app/api/models/doubtfire-model';
+import {ScormAdapterService} from 'src/app/api/services/scorm-adapter.service';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 
 declare global {
-  interface Window { API_1484_11: any; }
+  interface Window {
+    API_1484_11: any;
+  }
 }
 
 @Component({
@@ -24,34 +26,41 @@ export class ScormPlayerComponent implements OnInit {
 
   constructor(
     private dialogRef: MatDialogRef<ScormPlayerComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: { task: Task, mode: 'attempt' | 'review' },
+    @Inject(MAT_DIALOG_DATA) public data: {task: Task; mode: 'attempt' | 'review'},
     private scormAdapter: ScormAdapterService,
-    private sanitizer: DomSanitizer
+    private sanitizer: DomSanitizer,
   ) {}
 
   ngOnInit(): void {
     this.task = this.data.task;
-    this.scormAdapter.setTask(this.task);
+    this.scormAdapter.task = this.task;
 
     window.API_1484_11 = {
-      Initialize: () => this.scormAdapter.Initialize(this.currentMode),
+      Initialize: () => this.scormAdapter.Initialize(),
       Terminate: () => this.scormAdapter.Terminate(),
       GetValue: (element: string) => this.scormAdapter.GetValue(element),
       SetValue: (element: string, value: string) => this.scormAdapter.SetValue(element, value),
       Commit: () => this.scormAdapter.Commit(),
       GetLastError: () => this.scormAdapter.GetLastError(),
       GetErrorString: (errorCode: string) => this.scormAdapter.GetErrorString(errorCode),
-      GetDiagnostic: (errorCode: string) => this.scormAdapter.GetDiagnostic(errorCode)
+      GetDiagnostic: (errorCode: string) => this.scormAdapter.GetDiagnostic(errorCode),
     };
 
     this.currentMode = this.data.mode;
 
-    this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(`${AppInjector.get(DoubtfireConstants).API_URL}/numbas_api/${this.task.taskDefId}/index.html`);
+    this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(
+      `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.task.taskDefId}/index.html`,
+    );
   }
 
   close(): void {
-    console.log('SCORM player closing, commiting DataModel!');
-    this.scormAdapter.Commit();
+    if (this.scormAdapter.state == 'Initialized') {
+      console.log('SCORM player closing during an initialized session, commiting DataModel');
+      this.scormAdapter.Commit();
+    }
+    // TODO: would be nice if we can destroy this entire adapter object when the modal is closed
+    console.log('Clearing player context and DataModel');
+    this.scormAdapter.destroy();
     const iframe = document.getElementsByTagName('iframe')[0];
     iframe?.parentNode?.removeChild(iframe);
     this.dialogRef.close();
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index 6a17bd558c..7c0baf7ee9 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -128,7 +128,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       removed.push('group') if !isRFF || !task.isGroupTask()
       removed.push('alignment') if !isRFF || !task.unit.ilos.length > 0
       removed.push('comments') if isTestSubmission
-      removed.push('scorm-assessment') if !isRFF || !task.definition.hasEnabledNumbasTest
+      removed.push('scorm-assessment') if !isRFF || !task.definition.scormEnabled
       removed
     # Initialises the states
     initialise: ->
diff --git a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
index 650a110d0f..c8ba676c55 100644
--- a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { Task, TaskComment } from 'src/app/api/models/doubtfire-model';
-import { ScormPlayerModal } from 'src/app/common/scorm-player/scorm-player-modal.component';
+import {Component, OnInit, Input} from '@angular/core';
+import {Task, TaskComment} from 'src/app/api/models/doubtfire-model';
+import {ScormPlayerModal} from 'src/app/common/scorm-player/scorm-player-modal.component';
 
 @Component({
   selector: 'numbas-comment',
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index cd18eda9ba..0be0e7b758 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -72,7 +72,7 @@
                 ></app-task-assessment-comment>
               </div>
 
-              <div *ngSwitchCase="'numbas'" class="comment-numbas">
+              <div *ngSwitchCase="'numbas'" class="comment-scorm">
                 <numbas-comment
                   [task]="task"
                   [comment]="comment"
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
index 993c2be6f2..d82983038f 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
@@ -144,7 +144,7 @@ $comment-inner-border-radius: 4px;
     width: 100%;
   }
 
-  .comment-container .comment-assessment, .comment-container .comment-numbas {
+  .comment-container .comment-assessment, .comment-container .comment-scorm {
     width: 100%;
   }
 
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
index e0021065aa..36acb4ca4c 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
@@ -1,5 +1,5 @@
 <div class="flex flex-col gap-4">
-  <mat-checkbox matInput required [(ngModel)]="taskDefinition.hasEnabledNumbasTest">
+  <mat-checkbox matInput required [(ngModel)]="taskDefinition.scormEnabled">
     Enable Numbas Test
   </mat-checkbox>
 
@@ -10,7 +10,7 @@
       accept="application/zip"
       [desiredFileName]="'Numbas zip'"
     />
-    @if (taskDefinition.hasNumbasData) {
+    @if (taskDefinition.hasScormData) {
       <div class="flex flex-row gap-4 pt-4">
         <button mat-flat-button color="warn" (click)="removeNumbasTest()" class="flex-grow me-4">
           Delete Numbas Zip
@@ -22,9 +22,9 @@
     }
   </div>
 
-  @if (taskDefinition.hasEnabledNumbasTest) {
+  @if (taskDefinition.scormEnabled) {
     <div class="flex-grow flex flex-row gap-4 pt-4">
-      <mat-checkbox class="basis-1/2" matInput required [(ngModel)]="taskDefinition.hasNumbasTimeDelay">
+      <mat-checkbox class="basis-1/2" matInput required [(ngModel)]="taskDefinition.scormTimeDelayEnabled">
         Enable incremental time delays between test attempts
       </mat-checkbox>
       <mat-form-field appearance="outline" class="basis-1/2">
@@ -34,7 +34,7 @@
           min="0"
           max="100"
           type="number"
-          [(ngModel)]="taskDefinition.numbasAttemptLimit"
+          [(ngModel)]="taskDefinition.scormAttemptLimit"
           [formControl]="attemptLimitControl"
         />
       </mat-form-field>

From 644c025e698480276a068d717589be547817ddc8 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 14 May 2024 13:18:33 +1000
Subject: [PATCH 046/776] refactor: rename numbas references to scorm and fix
 typos

---
 src/app/api/models/scorm-datamodel.ts         |  4 +-
 src/app/api/models/task-definition.ts         |  8 +-
 src/app/api/models/task.ts                    |  2 +-
 .../spec/scorm-adapter.service.spec.ts        | 87 -------------------
 .../api/services/task-definition.service.ts   |  4 +-
 .../scorm-player-modal.component.ts           |  2 +-
 .../scorm-player/scorm-player.component.ts    |  4 +-
 src/app/doubtfire-angular.module.ts           |  8 +-
 .../upload-submission-modal.coffee            |  2 +-
 .../upload-submission-modal.tpl.html          |  6 +-
 .../scorm-comment.component.html}             |  4 +-
 .../scorm-comment.component.scss}             |  0
 .../scorm-comment.component.ts}               | 10 +--
 .../task-comments-viewer.component.html       |  8 +-
 .../task-comments-viewer.component.ts         |  6 +-
 .../task-definition-editor.component.html     |  6 +-
 .../task-definition-scorm.component.html}     | 14 +--
 .../task-definition-scorm.component.scss}     |  0
 .../task-definition-scorm.component.ts}       | 32 +++----
 19 files changed, 60 insertions(+), 147 deletions(-)
 delete mode 100644 src/app/api/services/spec/scorm-adapter.service.spec.ts
 rename src/app/tasks/task-comments-viewer/{numbas-comment/numbas-comment.component.html => scorm-comment/scorm-comment.component.html} (65%)
 rename src/app/tasks/task-comments-viewer/{numbas-comment/numbas-comment.component.scss => scorm-comment/scorm-comment.component.scss} (100%)
 rename src/app/tasks/task-comments-viewer/{numbas-comment/numbas-comment.component.ts => scorm-comment/scorm-comment.component.ts} (66%)
 rename src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/{task-definition-numbas/task-definition-numbas.component.html => task-definition-scorm/task-definition-scorm.component.html} (78%)
 rename src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/{task-definition-numbas/task-definition-numbas.component.scss => task-definition-scorm/task-definition-scorm.component.scss} (100%)
 rename src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/{task-definition-numbas/task-definition-numbas.component.ts => task-definition-scorm/task-definition-scorm.component.ts} (58%)

diff --git a/src/app/api/models/scorm-datamodel.ts b/src/app/api/models/scorm-datamodel.ts
index 9454db78f6..7559318eb5 100644
--- a/src/app/api/models/scorm-datamodel.ts
+++ b/src/app/api/models/scorm-datamodel.ts
@@ -24,7 +24,7 @@ export class ScormDataModel {
     // console.log(this.msgPrefix + 'set: ', key, value);
     this.dataModel[key] = value;
     if (key.match('cmi.interactions.\\d+.id')) {
-      // cmi.interactions._count must be incremented after a new interaction is crated
+      // cmi.interactions._count must be incremented after a new interaction is created
       const interactionPath = key.match('cmi.interactions.\\d+');
       const objectivesCounterForInteraction = interactionPath.toString() + '.objectives._count';
       console.log('Incrementing cmi.interactions._count');
@@ -41,7 +41,7 @@ export class ScormDataModel {
       this.dataModel[objectivesCounterForInteraction.toString()]++;
     }
     if (key.match('cmi.objectives.\\d+.id')) {
-      // cmi.objectives._count must be incremented after a new objective is crated
+      // cmi.objectives._count must be incremented after a new objective is created
       console.log('Incrementing cmi.objectives._count');
       this.dataModel['cmi.objectives._count']++;
     }
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 985b810137..538b449338 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -156,7 +156,7 @@ export class TaskDefinition extends Entity {
     }`;
   }
 
-  public getNumbasTestUrl(asAttachment: boolean = false) {
+  public getScormDataUrl(asAttachment: boolean = false) {
     const constants = AppInjector.get(DoubtfireConstants);
     return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/scorm_data.json${
       asAttachment ? '?as_attachment=true' : ''
@@ -187,7 +187,7 @@ export class TaskDefinition extends Entity {
     }/task_resources`;
   }
 
-  public get numbasTestUploadUrl(): string {
+  public get scormDataUploadUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
       this.id
     }/scorm_data`;
@@ -215,9 +215,9 @@ export class TaskDefinition extends Entity {
     return httpClient.delete(this.taskResourcesUploadUrl).pipe(tap(() => (this.hasTaskResources = false)));
   }
 
-  public deleteNumbasTest(): Observable<any> {
+  public deleteScormData(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
-    return httpClient.delete(this.numbasTestUploadUrl).pipe(tap(() => (this.hasScormData = false)));
+    return httpClient.delete(this.scormDataUploadUrl).pipe(tap(() => (this.hasScormData = false)));
   }
 
   public deleteTaskAssessmentResources(): Observable<any> {
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 3803d325b6..556d0a7dd2 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -507,7 +507,7 @@ export class Task extends Entity {
     );
   }
 
-  public get numbasEnabled(): boolean {
+  public get scormEnabled(): boolean {
     return (
       this.definition.scormEnabled && this.definition.hasScormData
     );
diff --git a/src/app/api/services/spec/scorm-adapter.service.spec.ts b/src/app/api/services/spec/scorm-adapter.service.spec.ts
deleted file mode 100644
index 5d3a52caac..0000000000
--- a/src/app/api/services/spec/scorm-adapter.service.spec.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { ScormAdapterService } from '../scorm-adapter.service';
-import { TaskService } from '../task.service';
-import { UserService } from '../user.service';
-
-describe('ScormAdapterService', () => {
-  let service: ScormAdapterService;
-  let httpTestingController: HttpTestingController;
-  let mockUserService: Partial<UserService>;
-  let mockTaskService: Partial<TaskService>;
-
-  const mockUserData = {
-    currentUser: { studentId: '12345' }
-  };
-
-  beforeEach(() => {
-    mockUserService = {
-      currentUser: mockUserData.currentUser
-    };
-
-    mockTaskService = {
-      // you can add mocked methods if needed for the TaskService
-    };
-
-    TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [
-        ScormAdapterService,
-        { provide: UserService, useValue: mockUserService },
-        { provide: TaskService, useValue: mockTaskService }
-      ]
-    });
-
-    service = TestBed.inject(ScormAdapterService);
-    httpTestingController = TestBed.inject(HttpTestingController);
-  });
-
-  afterEach(() => {
-    httpTestingController.verify();
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-
-  it('should initialize with default values', () => {
-    expect(service.GetValue('cmi.completion_status')).toBe('not attempted');
-    expect(service.GetValue('cmi.entry')).toBe('ab-initio');
-  });
-
-  describe('Initialize function', () => {
-
-    it('should handle review mode and get latest completed test result', () => {
-      const mockResponse = {
-        data: {
-          suspend_data: JSON.stringify({ someData: 'value' })
-        }
-      };
-
-      service.Initialize('review');
-      const req = httpTestingController.expectOne(`${service['apiBaseUrl']}/completed-latest`);
-      expect(req.request.method).toEqual('GET');
-      req.flush(mockResponse);
-
-      expect(service.GetValue('cmi.suspend_data')).toEqual(JSON.stringify({ someData: 'value' }));
-    });
-
-    it('should handle attempt mode and get latest test result', () => {
-      const mockResponse = {
-        data: {
-          id: 1,
-          cmi_entry: 'ab-initio',
-          attempt_number: 2
-        }
-      };
-
-      service.Initialize('attempt');
-      const req = httpTestingController.expectOne(`${service['apiBaseUrl']}/latest`);
-      expect(req.request.method).toEqual('GET');
-      req.flush(mockResponse);
-
-      expect(service.GetValue('cmi.learner_id')).toBe('12345');
-    });
-  });
-
-});
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index a738626884..defd83dc77 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -134,9 +134,9 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
     return AppInjector.get(HttpClient).post<boolean>(taskDefinition.taskAssessmentResourcesUploadUrl, formData);
   }
 
-  public uploadNumbasData(taskDefinition: TaskDefinition, file: File): Observable<boolean> {
+  public uploadScormData(taskDefinition: TaskDefinition, file: File): Observable<boolean> {
     const formData = new FormData();
     formData.append('file', file);
-    return AppInjector.get(HttpClient).post<boolean>(taskDefinition.numbasTestUploadUrl, formData);
+    return AppInjector.get(HttpClient).post<boolean>(taskDefinition.scormDataUploadUrl, formData);
   }
 }
diff --git a/src/app/common/scorm-player/scorm-player-modal.component.ts b/src/app/common/scorm-player/scorm-player-modal.component.ts
index 2fb4630263..cd7740571c 100644
--- a/src/app/common/scorm-player/scorm-player-modal.component.ts
+++ b/src/app/common/scorm-player/scorm-player-modal.component.ts
@@ -9,7 +9,7 @@ import {Task} from 'src/app/api/models/task';
 export class ScormPlayerModal {
   constructor(public dialog: MatDialog) {}
 
-  public show(task: Task, mode: 'attempt' | 'review'): void {
+  public show(task: Task, mode: 'browse' | 'normal' | 'review'): void {
     let dialogRef: MatDialogRef<ScormPlayerComponent, any>;
 
     dialogRef = this.dialog.open(ScormPlayerComponent, {
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index 1b89e36bae..106e6a8520 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -21,12 +21,12 @@ export class ScormPlayerComponent implements OnInit {
   context: ScormPlayerContext;
 
   task: Task;
-  currentMode: 'attempt' | 'review' = 'attempt';
+  currentMode: 'browse' | 'normal' | 'review' = 'normal';
   iframeSrc: SafeResourceUrl;
 
   constructor(
     private dialogRef: MatDialogRef<ScormPlayerComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: {task: Task; mode: 'attempt' | 'review'},
+    @Inject(MAT_DIALOG_DATA) public data: {task: Task, mode: 'browse' | 'normal' | 'review'},
     private scormAdapter: ScormAdapterService,
     private sanitizer: DomSanitizer,
   ) {}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 23145ccaea..110ae4a3a2 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -204,7 +204,7 @@ import {TaskDefinitionUploadComponent} from './units/states/edit/directives/unit
 import {TaskDefinitionOptionsComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component';
 import {TaskDefinitionResourcesComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component';
 import {TaskDefinitionOverseerComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component';
-import {TaskDefinitionNumbasComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component';
+import {TaskDefinitionScormComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component';
 import {UnitAnalyticsComponent} from './units/states/analytics/unit-analytics-route.component';
 import {FileDropComponent} from './common/file-drop/file-drop.component';
 import {UnitTaskEditorComponent} from './units/states/edit/directives/unit-tasks-editor/unit-task-editor.component';
@@ -228,7 +228,7 @@ import {UnitCodeComponent} from './common/unit-code/unit-code.component';
 import {GradeService} from './common/services/grade.service';
 import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
 import {ScormAdapterService} from './api/services/scorm-adapter.service';
-import {NumbasCommentComponent} from './tasks/task-comments-viewer/numbas-comment/numbas-comment.component';
+import {ScormCommentComponent} from './tasks/task-comments-viewer/scorm-comment/scorm-comment.component';
 import {TestAttemptService} from './api/services/test-attempt.service';
 
 @NgModule({
@@ -268,7 +268,7 @@ import {TestAttemptService} from './api/services/test-attempt.service';
     TaskDefinitionOptionsComponent,
     TaskDefinitionResourcesComponent,
     TaskDefinitionOverseerComponent,
-    TaskDefinitionNumbasComponent,
+    TaskDefinitionScormComponent,
     UnitAnalyticsComponent,
     StudentTutorialSelectComponent,
     StudentCampusSelectComponent,
@@ -333,7 +333,7 @@ import {TestAttemptService} from './api/services/test-attempt.service';
     FTaskBadgeComponent,
     FUnitsComponent,
     ScormPlayerComponent,
-    NumbasCommentComponent,
+    ScormCommentComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index 7c0baf7ee9..976c116f33 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -157,7 +157,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
 
   $scope.launchScormPlayer = ->
     console.clear()
-    ScormPlayerModal.show $scope.task, 'attempt'
+    ScormPlayerModal.show $scope.task, 'normal'
 
   # Whether or not we should disable this button
   $scope.shouldDisableBtn = {
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 8b6c89bea3..0b296c2099 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -50,15 +50,15 @@ <h4>
       <div class="card card-default">
         <div class="card-heading">
           <h4>
-            Attempt Numbas Test
+            Attempt SCORM Test
           </h4>
           <span>
-            Complete the Numbas test first to proceed to upload evidence of your task completion.
+            Complete the SCORM test first to proceed to upload evidence of your task completion.
           </span>
         </div>
         <div class="card-body">
           <button class="btn btn-default" ng-click="launchScormPlayer(); $dismiss()">
-            <i class="fa fa-check-square-o"></i> Launch Numbas Test
+            <i class="fa fa-check-square-o"></i> Launch SCORM Test
           </button>
         </div>
       </div>
diff --git a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.html b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
similarity index 65%
rename from src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.html
rename to src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
index d87863bee8..b74db43a07 100644
--- a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
@@ -1,9 +1,9 @@
 <div fxLayout="row" fxLayoutAlign="space-evenly center">
   <div fxLayout="column" fxLayoutAlign="space-around center">
     <div>
-      <hr class="hr-text" data-content="Numbas Summary" />
+      <hr class="hr-text" data-content="SCORM Test Summary" />
       <div class="markdown-to-html" [innerHTML]="comment.text"></div>
-      <button mat-button (click)="reviewNumbasTest()">Review test</button>
+      <button mat-button (click)="reviewScormTest()">Review test</button>
       <hr class="hr-fade" />
     </div>
   </div>
diff --git a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.scss b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.scss
similarity index 100%
rename from src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.scss
rename to src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.scss
diff --git a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
similarity index 66%
rename from src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
rename to src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
index c8ba676c55..817a6cd64f 100644
--- a/src/app/tasks/task-comments-viewer/numbas-comment/numbas-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
@@ -3,11 +3,11 @@ import {Task, TaskComment} from 'src/app/api/models/doubtfire-model';
 import {ScormPlayerModal} from 'src/app/common/scorm-player/scorm-player-modal.component';
 
 @Component({
-  selector: 'numbas-comment',
-  templateUrl: './numbas-comment.component.html',
-  styleUrls: ['./numbas-comment.component.scss'],
+  selector: 'scorm-comment',
+  templateUrl: './scorm-comment.component.html',
+  styleUrls: ['./scorm-comment.component.scss'],
 })
-export class NumbasCommentComponent implements OnInit {
+export class ScormCommentComponent implements OnInit {
   @Input() task: Task;
   @Input() comment: TaskComment;
 
@@ -15,7 +15,7 @@ export class NumbasCommentComponent implements OnInit {
 
   ngOnInit() {}
 
-  reviewNumbasTest() {
+  reviewScormTest() {
     this.modalService.show(this.task, 'review');
   }
 }
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index 0be0e7b758..aa20275ff6 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -72,12 +72,12 @@
                 ></app-task-assessment-comment>
               </div>
 
-              <div *ngSwitchCase="'numbas'" class="comment-scorm">
-                <numbas-comment
+              <div *ngSwitchCase="'scorm'" class="comment-scorm">
+                <scorm-comment
                   [task]="task"
                   [comment]="comment"
-                  *ngIf="numbasEnabled"
-                ></numbas-comment>
+                  *ngIf="scormEnabled"
+                ></scorm-comment>
               </div>
 
               <div class="bubble" [ngClass]="commentClasses(comment)">
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 7436cd7d79..8ad719f339 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -98,8 +98,8 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
     return this.constants.IsOverseerEnabled.value;
   }
 
-  get numbasEnabled(): boolean {
-    return this.task.numbasEnabled;
+  get scormEnabled(): boolean {
+    return this.task.scormEnabled;
   }
 
   uploadFiles(event) {
@@ -154,7 +154,7 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
   }
 
   shouldShowAuthorIcon(commentType: string) {
-    return !(commentType === 'extension' || commentType === 'status' || commentType == 'assessment' || commentType == 'numbas');
+    return !(commentType === 'extension' || commentType === 'status' || commentType == 'assessment' || commentType == 'scorm');
   }
 
   commentClasses(comment: TaskComment): object {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index bd2c7ec65d..6bc386569e 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -105,10 +105,10 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
     </div>
 
     <div class="w-full">
-      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Upload Numbas test</h3>
-      <p class="font-normal text-gray-700">Upload the corresponding Numbas test</p>
+      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Upload SCORM test</h3>
+      <p class="font-normal text-gray-700">Upload the corresponding SCORM 2004 test (e.g. Numbas)</p>
       <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-        <f-task-definition-numbas [taskDefinition]="taskDefinition"></f-task-definition-numbas>
+        <f-task-definition-scorm [taskDefinition]="taskDefinition"></f-task-definition-scorm>
       </div>
     </div>
   </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
similarity index 78%
rename from src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
rename to src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
index 36acb4ca4c..433405669b 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
@@ -1,22 +1,22 @@
 <div class="flex flex-col gap-4">
   <mat-checkbox matInput required [(ngModel)]="taskDefinition.scormEnabled">
-    Enable Numbas Test
+    Enable test for task
   </mat-checkbox>
 
   <div class="basis-1/2 flex flex-col">
     <f-file-drop
       mode="event"
-      (filesDropped)="uploadNumbasTest($event)"
+      (filesDropped)="uploadScormData($event)"
       accept="application/zip"
-      [desiredFileName]="'Numbas zip'"
+      [desiredFileName]="'SCORM zip'"
     />
     @if (taskDefinition.hasScormData) {
       <div class="flex flex-row gap-4 pt-4">
-        <button mat-flat-button color="warn" (click)="removeNumbasTest()" class="flex-grow me-4">
-          Delete Numbas Zip
+        <button mat-flat-button color="warn" (click)="removeScormData()" class="flex-grow me-4">
+          Delete SCORM Zip
         </button>
-        <button mat-flat-button color="accent" (click)="downloadNumbasTest()" class="flex-grow ms-4">
-          Download Numbas Zip
+        <button mat-flat-button color="accent" (click)="downloadScormData()" class="flex-grow ms-4">
+          Download SCORM Zip
         </button>
       </div>
     }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.scss
similarity index 100%
rename from src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.scss
rename to src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.scss
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
similarity index 58%
rename from src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
rename to src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
index f6687a4af9..8f2b72fcb9 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
@@ -7,11 +7,11 @@ import { TaskDefinitionService } from 'src/app/api/services/task-definition.serv
 import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
 
 @Component({
-  selector: 'f-task-definition-numbas',
-  templateUrl: 'task-definition-numbas.component.html',
-  styleUrls: ['task-definition-numbas.component.scss'],
+  selector: 'f-task-definition-scorm',
+  templateUrl: 'task-definition-scorm.component.html',
+  styleUrls: ['task-definition-scorm.component.scss'],
 })
-export class TaskDefinitionNumbasComponent {
+export class TaskDefinitionScormComponent {
   @Input() taskDefinition: TaskDefinition;
 
   constructor(
@@ -26,32 +26,32 @@ export class TaskDefinitionNumbasComponent {
     return this.taskDefinition?.unit;
   }
 
-  public downloadNumbasTest() {
+  public downloadScormData() {
     this.fileDownloaderService.downloadFile(
-      this.taskDefinition.getNumbasTestUrl(true),
-      this.taskDefinition.name + '-Numbas.zip',
+      this.taskDefinition.getScormDataUrl(true),
+      this.taskDefinition.name + '-SCORM.zip',
     );
   }
 
-  public removeNumbasTest() {
-    this.taskDefinition.deleteNumbasTest().subscribe({
-      next: () => this.alerts.add('success', 'Deleted Numbas test', 2000),
-      error: (message) => this.alerts.add('danger', message, 6000),
+  public removeScormData() {
+    this.taskDefinition.deleteScormData().subscribe({
+      next: () => this.alerts.success('Deleted SCORM test data', 2000),
+      error: (message) => this.alerts.error(message, 6000),
     });
   }
 
-  public uploadNumbasTest(files: FileList) {
+  public uploadScormData(files: FileList) {
     console.log(Array.from(files).map(f => f.type));
     const validMimeTypes = ['application/zip', 'application/x-zip-compressed', 'multipart/x-zip'];
     const validFiles = Array.from(files as ArrayLike<File>).filter(f => validMimeTypes.includes(f.type));
     if (validFiles.length > 0) {
       const file = validFiles[0];
-      this.taskDefinitionService.uploadNumbasData(this.taskDefinition, file).subscribe({
-        next: () => this.alerts.add('success', 'Uploaded Numbas test data', 2000),
-        error: (message) => this.alerts.add('danger', message, 6000),
+      this.taskDefinitionService.uploadScormData(this.taskDefinition, file).subscribe({
+        next: () => this.alerts.success('Uploaded SCORM test data', 2000),
+        error: (message) => this.alerts.error(message, 6000),
       });
     } else {
-      this.alerts.add('danger', 'Please drop a zip file to upload Numbas test data for this task', 6000);
+      this.alerts.error('Please drop a zip file to upload SCORM test data for this task', 6000);
     }
   }
 }

From 2ac487f13c3743f2b5b805521964bdcbca7cdc15 Mon Sep 17 00:00:00 2001
From: ublefo <90136978+ublefo@users.noreply.github.com>
Date: Tue, 14 May 2024 13:25:23 +1000
Subject: [PATCH 047/776] fix: ensure datamodel is updated on termination

---
 src/app/api/services/scorm-adapter.service.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index 8886121031..9519f4cc2c 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -129,6 +129,7 @@ export class ScormAdapterService {
     );
     this.xhr.setRequestHeader('Content-Type', 'application/json');
     const requestData = {
+      cmi_datamodel: JSON.stringify(this.dataModel.dump()),
       terminated: true,
     };
     this.xhr.send(JSON.stringify(requestData));

From fc023af462656e3557e2970f211fa4d59ee1e3d5 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 14 May 2024 14:24:31 +1000
Subject: [PATCH 048/776] feat: allow changing scorm review config and add
 minor UI changes

---
 src/app/api/models/task-definition.ts         |  1 +
 .../api/services/task-definition.service.ts   |  1 +
 .../task-definition-editor.component.html     |  2 +-
 .../task-definition-scorm.component.html      | 49 ++++++++++---------
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 538b449338..ca2d188eb6 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -33,6 +33,7 @@ export class TaskDefinition extends Entity {
   hasTaskResources: boolean;
   scormEnabled: boolean;
   hasScormData: boolean;
+  scormAllowReview: boolean;
   scormTimeDelayEnabled: boolean;
   scormAttemptLimit: number = 0;
   hasTaskAssessmentResources: boolean;
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index defd83dc77..3776432fd8 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -95,6 +95,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskAssessmentResources',
       'scormEnabled',
       'hasScormData',
+      'scormAllowReview',
       'scormTimeDelayEnabled',
       'scormAttemptLimit',
       'isGraded',
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 6bc386569e..bf75eda5b5 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -105,7 +105,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
     </div>
 
     <div class="w-full">
-      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Upload SCORM test</h3>
+      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">SCORM test</h3>
       <p class="font-normal text-gray-700">Upload the corresponding SCORM 2004 test (e.g. Numbas)</p>
       <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
         <f-task-definition-scorm [taskDefinition]="taskDefinition"></f-task-definition-scorm>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
index 433405669b..5b3b54c111 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
@@ -3,30 +3,35 @@
     Enable test for task
   </mat-checkbox>
 
-  <div class="basis-1/2 flex flex-col">
-    <f-file-drop
-      mode="event"
-      (filesDropped)="uploadScormData($event)"
-      accept="application/zip"
-      [desiredFileName]="'SCORM zip'"
-    />
-    @if (taskDefinition.hasScormData) {
-      <div class="flex flex-row gap-4 pt-4">
-        <button mat-flat-button color="warn" (click)="removeScormData()" class="flex-grow me-4">
-          Delete SCORM Zip
-        </button>
-        <button mat-flat-button color="accent" (click)="downloadScormData()" class="flex-grow ms-4">
-          Download SCORM Zip
-        </button>
-      </div>
-    }
-  </div>
-
   @if (taskDefinition.scormEnabled) {
+    <div class="basis-1/2 flex flex-col">
+      <f-file-drop
+        mode="event"
+        (filesDropped)="uploadScormData($event)"
+        accept="application/zip"
+        [desiredFileName]="'SCORM zip'"
+      />
+      @if (taskDefinition.hasScormData) {
+        <div class="flex flex-row gap-4 pt-4">
+          <button mat-flat-button color="warn" (click)="removeScormData()" class="flex-grow me-4">
+            Delete SCORM Zip
+          </button>
+          <button mat-flat-button color="accent" (click)="downloadScormData()" class="flex-grow ms-4">
+            Download SCORM Zip
+          </button>
+        </div>
+      }
+    </div>
+
     <div class="flex-grow flex flex-row gap-4 pt-4">
-      <mat-checkbox class="basis-1/2" matInput required [(ngModel)]="taskDefinition.scormTimeDelayEnabled">
-        Enable incremental time delays between test attempts
-      </mat-checkbox>
+      <div class="basis-1/2" >
+        <mat-checkbox matInput required [(ngModel)]="taskDefinition.scormTimeDelayEnabled" disabled>
+          Enable incremental time delays between test attempts
+        </mat-checkbox>
+        <mat-checkbox matInput required [(ngModel)]="taskDefinition.scormAllowReview">
+          Allow students to review completed test attempt
+        </mat-checkbox>
+      </div>
       <mat-form-field appearance="outline" class="basis-1/2">
         <mat-label>Attempt limit</mat-label>
         <input

From db102c8280152cfe14ada08cab823ebdf8b9d1c7 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 14 May 2024 14:29:48 +1000
Subject: [PATCH 049/776] refactor: remove test attempt model and service

---
 src/app/api/models/test-attempt.ts           | 22 -----------
 src/app/api/services/test-attempt.service.ts | 40 --------------------
 src/app/doubtfire-angular.module.ts          |  2 -
 src/app/doubtfire-angularjs.module.ts        |  2 -
 4 files changed, 66 deletions(-)
 delete mode 100644 src/app/api/models/test-attempt.ts
 delete mode 100644 src/app/api/services/test-attempt.service.ts

diff --git a/src/app/api/models/test-attempt.ts b/src/app/api/models/test-attempt.ts
deleted file mode 100644
index e6f2e5d61d..0000000000
--- a/src/app/api/models/test-attempt.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Entity } from "ngx-entity-service";
-import { Task } from "./task";
-
-export class TestAttempt extends Entity {
-  public id: number;
-  name: string;
-  attemptNumber: number;
-  passStatus: boolean;
-  suspendData: string;
-  completed: boolean;
-  cmiEntry: string;
-  examResult: string;
-  attemptedAt: Date;
-  taskId: number;
-
-  task: Task;
-
-  constructor(task: Task) {
-    super();
-    this.task = task;
-  }
-}
diff --git a/src/app/api/services/test-attempt.service.ts b/src/app/api/services/test-attempt.service.ts
deleted file mode 100644
index 094f2baa0c..0000000000
--- a/src/app/api/services/test-attempt.service.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Injectable } from "@angular/core";
-import { EntityService } from "ngx-entity-service";
-import { TestAttempt } from "../models/test-attempt";
-import { HttpClient } from "@angular/common/http";
-import API_URL from "src/app/config/constants/apiURL";
-import { Task } from "../models/task";
-import { Observable } from "rxjs";
-import { AppInjector } from "src/app/app-injector";
-import { DoubtfireConstants } from "src/app/config/constants/doubtfire-constants";
-
-@Injectable()
-export class TestAttemptService extends EntityService<TestAttempt> {
-  protected readonly endpointFormat = '/test_attempts?id=:id:';
-
-  constructor(httpClient: HttpClient) {
-    super(httpClient, API_URL);
-
-    this.mapping.addKeys(
-      'id',
-      'name',
-      'attemptNumber',
-      'passStatus',
-      'suspendData',
-      'completed',
-      'cmiEntry',
-      'examResult',
-      'attemptedAt',
-      'taskId'
-    );
-  }
-
-  public createInstanceFrom(json: object, other?: any): TestAttempt {
-    return new TestAttempt(other as Task);
-  }
-
-  public getLatestCompletedTestAttempt(task: Task): Observable<TestAttempt> {
-    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/test_attempts/completed-latest?task_id=${task.id}`;
-    return AppInjector.get(HttpClient).get<TestAttempt>(url);
-  }
-}
\ No newline at end of file
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 110ae4a3a2..f464c6c13d 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -229,7 +229,6 @@ import {GradeService} from './common/services/grade.service';
 import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
 import {ScormAdapterService} from './api/services/scorm-adapter.service';
 import {ScormCommentComponent} from './tasks/task-comments-viewer/scorm-comment/scorm-comment.component';
-import {TestAttemptService} from './api/services/test-attempt.service';
 
 @NgModule({
   // Components we declare
@@ -407,7 +406,6 @@ import {TestAttemptService} from './api/services/test-attempt.service';
     CreateNewUnitModal,
     ScormPlayerModalProvider,
     ScormAdapterService,
-    TestAttemptService,
     provideLottieOptions({
       player: () => player,
     }),
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 3cd6555bd8..eb119b464b 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -227,7 +227,6 @@ import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
 import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
 import {ScormPlayerModal} from './common/scorm-player/scorm-player-modal.component';
-import {TestAttemptService} from './api/services/test-attempt.service';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -311,7 +310,6 @@ DoubtfireAngularJSModule.factory(
 );
 DoubtfireAngularJSModule.factory('CreateNewUnitModal', downgradeInjectable(CreateNewUnitModal));
 DoubtfireAngularJSModule.factory('ScormPlayerModal', downgradeInjectable(ScormPlayerModal));
-DoubtfireAngularJSModule.factory('testAttemptService', downgradeInjectable(TestAttemptService));
 
 // directive -> component
 DoubtfireAngularJSModule.directive(

From ce53396ab93a98b30a78d9259849262bcec5e9ff Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 15 May 2024 17:39:20 +1000
Subject: [PATCH 050/776] refactor: use task card and new tab for scorm and
 match comment display

---
 src/app/ajs-upgraded-providers.ts             |  7 ---
 src/app/api/models/scorm-player-context.ts    |  4 +-
 src/app/api/services/scorm-adapter.service.ts | 20 +++++----
 .../scorm-player-modal.component.ts           | 22 ----------
 .../scorm-player/scorm-player.component.html  |  5 +--
 .../scorm-player/scorm-player.component.scss  | 12 ++----
 .../scorm-player/scorm-player.component.ts    | 43 +++++++++++--------
 src/app/doubtfire-angular.module.ts           |  4 +-
 src/app/doubtfire-angularjs.module.ts         | 13 +++---
 src/app/doubtfire.states.ts                   | 30 +++++++++++++
 .../task-scorm-card.component.html            | 27 ++++++++++++
 .../task-scorm-card.component.scss            |  0
 .../task-scorm-card.component.ts              | 31 +++++++++++++
 .../task-dashboard/task-dashboard.tpl.html    |  1 +
 .../upload-submission-modal.coffee            |  9 +---
 .../upload-submission-modal.tpl.html          | 20 ---------
 .../scorm-comment.component.html              |  5 ++-
 .../scorm-comment/scorm-comment.component.ts  |  5 +--
 18 files changed, 147 insertions(+), 111 deletions(-)
 delete mode 100644 src/app/common/scorm-player/scorm-player-modal.component.ts
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.scss
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts

diff --git a/src/app/ajs-upgraded-providers.ts b/src/app/ajs-upgraded-providers.ts
index f114da1c79..795869225d 100644
--- a/src/app/ajs-upgraded-providers.ts
+++ b/src/app/ajs-upgraded-providers.ts
@@ -18,7 +18,6 @@ export const rootScope = new InjectionToken('$rootScope');
 export const calendarModal = new InjectionToken('CalendarModal');
 export const aboutDoubtfireModal = new InjectionToken('AboutDoubtfireModal');
 export const plagiarismReportModal = new InjectionToken('PlagiarismReportModal');
-export const scormPlayerModal = new InjectionToken('ScormPlayerModal');
 
 // Define a provider for the above injection token...
 // It will get the service from AngularJS via the factory
@@ -117,9 +116,3 @@ export const UnitStudentEnrolmentModalProvider = {
   useFactory: (i) => i.get('UnitStudentEnrolmentModal'),
   deps: ['$injector'],
 };
-
-export const ScormPlayerModalProvider = {
-  provide: scormPlayerModal,
-  useFactory: (i) => i.get('ScormPlayerModal'),
-  deps: ['$injector'],
-};
diff --git a/src/app/api/models/scorm-player-context.ts b/src/app/api/models/scorm-player-context.ts
index f3b3b8a13f..ed7df07c0a 100644
--- a/src/app/api/models/scorm-player-context.ts
+++ b/src/app/api/models/scorm-player-context.ts
@@ -1,4 +1,4 @@
-import {Task, User} from 'src/app/api/models/doubtfire-model';
+import {User} from 'src/app/api/models/doubtfire-model';
 
 type DataModelState = 'Uninitialized' | 'Initialized' | 'Terminated';
 
@@ -48,7 +48,7 @@ export class ScormPlayerContext {
     return CMIErrorCodes[value];
   }
 
-  task: Task;
+  taskId: number;
   user: User;
 
   attemptNumber: number;
diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index 9519f4cc2c..cb6a780952 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -1,7 +1,7 @@
 import {Injectable} from '@angular/core';
 import {UserService} from './user.service';
 import API_URL from 'src/app/config/constants/apiURL';
-import {Task, ScormDataModel, ScormPlayerContext} from 'src/app/api/models/doubtfire-model';
+import {ScormDataModel, ScormPlayerContext} from 'src/app/api/models/doubtfire-model';
 
 @Injectable({
   providedIn: 'root',
@@ -18,8 +18,12 @@ export class ScormAdapterService {
     this.xhr = new XMLHttpRequest();
   }
 
-  set task(task: Task) {
-    this.context.task = task;
+  set taskId(taskId: number) {
+    this.context.taskId = taskId;
+  }
+
+  set mode(mode: 'browse' | 'normal' | 'review') {
+    this.context.mode = mode;
   }
 
   get state() {
@@ -47,7 +51,7 @@ export class ScormAdapterService {
     }
 
     // TODO: move this part into the player component
-    this.xhr.open('GET', `${this.apiBaseUrl}/${this.context.task.id}/latest`, false);
+    this.xhr.open('GET', `${this.apiBaseUrl}/${this.context.taskId}/latest`, false);
 
     let noTestFound = false;
     let startNewTest = false;
@@ -80,7 +84,7 @@ export class ScormAdapterService {
     if (!startNewTest) {
       this.xhr.open(
         'PATCH',
-        `${this.apiBaseUrl}/${this.context.task.id}/session/${this.context.attemptId}`,
+        `${this.apiBaseUrl}/${this.context.taskId}/session/${this.context.attemptId}`,
         false,
       );
       this.xhr.send();
@@ -92,7 +96,7 @@ export class ScormAdapterService {
       this.dataModel.restore(currentSession.cmi_datamodel);
       console.log(this.dataModel.dump());
     } else {
-      this.xhr.open('POST', `${this.apiBaseUrl}/${this.context.task.id}/session`, false);
+      this.xhr.open('POST', `${this.apiBaseUrl}/${this.context.taskId}/session`, false);
       this.xhr.send();
       console.log(this.xhr.responseText);
 
@@ -124,7 +128,7 @@ export class ScormAdapterService {
 
     this.xhr.open(
       'PATCH',
-      `${this.apiBaseUrl}/${this.context.task.id}/session/${this.context.attemptId}`,
+      `${this.apiBaseUrl}/${this.context.taskId}/session/${this.context.attemptId}`,
       false,
     );
     this.xhr.setRequestHeader('Content-Type', 'application/json');
@@ -200,7 +204,7 @@ export class ScormAdapterService {
     const xhr = new XMLHttpRequest();
     xhr.open(
       'PATCH',
-      `${this.apiBaseUrl}/${this.context.task.id}/session/${this.context.attemptId}`,
+      `${this.apiBaseUrl}/${this.context.taskId}/session/${this.context.attemptId}`,
       true,
     );
     xhr.setRequestHeader('Content-Type', 'application/json');
diff --git a/src/app/common/scorm-player/scorm-player-modal.component.ts b/src/app/common/scorm-player/scorm-player-modal.component.ts
deleted file mode 100644
index cd7740571c..0000000000
--- a/src/app/common/scorm-player/scorm-player-modal.component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {Injectable} from '@angular/core';
-import {MatDialog, MatDialogRef} from '@angular/material/dialog';
-import {ScormPlayerComponent} from './scorm-player.component';
-import {Task} from 'src/app/api/models/task';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ScormPlayerModal {
-  constructor(public dialog: MatDialog) {}
-
-  public show(task: Task, mode: 'browse' | 'normal' | 'review'): void {
-    let dialogRef: MatDialogRef<ScormPlayerComponent, any>;
-
-    dialogRef = this.dialog.open(ScormPlayerComponent, {
-      data: {task, mode},
-      width: '95%',
-      height: '90%',
-      disableClose: true,
-    });
-  }
-}
diff --git a/src/app/common/scorm-player/scorm-player.component.html b/src/app/common/scorm-player/scorm-player.component.html
index 5089ad9de3..4855cf4d2b 100644
--- a/src/app/common/scorm-player/scorm-player.component.html
+++ b/src/app/common/scorm-player/scorm-player.component.html
@@ -1,4 +1 @@
-<div mat-dialog-content>
-  <iframe [src]="iframeSrc"></iframe>
-  <button mat-dialog-close mat-stroked-button color="warn" (click)="close()">Exit</button>
-</div>
+<iframe [src]="iframeSrc"></iframe>
diff --git a/src/app/common/scorm-player/scorm-player.component.scss b/src/app/common/scorm-player/scorm-player.component.scss
index 5e24cc5d9e..f011d35aee 100644
--- a/src/app/common/scorm-player/scorm-player.component.scss
+++ b/src/app/common/scorm-player/scorm-player.component.scss
@@ -1,5 +1,7 @@
-.mat-dialog-content {
+f-scorm-player {
   position: relative;
+  height: 100vh;
+  width: 100vw;
 }
 
 iframe {
@@ -7,11 +9,5 @@ iframe {
   top: 0;
   left: 0;
   width: 100%;
-  height: 95%;
+  height: 100%;
 }
-
-button {
-  position: absolute;
-  bottom: 20px;
-  right: 20px;
-}
\ No newline at end of file
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index 106e6a8520..e1c68dc872 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -1,10 +1,10 @@
-import {Component, OnInit, Inject} from '@angular/core';
-import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {Component, OnInit, Input, HostListener} from '@angular/core';
 import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
-import {Task, ScormPlayerContext} from 'src/app/api/models/doubtfire-model';
+import {ScormPlayerContext} from 'src/app/api/models/doubtfire-model';
 import {ScormAdapterService} from 'src/app/api/services/scorm-adapter.service';
 import {AppInjector} from 'src/app/app-injector';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {GlobalStateService, ViewType} from 'src/app/projects/states/index/global-state.service';
 
 declare global {
   interface Window {
@@ -20,20 +20,29 @@ declare global {
 export class ScormPlayerComponent implements OnInit {
   context: ScormPlayerContext;
 
-  task: Task;
-  currentMode: 'browse' | 'normal' | 'review' = 'normal';
+  @Input()
+  taskId: number;
+
+  @Input()
+  taskDefId: number;
+
+  @Input()
+  mode: 'browse' | 'normal' | 'review';
+
   iframeSrc: SafeResourceUrl;
 
   constructor(
-    private dialogRef: MatDialogRef<ScormPlayerComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: {task: Task, mode: 'browse' | 'normal' | 'review'},
+    private globalState: GlobalStateService,
     private scormAdapter: ScormAdapterService,
     private sanitizer: DomSanitizer,
   ) {}
 
   ngOnInit(): void {
-    this.task = this.data.task;
-    this.scormAdapter.task = this.task;
+    this.globalState.setView(ViewType.OTHER);
+    this.globalState.hideHeader();
+
+    this.scormAdapter.taskId = this.taskId;
+    this.scormAdapter.mode = this.mode;
 
     window.API_1484_11 = {
       Initialize: () => this.scormAdapter.Initialize(),
@@ -46,23 +55,21 @@ export class ScormPlayerComponent implements OnInit {
       GetDiagnostic: (errorCode: string) => this.scormAdapter.GetDiagnostic(errorCode),
     };
 
-    this.currentMode = this.data.mode;
-
     this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(
-      `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.task.taskDefId}/index.html`,
+      `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.taskDefId}/index.html`,
     );
   }
 
-  close(): void {
+  @HostListener('window:beforeunload', ['$event'])
+  beforeUnload($event: any): void {
     if (this.scormAdapter.state == 'Initialized') {
       console.log('SCORM player closing during an initialized session, commiting DataModel');
       this.scormAdapter.Commit();
     }
-    // TODO: would be nice if we can destroy this entire adapter object when the modal is closed
-    console.log('Clearing player context and DataModel');
+  }
+
+  @HostListener('window:unload', ['$event'])
+  onUnload($event: any): void {
     this.scormAdapter.destroy();
-    const iframe = document.getElementsByTagName('iframe')[0];
-    iframe?.parentNode?.removeChild(iframe);
-    this.dialogRef.close();
   }
 }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index f464c6c13d..dabcd49145 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -72,7 +72,6 @@ import {
   gradeTaskModalProvider,
   uploadSubmissionModalProvider,
   ConfirmationModalProvider,
-  ScormPlayerModalProvider,
 } from './ajs-upgraded-providers';
 import {
   TaskCommentComposerComponent,
@@ -229,6 +228,7 @@ import {GradeService} from './common/services/grade.service';
 import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
 import {ScormAdapterService} from './api/services/scorm-adapter.service';
 import {ScormCommentComponent} from './tasks/task-comments-viewer/scorm-comment/scorm-comment.component';
+import {TaskScormCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component';
 
 @NgModule({
   // Components we declare
@@ -333,6 +333,7 @@ import {ScormCommentComponent} from './tasks/task-comments-viewer/scorm-comment/
     FUnitsComponent,
     ScormPlayerComponent,
     ScormCommentComponent,
+    TaskScormCardComponent,
   ],
   // Services we provide
   providers: [
@@ -404,7 +405,6 @@ import {ScormCommentComponent} from './tasks/task-comments-viewer/scorm-comment/
     TasksForInboxSearchPipe,
     IsActiveUnitRole,
     CreateNewUnitModal,
-    ScormPlayerModalProvider,
     ScormAdapterService,
     provideLottieOptions({
       player: () => player,
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index eb119b464b..bc5ad5ed4a 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -225,8 +225,7 @@ import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {MarkedPipe} from './common/pipes/marked.pipe';
 import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
-import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
-import {ScormPlayerModal} from './common/scorm-player/scorm-player-modal.component';
+import {TaskScormCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -309,7 +308,6 @@ DoubtfireAngularJSModule.factory(
   downgradeInjectable(EditProfileDialogService),
 );
 DoubtfireAngularJSModule.factory('CreateNewUnitModal', downgradeInjectable(CreateNewUnitModal));
-DoubtfireAngularJSModule.factory('ScormPlayerModal', downgradeInjectable(ScormPlayerModal));
 
 // directive -> component
 DoubtfireAngularJSModule.directive(
@@ -367,6 +365,10 @@ DoubtfireAngularJSModule.directive(
   'activityTypeList',
   downgradeComponent({component: ActivityTypeListComponent}),
 );
+DoubtfireAngularJSModule.directive(
+  'fTaskScormCard',
+  downgradeComponent({component: TaskScormCardComponent}),
+);
 DoubtfireAngularJSModule.directive(
   'fTaskStatusCard',
   downgradeComponent({component: TaskStatusCardComponent}),
@@ -444,11 +446,6 @@ DoubtfireAngularJSModule.directive(
 );
 DoubtfireAngularJSModule.directive('fUnits', downgradeComponent({component: FUnitsComponent}));
 
-DoubtfireAngularJSModule.directive(
-  'fScormPlayerComponent',
-  downgradeComponent({component: ScormPlayerComponent}),
-);
-
 // Global configuration
 DoubtfireAngularJSModule.directive(
   'taskCommentsViewer',
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index b9f95e88af..23b60886d6 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -8,6 +8,7 @@ import {TeachingPeriodListComponent} from './admin/states/teaching-periods/teach
 import {AcceptEulaComponent} from './eula/accept-eula/accept-eula.component';
 import {FUsersComponent} from './admin/states/f-users/f-users.component';
 import {FUnitsComponent} from './admin/states/f-units/f-units.component';
+import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
 
 /*
  * Use this file to store any states that are sourced by angular components.
@@ -291,6 +292,34 @@ const ViewAllUnits: NgHybridStateDeclaration = {
   },
 };
 
+/**
+ * Define the SCORM Player state.
+ */
+const ScormPlayerState: NgHybridStateDeclaration = {
+  name: 'scorm-player',
+  url: '/task_def/:task_def_id/task/:task_id/scorm-player/:mode',
+  resolve: {
+    taskId: function ($stateParams) {
+      return $stateParams.task_id;
+    },
+    taskDefId: function ($stateParams) {
+      return $stateParams.task_def_id;
+    },
+    mode: function ($stateParams) {
+      return $stateParams.mode;
+    },
+  },
+  views: {
+    main: {
+      component: ScormPlayerComponent,
+    },
+  },
+  data: {
+    pageTitle: 'Knowledge Check',
+    roleWhitelist: ['Student', 'Tutor', 'Convenor', 'Admin'],
+  },
+};
+
 /**
  * Export the list of states we have created in angular
  */
@@ -306,4 +335,5 @@ export const doubtfireStates = [
   ViewAllProjectsState,
   ViewAllUnits,
   AdministerUnits,
+  ScormPlayerState,
 ];
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
new file mode 100644
index 0000000000..67265461cd
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -0,0 +1,27 @@
+<mat-card appearance="outlined" [hidden]="!task.scormEnabled">
+  <mat-card-header>
+    <mat-card-title>Knowledge Check</mat-card-title>
+  </mat-card-header>
+  <mat-card-content>
+    <p>
+      You have to successfully pass this knowledge check to complete the task.
+    </p>
+    <p>
+      You have {{ (task.definition.scormAttemptLimit > 0) ? task.definition.scormAttemptLimit : 'unlimited' }} attempts to complete this test.
+    </p>
+    <p [hidden]="!task.definition.scormTimeDelayEnabled">
+      There will be an increased time delay between test attempts. First 2 attempts will not have a time delay in between.
+    </p>
+  </mat-card-content>
+  <mat-card-actions class="space-x-2">
+    <button mat-stroked-button (click)="launchScormPlayer()">
+      <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="Launch icon">
+        launch
+      </mat-icon>
+      Attempt test
+    </button>
+    <button mat-stroked-button (click)="requestMoreAttempts()" [hidden]="task.definition.scormAttemptLimit === 0">
+      Request more attempts
+    </button>
+  </mat-card-actions>
+</mat-card>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.scss b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
new file mode 100644
index 0000000000..7d7dce6e1b
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -0,0 +1,31 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {Task} from 'src/app/api/models/task';
+import {TaskService} from 'src/app/api/services/task.service';
+
+@Component({
+  selector: 'f-task-scorm-card',
+  templateUrl: './task-scorm-card.component.html',
+  styleUrls: ['./task-scorm-card.component.scss'],
+})
+export class TaskScormCardComponent implements OnInit {
+  @Input() task: Task;
+  attemptsLeft: number;
+
+  constructor(
+    private taskService: TaskService,
+  ) {}
+
+  ngOnInit(): void {
+    if (this.task) {
+
+    }
+  }
+
+  launchScormPlayer(): void {
+    window.open(`#/task_def/${this.task.taskDefId}/task/${this.task.id}/scorm-player/normal`, '_blank');
+  }
+
+  requestMoreAttempts(): void {
+
+  }
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index 0962ddd82a..8402f4252c 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -42,6 +42,7 @@
   <div class="panel-body task-detail-cards" ng-show="isCurrentView('details')">
     <!-- <div class="col-sm-12 col-xl-6"> -->
     <!-- migrated -->
+    <f-task-scorm-card [task]="task"></f-task-scorm-card>
     <f-task-status-card [task]="task"></f-task-status-card>
     <f-task-due-card [task]="task"></f-task-due-card>
     <task-description-card [task-def]="task.definition" [task]="task" [unit]="task.unit"></task-description-card>
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index 976c116f33..b9c9ebd2b9 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -32,7 +32,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
 
   UploadSubmissionModal
 )
-.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, ScormPlayerModal, newTaskService, newProjectService, task, reuploadEvidence, outcomeService, PrivacyPolicy) ->
+.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, newTaskService, newProjectService, task, reuploadEvidence, outcomeService, PrivacyPolicy) ->
   $scope.privacyPolicy = PrivacyPolicy
   # Expose task to scope
   $scope.task = task
@@ -100,7 +100,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
   # States functionality
   states = {
     # All possible states
-    all: ['group', 'scorm-assessment', 'files', 'alignment', 'comments', 'uploading']
+    all: ['group', 'files', 'alignment', 'comments', 'uploading']
     # Only states which are shown (populated in initialise)
     shown: []
     # The currently active state (set in initialise)
@@ -128,7 +128,6 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       removed.push('group') if !isRFF || !task.isGroupTask()
       removed.push('alignment') if !isRFF || !task.unit.ilos.length > 0
       removed.push('comments') if isTestSubmission
-      removed.push('scorm-assessment') if !isRFF || !task.definition.scormEnabled
       removed
     # Initialises the states
     initialise: ->
@@ -155,10 +154,6 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
     previous: states.previous
   }
 
-  $scope.launchScormPlayer = ->
-    console.clear()
-    ScormPlayerModal.show $scope.task, 'normal'
-
   # Whether or not we should disable this button
   $scope.shouldDisableBtn = {
     next: ->
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 0b296c2099..9caab7897e 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -43,26 +43,6 @@ <h4>
         </group-member-contribution-assigner><!--/group-member-contribution-->
       </div><!--/card-group-->
     </div><!--/state-group-->
-    <div
-      class="state state-scorm-assessment"
-      ng-class="{'state-hidden-left': isHidden('scorm-assessment').left,
-                 'state-hidden-right': isHidden('scorm-assessment').right}">
-      <div class="card card-default">
-        <div class="card-heading">
-          <h4>
-            Attempt SCORM Test
-          </h4>
-          <span>
-            Complete the SCORM test first to proceed to upload evidence of your task completion.
-          </span>
-        </div>
-        <div class="card-body">
-          <button class="btn btn-default" ng-click="launchScormPlayer(); $dismiss()">
-            <i class="fa fa-check-square-o"></i> Launch SCORM Test
-          </button>
-        </div>
-      </div>
-    </div>
     <div class="state state-files" ng-class="{'state-hidden-left': isHidden('files').left,
                  'state-hidden-right': isHidden('files').right,
                  'state-files-uploading': uploader.isUploading}">
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
index b74db43a07..ffe375f19d 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
@@ -1,9 +1,10 @@
 <div fxLayout="row" fxLayoutAlign="space-evenly center">
   <div fxLayout="column" fxLayoutAlign="space-around center">
     <div>
-      <hr class="hr-text" data-content="SCORM Test Summary" />
+      <hr class="hr-text" data-content="Knowledge Check Summary" />
       <div class="markdown-to-html" [innerHTML]="comment.text"></div>
-      <button mat-button (click)="reviewScormTest()">Review test</button>
+      <button mat-button (click)="reviewScormTest()" [hidden]="!task.definition.scormAllowReview">Review test</button>
+      <br/>
       <hr class="hr-fade" />
     </div>
   </div>
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
index 817a6cd64f..b584629668 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
@@ -1,6 +1,5 @@
 import {Component, OnInit, Input} from '@angular/core';
 import {Task, TaskComment} from 'src/app/api/models/doubtfire-model';
-import {ScormPlayerModal} from 'src/app/common/scorm-player/scorm-player-modal.component';
 
 @Component({
   selector: 'scorm-comment',
@@ -11,11 +10,11 @@ export class ScormCommentComponent implements OnInit {
   @Input() task: Task;
   @Input() comment: TaskComment;
 
-  constructor(private modalService: ScormPlayerModal) {}
+  constructor() {}
 
   ngOnInit() {}
 
   reviewScormTest() {
-    this.modalService.show(this.task, 'review');
+    window.open(`#/task_def/${this.task.taskDefId}/task/${this.task.id}/scorm-player/review`, '_blank');
   }
 }

From c022c925bc8b569a416c24696b54580248413001 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 1 Jun 2024 20:14:54 +1000
Subject: [PATCH 051/776] refactor: change url params for test attempts

---
 src/app/api/models/scorm-player-context.ts    |  3 +-
 src/app/api/services/scorm-adapter.service.ts | 39 +++++++++----------
 .../scorm-player/scorm-player.component.ts    |  5 ++-
 src/app/doubtfire.states.ts                   |  8 ++--
 .../task-scorm-card.component.ts              |  5 ++-
 .../scorm-comment/scorm-comment.component.ts  |  5 ++-
 6 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/app/api/models/scorm-player-context.ts b/src/app/api/models/scorm-player-context.ts
index ed7df07c0a..c065957ac0 100644
--- a/src/app/api/models/scorm-player-context.ts
+++ b/src/app/api/models/scorm-player-context.ts
@@ -48,7 +48,8 @@ export class ScormPlayerContext {
     return CMIErrorCodes[value];
   }
 
-  taskId: number;
+  projectId: number;
+  taskDefId: number;
   user: User;
 
   attemptNumber: number;
diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index cb6a780952..233c7aed6a 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -7,7 +7,6 @@ import {ScormDataModel, ScormPlayerContext} from 'src/app/api/models/doubtfire-m
   providedIn: 'root',
 })
 export class ScormAdapterService {
-  private readonly apiBaseUrl = `${API_URL}/test_attempts`;
   private dataModel: ScormDataModel;
   private context: ScormPlayerContext;
   private xhr: XMLHttpRequest;
@@ -18,8 +17,12 @@ export class ScormAdapterService {
     this.xhr = new XMLHttpRequest();
   }
 
-  set taskId(taskId: number) {
-    this.context.taskId = taskId;
+  set projectId(projectId: number) {
+    this.context.projectId = projectId;
+  }
+
+  set taskDefId(taskDefId: number) {
+    this.context.taskDefId = taskDefId;
   }
 
   set mode(mode: 'browse' | 'normal' | 'review') {
@@ -51,7 +54,11 @@ export class ScormAdapterService {
     }
 
     // TODO: move this part into the player component
-    this.xhr.open('GET', `${this.apiBaseUrl}/${this.context.taskId}/latest`, false);
+    this.xhr.open(
+      'GET',
+      `${API_URL}/projects/${this.context.projectId}/task_def_id/${this.context.taskDefId}/test_attempts/latest`,
+      false,
+    );
 
     let noTestFound = false;
     let startNewTest = false;
@@ -82,11 +89,7 @@ export class ScormAdapterService {
     }
 
     if (!startNewTest) {
-      this.xhr.open(
-        'PATCH',
-        `${this.apiBaseUrl}/${this.context.taskId}/session/${this.context.attemptId}`,
-        false,
-      );
+      this.xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, false);
       this.xhr.send();
       console.log(this.xhr.responseText);
 
@@ -96,7 +99,11 @@ export class ScormAdapterService {
       this.dataModel.restore(currentSession.cmi_datamodel);
       console.log(this.dataModel.dump());
     } else {
-      this.xhr.open('POST', `${this.apiBaseUrl}/${this.context.taskId}/session`, false);
+      this.xhr.open(
+        'POST',
+        `${API_URL}/projects/${this.context.projectId}/task_def_id/${this.context.taskDefId}/test_attempts`,
+        false,
+      );
       this.xhr.send();
       console.log(this.xhr.responseText);
 
@@ -126,11 +133,7 @@ export class ScormAdapterService {
         break;
     }
 
-    this.xhr.open(
-      'PATCH',
-      `${this.apiBaseUrl}/${this.context.taskId}/session/${this.context.attemptId}`,
-      false,
-    );
+    this.xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, false);
     this.xhr.setRequestHeader('Content-Type', 'application/json');
     const requestData = {
       cmi_datamodel: JSON.stringify(this.dataModel.dump()),
@@ -202,11 +205,7 @@ export class ScormAdapterService {
     }
 
     const xhr = new XMLHttpRequest();
-    xhr.open(
-      'PATCH',
-      `${this.apiBaseUrl}/${this.context.taskId}/session/${this.context.attemptId}`,
-      true,
-    );
+    xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, true);
     xhr.setRequestHeader('Content-Type', 'application/json');
     const requestData = {
       cmi_datamodel: JSON.stringify(this.dataModel.dump()),
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index e1c68dc872..9c2ee9edb4 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -21,7 +21,7 @@ export class ScormPlayerComponent implements OnInit {
   context: ScormPlayerContext;
 
   @Input()
-  taskId: number;
+  projectId: number;
 
   @Input()
   taskDefId: number;
@@ -41,7 +41,8 @@ export class ScormPlayerComponent implements OnInit {
     this.globalState.setView(ViewType.OTHER);
     this.globalState.hideHeader();
 
-    this.scormAdapter.taskId = this.taskId;
+    this.scormAdapter.projectId = this.projectId;
+    this.scormAdapter.taskDefId = this.taskDefId;
     this.scormAdapter.mode = this.mode;
 
     window.API_1484_11 = {
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 23b60886d6..8f48cd06fd 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -297,13 +297,13 @@ const ViewAllUnits: NgHybridStateDeclaration = {
  */
 const ScormPlayerState: NgHybridStateDeclaration = {
   name: 'scorm-player',
-  url: '/task_def/:task_def_id/task/:task_id/scorm-player/:mode',
+  url: '/projects/:project_id/task_def_id/:task_definition_id/scorm-player/:mode',
   resolve: {
-    taskId: function ($stateParams) {
-      return $stateParams.task_id;
+    projectId: function ($stateParams) {
+      return $stateParams.project_id;
     },
     taskDefId: function ($stateParams) {
-      return $stateParams.task_def_id;
+      return $stateParams.task_definition_id;
     },
     mode: function ($stateParams) {
       return $stateParams.mode;
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
index 7d7dce6e1b..8172bcf1ff 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -22,7 +22,10 @@ export class TaskScormCardComponent implements OnInit {
   }
 
   launchScormPlayer(): void {
-    window.open(`#/task_def/${this.task.taskDefId}/task/${this.task.id}/scorm-player/normal`, '_blank');
+    window.open(
+      `#/projects/${this.task.project.id}/task_def_id/${this.task.taskDefId}/scorm-player/normal`,
+      '_blank',
+    );
   }
 
   requestMoreAttempts(): void {
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
index b584629668..b16184a042 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
@@ -15,6 +15,9 @@ export class ScormCommentComponent implements OnInit {
   ngOnInit() {}
 
   reviewScormTest() {
-    window.open(`#/task_def/${this.task.taskDefId}/task/${this.task.id}/scorm-player/review`, '_blank');
+    window.open(
+      `#/projects/${this.task.project.id}/task_def_id/${this.task.taskDefId}/scorm-player/review`,
+      '_blank',
+    );
   }
 }

From 561b9241c2f44fd69d3f09c656a025f514bbaf3a Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 2 Jun 2024 02:20:03 +1000
Subject: [PATCH 052/776] feat: enable reviewing, passing, deleting test
 attempts and add test attempt model and service

---
 src/app/api/models/doubtfire-model.ts         |   3 +
 .../api/models/task-comment/scorm-comment.ts  |   9 ++
 src/app/api/models/test-attempt.ts            |  20 ++++
 src/app/api/services/scorm-adapter.service.ts |  29 +++++
 src/app/api/services/task-comment.service.ts  |  22 +++-
 src/app/api/services/test-attempt.service.ts  | 103 ++++++++++++++++++
 .../scorm-player/scorm-player.component.ts    |  11 +-
 src/app/doubtfire-angular.module.ts           |   2 +
 src/app/doubtfire.states.ts                   |  38 ++++++-
 .../scorm-comment.component.html              |  11 +-
 .../scorm-comment/scorm-comment.component.ts  |  29 ++++-
 .../task-comments-viewer.component.html       |   4 +-
 12 files changed, 259 insertions(+), 22 deletions(-)
 create mode 100644 src/app/api/models/task-comment/scorm-comment.ts
 create mode 100644 src/app/api/models/test-attempt.ts
 create mode 100644 src/app/api/services/test-attempt.service.ts

diff --git a/src/app/api/models/doubtfire-model.ts b/src/app/api/models/doubtfire-model.ts
index baca2f22d2..d6e4230f6e 100644
--- a/src/app/api/models/doubtfire-model.ts
+++ b/src/app/api/models/doubtfire-model.ts
@@ -34,6 +34,8 @@ export * from './task-similarity';
 export * from './tii-action';
 export * from './scorm-datamodel';
 export * from './scorm-player-context';
+export * from './test-attempt';
+export * from './task-comment/scorm-comment';
 
 // Users -- are students or staff
 export * from './user/user';
@@ -58,3 +60,4 @@ export * from '../services/teaching-period-break.service';
 export * from '../services/learning-outcome.service';
 export * from '../services/group-set.service';
 export * from '../services/task-similarity.service';
+export * from '../services/test-attempt.service';
diff --git a/src/app/api/models/task-comment/scorm-comment.ts b/src/app/api/models/task-comment/scorm-comment.ts
new file mode 100644
index 0000000000..3356b62b93
--- /dev/null
+++ b/src/app/api/models/task-comment/scorm-comment.ts
@@ -0,0 +1,9 @@
+import {Task, TaskComment, TestAttempt} from '../doubtfire-model';
+
+export class ScormComment extends TaskComment {
+  testAttempt: TestAttempt;
+
+  constructor(task: Task) {
+    super(task);
+  }
+}
diff --git a/src/app/api/models/test-attempt.ts b/src/app/api/models/test-attempt.ts
new file mode 100644
index 0000000000..02bb4bb4e9
--- /dev/null
+++ b/src/app/api/models/test-attempt.ts
@@ -0,0 +1,20 @@
+import {Entity} from 'ngx-entity-service';
+import {Task} from './doubtfire-model';
+
+export class TestAttempt extends Entity {
+  id: number;
+  attemptNumber: number;
+  terminated: boolean;
+  completionStatus: boolean;
+  successStatus: boolean;
+  scoreScaled: number;
+  cmiDatamodel: string;
+  attemptedTime: Date;
+
+  task: Task;
+
+  constructor(task: Task) {
+    super();
+    this.task = task;
+  }
+}
diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index 233c7aed6a..b6014f14b4 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -29,6 +29,10 @@ export class ScormAdapterService {
     this.context.mode = mode;
   }
 
+  set testAttemptId(testAttemptId: number) {
+    this.context.attemptId = testAttemptId;
+  }
+
   get state() {
     return this.context.state;
   }
@@ -53,6 +57,31 @@ export class ScormAdapterService {
         break;
     }
 
+    if (this.context.mode === 'review') {
+      this.xhr.open('GET', `${API_URL}/test_attempts/${this.context.attemptId}/review`, false);
+
+      this.xhr.onload = () => {
+        if (this.xhr.status >= 200 && this.xhr.status < 400) {
+          console.log('Retrieved the attempt.');
+        } else if (this.xhr.status == 404) {
+          console.log('Not found.');
+          noTestFound = true;
+        } else {
+          console.error('Error saving DataModel:', this.xhr.responseText);
+        }
+      };
+
+      this.xhr.send();
+      console.log(this.xhr.responseText);
+
+      const reviewSession = JSON.parse(this.xhr.responseText);
+      this.dataModel.restore(reviewSession.cmi_datamodel);
+      console.log(this.dataModel.dump());
+
+      this.context.state = 'Initialized';
+      return 'true';
+    }
+
     // TODO: move this part into the player component
     this.xhr.open(
       'GET',
diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index 5f034b870d..c97ec4c3e0 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -1,4 +1,4 @@
-import { Task, TaskComment, UserService } from 'src/app/api/models/doubtfire-model';
+import { ScormComment, Task, TaskComment, TestAttemptService, UserService } from 'src/app/api/models/doubtfire-model';
 import { EventEmitter, Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
@@ -32,7 +32,8 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
     httpClient: HttpClient,
     private emojiService: EmojiService,
     private userService: UserService,
-    private downloader: FileDownloaderService
+    private downloader: FileDownloaderService,
+    private testAttemptService: TestAttemptService,
   ) {
     super(httpClient, API_URL);
 
@@ -85,7 +86,20 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
       'status',
       'numberOfPrompts',
       'timeDiscussionComplete',
-      'timeDiscussionStarted'
+      'timeDiscussionStarted',
+
+      // Scorm Comments
+      {
+        keys: 'testAttempt',
+        toEntityFn: (data: object, key: string, comment: ScormComment) => {
+          const testAttempt = this.testAttemptService.cache.getOrCreate(
+            data[key].id,
+            testAttemptService,
+            data[key],
+          );
+          return testAttempt;
+        },
+      },
     );
 
     this.mapping.addJsonKey(
@@ -103,6 +117,8 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
         return new DiscussionComment(other);
       case 'extension':
         return new ExtensionComment(other);
+      case 'scorm':
+        return new ScormComment(other);
       default:
         return new TaskComment(other);
     }
diff --git a/src/app/api/services/test-attempt.service.ts b/src/app/api/services/test-attempt.service.ts
new file mode 100644
index 0000000000..7a7ac25ca2
--- /dev/null
+++ b/src/app/api/services/test-attempt.service.ts
@@ -0,0 +1,103 @@
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiURL';
+import {Task, TestAttempt} from 'src/app/api/models/doubtfire-model';
+import {Observable} from 'rxjs';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {HttpClient} from '@angular/common/http';
+
+@Injectable()
+export class TestAttemptService extends CachedEntityService<TestAttempt> {
+  protected readonly endpointFormat = 'test_attempts/:id:';
+  protected readonly forTaskEndpoint =
+    '/projects/:project_id:/task_definition_id/:task_def_id:/test_attempts';
+  protected readonly latestCompletedEndpoint =
+    this.forTaskEndpoint + '/latest?completed=:completed:';
+
+  constructor(httpClient: HttpClient) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys(
+      'id',
+      'attemptNumber',
+      'terminated',
+      'completionStatus',
+      'successStatus',
+      'scoreScaled',
+      'cmiDatamodel',
+      'attemptedTime',
+    );
+  }
+
+  public override createInstanceFrom(_json: object, constructorParams: Task): TestAttempt {
+    return new TestAttempt(constructorParams);
+  }
+
+  public getAttemptsForTask(task: Task): Observable<TestAttempt[]> {
+    return this.query(
+      {
+        project_id: task.project.id,
+        task_def_id: task.taskDefId,
+      },
+      {
+        endpointFormat: this.forTaskEndpoint,
+        constructorParams: task,
+      },
+    );
+  }
+
+  public getLatestCompletedAttempt(task: Task): Observable<TestAttempt> {
+    return this.get(
+      {
+        project_id: task.project.id,
+        task_def_id: task.taskDefId,
+        completed: true,
+      },
+      {
+        endpointFormat: this.latestCompletedEndpoint,
+        constructorParams: task,
+      },
+    );
+  }
+
+  public overrideSuccessStatus(testAttemptId: number, successStatus: boolean): void {
+    const http = AppInjector.get(HttpClient);
+
+    http
+      .patch(
+        `${AppInjector.get(DoubtfireConstants).API_URL}/test_attempts/${testAttemptId}?success_status=${successStatus}`,
+        {},
+      )
+      .subscribe({
+        next: (_data) => {
+          (AppInjector.get(AlertService) as AlertService).success(
+            'Attempt pass status successfully overridden.',
+            6000,
+          );
+        },
+        error: (message) => {
+          (AppInjector.get(AlertService) as AlertService).error(message, 6000);
+        },
+      });
+  }
+
+  public deleteAttempt(testAttemptId: number): void {
+    const http = AppInjector.get(HttpClient);
+
+    http
+      .delete(`${AppInjector.get(DoubtfireConstants).API_URL}/test_attempts/${testAttemptId}`, {})
+      .subscribe({
+        next: (_data) => {
+          (AppInjector.get(AlertService) as AlertService).success(
+            'Attempt successfully deleted.',
+            6000,
+          );
+        },
+        error: (message) => {
+          (AppInjector.get(AlertService) as AlertService).error(message, 6000);
+        },
+      });
+  }
+}
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index 9c2ee9edb4..4a32eb0ac7 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -29,6 +29,9 @@ export class ScormPlayerComponent implements OnInit {
   @Input()
   mode: 'browse' | 'normal' | 'review';
 
+  @Input()
+  testAttemptId: number;
+
   iframeSrc: SafeResourceUrl;
 
   constructor(
@@ -41,9 +44,13 @@ export class ScormPlayerComponent implements OnInit {
     this.globalState.setView(ViewType.OTHER);
     this.globalState.hideHeader();
 
-    this.scormAdapter.projectId = this.projectId;
-    this.scormAdapter.taskDefId = this.taskDefId;
     this.scormAdapter.mode = this.mode;
+    if (this.mode === 'normal') {
+      this.scormAdapter.projectId = this.projectId;
+      this.scormAdapter.taskDefId = this.taskDefId;
+    } else if (this.mode === 'review') {
+      this.scormAdapter.testAttemptId = this.testAttemptId;
+    }
 
     window.API_1484_11 = {
       Initialize: () => this.scormAdapter.Initialize(),
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index dabcd49145..5f6e91e775 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -229,6 +229,7 @@ import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component
 import {ScormAdapterService} from './api/services/scorm-adapter.service';
 import {ScormCommentComponent} from './tasks/task-comments-viewer/scorm-comment/scorm-comment.component';
 import {TaskScormCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component';
+import {TestAttemptService} from './api/services/test-attempt.service';
 
 @NgModule({
   // Components we declare
@@ -406,6 +407,7 @@ import {TaskScormCardComponent} from './projects/states/dashboard/directives/tas
     IsActiveUnitRole,
     CreateNewUnitModal,
     ScormAdapterService,
+    TestAttemptService,
     provideLottieOptions({
       player: () => player,
     }),
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 8f48cd06fd..0338a550a9 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -295,9 +295,9 @@ const ViewAllUnits: NgHybridStateDeclaration = {
 /**
  * Define the SCORM Player state.
  */
-const ScormPlayerState: NgHybridStateDeclaration = {
-  name: 'scorm-player',
-  url: '/projects/:project_id/task_def_id/:task_definition_id/scorm-player/:mode',
+const ScormPlayerNormalState: NgHybridStateDeclaration = {
+  name: 'scorm-player-normal',
+  url: '/projects/:project_id/task_def_id/:task_definition_id/scorm-player/normal',
   resolve: {
     projectId: function ($stateParams) {
       return $stateParams.project_id;
@@ -305,8 +305,8 @@ const ScormPlayerState: NgHybridStateDeclaration = {
     taskDefId: function ($stateParams) {
       return $stateParams.task_definition_id;
     },
-    mode: function ($stateParams) {
-      return $stateParams.mode;
+    mode: function () {
+      return 'normal';
     },
   },
   views: {
@@ -320,6 +320,31 @@ const ScormPlayerState: NgHybridStateDeclaration = {
   },
 };
 
+const ScormPlayerReviewState: NgHybridStateDeclaration = {
+  name: 'scorm-player-review',
+  url: '/task_def_id/:task_definition_id/scorm-player/review/:test_attempt_id',
+  resolve: {
+    taskDefId: function ($stateParams) {
+      return $stateParams.task_definition_id;
+    },
+    testAttemptId: function ($stateParams) {
+      return $stateParams.test_attempt_id;
+    },
+    mode: function () {
+      return 'review';
+    },
+  },
+  views: {
+    main: {
+      component: ScormPlayerComponent,
+    },
+  },
+  data: {
+    pageTitle: 'Review Knowledge Check',
+    roleWhitelist: ['Student', 'Tutor', 'Convenor', 'Admin'],
+  },
+};
+
 /**
  * Export the list of states we have created in angular
  */
@@ -335,5 +360,6 @@ export const doubtfireStates = [
   ViewAllProjectsState,
   ViewAllUnits,
   AdministerUnits,
-  ScormPlayerState,
+  ScormPlayerNormalState,
+  ScormPlayerReviewState,
 ];
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
index ffe375f19d..b0536d2ce6 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
@@ -1,10 +1,13 @@
-<div fxLayout="row" fxLayoutAlign="space-evenly center">
-  <div fxLayout="column" fxLayoutAlign="space-around center">
+<div class="flex-row justify-evenly items-center">
+  <div class="flex-column justify-around items-center">
     <div>
       <hr class="hr-text" data-content="Knowledge Check Summary" />
       <div class="markdown-to-html" [innerHTML]="comment.text"></div>
-      <button mat-button (click)="reviewScormTest()" [hidden]="!task.definition.scormAllowReview">Review test</button>
-      <br/>
+      <div class="flex-row">
+        <button mat-button (click)="reviewScormTest()" [hidden]="!task.definition.scormAllowReview">Review test</button>
+        <button mat-button (click)="passScormAttempt()" [hidden]="!canOverridePass">Pass attempt</button>
+        <button mat-button (click)="deleteScormAttempt()" [hidden]="!user.isStaff">Delete attempt</button>
+      </div>
       <hr class="hr-fade" />
     </div>
   </div>
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
index b16184a042..201e35544a 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
@@ -1,23 +1,42 @@
 import {Component, OnInit, Input} from '@angular/core';
-import {Task, TaskComment} from 'src/app/api/models/doubtfire-model';
+import {Task, ScormComment, User, UserService, TestAttemptService} from 'src/app/api/models/doubtfire-model';
 
 @Component({
-  selector: 'scorm-comment',
+  selector: 'f-scorm-comment',
   templateUrl: './scorm-comment.component.html',
   styleUrls: ['./scorm-comment.component.scss'],
 })
 export class ScormCommentComponent implements OnInit {
   @Input() task: Task;
-  @Input() comment: TaskComment;
+  @Input() comment: ScormComment;
 
-  constructor() {}
+  user: User;
+
+  constructor(
+    private userService: UserService,
+    private testAttemptService: TestAttemptService,
+  ) {
+    this.user = this.userService.currentUser;
+  }
 
   ngOnInit() {}
 
+  get canOverridePass(): boolean {
+    return this.user.isStaff && !this.comment.testAttempt.successStatus;
+  }
+
   reviewScormTest() {
     window.open(
-      `#/projects/${this.task.project.id}/task_def_id/${this.task.taskDefId}/scorm-player/review`,
+      `#/task_def_id/${this.task.taskDefId}/scorm-player/review/${this.comment.testAttempt.id}`,
       '_blank',
     );
   }
+
+  passScormAttempt() {
+    this.testAttemptService.overrideSuccessStatus(this.comment.testAttempt.id, true);
+  }
+
+  deleteScormAttempt() {
+    this.testAttemptService.deleteAttempt(this.comment.testAttempt.id);
+  }
 }
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index aa20275ff6..f6228c576a 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -73,11 +73,11 @@
               </div>
 
               <div *ngSwitchCase="'scorm'" class="comment-scorm">
-                <scorm-comment
+                <f-scorm-comment
                   [task]="task"
                   [comment]="comment"
                   *ngIf="scormEnabled"
-                ></scorm-comment>
+                ></f-scorm-comment>
               </div>
 
               <div class="bubble" [ngClass]="commentClasses(comment)">

From e605a3cfb56f8979b6e8d3ddf16dab7a8d253c03 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 2 Jun 2024 21:00:31 +1000
Subject: [PATCH 053/776] refactor: use new alert service for scorm editor

---
 .../task-definition-scorm.component.ts        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
index 8f2b72fcb9..3e41aa39d2 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
@@ -1,10 +1,10 @@
-import { Component, Inject, Input } from '@angular/core';
-import { FormControl, Validators } from '@angular/forms';
-import { alertService } from 'src/app/ajs-upgraded-providers';
-import { TaskDefinition } from 'src/app/api/models/task-definition';
-import { Unit } from 'src/app/api/models/unit';
-import { TaskDefinitionService } from 'src/app/api/services/task-definition.service';
-import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
+import {Component, Input} from '@angular/core';
+import {FormControl, Validators} from '@angular/forms';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {Unit} from 'src/app/api/models/unit';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
 
 @Component({
   selector: 'f-task-definition-scorm',
@@ -16,8 +16,8 @@ export class TaskDefinitionScormComponent {
 
   constructor(
     private fileDownloaderService: FileDownloaderService,
-    @Inject(alertService) private alerts: any,
-    private taskDefinitionService: TaskDefinitionService
+    private alerts: AlertService,
+    private taskDefinitionService: TaskDefinitionService,
   ) {}
 
   public attemptLimitControl = new FormControl('', [Validators.max(100), Validators.min(0)]);
@@ -41,9 +41,11 @@ export class TaskDefinitionScormComponent {
   }
 
   public uploadScormData(files: FileList) {
-    console.log(Array.from(files).map(f => f.type));
+    console.log(Array.from(files).map((f) => f.type));
     const validMimeTypes = ['application/zip', 'application/x-zip-compressed', 'multipart/x-zip'];
-    const validFiles = Array.from(files as ArrayLike<File>).filter(f => validMimeTypes.includes(f.type));
+    const validFiles = Array.from(files as ArrayLike<File>).filter((f) =>
+      validMimeTypes.includes(f.type),
+    );
     if (validFiles.length > 0) {
       const file = validFiles[0];
       this.taskDefinitionService.uploadScormData(this.taskDefinition, file).subscribe({

From 58c24c3a6760af168a918bc099e755f475eac5f0 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 3 Jun 2024 00:24:20 +1000
Subject: [PATCH 054/776] fix: show correct attempts left and allow tutor to
 review attempt always

---
 src/app/api/models/task.ts                    | 20 +++++++++++++
 src/app/api/services/test-attempt.service.ts  | 20 ++-----------
 .../task-scorm-card.component.html            | 18 ++++++-----
 .../task-scorm-card.component.ts              | 30 +++++++++++--------
 .../scorm-comment.component.html              | 18 ++++++++---
 5 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 556d0a7dd2..86ac445fc2 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -15,6 +15,8 @@ import {
   TaskCommentService,
   TaskSimilarity,
   TaskSimilarityService,
+  TestAttempt,
+  TestAttemptService,
 } from './doubtfire-model';
 import {Grade} from './grade';
 import {LOCALE_ID} from '@angular/core';
@@ -53,6 +55,7 @@ export class Task extends Entity {
   public readonly commentCache: EntityCache<TaskComment> = new EntityCache<TaskComment>();
 
   public readonly similarityCache: EntityCache<TaskSimilarity> = new EntityCache<TaskSimilarity>();
+  public readonly testAttemptCache: EntityCache<TestAttempt> = new EntityCache<TestAttempt>();
 
   private _unit: Unit;
 
@@ -770,4 +773,21 @@ export class Task extends Entity {
       },
     );
   }
+
+  /**
+   * Fetch the SCORM test attempts for this task.
+   */
+  public fetchTestAttempts(): Observable<TestAttempt[]> {
+    const testAttemptService: TestAttemptService = AppInjector.get(TestAttemptService);
+    return testAttemptService.query(
+      {
+        project_id: this.project.id,
+        task_def_id: this.taskDefId,
+      },
+      {
+        cache: this.testAttemptCache,
+        constructorParams: this,
+      },
+    );
+  }
 }
diff --git a/src/app/api/services/test-attempt.service.ts b/src/app/api/services/test-attempt.service.ts
index 7a7ac25ca2..6c32ed01a8 100644
--- a/src/app/api/services/test-attempt.service.ts
+++ b/src/app/api/services/test-attempt.service.ts
@@ -10,11 +10,10 @@ import {HttpClient} from '@angular/common/http';
 
 @Injectable()
 export class TestAttemptService extends CachedEntityService<TestAttempt> {
-  protected readonly endpointFormat = 'test_attempts/:id:';
-  protected readonly forTaskEndpoint =
-    '/projects/:project_id:/task_definition_id/:task_def_id:/test_attempts';
+  protected readonly endpointFormat =
+    '/projects/:project_id:/task_def_id/:task_def_id:/test_attempts';
   protected readonly latestCompletedEndpoint =
-    this.forTaskEndpoint + '/latest?completed=:completed:';
+    this.endpointFormat + '/latest?completed=:completed:';
 
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
@@ -35,19 +34,6 @@ export class TestAttemptService extends CachedEntityService<TestAttempt> {
     return new TestAttempt(constructorParams);
   }
 
-  public getAttemptsForTask(task: Task): Observable<TestAttempt[]> {
-    return this.query(
-      {
-        project_id: task.project.id,
-        task_def_id: task.taskDefId,
-      },
-      {
-        endpointFormat: this.forTaskEndpoint,
-        constructorParams: task,
-      },
-    );
-  }
-
   public getLatestCompletedAttempt(task: Task): Observable<TestAttempt> {
     return this.get(
       {
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
index 67265461cd..9d518fb1c4 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -3,24 +3,28 @@
     <mat-card-title>Knowledge Check</mat-card-title>
   </mat-card-header>
   <mat-card-content>
+    <p>You have to successfully pass this knowledge check to complete the task.</p>
     <p>
-      You have to successfully pass this knowledge check to complete the task.
-    </p>
-    <p>
-      You have {{ (task.definition.scormAttemptLimit > 0) ? task.definition.scormAttemptLimit : 'unlimited' }} attempts to complete this test.
+      You have {{ attemptsLeft !== undefined ? attemptsLeft : 'unlimited' }} attempts left to
+      complete this test.
     </p>
     <p [hidden]="!task.definition.scormTimeDelayEnabled">
-      There will be an increased time delay between test attempts. First 2 attempts will not have a time delay in between.
+      There will be an increased time delay between test attempts. First 2 attempts will not have a
+      time delay in between.
     </p>
   </mat-card-content>
   <mat-card-actions class="space-x-2">
-    <button mat-stroked-button (click)="launchScormPlayer()">
+    <button mat-stroked-button (click)="launchScormPlayer()" [hidden]="attemptsLeft === 0">
       <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="Launch icon">
         launch
       </mat-icon>
       Attempt test
     </button>
-    <button mat-stroked-button (click)="requestMoreAttempts()" [hidden]="task.definition.scormAttemptLimit === 0">
+    <button
+      mat-stroked-button
+      (click)="requestMoreAttempts()"
+      [hidden]="task.definition.scormAttemptLimit === 0"
+    >
       Request more attempts
     </button>
   </mat-card-actions>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
index 8172bcf1ff..cdeb73df0e 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -1,23 +1,29 @@
-import {Component, Input, OnInit} from '@angular/core';
-import {Task} from 'src/app/api/models/task';
-import {TaskService} from 'src/app/api/services/task.service';
+import {Component, Input, OnChanges, SimpleChanges} from '@angular/core';
+import {Task} from 'src/app/api/models/doubtfire-model';
 
 @Component({
   selector: 'f-task-scorm-card',
   templateUrl: './task-scorm-card.component.html',
   styleUrls: ['./task-scorm-card.component.scss'],
 })
-export class TaskScormCardComponent implements OnInit {
+export class TaskScormCardComponent implements OnChanges {
   @Input() task: Task;
   attemptsLeft: number;
 
-  constructor(
-    private taskService: TaskService,
-  ) {}
-
-  ngOnInit(): void {
-    if (this.task) {
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes.task && changes.task.currentValue) {
+      this.attemptsLeft = undefined;
+      this.getAttemptsLeft();
+    }
+  }
 
+  getAttemptsLeft(): void {
+    if (this.task.definition.scormAttemptLimit != 0) {
+      this.task.fetchTestAttempts().subscribe((attempts) => {
+        let count = attempts.length;
+        if (count > 0 && attempts[0].terminated === false) count--;
+        this.attemptsLeft = this.task.definition.scormAttemptLimit - count;
+      });
     }
   }
 
@@ -28,7 +34,5 @@ export class TaskScormCardComponent implements OnInit {
     );
   }
 
-  requestMoreAttempts(): void {
-
-  }
+  requestMoreAttempts(): void {}
 }
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
index b0536d2ce6..c1dacaa788 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
@@ -2,11 +2,21 @@
   <div class="flex-column justify-around items-center">
     <div>
       <hr class="hr-text" data-content="Knowledge Check Summary" />
-      <div class="markdown-to-html" [innerHTML]="comment.text"></div>
+      <div class="markdown-to-html my-1.5" [innerHTML]="comment.text"></div>
       <div class="flex-row">
-        <button mat-button (click)="reviewScormTest()" [hidden]="!task.definition.scormAllowReview">Review test</button>
-        <button mat-button (click)="passScormAttempt()" [hidden]="!canOverridePass">Pass attempt</button>
-        <button mat-button (click)="deleteScormAttempt()" [hidden]="!user.isStaff">Delete attempt</button>
+        <button
+          mat-button
+          (click)="reviewScormTest()"
+          [hidden]="!user.isStaff && !task.definition.scormAllowReview"
+        >
+          Review test
+        </button>
+        <button mat-button (click)="passScormAttempt()" [hidden]="!canOverridePass">
+          Pass attempt
+        </button>
+        <button mat-button (click)="deleteScormAttempt()" [hidden]="!user.isStaff">
+          Delete attempt
+        </button>
       </div>
       <hr class="hr-fade" />
     </div>

From d904ffd6fd674f6e61894d517f5aa147d1db6d29 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 5 Jun 2024 15:17:47 +1000
Subject: [PATCH 055/776] feat: enable students to request extra scorm attempt

---
 src/app/api/models/doubtfire-model.ts         |  1 +
 .../task-comment/scorm-extension-comment.ts   | 38 +++++++++++
 src/app/api/models/task.ts                    |  1 +
 src/app/api/services/task-comment.service.ts  | 43 ++++++++++++
 src/app/api/services/task.service.ts          |  1 +
 .../scorm-extension-modal.component.html      | 45 +++++++++++++
 .../scorm-extension-modal.component.ts        | 67 +++++++++++++++++++
 .../scorm-extension-modal.service.ts          | 26 +++++++
 src/app/doubtfire-angular.module.ts           |  4 ++
 .../task-scorm-card.component.html            |  6 +-
 .../task-scorm-card.component.ts              | 11 ++-
 .../scorm-extension-comment.component.html    | 32 +++++++++
 .../scorm-extension-comment.component.scss    | 55 +++++++++++++++
 .../scorm-extension-comment.component.ts      | 63 +++++++++++++++++
 .../task-comments-viewer.component.html       |  5 ++
 .../task-comments-viewer.component.scss       |  4 +-
 .../task-comments-viewer.component.ts         |  8 ++-
 17 files changed, 402 insertions(+), 8 deletions(-)
 create mode 100644 src/app/api/models/task-comment/scorm-extension-comment.ts
 create mode 100644 src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.html
 create mode 100644 src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.ts
 create mode 100644 src/app/common/modals/scorm-extension-modal/scorm-extension-modal.service.ts
 create mode 100644 src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.html
 create mode 100644 src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.scss
 create mode 100644 src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.ts

diff --git a/src/app/api/models/doubtfire-model.ts b/src/app/api/models/doubtfire-model.ts
index d6e4230f6e..fffc361a4e 100644
--- a/src/app/api/models/doubtfire-model.ts
+++ b/src/app/api/models/doubtfire-model.ts
@@ -36,6 +36,7 @@ export * from './scorm-datamodel';
 export * from './scorm-player-context';
 export * from './test-attempt';
 export * from './task-comment/scorm-comment';
+export * from './task-comment/scorm-extension-comment';
 
 // Users -- are students or staff
 export * from './user/user';
diff --git a/src/app/api/models/task-comment/scorm-extension-comment.ts b/src/app/api/models/task-comment/scorm-extension-comment.ts
new file mode 100644
index 0000000000..3b4dfbccb6
--- /dev/null
+++ b/src/app/api/models/task-comment/scorm-extension-comment.ts
@@ -0,0 +1,38 @@
+import {Observable} from 'rxjs';
+import {tap} from 'rxjs/operators';
+import {AppInjector} from 'src/app/app-injector';
+import {TaskCommentService} from '../../services/task-comment.service';
+import {TaskComment, Task} from '../doubtfire-model';
+
+export class ScormExtensionComment extends TaskComment {
+  assessed: boolean;
+  granted: boolean;
+  dateAssessed: Date;
+  taskScormExtensions: number;
+
+  constructor(task: Task) {
+    super(task);
+  }
+
+  private assessScormExtension(): Observable<TaskComment> {
+    const tcs: TaskCommentService = AppInjector.get(TaskCommentService);
+    return tcs.assessScormExtension(this).pipe(
+      tap((tc: TaskComment) => {
+        const scormExtension: ScormExtensionComment = tc as ScormExtensionComment;
+
+        const task = tc.task;
+        task.scormExtensions = scormExtension.taskScormExtensions;
+      }),
+    );
+  }
+
+  public deny(): Observable<TaskComment> {
+    this.granted = false;
+    return this.assessScormExtension();
+  }
+
+  public grant(): Observable<TaskComment> {
+    this.granted = true;
+    return this.assessScormExtension();
+  }
+}
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 86ac445fc2..ba4bce8e04 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -32,6 +32,7 @@ export class Task extends Entity {
   status: TaskStatusEnum = 'not_started';
   dueDate: Date;
   extensions: number;
+  scormExtensions: number;
   submissionDate: Date;
   completionDate: Date;
   timesAssessed: number;
diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index c97ec4c3e0..e7f76d37b1 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -11,6 +11,7 @@ import API_URL from 'src/app/config/constants/apiURL';
 import { EmojiService } from 'src/app/common/services/emoji.service';
 import { MappingFunctions } from './mapping-fn';
 import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
+import { ScormExtensionComment } from '../models/task-comment/scorm-extension-comment';
 
 @Injectable()
 export class TaskCommentService extends CachedEntityService<TaskComment> {
@@ -22,6 +23,10 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
     'projects/:projectId:/task_def_id/:taskDefinitionId:/assess_extension/:id:';
   private readonly requestExtensionEndpointFormat =
     'projects/:projectId:/task_def_id/:taskDefinitionId:/request_extension';
+  private readonly scormExtensionGrantEndpointFormat =
+    'projects/:projectId:/task_def_id/:taskDefinitionId:/assess_scorm_extension/:id:';
+  private readonly scormRequestExtensionEndpointFormat =
+    'projects/:projectId:/task_def_id/:taskDefinitionId:/request_scorm_extension';
   private readonly discussionCommentReplyEndpointFormat = "/projects/:project_id:/task_def_id/:task_definition_id:/comments/:task_comment_id:/discussion_comment/reply";
   private readonly getDiscussionCommentPromptEndpointFormat = "/projects/:project_id:/task_def_id/:task_definition_id:/comments/:task_comment_id:/discussion_comment/prompt_number/:prompt_number:";
 
@@ -100,6 +105,9 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
           return testAttempt;
         },
       },
+
+      // Scorm Extension Comments
+      ['taskScormExtensions', 'scorm_extensions']
     );
 
     this.mapping.addJsonKey(
@@ -119,6 +127,8 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
         return new ExtensionComment(other);
       case 'scorm':
         return new ScormComment(other);
+      case 'scorm_extension':
+        return new ScormExtensionComment(other);
       default:
         return new TaskComment(other);
     }
@@ -218,6 +228,39 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
     );
   }
 
+  public assessScormExtension(extension: ScormExtensionComment): Observable<TaskComment> {
+    const opts: RequestOptions<TaskComment> = {
+      endpointFormat: this.scormExtensionGrantEndpointFormat,
+      entity: extension,
+    };
+
+    return super.update(
+      {
+        id: extension.id,
+        projectId: extension.project.id,
+        taskDefinitionId: extension.task.definition.id,
+      },
+      opts,
+    );
+  }
+
+  public requestScormExtension(reason: string, task: any): Observable<TaskComment> {
+    const opts: RequestOptions<TaskComment> = {
+      endpointFormat: this.scormRequestExtensionEndpointFormat,
+      body: {
+        comment: reason,
+      },
+      cache: task.commentCache,
+    };
+    return super.create(
+      {
+        projectId: task.project.id,
+        taskDefinitionId: task.definition.id,
+      },
+      opts,
+    );
+  }
+
   public postDiscussionReply(comment: TaskComment, replyAudio: Blob): Observable<TaskComment>{
     const form = new FormData();
     const pathIds = {
diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 344494c0eb..737fe1ea4c 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -46,6 +46,7 @@ export class TaskService extends CachedEntityService<Task> {
         toEntityFn: MappingFunctions.mapDateToEndOfDay,
       },
       'extensions',
+      'scormExtensions',
       {
         keys: 'submissionDate',
         toEntityFn: MappingFunctions.mapDateToDay,
diff --git a/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.html b/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.html
new file mode 100644
index 0000000000..f39a9580b5
--- /dev/null
+++ b/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.html
@@ -0,0 +1,45 @@
+<h3 mat-dialog-title>Extra attempt request</h3>
+<div mat-dialog-content [formGroup]="extensionData">
+  <p class="w-full">
+    Please explain why you require an extra attempt for this knowledge check, the teaching team will
+    assess the request shortly.
+  </p>
+
+  <mat-form-field style="width: 100%" appearance="outline">
+    <mat-label>Reason</mat-label>
+    <textarea
+      type="text"
+      matInput
+      [formControl]="extensionData.controls.extensionReason"
+      [errorStateMatcher]="matcher"
+      placeholder="Reason"
+    ></textarea>
+    <mat-hint align="end"
+      >{{ extensionData.controls.extensionReason.value.length }} / {{ reasonMaxLength }}</mat-hint
+    >
+    @if (extensionData.controls.extensionReason.hasError('required')) {
+      <mat-error>You must enter a reason</mat-error>
+    }
+    @if (extensionData.controls.extensionReason.hasError('minlength')) {
+      <mat-error>The reason must be at least {{ reasonMinLength }} characters long</mat-error>
+    }
+    @if (extensionData.controls.extensionReason.hasError('maxlength')) {
+      <mat-error>The reason must be less than {{ reasonMaxLength }} characters long</mat-error>
+    }
+  </mat-form-field>
+</div>
+
+<div mat-dialog-actions style="float: right">
+  <button mat-dialog-close mat-stroked-button color="warn">Cancel</button>
+  <button
+    mat-dialog-close
+    style="margin-right: 10px"
+    mat-stroked-button
+    color="primary"
+    mat-button
+    [disabled]="!extensionData.valid"
+    (click)="submitApplication()"
+  >
+    Request extra attempt
+  </button>
+</div>
diff --git a/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.ts b/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.ts
new file mode 100644
index 0000000000..c7f5833821
--- /dev/null
+++ b/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.component.ts
@@ -0,0 +1,67 @@
+import {Component, Inject, LOCALE_ID} from '@angular/core';
+import {MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {TaskComment, TaskCommentService, Task} from 'src/app/api/models/doubtfire-model';
+import {AppInjector} from 'src/app/app-injector';
+import {FormControl, Validators, FormGroup, FormGroupDirective, NgForm} from '@angular/forms';
+import {ErrorStateMatcher} from '@angular/material/core';
+import {AlertService} from '../../services/alert.service';
+
+/** Error when invalid control is dirty, touched, or submitted. */
+export class ReasonErrorStateMatcher implements ErrorStateMatcher {
+  isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
+    const isSubmitted = form && form.submitted;
+    return !!(control && control.invalid && (control.dirty || control.touched || isSubmitted));
+  }
+}
+
+@Component({
+  selector: 'f-scorm-extension-modal',
+  templateUrl: './scorm-extension-modal.component.html',
+})
+export class ScormExtensionModalComponent {
+  protected reasonMinLength: number = 15;
+  protected reasonMaxLength: number = 256;
+  constructor(
+    public dialogRef: MatDialogRef<ScormExtensionModalComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: {task: Task; afterApplication?: () => void},
+    private alerts: AlertService,
+  ) {}
+
+  matcher = new ReasonErrorStateMatcher();
+  currentLocale = AppInjector.get(LOCALE_ID);
+  extensionData = new FormGroup({
+    extensionReason: new FormControl('', [
+      Validators.required,
+      Validators.minLength(this.reasonMinLength),
+      Validators.maxLength(this.reasonMaxLength),
+    ]),
+  });
+
+  private scrollCommentsDown(): void {
+    setTimeout(() => {
+      const objDiv = document.querySelector('div.comments-body');
+      // let wrappedResult = angular.element(objDiv);
+      objDiv.scrollTop = objDiv.scrollHeight;
+    }, 50);
+  }
+
+  submitApplication() {
+    const tcs: TaskCommentService = AppInjector.get(TaskCommentService);
+    tcs
+      .requestScormExtension(this.extensionData.controls.extensionReason.value, this.data.task)
+      .subscribe({
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        next: ((tc: TaskComment) => {
+          this.alerts.success('Extra attempt requested.', 2000);
+          this.scrollCommentsDown();
+          if (typeof this.data.afterApplication === 'function') {
+            this.data.afterApplication();
+          }
+        }).bind(this),
+        error: ((response: never) => {
+          this.alerts.error('Error requesting extra attempt ' + response);
+          console.log(response);
+        }).bind(this),
+      });
+  }
+}
diff --git a/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.service.ts b/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.service.ts
new file mode 100644
index 0000000000..7e9b46f8e9
--- /dev/null
+++ b/src/app/common/modals/scorm-extension-modal/scorm-extension-modal.service.ts
@@ -0,0 +1,26 @@
+import {Injectable} from '@angular/core';
+import {Task} from 'src/app/api/models/task';
+import {MatDialogRef, MatDialog} from '@angular/material/dialog';
+import {ScormExtensionModalComponent} from './scorm-extension-modal.component';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ScormExtensionModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(task: Task, afterApplication?: any) {
+    let dialogRef: MatDialogRef<ScormExtensionModalComponent, any>;
+
+    dialogRef = this.dialog.open(ScormExtensionModalComponent, {
+      data: {
+        task,
+        afterApplication,
+      },
+    });
+
+    dialogRef.afterOpened().subscribe((result: any) => {});
+
+    dialogRef.afterClosed().subscribe((result: any) => {});
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 5f6e91e775..67e3c3f1dd 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -230,6 +230,8 @@ import {ScormAdapterService} from './api/services/scorm-adapter.service';
 import {ScormCommentComponent} from './tasks/task-comments-viewer/scorm-comment/scorm-comment.component';
 import {TaskScormCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component';
 import {TestAttemptService} from './api/services/test-attempt.service';
+import {ScormExtensionCommentComponent} from './tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component';
+import {ScormExtensionModalComponent} from './common/modals/scorm-extension-modal/scorm-extension-modal.component';
 
 @NgModule({
   // Components we declare
@@ -335,6 +337,8 @@ import {TestAttemptService} from './api/services/test-attempt.service';
     ScormPlayerComponent,
     ScormCommentComponent,
     TaskScormCardComponent,
+    ScormExtensionCommentComponent,
+    ScormExtensionModalComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
index 9d518fb1c4..1929afb248 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -22,10 +22,10 @@
     </button>
     <button
       mat-stroked-button
-      (click)="requestMoreAttempts()"
-      [hidden]="task.definition.scormAttemptLimit === 0"
+      (click)="requestExtraAttempt()"
+      [hidden]="task.definition.scormAttemptLimit === 0 || attemptsLeft !== 0"
     >
-      Request more attempts
+      Request extra attempt
     </button>
   </mat-card-actions>
 </mat-card>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
index cdeb73df0e..2713c9ee33 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -1,5 +1,6 @@
 import {Component, Input, OnChanges, SimpleChanges} from '@angular/core';
 import {Task} from 'src/app/api/models/doubtfire-model';
+import {ScormExtensionModalService} from 'src/app/common/modals/scorm-extension-modal/scorm-extension-modal.service';
 
 @Component({
   selector: 'f-task-scorm-card',
@@ -10,6 +11,8 @@ export class TaskScormCardComponent implements OnChanges {
   @Input() task: Task;
   attemptsLeft: number;
 
+  constructor(private extensions: ScormExtensionModalService) {}
+
   ngOnChanges(changes: SimpleChanges) {
     if (changes.task && changes.task.currentValue) {
       this.attemptsLeft = undefined;
@@ -22,7 +25,7 @@ export class TaskScormCardComponent implements OnChanges {
       this.task.fetchTestAttempts().subscribe((attempts) => {
         let count = attempts.length;
         if (count > 0 && attempts[0].terminated === false) count--;
-        this.attemptsLeft = this.task.definition.scormAttemptLimit - count;
+        this.attemptsLeft = this.task.definition.scormAttemptLimit + this.task.scormExtensions - count;
       });
     }
   }
@@ -34,5 +37,9 @@ export class TaskScormCardComponent implements OnChanges {
     );
   }
 
-  requestMoreAttempts(): void {}
+  requestExtraAttempt(): void {
+    this.extensions.show(this.task, () => {
+      this.task.refresh();
+    });
+  }
 }
diff --git a/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.html b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.html
new file mode 100644
index 0000000000..fa7c4cb39f
--- /dev/null
+++ b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.html
@@ -0,0 +1,32 @@
+<div class="flex flex-row justify-evenly items-center">
+  @if (comment.assessed) {
+    <div class="flex flex-col justify-around items-center">
+      <hr class="hr-text" [attr.data-content]="message" />
+      <p class="fade-text"><strong> reason:</strong> {{ comment.text }}</p>
+    </div>
+  }
+
+  @if (!comment.assessed) {
+    <div class="flex flex-col justify-around items-center">
+      <hr class="hr-fade" />
+      <p>
+        {{ message }} <br />
+        <strong> reason:</strong> {{ comment.text }}
+      </p>
+      @if (isNotStudent) {
+        <div class="flex flex-row justify-evenly items-center">
+          <button
+            (click)="grantExtension()"
+            mat-flat-button
+            color="primary"
+            style="background-color: #43a047"
+          >
+            Grant
+          </button>
+          <button (click)="denyExtension()" mat-flat-button color="warn">Deny</button>
+        </div>
+      }
+      <hr class="hr-fade" />
+    </div>
+  }
+</div>
diff --git a/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.scss b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.scss
new file mode 100644
index 0000000000..c2917f902e
--- /dev/null
+++ b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.scss
@@ -0,0 +1,55 @@
+div {
+  width: 100%;
+}
+
+p {
+  color: #2c2c2c;
+  text-align: center;
+}
+
+hr {
+  width: 100%;
+}
+
+.hr-fade {
+  background: linear-gradient(to right, transparent, #9696969d, transparent);
+  width: 100%;
+}
+
+.fade-text {
+  color: #9696969d;
+  opacity: 0.8;
+}
+
+.hr-text {
+  margin: 0;
+  line-height: 1em;
+  position: relative;
+  outline: 0;
+  border: 0;
+  color: black;
+  text-align: center;
+  height: 1.5em;
+  opacity: 0.8;
+  &:before {
+    content: "";
+    background: linear-gradient(to right, transparent, #9696969d, transparent);
+    position: absolute;
+    left: 0;
+    top: 50%;
+    width: 100%;
+    height: 1px;
+  }
+  &:after {
+    content: attr(data-content);
+    position: relative;
+    display: inline-block;
+    color: black;
+
+    padding: 0 0.5em;
+    line-height: 1.5em;
+
+    color: #9696969d;
+    background-color: #fff;
+  }
+}
diff --git a/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.ts
new file mode 100644
index 0000000000..eb1790edd4
--- /dev/null
+++ b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.ts
@@ -0,0 +1,63 @@
+import {Component, OnInit, Input} from '@angular/core';
+import {ScormExtensionComment, TaskComment, Task} from 'src/app/api/models/doubtfire-model';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-scorm-extension-comment',
+  templateUrl: './scorm-extension-comment.component.html',
+  styleUrls: ['./scorm-extension-comment.component.scss'],
+})
+export class ScormExtensionCommentComponent implements OnInit {
+  @Input() comment: ScormExtensionComment;
+  @Input() task: Task;
+
+  constructor(private alerts: AlertService) {}
+
+  private handleError(error: any) {
+    this.alerts.error('Error: ' + error.data.error, 6000);
+  }
+
+  ngOnInit() {}
+
+  get message() {
+    const studentName = this.comment.author.name;
+    if (this.comment.assessed && this.comment.granted) {
+      return 'Extra attempt granted.';
+    } else if (this.comment.assessed && !this.comment.granted) {
+      return 'Extra attempt request rejected.';
+    }
+    const subject = this.isStudent ? 'You have ' : studentName + ' has ';
+    const message = 'requested an extra attempt for the knowledge check.';
+    return subject + message;
+  }
+
+  get isStudent() {
+    return !this.isNotStudent;
+  }
+
+  get isNotStudent() {
+    return this.task.unit.currentUserIsStaff;
+  }
+
+  denyExtension() {
+    this.comment.deny().subscribe({
+      next: (tc: TaskComment) => {
+        this.alerts.success('Attempt request denied', 2000);
+      },
+      error: (response) => {
+        this.handleError(response);
+      },
+    });
+  }
+
+  grantExtension() {
+    this.comment.grant().subscribe({
+      next: (tc: TaskComment) => {
+        this.alerts.success('Attempt request granted', 2000);
+      },
+      error: (response) => {
+        this.handleError(response);
+      },
+    });
+  }
+}
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index f6228c576a..81b09e6011 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -95,6 +95,11 @@
                   <extension-comment [task]="task" [comment]="comment"> </extension-comment>
                 </div>
 
+                <div *ngSwitchCase="'scorm_extension'" class="comment-scorm-extension">
+                  <f-scorm-extension-comment [task]="task" [comment]="comment">
+                  </f-scorm-extension-comment>
+                </div>
+
                 <div *ngSwitchCase="'text'" class="comment-text">
                   <div class="markdown-to-html" [innerHTML]="comment.text | marked"></div>
                 </div>
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
index d82983038f..a1b4811941 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
@@ -140,7 +140,7 @@ $comment-inner-border-radius: 4px;
     }
   }
 
-  .comment-container .comment-extension {
+  .comment-container .comment-extension, .comment-container .comment-scorm-extension {
     width: 100%;
   }
 
@@ -354,7 +354,7 @@ $comment-inner-border-radius: 4px;
     }
   }
 
-  .comment .extension-bubble {
+  .comment .extension-bubble, .comment .scorm_extension-bubble {
     width: 100%;
     background-color: transparent;
   }
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 8ad719f339..857f4581f2 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -154,7 +154,13 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
   }
 
   shouldShowAuthorIcon(commentType: string) {
-    return !(commentType === 'extension' || commentType === 'status' || commentType == 'assessment' || commentType == 'scorm');
+    return !(
+      commentType === 'extension' ||
+      commentType === 'status' ||
+      commentType == 'assessment' ||
+      commentType === 'scorm' ||
+      commentType === 'scorm_extension'
+    );
   }
 
   commentClasses(comment: TaskComment): object {

From 97e1ea187b769a51ebb66b82d76f21193bb29386 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 5 Jun 2024 23:15:15 +1000
Subject: [PATCH 056/776] fix: add auth headers to scorm adapter xhr requests

---
 src/app/api/services/scorm-adapter.service.ts | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index b6014f14b4..085d41610b 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -59,6 +59,8 @@ export class ScormAdapterService {
 
     if (this.context.mode === 'review') {
       this.xhr.open('GET', `${API_URL}/test_attempts/${this.context.attemptId}/review`, false);
+      this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+      this.xhr.setRequestHeader('Username', this.context.user.username);
 
       this.xhr.onload = () => {
         if (this.xhr.status >= 200 && this.xhr.status < 400) {
@@ -88,6 +90,8 @@ export class ScormAdapterService {
       `${API_URL}/projects/${this.context.projectId}/task_def_id/${this.context.taskDefId}/test_attempts/latest`,
       false,
     );
+    this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+    this.xhr.setRequestHeader('Username', this.context.user.username);
 
     let noTestFound = false;
     let startNewTest = false;
@@ -119,6 +123,8 @@ export class ScormAdapterService {
 
     if (!startNewTest) {
       this.xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, false);
+      this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+      this.xhr.setRequestHeader('Username', this.context.user.username);
       this.xhr.send();
       console.log(this.xhr.responseText);
 
@@ -133,6 +139,8 @@ export class ScormAdapterService {
         `${API_URL}/projects/${this.context.projectId}/task_def_id/${this.context.taskDefId}/test_attempts`,
         false,
       );
+      this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+      this.xhr.setRequestHeader('Username', this.context.user.username);
       this.xhr.send();
       console.log(this.xhr.responseText);
 
@@ -163,6 +171,8 @@ export class ScormAdapterService {
     }
 
     this.xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, false);
+    this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+    this.xhr.setRequestHeader('Username', this.context.user.username);
     this.xhr.setRequestHeader('Content-Type', 'application/json');
     const requestData = {
       cmi_datamodel: JSON.stringify(this.dataModel.dump()),
@@ -233,26 +243,28 @@ export class ScormAdapterService {
         break;
     }
 
-    const xhr = new XMLHttpRequest();
-    xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, true);
-    xhr.setRequestHeader('Content-Type', 'application/json');
+    this.xhr.open('PATCH', `${API_URL}/test_attempts/${this.context.attemptId}`, true);
+    this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
+    this.xhr.setRequestHeader('Username', this.context.user.username);
+    this.xhr.setRequestHeader('Content-Type', 'application/json');
     const requestData = {
       cmi_datamodel: JSON.stringify(this.dataModel.dump()),
     };
-    xhr.send(JSON.stringify(requestData));
+    
 
-    xhr.onload = () => {
-      if (xhr.status >= 200 && xhr.status < 400) {
+    this.xhr.onload = () => {
+      if (this.xhr.status >= 200 && this.xhr.status < 400) {
         console.log('DataModel saved successfully.');
       } else {
-        console.error('Error saving DataModel:', xhr.responseText);
+        console.error('Error saving DataModel:', this.xhr.responseText);
       }
     };
 
-    xhr.onerror = () => {
+    this.xhr.onerror = () => {
       console.error('Request failed.');
     };
 
+    this.xhr.send(JSON.stringify(requestData));
     this.context.errorCode = 0;
     return 'true';
   }

From f0ff40bfd7e86b904adae94bf8cbe5d56371e011 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 5 Jun 2024 23:42:14 +1000
Subject: [PATCH 057/776] fix: remove attempt number field

---
 src/app/api/models/scorm-player-context.ts   | 1 -
 src/app/api/models/test-attempt.ts           | 1 -
 src/app/api/services/test-attempt.service.ts | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/app/api/models/scorm-player-context.ts b/src/app/api/models/scorm-player-context.ts
index c065957ac0..195bc3cd4c 100644
--- a/src/app/api/models/scorm-player-context.ts
+++ b/src/app/api/models/scorm-player-context.ts
@@ -52,7 +52,6 @@ export class ScormPlayerContext {
   taskDefId: number;
   user: User;
 
-  attemptNumber: number;
   attemptId: number;
   learnerName: string;
   learnerId: number;
diff --git a/src/app/api/models/test-attempt.ts b/src/app/api/models/test-attempt.ts
index 02bb4bb4e9..646b9ed64f 100644
--- a/src/app/api/models/test-attempt.ts
+++ b/src/app/api/models/test-attempt.ts
@@ -3,7 +3,6 @@ import {Task} from './doubtfire-model';
 
 export class TestAttempt extends Entity {
   id: number;
-  attemptNumber: number;
   terminated: boolean;
   completionStatus: boolean;
   successStatus: boolean;
diff --git a/src/app/api/services/test-attempt.service.ts b/src/app/api/services/test-attempt.service.ts
index 6c32ed01a8..df5654855f 100644
--- a/src/app/api/services/test-attempt.service.ts
+++ b/src/app/api/services/test-attempt.service.ts
@@ -20,7 +20,6 @@ export class TestAttemptService extends CachedEntityService<TestAttempt> {
 
     this.mapping.addKeys(
       'id',
-      'attemptNumber',
       'terminated',
       'completionStatus',
       'successStatus',

From 9bc48b03905c0a839d78ea13be9817ca73ba54cf Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 6 Jun 2024 20:53:45 +1000
Subject: [PATCH 058/776] fix: disable launch scorm test button if user is
 staff

---
 .../task-scorm-card/task-scorm-card.component.html     |  7 ++++++-
 .../task-scorm-card/task-scorm-card.component.ts       | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
index 1929afb248..ec385b4760 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -14,7 +14,12 @@
     </p>
   </mat-card-content>
   <mat-card-actions class="space-x-2">
-    <button mat-stroked-button (click)="launchScormPlayer()" [hidden]="attemptsLeft === 0">
+    <button
+      mat-stroked-button
+      (click)="launchScormPlayer()"
+      [hidden]="attemptsLeft === 0"
+      [disabled]="user.isStaff"
+    >
       <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="Launch icon">
         launch
       </mat-icon>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
index 2713c9ee33..f2a2040517 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -1,5 +1,5 @@
 import {Component, Input, OnChanges, SimpleChanges} from '@angular/core';
-import {Task} from 'src/app/api/models/doubtfire-model';
+import {Task, User, UserService} from 'src/app/api/models/doubtfire-model';
 import {ScormExtensionModalService} from 'src/app/common/modals/scorm-extension-modal/scorm-extension-modal.service';
 
 @Component({
@@ -10,8 +10,14 @@ import {ScormExtensionModalService} from 'src/app/common/modals/scorm-extension-
 export class TaskScormCardComponent implements OnChanges {
   @Input() task: Task;
   attemptsLeft: number;
+  user: User;
 
-  constructor(private extensions: ScormExtensionModalService) {}
+  constructor(
+    private extensions: ScormExtensionModalService,
+    private userService: UserService,
+  ) {
+    this.user = userService.currentUser;
+  }
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.task && changes.task.currentValue) {

From 3fb25bb373acab837a3ef787620dd654bfd6803f Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 6 Jun 2024 22:18:03 +1000
Subject: [PATCH 059/776] feat: use confirmation modal when passing or deleting
 test attempts

---
 .../scorm-comment/scorm-comment.component.ts  | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
index 201e35544a..87daf5b6ca 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
@@ -1,12 +1,19 @@
-import {Component, OnInit, Input} from '@angular/core';
-import {Task, ScormComment, User, UserService, TestAttemptService} from 'src/app/api/models/doubtfire-model';
+import {Component, Input, Inject} from '@angular/core';
+import {confirmationModal} from 'src/app/ajs-upgraded-providers';
+import {
+  Task,
+  ScormComment,
+  User,
+  UserService,
+  TestAttemptService,
+} from 'src/app/api/models/doubtfire-model';
 
 @Component({
   selector: 'f-scorm-comment',
   templateUrl: './scorm-comment.component.html',
   styleUrls: ['./scorm-comment.component.scss'],
 })
-export class ScormCommentComponent implements OnInit {
+export class ScormCommentComponent {
   @Input() task: Task;
   @Input() comment: ScormComment;
 
@@ -15,12 +22,11 @@ export class ScormCommentComponent implements OnInit {
   constructor(
     private userService: UserService,
     private testAttemptService: TestAttemptService,
+    @Inject(confirmationModal) private confirmationModal: any,
   ) {
     this.user = this.userService.currentUser;
   }
 
-  ngOnInit() {}
-
   get canOverridePass(): boolean {
     return this.user.isStaff && !this.comment.testAttempt.successStatus;
   }
@@ -33,10 +39,22 @@ export class ScormCommentComponent implements OnInit {
   }
 
   passScormAttempt() {
-    this.testAttemptService.overrideSuccessStatus(this.comment.testAttempt.id, true);
+    this.confirmationModal.show(
+      'Pass Test Attempt',
+      'Are you sure you want to pass this test attempt? This action will override the success status of this test attempt to a pass.',
+      () => {
+        this.testAttemptService.overrideSuccessStatus(this.comment.testAttempt.id, true);
+      },
+    );
   }
 
   deleteScormAttempt() {
-    this.testAttemptService.deleteAttempt(this.comment.testAttempt.id);
+    this.confirmationModal.show(
+      'Delete Test Attempt',
+      'Are you sure you want to delete this test attempt? This action is final and will delete information associated with this test attempt.',
+      () => {
+        this.testAttemptService.deleteAttempt(this.comment.testAttempt.id);
+      },
+    );
   }
 }

From 4b983bae1f522013f750b8c36d5e1a52624abbbc Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 6 Jun 2024 22:25:47 +1000
Subject: [PATCH 060/776] fix: indicate task def has scorm data when zip is
 uploaded

---
 .../task-definition-scorm/task-definition-scorm.component.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
index 3e41aa39d2..3ebd0d2a6d 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
@@ -49,7 +49,10 @@ export class TaskDefinitionScormComponent {
     if (validFiles.length > 0) {
       const file = validFiles[0];
       this.taskDefinitionService.uploadScormData(this.taskDefinition, file).subscribe({
-        next: () => this.alerts.success('Uploaded SCORM test data', 2000),
+        next: () => {
+          this.alerts.success('Uploaded SCORM test data', 2000);
+          this.taskDefinition.hasScormData = true;
+        },
         error: (message) => this.alerts.error(message, 6000),
       });
     } else {

From 729c438f7f6a988f5ff2fa4035493b5cae1c98f7 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 11 Jun 2024 20:50:37 +1000
Subject: [PATCH 061/776] fix: ensure loading screen removed in sign in
 component

---
 src/app/projects/states/index/global-state.service.ts | 7 ++++++-
 src/app/sessions/states/sign-in/sign-in.component.ts  | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/index/global-state.service.ts b/src/app/projects/states/index/global-state.service.ts
index bb730a37c8..18d77561ac 100644
--- a/src/app/projects/states/index/global-state.service.ts
+++ b/src/app/projects/states/index/global-state.service.ts
@@ -251,7 +251,6 @@ export class GlobalStateService implements OnDestroy {
    * Query the API for the units taught and studied by the current user.
    */
   private loadUnitsAndProjects() {
-    this.isLoadingSubject.next(true);
     this.unitRoleService.query().subscribe({
       next: (_unitRoles: UnitRole[]) => {
         // unit roles are now in the cache
@@ -264,8 +263,14 @@ export class GlobalStateService implements OnDestroy {
               this.isLoadingSubject.next(false);
             }, 800);
           },
+          error: (_response) => {
+            this.alerts.error('Unable to access the units you study.', 6000);
+          },
         });
       },
+      error: (_response) => {
+        this.alerts.error('Unable to access your units.', 6000);
+      }
     });
   }
 
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index f41b944018..1ac97cca73 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -79,11 +79,13 @@ export class SignInComponent implements OnInit {
             }
           });
         } else {
+          this.globalState.isLoadingSubject.next(false);
           // We are SSO and no credentials
           this.showCredentials = false;
           return wait.then();
         }
       } else {
+        this.globalState.isLoadingSubject.next(false);
         this.authMethodLoaded = true;
         this.showCredentials = true;
         return wait.then();

From 5def11c81fd1c1adb9a705b126e6d81cc9510c88 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 11 Jun 2024 21:55:37 +1000
Subject: [PATCH 062/776] refactor: remove scorm extension deny button

---
 .../task-comment/scorm-extension-comment.ts   |  5 -----
 .../scorm-extension-comment.component.html    | 19 ++++++++-----------
 .../scorm-extension-comment.component.ts      | 11 -----------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/app/api/models/task-comment/scorm-extension-comment.ts b/src/app/api/models/task-comment/scorm-extension-comment.ts
index 3b4dfbccb6..b8aac7909b 100644
--- a/src/app/api/models/task-comment/scorm-extension-comment.ts
+++ b/src/app/api/models/task-comment/scorm-extension-comment.ts
@@ -26,11 +26,6 @@ export class ScormExtensionComment extends TaskComment {
     );
   }
 
-  public deny(): Observable<TaskComment> {
-    this.granted = false;
-    return this.assessScormExtension();
-  }
-
   public grant(): Observable<TaskComment> {
     this.granted = true;
     return this.assessScormExtension();
diff --git a/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.html b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.html
index fa7c4cb39f..b0a74a991e 100644
--- a/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.html
@@ -14,17 +14,14 @@
         <strong> reason:</strong> {{ comment.text }}
       </p>
       @if (isNotStudent) {
-        <div class="flex flex-row justify-evenly items-center">
-          <button
-            (click)="grantExtension()"
-            mat-flat-button
-            color="primary"
-            style="background-color: #43a047"
-          >
-            Grant
-          </button>
-          <button (click)="denyExtension()" mat-flat-button color="warn">Deny</button>
-        </div>
+        <button
+          (click)="grantExtension()"
+          mat-flat-button
+          color="primary"
+          style="background-color: #43a047"
+        >
+          Grant
+        </button>
       }
       <hr class="hr-fade" />
     </div>
diff --git a/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.ts
index eb1790edd4..7585e8d7c9 100644
--- a/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component.ts
@@ -39,17 +39,6 @@ export class ScormExtensionCommentComponent implements OnInit {
     return this.task.unit.currentUserIsStaff;
   }
 
-  denyExtension() {
-    this.comment.deny().subscribe({
-      next: (tc: TaskComment) => {
-        this.alerts.success('Attempt request denied', 2000);
-      },
-      error: (response) => {
-        this.handleError(response);
-      },
-    });
-  }
-
   grantExtension() {
     this.comment.grant().subscribe({
       next: (tc: TaskComment) => {

From 703563c86253c60ad30d451ee2d8e0fa7ebbfabb Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 11 Jun 2024 22:20:39 +1000
Subject: [PATCH 063/776] feat: disable attempt button if passed and add button
 to review latest attempt in card

---
 .../task-scorm-card.component.html            |  9 +++-
 .../task-scorm-card.component.ts              | 49 ++++++++++++++++---
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
index ec385b4760..4781d88f2f 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -18,13 +18,20 @@
       mat-stroked-button
       (click)="launchScormPlayer()"
       [hidden]="attemptsLeft === 0"
-      [disabled]="user.isStaff"
+      [disabled]="user.isStaff || checkIfPassed()"
     >
       <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="Launch icon">
         launch
       </mat-icon>
       Attempt test
     </button>
+    <button
+      mat-stroked-button
+      (click)="reviewLatestCompletedAttempt()"
+      [hidden]="(!user.isStaff && !task.definition.scormAllowReview) || !latestCompletedAttempt"
+    >
+      Review last attempt
+    </button>
     <button
       mat-stroked-button
       (click)="requestExtraAttempt()"
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
index f2a2040517..80744b104a 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -1,5 +1,11 @@
-import {Component, Input, OnChanges, SimpleChanges} from '@angular/core';
-import {Task, User, UserService} from 'src/app/api/models/doubtfire-model';
+import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
+import {
+  Task,
+  TestAttempt,
+  TestAttemptService,
+  User,
+  UserService,
+} from 'src/app/api/models/doubtfire-model';
 import {ScormExtensionModalService} from 'src/app/common/modals/scorm-extension-modal/scorm-extension-modal.service';
 
 @Component({
@@ -7,35 +13,57 @@ import {ScormExtensionModalService} from 'src/app/common/modals/scorm-extension-
   templateUrl: './task-scorm-card.component.html',
   styleUrls: ['./task-scorm-card.component.scss'],
 })
-export class TaskScormCardComponent implements OnChanges {
+export class TaskScormCardComponent implements OnInit, OnChanges {
   @Input() task: Task;
   attemptsLeft: number;
+  latestCompletedAttempt: TestAttempt;
   user: User;
 
   constructor(
     private extensions: ScormExtensionModalService,
+    private testAttemptService: TestAttemptService,
     private userService: UserService,
   ) {
-    this.user = userService.currentUser;
+    this.user = this.userService.currentUser;
+  }
+
+  ngOnInit() {
+    this.refreshAttemptData();
   }
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.task && changes.task.currentValue) {
-      this.attemptsLeft = undefined;
-      this.getAttemptsLeft();
+      this.refreshAttemptData();
     }
   }
 
+  refreshAttemptData(): void {
+    this.attemptsLeft = undefined;
+    this.getAttemptsLeft();
+    this.latestCompletedAttempt = undefined;
+    this.testAttemptService.getLatestCompletedAttempt(this.task).subscribe((attempt) => {
+      this.latestCompletedAttempt = attempt;
+    });
+  }
+
   getAttemptsLeft(): void {
     if (this.task.definition.scormAttemptLimit != 0) {
       this.task.fetchTestAttempts().subscribe((attempts) => {
         let count = attempts.length;
         if (count > 0 && attempts[0].terminated === false) count--;
-        this.attemptsLeft = this.task.definition.scormAttemptLimit + this.task.scormExtensions - count;
+        this.attemptsLeft =
+          this.task.definition.scormAttemptLimit + this.task.scormExtensions - count;
       });
     }
   }
 
+  checkIfPassed(): boolean {
+    if (this.latestCompletedAttempt) {
+      return this.latestCompletedAttempt.successStatus;
+    }
+    return false;
+  }
+
   launchScormPlayer(): void {
     window.open(
       `#/projects/${this.task.project.id}/task_def_id/${this.task.taskDefId}/scorm-player/normal`,
@@ -43,6 +71,13 @@ export class TaskScormCardComponent implements OnChanges {
     );
   }
 
+  reviewLatestCompletedAttempt(): void {
+    window.open(
+      `#/task_def_id/${this.task.taskDefId}/scorm-player/review/${this.latestCompletedAttempt.id}`,
+      '_blank',
+    );
+  }
+
   requestExtraAttempt(): void {
     this.extensions.show(this.task, () => {
       this.task.refresh();

From db161721fab1359694c44d8df7237cd01892938b Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 11 Jun 2024 23:17:58 +1000
Subject: [PATCH 064/776] feat: show banner based on scorm success status

---
 .../task-scorm-card.component.html            | 133 ++++++++++++------
 .../task-scorm-card.component.ts              |  13 +-
 2 files changed, 95 insertions(+), 51 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
index 4781d88f2f..cec59fc939 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -1,43 +1,90 @@
-<mat-card appearance="outlined" [hidden]="!task.scormEnabled">
-  <mat-card-header>
-    <mat-card-title>Knowledge Check</mat-card-title>
-  </mat-card-header>
-  <mat-card-content>
-    <p>You have to successfully pass this knowledge check to complete the task.</p>
-    <p>
-      You have {{ attemptsLeft !== undefined ? attemptsLeft : 'unlimited' }} attempts left to
-      complete this test.
-    </p>
-    <p [hidden]="!task.definition.scormTimeDelayEnabled">
-      There will be an increased time delay between test attempts. First 2 attempts will not have a
-      time delay in between.
-    </p>
-  </mat-card-content>
-  <mat-card-actions class="space-x-2">
-    <button
-      mat-stroked-button
-      (click)="launchScormPlayer()"
-      [hidden]="attemptsLeft === 0"
-      [disabled]="user.isStaff || checkIfPassed()"
-    >
-      <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="Launch icon">
-        launch
-      </mat-icon>
-      Attempt test
-    </button>
-    <button
-      mat-stroked-button
-      (click)="reviewLatestCompletedAttempt()"
-      [hidden]="(!user.isStaff && !task.definition.scormAllowReview) || !latestCompletedAttempt"
-    >
-      Review last attempt
-    </button>
-    <button
-      mat-stroked-button
-      (click)="requestExtraAttempt()"
-      [hidden]="task.definition.scormAttemptLimit === 0 || attemptsLeft !== 0"
-    >
-      Request extra attempt
-    </button>
-  </mat-card-actions>
-</mat-card>
+@if (isPassed) {
+  <mat-card appearance="outlined" [hidden]="!task.scormEnabled">
+    @if (latestCompletedAttempt.scoreScaled === 1) {
+      <mat-card-header class="bg-green-600 text-white">
+        <mat-card-title class="flex items-center mb-4"
+          ><mat-icon class="font-extrabold">check</mat-icon>
+          <span class="ml-4">Knowledge Check Passed</span></mat-card-title
+        >
+      </mat-card-header>
+    }
+    @if (latestCompletedAttempt.scoreScaled !== 1) {
+      <mat-card-header class="bg-green-500 text-white">
+        <mat-card-title class="flex items-center mb-4"
+          ><mat-icon class="font-extrabold">check</mat-icon>
+          <span class="ml-4">Knowledge Check Passed With Mistakes</span></mat-card-title
+        >
+      </mat-card-header>
+    }
+    <mat-card-content class="bg-green-50">
+      <p class="pt-2">
+        You have successfully completed this knowledge check. You can now proceed to submitting task
+        files.
+      </p>
+    </mat-card-content>
+    <mat-card-actions class="space-x-2 px-5 bg-green-50">
+      <button
+        mat-stroked-button
+        (click)="reviewLatestCompletedAttempt()"
+        [hidden]="!user.isStaff && !task.definition.scormAllowReview"
+      >
+        Review last attempt
+      </button>
+    </mat-card-actions>
+  </mat-card>
+}
+@if (!isPassed) {
+  <mat-card appearance="outlined" [hidden]="!task.scormEnabled">
+    @if (isPassed === false) {
+      <mat-card-header class="bg-red-600 text-white">
+        <mat-card-title class="flex items-center mb-4"
+          ><mat-icon class="font-extrabold">close</mat-icon>
+          <span class="ml-4">Knowledge Check Failed</span></mat-card-title
+        >
+      </mat-card-header>
+    }
+    @if (isPassed === undefined) {
+      <mat-card-header>
+        <mat-card-title>Knowledge Check</mat-card-title>
+      </mat-card-header>
+    }
+    <mat-card-content>
+      <p class="pt-2">You have to successfully pass this knowledge check to complete the task.</p>
+      <p>
+        You have {{ attemptsLeft !== undefined ? attemptsLeft : 'unlimited' }} attempts left to
+        complete this test.
+      </p>
+      <p [hidden]="!task.definition.scormTimeDelayEnabled">
+        There will be an increased time delay between test attempts. First 2 attempts will not have
+        a time delay in between.
+      </p>
+    </mat-card-content>
+    <mat-card-actions class="space-x-2 px-5 pt-0">
+      <button
+        mat-stroked-button
+        (click)="launchScormPlayer()"
+        [hidden]="attemptsLeft === 0"
+        [disabled]="user.isStaff"
+      >
+        <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="Launch icon">
+          launch
+        </mat-icon>
+        Attempt test
+      </button>
+      <button
+        mat-stroked-button
+        (click)="reviewLatestCompletedAttempt()"
+        [hidden]="(!user.isStaff && !task.definition.scormAllowReview) || !latestCompletedAttempt"
+      >
+        Review last attempt
+      </button>
+      <button
+        mat-stroked-button
+        (click)="requestExtraAttempt()"
+        [hidden]="task.definition.scormAttemptLimit === 0 || attemptsLeft !== 0"
+      >
+        Request extra attempt
+      </button>
+    </mat-card-actions>
+  </mat-card>
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
index 80744b104a..25fc9e479a 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -16,6 +16,7 @@ import {ScormExtensionModalService} from 'src/app/common/modals/scorm-extension-
 export class TaskScormCardComponent implements OnInit, OnChanges {
   @Input() task: Task;
   attemptsLeft: number;
+  isPassed: boolean;
   latestCompletedAttempt: TestAttempt;
   user: User;
 
@@ -39,10 +40,13 @@ export class TaskScormCardComponent implements OnInit, OnChanges {
 
   refreshAttemptData(): void {
     this.attemptsLeft = undefined;
-    this.getAttemptsLeft();
+    this.isPassed = undefined;
     this.latestCompletedAttempt = undefined;
+
+    this.getAttemptsLeft();
     this.testAttemptService.getLatestCompletedAttempt(this.task).subscribe((attempt) => {
       this.latestCompletedAttempt = attempt;
+      this.isPassed = attempt.successStatus;
     });
   }
 
@@ -57,13 +61,6 @@ export class TaskScormCardComponent implements OnInit, OnChanges {
     }
   }
 
-  checkIfPassed(): boolean {
-    if (this.latestCompletedAttempt) {
-      return this.latestCompletedAttempt.successStatus;
-    }
-    return false;
-  }
-
   launchScormPlayer(): void {
     window.open(
       `#/projects/${this.task.project.id}/task_def_id/${this.task.taskDefId}/scorm-player/normal`,

From 0fcb649a0346d78c04d179d2feccee7d920b6b53 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 14 Jun 2024 11:02:10 +1000
Subject: [PATCH 065/776] chore: ensure lf file endings

---
 .gitattributes        | 2 ++
 .gitignore            | 1 -
 .vscode/settings.json | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 .gitattributes
 create mode 100644 .vscode/settings.json

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..d56abbf304
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto eol=lf
diff --git a/.gitignore b/.gitignore
index 9abc43ca67..c5c729aef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ vendor/
 .sass-cache*
 .bundle*
 tmp.scss
-.vscode
 .tscache
 a.env
 dist/
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..8582900e71
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "files.eol": "\n"
+}

From c5dd45c57fd34e8373f11d065a0cd08edef0a794 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 14 Jun 2024 11:27:05 +1000
Subject: [PATCH 066/776] fix: ensure tii open report alerts errors

---
 .../task-similarity-view.component.ts               | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index 2a6739207a..c407d28b4c 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -18,7 +18,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
 
   constructor(
     private taskSimilarityService: TaskSimilarityService,
-    private alertsService: AlertService,
+    private alertService: AlertService,
     private selectedTaskService: SelectedTaskService
   ) {}
 
@@ -37,7 +37,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
     this.taskSimilarityService
       .update({ taskId: similarity.task.id, id: similarity.id }, { entity: similarity })
       .subscribe((_) => {
-        this.alertsService.success('Similarity flag updated');
+        this.alertService.success('Similarity flag updated');
         similarity.task.similarityFlag = similarity.task.similarityCache.currentValues
           .map((s) => {
             return s.flagged;
@@ -50,8 +50,13 @@ export class TaskSimilarityViewComponent implements OnChanges {
   openReport(e: Event, similarity: TaskSimilarity) {
     e.stopPropagation();
     // Open similarity report in new tab
-    similarity.fetchSimilarityReportUrl().subscribe((url) => {
-      window.open(url, '_blank');
+    similarity.fetchSimilarityReportUrl().subscribe({
+      next: (url) => {
+        window.open(url, '_blank');
+      },
+      error: (err) => {
+        this.alertService.error(`Error accessing TurnItIn: ${err}`);
+      },
     });
   }
 }

From 110271cd7140a31e8dcfca377092ce46181164fc Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 15 Jun 2024 20:23:14 +1000
Subject: [PATCH 067/776] refactor: fix spacing in task scorm card

---
 .../task-scorm-card.component.html                | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
index cec59fc939..81e11cf43c 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -17,17 +17,16 @@
       </mat-card-header>
     }
     <mat-card-content class="bg-green-50">
-      <p class="pt-2">
+      <p class="pt-2 pb-1">
         You have successfully completed this knowledge check. You can now proceed to submitting task
         files.
       </p>
     </mat-card-content>
-    <mat-card-actions class="space-x-2 px-5 bg-green-50">
-      <button
-        mat-stroked-button
-        (click)="reviewLatestCompletedAttempt()"
-        [hidden]="!user.isStaff && !task.definition.scormAllowReview"
-      >
+    <mat-card-actions
+      class="space-x-2 px-5 bg-green-50"
+      [hidden]="!user.isStaff && !task.definition.scormAllowReview"
+    >
+      <button mat-stroked-button (click)="reviewLatestCompletedAttempt()">
         Review last attempt
       </button>
     </mat-card-actions>
@@ -54,7 +53,7 @@
         You have {{ attemptsLeft !== undefined ? attemptsLeft : 'unlimited' }} attempts left to
         complete this test.
       </p>
-      <p [hidden]="!task.definition.scormTimeDelayEnabled">
+      <p class="mb-4" [hidden]="!task.definition.scormTimeDelayEnabled">
         There will be an increased time delay between test attempts. First 2 attempts will not have
         a time delay in between.
       </p>

From 3b7576570394dc0122db73c7052dd5ed97bf0152 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 15 Jun 2024 20:25:41 +1000
Subject: [PATCH 068/776] refactor: add description for scorm time delay

---
 .../task-definition-scorm.component.html      | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
index 5b3b54c111..5321600cf5 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
@@ -24,10 +24,7 @@
     </div>
 
     <div class="flex-grow flex flex-row gap-4 pt-4">
-      <div class="basis-1/2" >
-        <mat-checkbox matInput required [(ngModel)]="taskDefinition.scormTimeDelayEnabled" disabled>
-          Enable incremental time delays between test attempts
-        </mat-checkbox>
+      <div class="basis-1/2">
         <mat-checkbox matInput required [(ngModel)]="taskDefinition.scormAllowReview">
           Allow students to review completed test attempt
         </mat-checkbox>
@@ -44,5 +41,21 @@
         />
       </mat-form-field>
     </div>
+
+    <div class="flex-grow flex flex-row gap-4 pt-4">
+      <mat-checkbox
+        matInput
+        required
+        [(ngModel)]="taskDefinition.scormTimeDelayEnabled"
+        disabled
+        class="basis-1/2"
+      >
+        Enable incremental time delays between test attempts
+      </mat-checkbox>
+      <span class="basis-1/2" disabled
+        >If enabled, first 2 attempts can be completed immediately. Subsequently, a time delay will
+        be added, increasing by 2 hours every attempt made.</span
+      >
+    </div>
   }
 </div>

From ec86e4eca8e9c50ebdaf54c34c302da88dd44b31 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 15 Jun 2024 21:21:17 +1000
Subject: [PATCH 069/776] feat: prevent uploading files until scorm passed

---
 src/app/api/models/task-definition.ts         |  1 +
 src/app/api/models/task.ts                    | 24 +++++++--
 .../api/services/task-definition.service.ts   |  1 +
 src/app/api/services/test-attempt.service.ts  |  2 +-
 .../task-scorm-card.component.html            |  9 ++--
 .../task-scorm-card.component.ts              | 54 +++++++------------
 .../task-definition-scorm.component.html      |  3 ++
 7 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index ca2d188eb6..050466d740 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -34,6 +34,7 @@ export class TaskDefinition extends Entity {
   scormEnabled: boolean;
   hasScormData: boolean;
   scormAllowReview: boolean;
+  scormBypassTest: boolean;
   scormTimeDelayEnabled: boolean;
   scormAttemptLimit: number = 0;
   hasTaskAssessmentResources: boolean;
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index ba4bce8e04..2cadc79d72 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -512,9 +512,22 @@ export class Task extends Entity {
   }
 
   public get scormEnabled(): boolean {
-    return (
-      this.definition.scormEnabled && this.definition.hasScormData
-    );
+    return this.definition.scormEnabled && this.definition.hasScormData;
+  }
+
+  public get scormPassed(): boolean {
+    if (this.latestCompletedTestAttempt) {
+      return this.latestCompletedTestAttempt.successStatus;
+    }
+    return false;
+  }
+
+  public get isReadyForUpload(): boolean {
+    return !this.scormEnabled || this.definition.scormBypassTest || this.scormPassed;
+  }
+
+  public get latestCompletedTestAttempt(): TestAttempt {
+    return this.testAttemptCache.currentValues.find((attempt) => attempt.terminated);
   }
 
   public submissionUrl(asAttachment: boolean = false): string {
@@ -669,12 +682,15 @@ export class Task extends Entity {
 
   public triggerTransition(status: TaskStatusEnum): void {
     if (this.status === status) return;
+    const alerts: AlertService = AppInjector.get(AlertService);
 
     const requiresFileUpload =
       ['ready_for_feedback', 'need_help'].includes(status) && this.requiresFileUpload();
 
-    if (requiresFileUpload) {
+    if (requiresFileUpload && this.isReadyForUpload) {
       this.presentTaskSubmissionModal(status);
+    } else if (requiresFileUpload && !this.isReadyForUpload) {
+      alerts.error('Complete Knowledge Check first to submit files', 6000);
     } else {
       this.updateTaskStatus(status);
     }
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 3776432fd8..9a4a1eeb59 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -96,6 +96,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'scormEnabled',
       'hasScormData',
       'scormAllowReview',
+      'scormBypassTest',
       'scormTimeDelayEnabled',
       'scormAttemptLimit',
       'isGraded',
diff --git a/src/app/api/services/test-attempt.service.ts b/src/app/api/services/test-attempt.service.ts
index df5654855f..3e2c461619 100644
--- a/src/app/api/services/test-attempt.service.ts
+++ b/src/app/api/services/test-attempt.service.ts
@@ -11,7 +11,7 @@ import {HttpClient} from '@angular/common/http';
 @Injectable()
 export class TestAttemptService extends CachedEntityService<TestAttempt> {
   protected readonly endpointFormat =
-    '/projects/:project_id:/task_def_id/:task_def_id:/test_attempts';
+    'projects/:project_id:/task_def_id/:task_def_id:/test_attempts';
   protected readonly latestCompletedEndpoint =
     this.endpointFormat + '/latest?completed=:completed:';
 
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
index 81e11cf43c..12df6a4936 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -1,6 +1,6 @@
 @if (isPassed) {
   <mat-card appearance="outlined" [hidden]="!task.scormEnabled">
-    @if (latestCompletedAttempt.scoreScaled === 1) {
+    @if (this.task.latestCompletedTestAttempt.scoreScaled === 1) {
       <mat-card-header class="bg-green-600 text-white">
         <mat-card-title class="flex items-center mb-4"
           ><mat-icon class="font-extrabold">check</mat-icon>
@@ -8,7 +8,7 @@
         >
       </mat-card-header>
     }
-    @if (latestCompletedAttempt.scoreScaled !== 1) {
+    @if (this.task.latestCompletedTestAttempt.scoreScaled !== 1) {
       <mat-card-header class="bg-green-500 text-white">
         <mat-card-title class="flex items-center mb-4"
           ><mat-icon class="font-extrabold">check</mat-icon>
@@ -73,7 +73,10 @@
       <button
         mat-stroked-button
         (click)="reviewLatestCompletedAttempt()"
-        [hidden]="(!user.isStaff && !task.definition.scormAllowReview) || !latestCompletedAttempt"
+        [hidden]="
+          (!user.isStaff && !task.definition.scormAllowReview) ||
+          !this.task.latestCompletedTestAttempt
+        "
       >
         Review last attempt
       </button>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
index 25fc9e479a..9860d47741 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -1,11 +1,5 @@
-import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
-import {
-  Task,
-  TestAttempt,
-  TestAttemptService,
-  User,
-  UserService,
-} from 'src/app/api/models/doubtfire-model';
+import {Component, Input, OnChanges, SimpleChanges} from '@angular/core';
+import {Task, User, UserService} from 'src/app/api/models/doubtfire-model';
 import {ScormExtensionModalService} from 'src/app/common/modals/scorm-extension-modal/scorm-extension-modal.service';
 
 @Component({
@@ -13,51 +7,39 @@ import {ScormExtensionModalService} from 'src/app/common/modals/scorm-extension-
   templateUrl: './task-scorm-card.component.html',
   styleUrls: ['./task-scorm-card.component.scss'],
 })
-export class TaskScormCardComponent implements OnInit, OnChanges {
+export class TaskScormCardComponent implements OnChanges {
   @Input() task: Task;
   attemptsLeft: number;
   isPassed: boolean;
-  latestCompletedAttempt: TestAttempt;
   user: User;
 
   constructor(
     private extensions: ScormExtensionModalService,
-    private testAttemptService: TestAttemptService,
     private userService: UserService,
   ) {
     this.user = this.userService.currentUser;
   }
 
-  ngOnInit() {
-    this.refreshAttemptData();
-  }
-
   ngOnChanges(changes: SimpleChanges) {
-    if (changes.task && changes.task.currentValue) {
-      this.refreshAttemptData();
-    }
-  }
-
-  refreshAttemptData(): void {
-    this.attemptsLeft = undefined;
-    this.isPassed = undefined;
-    this.latestCompletedAttempt = undefined;
+    if (changes.task && changes.task.currentValue && changes.task.currentValue.scormEnabled) {
+      this.attemptsLeft = undefined;
+      this.isPassed = undefined;
 
-    this.getAttemptsLeft();
-    this.testAttemptService.getLatestCompletedAttempt(this.task).subscribe((attempt) => {
-      this.latestCompletedAttempt = attempt;
-      this.isPassed = attempt.successStatus;
-    });
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      this.task?.fetchTestAttempts().subscribe((_) => {
+        this.getAttemptsLeft();
+        if (this.task.latestCompletedTestAttempt) this.isPassed = this.task.scormPassed;
+      });
+    }
   }
 
   getAttemptsLeft(): void {
     if (this.task.definition.scormAttemptLimit != 0) {
-      this.task.fetchTestAttempts().subscribe((attempts) => {
-        let count = attempts.length;
-        if (count > 0 && attempts[0].terminated === false) count--;
-        this.attemptsLeft =
-          this.task.definition.scormAttemptLimit + this.task.scormExtensions - count;
-      });
+      const attempts = this.task.testAttemptCache.currentValues;
+      let count = attempts.length;
+      if (count > 0 && attempts[0].terminated === false) count--;
+      this.attemptsLeft =
+        this.task.definition.scormAttemptLimit + this.task.scormExtensions - count;
     }
   }
 
@@ -70,7 +52,7 @@ export class TaskScormCardComponent implements OnInit, OnChanges {
 
   reviewLatestCompletedAttempt(): void {
     window.open(
-      `#/task_def_id/${this.task.taskDefId}/scorm-player/review/${this.latestCompletedAttempt.id}`,
+      `#/task_def_id/${this.task.taskDefId}/scorm-player/review/${this.task.latestCompletedTestAttempt.id}`,
       '_blank',
     );
   }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
index 5321600cf5..c2b89f9d7b 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
@@ -28,6 +28,9 @@
         <mat-checkbox matInput required [(ngModel)]="taskDefinition.scormAllowReview">
           Allow students to review completed test attempt
         </mat-checkbox>
+        <mat-checkbox matInput required [(ngModel)]="taskDefinition.scormBypassTest">
+          Allow file upload regardless of test pass status
+        </mat-checkbox>
       </div>
       <mat-form-field appearance="outline" class="basis-1/2">
         <mat-label>Attempt limit</mat-label>

From 20da0423450fe3b9b8006660bf6f5e06670f520c Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 18 Jun 2024 19:04:03 +1000
Subject: [PATCH 070/776] fix: change success status descriptions

---
 .../task-scorm-card/task-scorm-card.component.html          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
index 12df6a4936..ac1221f87f 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -4,7 +4,7 @@
       <mat-card-header class="bg-green-600 text-white">
         <mat-card-title class="flex items-center mb-4"
           ><mat-icon class="font-extrabold">check</mat-icon>
-          <span class="ml-4">Knowledge Check Passed</span></mat-card-title
+          <span class="ml-4">Knowledge Check Passed Without Mistakes</span></mat-card-title
         >
       </mat-card-header>
     }
@@ -12,7 +12,7 @@
       <mat-card-header class="bg-green-500 text-white">
         <mat-card-title class="flex items-center mb-4"
           ><mat-icon class="font-extrabold">check</mat-icon>
-          <span class="ml-4">Knowledge Check Passed With Mistakes</span></mat-card-title
+          <span class="ml-4">Knowledge Check Passed</span></mat-card-title
         >
       </mat-card-header>
     }
@@ -38,7 +38,7 @@
       <mat-card-header class="bg-red-600 text-white">
         <mat-card-title class="flex items-center mb-4"
           ><mat-icon class="font-extrabold">close</mat-icon>
-          <span class="ml-4">Knowledge Check Failed</span></mat-card-title
+          <span class="ml-4">Knowledge Check Unsuccessful</span></mat-card-title
         >
       </mat-card-header>
     }

From 14c66a7bc8c1d75f1736d4e1682e78dca1e365de Mon Sep 17 00:00:00 2001
From: jakerenzella <j@kerenzella.com>
Date: Mon, 3 Jun 2024 23:20:12 +1000
Subject: [PATCH 071/776] build: upgrade pdf viewer

---
 package-lock.json | 388 ++++++++++++++++++++++++++++++++++++++++------
 package.json      |   4 +-
 2 files changed, 340 insertions(+), 52 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f1bfcafa3d..92e5cafe0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -62,8 +62,8 @@
         "moment": "^2.29.4",
         "ng-csv": "0.2.3",
         "ng-file-upload": "~5.0.9",
-        "ng-flex-layout": "^17.3.4-beta.1",
-        "ng2-pdf-viewer": "^10.0",
+        "ng-flex-layout": "^17.3.7-beta.1",
+        "ng2-pdf-viewer": "^10.2",
         "ngx-bootstrap": "^6.1.0",
         "ngx-entity-service": "^0.0.38",
         "ngx-lottie": "^11.0.2",
@@ -3836,6 +3836,90 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "optional": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "optional": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "optional": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "optional": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@material/animation": {
       "version": "15.0.0-canary.7f224ddd4.0",
       "resolved": "https://registry.npmjs.org/@material/animation/-/animation-15.0.0-canary.7f224ddd4.0.tgz",
@@ -6926,6 +7010,26 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+      "optional": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "deprecated": "This package is no longer supported.",
+      "optional": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/arg": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
@@ -8134,6 +8238,21 @@
       "integrity": "sha512-y8EIEvL+IW81S4hRQWCRFtly+g1cc1G+wxHpjhYR9jI2+JJjWiaKnkH8mmvNHOMOAd9fzgARDO3AEzjuR51qaA==",
       "dev": true
     },
+    "node_modules/canvas": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "nan": "^2.17.0",
+        "simple-get": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/canvas-confetti": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/canvas-confetti/-/canvas-confetti-1.9.3.tgz",
@@ -8573,6 +8692,15 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
     "node_modules/colorette": {
       "version": "2.0.20",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
@@ -8701,7 +8829,7 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/concurrently": {
       "version": "3.6.1",
@@ -8805,6 +8933,12 @@
         "date-now": "^0.1.4"
       }
     },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "optional": true
+    },
     "node_modules/constantinople": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz",
@@ -9452,6 +9586,18 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -9620,6 +9766,12 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "optional": true
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -9657,6 +9809,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
@@ -9795,12 +9956,6 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/dommatrix": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dommatrix/-/dommatrix-1.0.3.tgz",
-      "integrity": "sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww==",
-      "deprecated": "dommatrix is no longer maintained. Please use @thednp/dommatrix."
-    },
     "node_modules/domutils": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
@@ -11649,7 +11804,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/function-bind": {
       "version": "1.1.2",
@@ -11686,6 +11841,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "deprecated": "This package is no longer supported.",
+      "optional": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gaze": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
@@ -11830,7 +12006,7 @@
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
       "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -11868,7 +12044,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -11878,7 +12054,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -13455,6 +13631,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "optional": true
+    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -13984,7 +14166,7 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -16580,6 +16762,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -16999,6 +17193,12 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "node_modules/nan": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
+      "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
+      "optional": true
+    },
     "node_modules/nanoid": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
@@ -17191,9 +17391,9 @@
       "integrity": "sha512-298k/s42+cyHLFAWCtgmXHGOUFqAh5VviSbMuQAPfqAavK1h9ADU/A+gN7OLmgNhW9PM94bWSt22LpjO/cvKwA=="
     },
     "node_modules/ng-flex-layout": {
-      "version": "17.3.4-beta.1",
-      "resolved": "https://registry.npmjs.org/ng-flex-layout/-/ng-flex-layout-17.3.4-beta.1.tgz",
-      "integrity": "sha512-MmXj7Cq9cBSDgJKT3vOok2YCq3OcUD4zhPaKup9V5lVJLZ38sHPgfPf5fFBjDZO7R6AD66wYPod0i4zW5LrrgA==",
+      "version": "17.3.7-beta.1",
+      "resolved": "https://registry.npmjs.org/ng-flex-layout/-/ng-flex-layout-17.3.7-beta.1.tgz",
+      "integrity": "sha512-MTjlQUldB/hEsn0DY/RoY2SKBQoyaKltlOOFjCjH2OfcYA3COHhkJS3PZe9NAjR7TBDb9Ve989m18bSucRzACQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -17206,15 +17406,12 @@
       }
     },
     "node_modules/ng2-pdf-viewer": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-10.0.0.tgz",
-      "integrity": "sha512-zEefcAsTpDoxFceQYs3ycPMaUAkt5UX4OcTstVQoNqRK6w+vOY+V8z8aFCuBwnt+7iN1EHaIpquOf4S9mWc04g==",
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-10.2.2.tgz",
+      "integrity": "sha512-GaKAvF0nXAiR9U4LFWuT54MM9nzp0ie8GGscp34W+lFsSOXdlwS0iFx5UPuVlODRm3YEUKx6xcK5oaJeBq0SAw==",
       "dependencies": {
-        "pdfjs-dist": "~2.16.105",
+        "pdfjs-dist": "^3.11.174",
         "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "pdfjs-dist": "~2.16.105"
       }
     },
     "node_modules/ngx-bootstrap": {
@@ -17288,6 +17485,26 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "optional": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
@@ -17694,6 +17911,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "deprecated": "This package is no longer supported.",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -17963,7 +18193,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18139,7 +18369,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -18617,7 +18847,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -18700,21 +18930,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/path2d-polyfill": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz",
+      "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/pdfjs-dist": {
-      "version": "2.16.105",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.16.105.tgz",
-      "integrity": "sha512-J4dn41spsAwUxCpEoVf6GVoz908IAA3mYiLmNxg8J9kfRXc2jxpbUepcP0ocp0alVNLFthTAM8DZ1RaHh8sU0A==",
-      "dependencies": {
-        "dommatrix": "^1.0.3",
-        "web-streams-polyfill": "^3.2.1"
-      },
-      "peerDependencies": {
-        "worker-loader": "^3.0.8"
+      "version": "3.11.174",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.11.174.tgz",
+      "integrity": "sha512-TdTZPf1trZ8/UFu5Cx/GXB7GZM30LT+wWUNfsi6Bq8ePLnb+woNKtDymI2mxZYBpMbonNFqKmiz684DIfnd8dA==",
+      "engines": {
+        "node": ">=18"
       },
-      "peerDependenciesMeta": {
-        "worker-loader": {
-          "optional": true
-        }
+      "optionalDependencies": {
+        "canvas": "^2.11.2",
+        "path2d-polyfill": "^2.0.1"
       }
     },
     "node_modules/performance-now": {
@@ -20919,7 +21153,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -21794,12 +22028,43 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true
+    },
     "node_modules/simple-fmt": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz",
       "integrity": "sha512-9a3zTDDh9LXbTR37qBhACWIQ/mP/ry5xtmbE98BJM8GR02sanCkfMzp7AdCTqYhkBZggK/w7hJtc8Pb9nmo16A==",
       "dev": true
     },
+    "node_modules/simple-get": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^4.2.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
     "node_modules/simple-is": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz",
@@ -23174,6 +23439,12 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "optional": true
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -24040,14 +24311,6 @@
         "defaults": "^1.0.3"
       }
     },
-    "node_modules/web-streams-polyfill": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
-      "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/webdriver-js-extender": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
@@ -24168,6 +24431,12 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "optional": true
+    },
     "node_modules/webpack": {
       "version": "5.90.3",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz",
@@ -24490,6 +24759,16 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "optional": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -24544,6 +24823,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "node_modules/wildcard": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
@@ -24694,7 +24982,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/ws": {
       "version": "8.11.0",
diff --git a/package.json b/package.json
index 272c6019b9..3f95891a81 100644
--- a/package.json
+++ b/package.json
@@ -79,8 +79,8 @@
     "moment": "^2.29.4",
     "ng-csv": "0.2.3",
     "ng-file-upload": "~5.0.9",
-    "ng-flex-layout": "^17.3.4-beta.1",
-    "ng2-pdf-viewer": "^10.0",
+    "ng-flex-layout": "^17.3.7-beta.1",
+    "ng2-pdf-viewer": "^10.2",
     "ngx-bootstrap": "^6.1.0",
     "ngx-entity-service": "^0.0.38",
     "ngx-lottie": "^11.0.2",

From da376b9bc7905aadeb4d234cbb4f595e4c4424a1 Mon Sep 17 00:00:00 2001
From: jakerenzella <j@kerenzella.com>
Date: Sat, 15 Jun 2024 00:10:27 +1000
Subject: [PATCH 072/776] fix: fix pdf viewer for portfolios

---
 .../pdf-viewer/pdf-viewer.component.html      | 41 +++++++---
 .../common/pdf-viewer/pdf-viewer.component.ts |  9 +-
 .../units/states/portfolios/portfolios.coffee |  4 +-
 .../states/portfolios/portfolios.tpl.html     | 82 +++++++++++++++----
 4 files changed, 107 insertions(+), 29 deletions(-)

diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.html b/src/app/common/pdf-viewer/pdf-viewer.component.html
index 232c89d5ed..87dc97c996 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.html
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.html
@@ -3,25 +3,44 @@
     <form #loginForm="ngForm">
       <mat-form-field floatLabel="never" appearance="outline" class="pdf-form-field" ngSubmit>
         <mat-icon matPrefix>search</mat-icon>
-        <input matInput type="text" placeholder="Search PDF" [(ngModel)]="pdfSearchString" (ngModelChange)="searchPdf(pdfSearchString)" name="pdfSearchString" />
+        <input
+          matInput
+          type="text"
+          placeholder="Search PDF"
+          [(ngModel)]="pdfSearchString"
+          (ngModelChange)="searchPdf(pdfSearchString)"
+          name="pdfSearchString"
+        />
 
-        <button matSuffix mat-icon-button type="button" (click)="zoomOut()" aria-label="Zoom in PDF button">
+        <button
+          matSuffix
+          mat-icon-button
+          type="button"
+          (click)="zoomOut()"
+          aria-label="Zoom in PDF button"
+        >
           <mat-icon>zoom_out</mat-icon>
         </button>
-        <button matSuffix mat-icon-button type="button" (click)="zoomIn()" aria-label="Zoom in PDF button">
+        <button
+          matSuffix
+          mat-icon-button
+          type="button"
+          (click)="zoomIn()"
+          aria-label="Zoom in PDF button"
+        >
           <mat-icon>zoom_in</mat-icon>
         </button>
       </mat-form-field>
     </form>
   </div>
   @if (pdfBlobUrl) {
-  <pdf-viewer
-    [zoom]="zoomValue"
-    [src]="pdfBlobUrl"
-    [render-text]="true"
-    [original-size]="false"
-    (after-load-complete)="onLoaded()"
-    (page-rendered)="loaded = true"
-  ></pdf-viewer>
+    <pdf-viewer
+      [zoom]="zoomValue"
+      [src]="pdfBlobUrl"
+      [render-text]="true"
+      [original-size]="false"
+      (after-load-complete)="onLoaded()"
+      (page-rendered)="loaded = true"
+    ></pdf-viewer>
   }
 </div>
diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.ts b/src/app/common/pdf-viewer/pdf-viewer.component.ts
index 23d5029b2f..5cd893b5a9 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.ts
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.ts
@@ -7,6 +7,8 @@ import {
   SimpleChanges,
   OnChanges,
   ViewChild,
+  OnInit,
+  AfterViewInit,
 } from '@angular/core';
 import {PdfViewerComponent} from 'ng2-pdf-viewer';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
@@ -17,7 +19,7 @@ import {AlertService} from '../services/alert.service';
   templateUrl: './pdf-viewer.component.html',
   styleUrls: ['./pdf-viewer.component.scss'],
 })
-export class fPdfViewerComponent implements OnDestroy, OnChanges {
+export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit {
   private _pdfUrl: string;
   public pdfBlobUrl: string;
   @Input() pdfUrl: string;
@@ -38,6 +40,11 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges {
     }
   }
 
+  ngAfterViewInit(): void {
+    console.log("pdfUrl");
+    console.log(this.pdfUrl);
+  }
+
   ngOnChanges(changes: SimpleChanges): void {
     this.pdfUrlChanges(changes.pdfUrl.currentValue);
   }
diff --git a/src/app/units/states/portfolios/portfolios.coffee b/src/app/units/states/portfolios/portfolios.coffee
index 7e745b33d1..41d0b60797 100644
--- a/src/app/units/states/portfolios/portfolios.coffee
+++ b/src/app/units/states/portfolios/portfolios.coffee
@@ -122,7 +122,9 @@ angular.module('doubtfire.units.states.portfolios', [])
     $scope.selectedStudent = student
     $scope.project = null
     newProjectService.loadProject(student, $scope.unit).subscribe({
-      next: (project) -> $scope.project = project
+      next: (project) ->
+        $scope.project = project
+        $scope.project.preloadedUrl = $scope.project.portfolioUrl()
       error: (message) -> alertService.error( message, 6000)
     })
 )
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index 075680654c..2974d0719a 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -27,7 +27,11 @@ <h4 class="panel-title">Mark Portfolios</h4>
               ></i>
             </label>
             <label class="btn btn-default" ng-model="portfolioFilter" btn-radio="'withPortfolio'">
-              <i class="fa fa-book" tooltip-placement="top" tooltip="Show only students with portfolios"></i>
+              <i
+                class="fa fa-book"
+                tooltip-placement="top"
+                tooltip="Show only students with portfolios"
+              ></i>
             </label>
           </div>
           <div class="btn-group">
@@ -39,7 +43,11 @@ <h4 class="panel-title">Mark Portfolios</h4>
             </label>
           </div>
           <div class="btn-group btn-group-sm select-portfolio-grade">
-            <label class="btn btn-default text-center" ng-model="filterOptions.selectedGrade" btn-radio="-1">
+            <label
+              class="btn btn-default text-center"
+              ng-model="filterOptions.selectedGrade"
+              btn-radio="-1"
+            >
               <span
                 class="grade-icon"
                 tooltip="Show all portfolios"
@@ -92,54 +100,84 @@ <h4 class="panel-title">Mark Portfolios</h4>
         <i class="fa fa-book"></i>
         <p>No portfolios found</p>
       </div>
-      <table ng-hide="filteredStudents.length == 0" class="table table-condensed table-hover table-pointer">
+      <table
+        ng-hide="filteredStudents.length == 0"
+        class="table table-condensed table-hover table-pointer"
+      >
         <thead>
           <tr>
             <th class="student-id">
               <a ng-click="sortOrder='student.studentId'; reverse=!reverse">
-                Student <i ng-show="sortOrder=='student.studentId'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
+                Student
+                <i
+                  ng-show="sortOrder=='student.studentId'"
+                  class="fa fa-caret-{{reverse ? 'down' : 'up'}}"
+                ></i>
               </a>
             </th>
             <th class="name">
               <a ng-click="sortOrder='name'; reverse=!reverse">
-                Name <i ng-show="sortOrder=='name'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
+                Name
+                <i ng-show="sortOrder=='name'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
               </a>
             </th>
             <th>
               <a ng-click="sortOrder='tutorial.tutorName'; reverse=!reverse">
-                Tutor <i ng-show="sortOrder=='tutorial.tutorName'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
+                Tutor
+                <i
+                  ng-show="sortOrder=='tutorial.tutorName'"
+                  class="fa fa-caret-{{reverse ? 'down' : 'up'}}"
+                ></i>
               </a>
             </th>
             <th class="tutorial">
               <a ng-click="sortOrder='tutorial.abbreviation'; reverse=!reverse">
                 Tutorial
-                <i ng-show="sortOrder=='tutorial.abbreviation'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
+                <i
+                  ng-show="sortOrder=='tutorial.abbreviation'"
+                  class="fa fa-caret-{{reverse ? 'down' : 'up'}}"
+                ></i>
               </a>
             </th>
             <th>
               <a ng-click="sortOrder='targetGrade'; reverse=!reverse">
-                Target <i ng-show="sortOrder=='targetGrade'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
+                Target
+                <i
+                  ng-show="sortOrder=='targetGrade'"
+                  class="fa fa-caret-{{reverse ? 'down' : 'up'}}"
+                ></i>
               </a>
             </th>
             <th>
               <a ng-click="sortOrder='submittedGrade'; reverse=!reverse">
                 Submitted as
-                <i ng-show="sortOrder=='submittedGrade'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
+                <i
+                  ng-show="sortOrder=='submittedGrade'"
+                  class="fa fa-caret-{{reverse ? 'down' : 'up'}}"
+                ></i>
               </a>
             </th>
             <th>
               <a ng-click="sortOrder='orderScale'; reverse=!reverse">
-                Stats<i ng-show="sortOrder=='orderScale'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
+                Stats<i
+                  ng-show="sortOrder=='orderScale'"
+                  class="fa fa-caret-{{reverse ? 'down' : 'up'}}"
+                ></i>
               </a>
             </th>
             <th class="has-portfolio" ng-show="portfolioFilter == 'allStudents'">
               <a ng-click="sortOrder='hasPortfolio'; reverse=!reverse">
-                Portfolio? <i ng-show="sortOrder=='hasPortfolio'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
+                Portfolio?
+                <i
+                  ng-show="sortOrder=='hasPortfolio'"
+                  class="fa fa-caret-{{reverse ? 'down' : 'up'}}"
+                ></i>
               </a>
             </th>
             <th class="grade">
               <a ng-click="sortOrder='grade'; reverse=!reverse">
-                Grade <i ng-show="sortOrder=='grade'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
+                Grade
+                <i ng-show="sortOrder=='grade'" class="fa fa-caret-{{reverse ? 'down' : 'up'}}"></i>
               </a>
             </th>
           </tr>
@@ -172,7 +210,9 @@ <h4 class="panel-title">Mark Portfolios</h4>
                 </bar>
               </progress>
             </td>
-            <td ng-show="portfolioFilter == 'allStudents'">{{student.hasPortfolio ? "Yes" : "No"}}</td>
+            <td ng-show="portfolioFilter == 'allStudents'">
+              {{student.hasPortfolio ? "Yes" : "No"}}
+            </td>
             <td>{{student.grade}}</td>
           </tr>
         </tbody>
@@ -237,7 +277,13 @@ <h3 class="panel-title">Review Portfolio of {{selectedStudent.student.name}}</h3
         <i class="fa fa-book"></i>
         <p>No Portfolio Submitted</p>
       </div>
-      <f-pdf-viewer-panel ng-if="project.portfolioAvailable" [pdf-url]="project.portfolioUrl()"> </pdf-viewer-panel>
+      <div class="panel-body flex flex-col h-screen">
+        <f-pdf-viewer
+          class="flex flex-grow"
+          [pdf-url]="project.preloadedUrl"
+        >
+        </f-pdf-viewer>
+      </div>
     </div>
 
     <div class="panel panel-primary" ng-show="activeTab == tabs.assessPortfolio">
@@ -260,8 +306,12 @@ <h4 class="panel-title">Grade for {{selectedStudent.student.name}}</h4>
             ng-class="{'no-rationale': project.gradeRationale == null}"
             ng-hide="editingRationale"
           >
-            <label class="text-muted" ng-show="project.gradeRationale != null"> Provided Rationale </label>
-            <div ng-bind-html="(project.gradeRationale || 'No rationale provided') | markdown | to_trusted"></div>
+            <label class="text-muted" ng-show="project.gradeRationale != null">
+              Provided Rationale
+            </label>
+            <div
+              ng-bind-html="(project.gradeRationale || 'No rationale provided') | markdown | to_trusted"
+            ></div>
             <div class="small" ng-hide="project.gradeRationale">Click to add one</div>
           </div>
           <div ng-if="editingRationale" class="clearfix">

From a2e8a9c1bef2f2cbf3a32683ee84302c061b90ef Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 18 Jun 2024 20:24:39 +1000
Subject: [PATCH 073/776] refactor: show consecutive scorm comments together

---
 .../api/models/task-comment/scorm-comment.ts  |  3 ++
 src/app/api/models/task.ts                    |  9 ++++
 .../scorm-comment.component.html              | 54 +++++++++++--------
 .../scorm-comment.component.scss              |  6 +--
 .../scorm-comment/scorm-comment.component.ts  |  4 --
 5 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/app/api/models/task-comment/scorm-comment.ts b/src/app/api/models/task-comment/scorm-comment.ts
index 3356b62b93..b15a2c50c8 100644
--- a/src/app/api/models/task-comment/scorm-comment.ts
+++ b/src/app/api/models/task-comment/scorm-comment.ts
@@ -3,6 +3,9 @@ import {Task, TaskComment, TestAttempt} from '../doubtfire-model';
 export class ScormComment extends TaskComment {
   testAttempt: TestAttempt;
 
+  // UI rendering data
+  lastInScormSeries: boolean = false;
+
   constructor(task: Task) {
     super(task);
   }
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2cadc79d72..0643f99732 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -17,6 +17,7 @@ import {
   TaskSimilarityService,
   TestAttempt,
   TestAttemptService,
+  ScormComment,
 } from './doubtfire-model';
 import {Grade} from './grade';
 import {LOCALE_ID} from '@angular/core';
@@ -385,6 +386,14 @@ export class Task extends Entity {
       if (comments[i].replyToId) {
         comments[i].originalComment = comments.find((tc) => tc.id === comments[i].replyToId);
       }
+
+      // Scorm series
+      if (comments[i].commentType === 'scorm') {
+        comments[i].firstInSeries = i === 0 || comments[i - 1].commentType !== 'scorm';
+        (comments[i] as ScormComment).lastInScormSeries =
+          i + 1 === comments.length || comments[i + 1]?.commentType !== 'scorm';
+        if (!comments[i].firstInSeries) comments[i].shouldShowTimestamp = false;
+      }
     }
 
     comments[comments.length - 1].shouldShowAvatar = true;
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
index c1dacaa788..edde1e057c 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
@@ -1,24 +1,32 @@
-<div class="flex-row justify-evenly items-center">
-  <div class="flex-column justify-around items-center">
-    <div>
-      <hr class="hr-text" data-content="Knowledge Check Summary" />
-      <div class="markdown-to-html my-1.5" [innerHTML]="comment.text"></div>
-      <div class="flex-row">
-        <button
-          mat-button
-          (click)="reviewScormTest()"
-          [hidden]="!user.isStaff && !task.definition.scormAllowReview"
-        >
-          Review test
-        </button>
-        <button mat-button (click)="passScormAttempt()" [hidden]="!canOverridePass">
-          Pass attempt
-        </button>
-        <button mat-button (click)="deleteScormAttempt()" [hidden]="!user.isStaff">
-          Delete attempt
-        </button>
-      </div>
-      <hr class="hr-fade" />
-    </div>
-  </div>
+<hr class="hr-text" data-content="Knowledge Check Summary" [hidden]="!comment.firstInSeries" />
+<div class="flex flex-row items-center">
+  <button
+    mat-button
+    class="mr-4 h-12 flex-shrink-0"
+    (click)="reviewScormTest()"
+    [hidden]="!user.isStaff && !task.definition.scormAllowReview"
+  >
+    Review
+  </button>
+  <div class="markdown-to-html flex-grow" [innerHTML]="comment.text"></div>
+  <button
+    #menuState="matMenuTrigger"
+    mat-icon-button
+    class="p-0 h-12 flex-shrink-0"
+    [matMenuTriggerFor]="menu"
+    [hidden]="!user.isStaff"
+  >
+    <mat-icon>more_vert</mat-icon>
+  </button>
+  <mat-menu #menu="matMenu">
+    <button
+      mat-menu-item
+      (click)="passScormAttempt()"
+      [hidden]="this.comment.testAttempt.successStatus"
+    >
+      Pass attempt
+    </button>
+    <button mat-menu-item (click)="deleteScormAttempt()">Delete attempt</button>
+  </mat-menu>
 </div>
+<hr class="hr-fade" [hidden]="!comment.lastInScormSeries" />
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.scss b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.scss
index 31df73023a..7bc5f74d91 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.scss
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.scss
@@ -1,7 +1,3 @@
-div {
-  width: 100%;
-}
-
 p {
   color: #2c2c2c;
   text-align: center;
@@ -14,7 +10,7 @@ hr {
 .hr-fade {
   background: linear-gradient(to right, transparent, #9696969d, transparent);
   width: 100%;
-  margin-top: 1px;
+  margin-top: 6px;
 }
 
 .hr-text {
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
index 87daf5b6ca..a16e397ad6 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
@@ -27,10 +27,6 @@ export class ScormCommentComponent {
     this.user = this.userService.currentUser;
   }
 
-  get canOverridePass(): boolean {
-    return this.user.isStaff && !this.comment.testAttempt.successStatus;
-  }
-
   reviewScormTest() {
     window.open(
       `#/task_def_id/${this.task.taskDefId}/scorm-player/review/${this.comment.testAttempt.id}`,

From b6887e85b7a06b166519924dd682ef57650a4e32 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 18 Jun 2024 20:46:43 +1000
Subject: [PATCH 074/776] fix: delete comment as well as test attempt

---
 .../scorm-comment/scorm-comment.component.ts                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
index a16e397ad6..d26b914f7e 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
@@ -50,6 +50,7 @@ export class ScormCommentComponent {
       'Are you sure you want to delete this test attempt? This action is final and will delete information associated with this test attempt.',
       () => {
         this.testAttemptService.deleteAttempt(this.comment.testAttempt.id);
+        this.comment.delete();
       },
     );
   }

From fd916b94e9012c0909c5880f377f93d326c18e4d Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 20 Jun 2024 22:09:57 +1000
Subject: [PATCH 075/776] fix: ensure portfolio can get grades from strings

---
 src/app/common/grade-icon/grade-icon.coffee | 2 +-
 src/app/common/services/grade.service.ts    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/common/grade-icon/grade-icon.coffee b/src/app/common/grade-icon/grade-icon.coffee
index be0ed0b0c3..54480aff9f 100644
--- a/src/app/common/grade-icon/grade-icon.coffee
+++ b/src/app/common/grade-icon/grade-icon.coffee
@@ -9,7 +9,7 @@ angular.module('doubtfire.common.grade-icon', [])
     colorful: '=?'
   controller: ($scope, gradeService) ->
     $scope.$watch 'inputGrade', (newGrade) ->
-      $scope.grade = if _.isString($scope.inputGrade) then gradeService.grades.indexOf($scope.inputGrade) else $scope.inputGrade
+      $scope.grade = if _.isString($scope.inputGrade) then gradeService.stringToGrade($scope.inputGrade) else $scope.inputGrade
       $scope.gradeText = (grade) ->
         if $scope.grade? then gradeService.grades[$scope.grade] or "Grade"
       $scope.gradeLetter = (grade) ->
diff --git a/src/app/common/services/grade.service.ts b/src/app/common/services/grade.service.ts
index 619bad36f5..35e0f24f2a 100644
--- a/src/app/common/services/grade.service.ts
+++ b/src/app/common/services/grade.service.ts
@@ -16,6 +16,10 @@ export class GradeService {
     3: 'High Distinction',
   };
 
+  public stringToGrade(value: string): number {
+    return this.gradeViewData.find((grade) => grade.viewValue === value)?.value;
+  }
+
   gradeViewData = [
     {value: -1, viewValue: 'Fail'},
     {value: 0, viewValue: 'Pass'},

From ce970f5fdc4f42708edc71c98dc9d869056e9e2c Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 21 Jun 2024 21:21:07 +1000
Subject: [PATCH 076/776] fix: ensure portfolio only shown when it exists

---
 src/app/units/states/portfolios/portfolios.tpl.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index a51934b9a5..2b8a2277eb 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -277,7 +277,7 @@ <h3 class="panel-title">Review Portfolio of {{selectedStudent.student.name}}</h3
         <i class="fa fa-book"></i>
         <p>No Portfolio Submitted</p>
       </div>
-      <div class="panel-body flex flex-col h-screen">
+      <div class="panel-body flex flex-col h-screen" ng-if="project.portfolioAvailable">
         <f-pdf-viewer
           class="flex flex-grow"
           [pdf-url]="project.preloadedUrl"

From 824fdb9fa8d0752a687dbcf8f1d388316e5ecc40 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 21 Jun 2024 21:21:27 +1000
Subject: [PATCH 077/776] chore(release): 8.0.10

---
 CHANGELOG.md      | 326 ++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |   4 +-
 package.json      |   2 +-
 3 files changed, 329 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ca7d64128..887dcb3746 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,332 @@
 
 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.
 
+### [8.0.10](https://github.com/macite/doubtfire-deploy/compare/v7.0.23...v8.0.10) (2024-06-21)
+
+
+### Bug Fixes
+
+* ensure loading screen removed in sign in component ([729c438](https://github.com/macite/doubtfire-deploy/commit/729c438f7f6a988f5ff2fa4035493b5cae1c98f7))
+* ensure portfolio can get grades from strings ([fd916b9](https://github.com/macite/doubtfire-deploy/commit/fd916b94e9012c0909c5880f377f93d326c18e4d))
+* ensure portfolio only shown when it exists ([ce970f5](https://github.com/macite/doubtfire-deploy/commit/ce970f5fdc4f42708edc71c98dc9d869056e9e2c))
+* ensure tii open report alerts errors ([c5dd45c](https://github.com/macite/doubtfire-deploy/commit/c5dd45c57fd34e8373f11d065a0cd08edef0a794))
+* fix pdf viewer for portfolios ([da376b9](https://github.com/macite/doubtfire-deploy/commit/da376b9bc7905aadeb4d234cbb4f595e4c4424a1))
+* grade icon for portfolio page ([aab1b9c](https://github.com/macite/doubtfire-deploy/commit/aab1b9c3e7365cdf7dd64d767fdb6e5a9a2436a3))
+* show burndown and pie chart on portfolio page ([e70f4c7](https://github.com/macite/doubtfire-deploy/commit/e70f4c7cd1395eaab942ee389788f75f92e985c9))
+
+### [8.0.9](https://github.com/macite/doubtfire-deploy/compare/v7.0.22...v8.0.9) (2024-05-31)
+
+
+### Bug Fixes
+
+* comment out fix and complete hotkeys temporarily ([c1f623d](https://github.com/macite/doubtfire-deploy/commit/c1f623d17432f3563366ef32fc3da3b54dbef0b7))
+
+### [8.0.8](https://github.com/macite/doubtfire-deploy/compare/v8.0.7...v8.0.8) (2024-05-30)
+
+
+### Features
+
+* added percentage to tooltip when hovering student's task progress ([69ed613](https://github.com/macite/doubtfire-deploy/commit/69ed61380bd7681d4496cb109e628111873b6e82))
+
+
+### Bug Fixes
+
+* change from hiding element to not loading ([414da65](https://github.com/macite/doubtfire-deploy/commit/414da65fcef9b10367f53112239a60e1b271d475))
+* change grade values, change grade display ([081c35b](https://github.com/macite/doubtfire-deploy/commit/081c35ba0fbc7ab4ddb2fba3c58892d0e66f325c))
+* fix task inbox shortcuts ([9bc949f](https://github.com/macite/doubtfire-deploy/commit/9bc949fd6dcb71ea165e89de9a4ec9d9347e6562))
+* inbox search box width ([02a99a8](https://github.com/macite/doubtfire-deploy/commit/02a99a8f71033014b26260d3b0dbfca075ca7273))
+* remove pdf viewer on task view when no sheet ([f3e973d](https://github.com/macite/doubtfire-deploy/commit/f3e973dacc5b079ab58da239194d802c5586ca07))
+* revert index changes, html changes for grade ([8f41cd1](https://github.com/macite/doubtfire-deploy/commit/8f41cd1656971963c2035a9249acdde0a257766e))
+* task list scrolling ([0088e9e](https://github.com/macite/doubtfire-deploy/commit/0088e9e245dbd326dea4032239b53eee88754179))
+* use tailwind classes instead of css styling ([42434a5](https://github.com/macite/doubtfire-deploy/commit/42434a5fd4b866781da5d23ecdb0b9b4369aace1))
+
+### [8.0.7](https://github.com/macite/doubtfire-deploy/compare/v8.0.6...v8.0.7) (2024-05-26)
+
+
+### Bug Fixes
+
+* add task description editing ([ee0cfbf](https://github.com/macite/doubtfire-deploy/commit/ee0cfbf7ce804a1806ca5810bad138b97703ebfe))
+
+### [8.0.6](https://github.com/macite/doubtfire-deploy/compare/v8.0.5...v8.0.6) (2024-05-25)
+
+
+### Bug Fixes
+
+* ensure all admin units are fully loaded ([917325e](https://github.com/macite/doubtfire-deploy/commit/917325ed08b89690a7eea0716438673732ba1ec9))
+
+### [8.0.5](https://github.com/macite/doubtfire-deploy/compare/v8.0.4...v8.0.5) (2024-05-25)
+
+
+### Bug Fixes
+
+* ensure (click) is on button, not mat-icon ([99c717d](https://github.com/macite/doubtfire-deploy/commit/99c717d2333de0975da1b3f282195a0b3577a3f6))
+
+### [8.0.4](https://github.com/macite/doubtfire-deploy/compare/v8.0.3...v8.0.4) (2024-05-25)
+
+
+### Bug Fixes
+
+* fix various issues with admin unit list ([3720666](https://github.com/macite/doubtfire-deploy/commit/3720666fb4105bac274449eb468ce34e0f68bae7))
+
+### [8.0.3](https://github.com/macite/doubtfire-deploy/compare/v8.0.2...v8.0.3) (2024-05-25)
+
+
+### Features
+
+* add 4-character abbreviations ([eb62dfc](https://github.com/macite/doubtfire-deploy/commit/eb62dfc90db836870d6c396727fc43c149808e9d))
+
+### [8.0.2](https://github.com/macite/doubtfire-deploy/compare/v8.0.1...v8.0.2) (2024-05-25)
+
+
+### Bug Fixes
+
+* gradeservice bugs ([fd6eb1c](https://github.com/macite/doubtfire-deploy/commit/fd6eb1cd152b72cf297cbd6bd529579858afc543))
+* gradeservice bugs ([7545eb9](https://github.com/macite/doubtfire-deploy/commit/7545eb92b9353d99ac8d8d7d89982cdadf9688b1))
+
+### [8.0.1](https://github.com/macite/doubtfire-deploy/compare/v8.0.0...v8.0.1) (2024-05-24)
+
+
+### Features
+
+* implement live PDF search that updates dynamically as you type ([b9b9945](https://github.com/macite/doubtfire-deploy/commit/b9b9945346d55392e5ee9a6431d85ae92de1bde5))
+
+
+### Bug Fixes
+
+* fix critical bugs ([356846e](https://github.com/macite/doubtfire-deploy/commit/356846e5c385c484a6034553366965cde95ec78b))
+* fix splashscreen ([2692b7f](https://github.com/macite/doubtfire-deploy/commit/2692b7f4a3e1ca2a5bc4df3b82a9dfd4aa2ec68a))
+
+## [8.0.0](https://github.com/macite/doubtfire-deploy/compare/v8.0.0-6...v8.0.0) (2024-05-23)
+
+
+### Features
+
+* add multi-badge support ([44c1473](https://github.com/macite/doubtfire-deploy/commit/44c1473700a3d7a4a025d68acac5aa61189d8b52))
+* add synchronised multi-badge ([f70ebdc](https://github.com/macite/doubtfire-deploy/commit/f70ebdca92a05e5ca350d4062a8dc8efba9fd681))
+* add working unit-badge ([dd30247](https://github.com/macite/doubtfire-deploy/commit/dd302478e97228e6bfbfdbee0134abb3eabf2587))
+* add working unit-badge ([c7338ff](https://github.com/macite/doubtfire-deploy/commit/c7338ffd88edb457a3443b43ea21706c43231973))
+* qol improvements for unit codes ([f7f928e](https://github.com/macite/doubtfire-deploy/commit/f7f928e485448a69b054dca94f07d623f84e328f))
+* small fixes to home and unit code ([918e804](https://github.com/macite/doubtfire-deploy/commit/918e8047745b489aae1fafdc67720568dd8d829e))
+
+
+### Bug Fixes
+
+* add missing imports ([659b52c](https://github.com/macite/doubtfire-deploy/commit/659b52c82a26b9496a3dba81401b5147d05248ae))
+* change time exceeded to feedback exceeded ([673619d](https://github.com/macite/doubtfire-deploy/commit/673619d99f177d834fba3643171426092e0d05e0))
+* correct task resource upload actions ([5e9c9b1](https://github.com/macite/doubtfire-deploy/commit/5e9c9b1d05d6d6975fd4ba3a3176314ddd7d8514))
+* ensure loading state changed after projects and unit roles load ([9171d0c](https://github.com/macite/doubtfire-deploy/commit/9171d0c2c37c17d26f464f6aa0ba7c479851e6eb))
+* ensure staff task list checks unit exists ([dbb312d](https://github.com/macite/doubtfire-deploy/commit/dbb312dc3c5c9e2be24161914e8d95e1a5c1bc53))
+* ensure unit load updates unit object if it already exists ([e48ffad](https://github.com/macite/doubtfire-deploy/commit/e48ffadf63891212c3e40ab696d54a3935485b08))
+* hide overseer settings if automation disabled ([0c08fe3](https://github.com/macite/doubtfire-deploy/commit/0c08fe3e82a78dd1e91fb44ce6008fb5298c46ee))
+* slide unit code off left side ([8cd57b5](https://github.com/macite/doubtfire-deploy/commit/8cd57b589812fd59c6da4de02246791fb4410959))
+* sort units desc by start date ([9b78856](https://github.com/macite/doubtfire-deploy/commit/9b788561372a3ddf065d3b28e547a2194ef29655))
+* zip upload for overseer ([5ad2085](https://github.com/macite/doubtfire-deploy/commit/5ad2085b2d730235f61e7b7c603727d8b6736cf2))
+
+## [8.0.0-6](https://github.com/macite/doubtfire-deploy/compare/v8.0.0-5...v8.0.0-6) (2024-05-13)
+
+## [8.0.0-5](https://github.com/macite/doubtfire-deploy/compare/v8.0.0-4...v8.0.0-5) (2024-05-13)
+
+## [8.0.0-4](https://github.com/macite/doubtfire-deploy/compare/v8.0.0-3...v8.0.0-4) (2024-05-11)
+
+
+### Features
+
+* add task badge ([b48cd4c](https://github.com/macite/doubtfire-deploy/commit/b48cd4c99333e41c0c1d32531e571d32bb482a81))
+
+
+### Bug Fixes
+
+* (WIP) fix alert service migration ([3d9f4dc](https://github.com/macite/doubtfire-deploy/commit/3d9f4dc05e7a45884dc383e0f5ed4bdb09b0558d))
+* add max length validator and change reason field to text-area ([6227200](https://github.com/macite/doubtfire-deploy/commit/6227200566c3f608c279e92a3f255a7e94148c1d))
+* address linter issues in task.ts ([14e9699](https://github.com/macite/doubtfire-deploy/commit/14e9699bdfe336f1e3f3cce3d722c835d58f3cdb))
+* copy dist browser to nginx html ([08fa919](https://github.com/macite/doubtfire-deploy/commit/08fa91937e028cb3ee093709e5a31f94da44fc33))
+* correct filenames for grotesk fonts ([9bedd81](https://github.com/macite/doubtfire-deploy/commit/9bedd812b12628df9cb32e48cb91a88b5cdf69b1))
+* ensure eula state remains visible ([131540c](https://github.com/macite/doubtfire-deploy/commit/131540ca4b934773afd9f72aa2578579048ed6a2))
+* ensure unit admin shows all units ([02b7a15](https://github.com/macite/doubtfire-deploy/commit/02b7a15bbbd2306a61e344f995dffb72a3915498))
+* fix course progress bar on firefox ([ae5c1e0](https://github.com/macite/doubtfire-deploy/commit/ae5c1e0b5901bae0411cf7bbaa32ee8f340b908a))
+* fix incorrect projcets listed in dropdown ([6a7e478](https://github.com/macite/doubtfire-deploy/commit/6a7e4788b522e5af6331a82ed33e9c9137d2ca86))
+* fix margin issue on dropdown ([c8145f0](https://github.com/macite/doubtfire-deploy/commit/c8145f0972a03e52377e0203cabb2cf6353db8b3))
+* grade and quality point display on task-assessment-card ([7cba502](https://github.com/macite/doubtfire-deploy/commit/7cba502e002143e8255bf0d786551bd270f73f0e))
+* indicate mandatory fields in upload-submission-modal ([e8801e2](https://github.com/macite/doubtfire-deploy/commit/e8801e2a64fe15ad423d9017d10e5e23f6e00eda))
+* only check grade if it exists ([1c213c5](https://github.com/macite/doubtfire-deploy/commit/1c213c53571f79563e9a071e2dd9645598382522))
+* remove unused imports in extension-modal.service ([8081f51](https://github.com/macite/doubtfire-deploy/commit/8081f51b5f28ea511b9f76d026ae63f16153ae2c))
+* use tailwindcss classes ([8d7e160](https://github.com/macite/doubtfire-deploy/commit/8d7e160e2d40c42284ee0c1fc85d6d9e01166cda))
+
+## [8.0.0-3](https://github.com/macite/doubtfire-deploy/compare/v8.0.0-2...v8.0.0-3) (2024-05-02)
+
+
+### Bug Fixes
+
+* reenable eula html fetch ([cda9e52](https://github.com/macite/doubtfire-deploy/commit/cda9e52a259bfaa27e8252f40e579d11d1af280c))
+
+## [8.0.0-2](https://github.com/macite/doubtfire-deploy/compare/v7.0.21...v8.0.0-2) (2024-05-01)
+
+
+### Features
+
+* accept promela files ([df93a69](https://github.com/macite/doubtfire-deploy/commit/df93a69e45d2d9e41b9cf0802d521a3663d7a36c))
+* migrate unit list in all locations ([6651d00](https://github.com/macite/doubtfire-deploy/commit/6651d0011446fdde7179c5173f902ce2e4ea7545))
+* remove misleading progress statement ([63e276c](https://github.com/macite/doubtfire-deploy/commit/63e276c041f77d8b401d24a4f49896cfa2095442))
+
+
+### Bug Fixes
+
+* correct change detection on task def ([55daff2](https://github.com/macite/doubtfire-deploy/commit/55daff234441a242d96de097c2b2912df0c6c9a8))
+* correct npm install for dev container image ([5126c3b](https://github.com/macite/doubtfire-deploy/commit/5126c3ba7fed55217e88c54c25dc70595ec4c666))
+* ensure npm will force install ([f91751e](https://github.com/macite/doubtfire-deploy/commit/f91751eae788bc3f65d33b610ed80c96d3978974))
+* fix firefox-specific bug ([6b6054b](https://github.com/macite/doubtfire-deploy/commit/6b6054bd5c1104a96ccac413a7115009eeba8d2f))
+* remove ngClass ([d1d8c72](https://github.com/macite/doubtfire-deploy/commit/d1d8c72ace21551a68bd4d0a8ba88eabb2ebdb9d))
+* remove plagiarism checks ([21b02fb](https://github.com/macite/doubtfire-deploy/commit/21b02fb7cc616090f1fb2d26f65b336072f9105b))
+* remove the incorrect option from for scrollIntoView() ([9e752fe](https://github.com/macite/doubtfire-deploy/commit/9e752fe9d49df786ceb3e7007cbf0aad57809604))
+* remove unused loading from f-units ([c4c38fa](https://github.com/macite/doubtfire-deploy/commit/c4c38fad4fbdfe248e383cf247f949197ad0a047))
+* typo ([820c56f](https://github.com/macite/doubtfire-deploy/commit/820c56f3a1bc30b7637b98e6f80b406ca350b5b8))
+
+## [8.0.0-1](https://github.com/macite/doubtfire-deploy/compare/v8.0.0-0...v8.0.0-1) (2024-03-21)
+
+
+### Bug Fixes
+
+* update deploy dockerfile ([41a5161](https://github.com/macite/doubtfire-deploy/commit/41a5161b356931eafd8e4caf256f311f10bc8bb4))
+
+## [8.0.0-0](https://github.com/macite/doubtfire-deploy/compare/v7.0.18...v8.0.0-0) (2024-03-21)
+
+
+### Features
+
+* (wip) add similarities notification ([8e4a198](https://github.com/macite/doubtfire-deploy/commit/8e4a198a037de832bbebe96e309c4c8485d076cc))
+* add ability to accept tii eula to model ([0106b01](https://github.com/macite/doubtfire-deploy/commit/0106b01ed249139cbe06096f95a36b5d11bcd0ac))
+* add ability to accept turn it in eula ([380ad1e](https://github.com/macite/doubtfire-deploy/commit/380ad1e93252f8f928893626b65f4dab01813524))
+* add ability to open turnitin viewer ([5248e80](https://github.com/macite/doubtfire-deploy/commit/5248e80622e55b79ce4d7b35f8202ee8099c2dce))
+* add ability to update similarity flag ([de005ee](https://github.com/macite/doubtfire-deploy/commit/de005ee98a270998e2175109783cab72b92e36f3))
+* add dynamic footer ([3c62fe0](https://github.com/macite/doubtfire-deploy/commit/3c62fe06d009c3b752259f50887c625c98a371cd))
+* add empty pdf view to new task dashboard ([9c3cdfb](https://github.com/macite/doubtfire-deploy/commit/9c3cdfbb93711a6ae911ed461651200d8c75db48))
+* add file drop component ([c211003](https://github.com/macite/doubtfire-deploy/commit/c211003004ae6c7505158a65ce2006b219920827))
+* add footer content ([735c43b](https://github.com/macite/doubtfire-deploy/commit/735c43b5c2df7e8f367310ad92ef716fd5140375))
+* add link to student task from inbox ([d4301e0](https://github.com/macite/doubtfire-deploy/commit/d4301e0d1f2f6ec4c563801a7f0d1132884f9989))
+* add mobile inbox view ([56ded70](https://github.com/macite/doubtfire-deploy/commit/56ded707e638ae769665a863ce65acffea5a588a))
+* add multi-file support to f-upload ([d181969](https://github.com/macite/doubtfire-deploy/commit/d181969198e2b7611e3f0e330577b825e99a248f))
+* add new file upload component ([891ab20](https://github.com/macite/doubtfire-deploy/commit/891ab20eb6f1d545ff58d0157fdd9912b9546c9f))
+* add new inbox component ([ec0f62c](https://github.com/macite/doubtfire-deploy/commit/ec0f62c488ae3e99e9487ea1ab87f5bb2f1fbed7))
+* add new pdf-viewer ([617fbd2](https://github.com/macite/doubtfire-deploy/commit/617fbd24f8424541aeb87b16651f06737b570633))
+* add new similarity component ([48ba01c](https://github.com/macite/doubtfire-deploy/commit/48ba01c8d780a04a1f526f89fcd9bc63ef5d4aec))
+* add new task assessment card ([ac3b50f](https://github.com/macite/doubtfire-deploy/commit/ac3b50f29b8a2722d09ad94a2f82bb54c1c32da7))
+* add new task dashboard component ([dc841f9](https://github.com/macite/doubtfire-deploy/commit/dc841f9e7af811a3a56a0c21fd3b3968ec7aead9))
+* add new task due card ([3ade5ea](https://github.com/macite/doubtfire-deploy/commit/3ade5ea34eb3c2c756d7df0f7a6c250fa50290bb))
+* add new task due card content ([c43ea3e](https://github.com/macite/doubtfire-deploy/commit/c43ea3e27abdf253596bfedd5112f5ef7a7b929d))
+* add new task submission card ([6d27690](https://github.com/macite/doubtfire-deploy/commit/6d2769029413f84b73c7c825d16e9a3366142177))
+* add pdf search and zoom ([f83ce57](https://github.com/macite/doubtfire-deploy/commit/f83ce570e80dc20d118288c6d32c2d2a9ca263b5))
+* add resizable inbox panels ([4920e31](https://github.com/macite/doubtfire-deploy/commit/4920e31ce366c3dfb4340ab4da159b176381cf49))
+* add resizable panels to inbox ([5abda03](https://github.com/macite/doubtfire-deploy/commit/5abda039af5b2d3b5e2589c4864b2e1715c5e8c0))
+* add rest of layout to footer ([3b9de7c](https://github.com/macite/doubtfire-deploy/commit/3b9de7cc6d923a0e6431524f2967b5e3bc360a6f))
+* add selected task sheet url ([00a7fb5](https://github.com/macite/doubtfire-deploy/commit/00a7fb516d362d3725b915d012878a9ccf8ef009))
+* add selectedTask service ([02aa41a](https://github.com/macite/doubtfire-deploy/commit/02aa41a34232359d1366d841d1236a068a837ae5))
+* add similarities staff dashboard switch ([1ec0b72](https://github.com/macite/doubtfire-deploy/commit/1ec0b72c26cc27bd4d17376af5b47650d28bbc10))
+* add similarity flags to view ([8c7975c](https://github.com/macite/doubtfire-deploy/commit/8c7975cadd14e6d3390cfa9917983cd01498a69c))
+* add simple project progress bar ([73fda77](https://github.com/macite/doubtfire-deploy/commit/73fda776ee36c6574c1ddc0dc09b958d61de3000))
+* add start of new similarity view ([a1e51b6](https://github.com/macite/doubtfire-deploy/commit/a1e51b6bc7030086a1d7a4d715f23b3e76f7ddb3))
+* add task plagairism warning on inbox ([6bd8620](https://github.com/macite/doubtfire-deploy/commit/6bd8620f5473db4517e38fd0487ab5876f921a36))
+* add teaching period remove break function ([90c6a37](https://github.com/macite/doubtfire-deploy/commit/90c6a3730f84da9e64abec676bcdf66c10b7fc60))
+* add tii action log ([96d982d](https://github.com/macite/doubtfire-deploy/commit/96d982d5fb945bdbf9ea8b6d534a5dd18ab64ad7))
+* add unselected user icon badge in inbox ([794697b](https://github.com/macite/doubtfire-deploy/commit/794697b53d6ee81f57b37b173d03a0688c6993b5))
+* complete mobile task inbox view ([00a4b3f](https://github.com/macite/doubtfire-deploy/commit/00a4b3f1e8f52364a83b6affae34295da4a7af34))
+* disable hover on task inbox for mobile ([a59fd01](https://github.com/macite/doubtfire-deploy/commit/a59fd0153de8b1f9e9b9022d0f6df1032c92f8d1))
+* downgrade task due card ([c342ac2](https://github.com/macite/doubtfire-deploy/commit/c342ac2e3cc4213c2b92499bc4a191485184af37))
+* enhance task search with similarity flags ([65ad918](https://github.com/macite/doubtfire-deploy/commit/65ad91842882e76379033350f90b966d874c6ba4))
+* enhance ui/ux of task inbox screen ([6b275c3](https://github.com/macite/doubtfire-deploy/commit/6b275c3cd5d575a399e901d52a62808238c6d0e4))
+* expand new file uplaoder ([11d798d](https://github.com/macite/doubtfire-deploy/commit/11d798d6a6e5eca4555a7d141e1d11d2a862fcfe))
+* finish new alerts service ([3beb059](https://github.com/macite/doubtfire-deploy/commit/3beb05987e605c9f4270fc0d7bdd95f82bf64007))
+* make all datetime in aus format ([7a0f749](https://github.com/macite/doubtfire-deploy/commit/7a0f749a4328a44c1ffb5692017dfa39a061e1d5))
+* migrate new unit dialog ([0a2a1e9](https://github.com/macite/doubtfire-deploy/commit/0a2a1e9baca6b0553730c1a939b246bf1be178a3))
+* minor improvements to file-drop ([73139be](https://github.com/macite/doubtfire-deploy/commit/73139be83449f50036eedb3520ed2d8daa5da09c))
+* new footer component ([c3b4c18](https://github.com/macite/doubtfire-deploy/commit/c3b4c182921079d6ebc0851ec7e6515e65f1c15b))
+* new grade service ([31073e1](https://github.com/macite/doubtfire-deploy/commit/31073e1dbe963c1e0f2c84139a2c3f746cc31bbb))
+* new student user badge ([97c84d3](https://github.com/macite/doubtfire-deploy/commit/97c84d3016b0e322d54062fae0d46da112146d5d))
+* new task status card ([78218cf](https://github.com/macite/doubtfire-deploy/commit/78218cf6d45f5cac50203f96109d27400fa37686))
+* only download similarity resource on view ([563d102](https://github.com/macite/doubtfire-deploy/commit/563d1024ee7023e4228a9ceef9f556e48e7127d1))
+* progress redesigned inbox ([f1b672b](https://github.com/macite/doubtfire-deploy/commit/f1b672b7495a9086abb88f5e1991cb4c4f7b60c1))
+* register new inbox component ([3d79baa](https://github.com/macite/doubtfire-deploy/commit/3d79baae505e44c401179ae34de4804e8d90b7ba))
+* show TII accepted status in profile ([7b5c3e2](https://github.com/macite/doubtfire-deploy/commit/7b5c3e2c0fe9fcc30f9fffc73d9a942714db7cb2))
+* small change to task view ([f640920](https://github.com/macite/doubtfire-deploy/commit/f6409201e9d4af4f075b4db8559fc1e26f4a374f))
+* small changes to user table ([18957ac](https://github.com/macite/doubtfire-deploy/commit/18957acfc700e941ebb161d9ddb8f5e1ebe1beff))
+* trigger window resize when pdf loads ([044c170](https://github.com/macite/doubtfire-deploy/commit/044c170ebe05e7e3a368df2e8041884d2e23c752))
+* update file viewer to use file download and blobs ([8751123](https://github.com/macite/doubtfire-deploy/commit/87511232ca384a355ddfc5eb396186babd676f92))
+* wip add file uploader component ([48c73f5](https://github.com/macite/doubtfire-deploy/commit/48c73f547892ae3ce12fdac416bf93c3a2c72006))
+
+
+### Bug Fixes
+
+* add activeUntil date mapping to tps ([2cae20a](https://github.com/macite/doubtfire-deploy/commit/2cae20a6b3fa3e5ea8a001ffa40a87263c438b68))
+* add arbitrary task argument to `togglePin` in task inbox ([6e1784f](https://github.com/macite/doubtfire-deploy/commit/6e1784ff52a745330e57f2ccc2a55b3206d535d0))
+* add seperator to naviation on mobile ([fc4f052](https://github.com/macite/doubtfire-deploy/commit/fc4f0527b144fd8f3b6e98b335e629f85fe1bb3b))
+* add the correct enterkeyhint to the comment composer ([569db05](https://github.com/macite/doubtfire-deploy/commit/569db059fc9786363b1b62d7be72e44f711faba3))
+* add unloaded state to progressbar ([2c3a28e](https://github.com/macite/doubtfire-deploy/commit/2c3a28e9718879f55596221517db35bda8c09450))
+* adjust due card layout ([0360a6e](https://github.com/macite/doubtfire-deploy/commit/0360a6e0868e995d7ba5c9091be556dad4bfd474))
+* always display shortened task name in header ([a05c8ff](https://github.com/macite/doubtfire-deploy/commit/a05c8ffd9aef9c865f72458157b465f9de1e07f3))
+* center pins along items in new task inbox ([6b3c0d2](https://github.com/macite/doubtfire-deploy/commit/6b3c0d2b1d5541fe36c6fbd03dfc752f43d03e18))
+* center placeholder text in task inbox search bar & reduce padding on far-right ([ffec9b6](https://github.com/macite/doubtfire-deploy/commit/ffec9b6f4bfc9d2aee6aa762c41bcce1ed1823ba))
+* center student and task name on bottom left screen ([e986199](https://github.com/macite/doubtfire-deploy/commit/e9861992e9e5a40076973a2215bcc919c1777b5d))
+* center view all units button on home page ([9807dfd](https://github.com/macite/doubtfire-deploy/commit/9807dfd1f18e1efc9f882a67ef99f1d198a03ff7))
+* centering of Administration icons on home page ([1043f74](https://github.com/macite/doubtfire-deploy/commit/1043f74e2ca5d23cad8c4d890a202b20ddb4bc37))
+* change display name of student on bottom left screen from being nickname to full name ([5fe7790](https://github.com/macite/doubtfire-deploy/commit/5fe7790e23aec709f8be5a444bf84ebdf77c9ce5))
+* change shown name on messages in chat to be student's full name ([93636c4](https://github.com/macite/doubtfire-deploy/commit/93636c400c1850e20320a57be010347541c5137c))
+* chatbox spacing, placement of messages <> photos, distance between message & name ([dd9cb2a](https://github.com/macite/doubtfire-deploy/commit/dd9cb2ab3bdde886c2f297d8044986427febd366))
+* ensure accepted TII eula details are retained ([e60ae54](https://github.com/macite/doubtfire-deploy/commit/e60ae547121f33edd7cc8d8c5d4afd27a1f90e8c))
+* ensure blobs are freed on destroy ([ee017eb](https://github.com/macite/doubtfire-deploy/commit/ee017eb00a506c81a108ce6dec52f7f91064d350))
+* ensure font is set to roboto ([a6ff4ce](https://github.com/macite/doubtfire-deploy/commit/a6ff4cee9794e37a208af28d7d085182441fa555))
+* ensure loadedUnitRoles is public in global ([b92159f](https://github.com/macite/doubtfire-deploy/commit/b92159ff33cf9537c0ccec50d57a54636315bec4))
+* ensure logout in timeout always signs out ([3380075](https://github.com/macite/doubtfire-deploy/commit/33800759083156682014f0f63bc83a0283ae96fa))
+* ensure mat menu icons have correct tags ([f971ad1](https://github.com/macite/doubtfire-deploy/commit/f971ad1cf7fa56de0f4e97e9533a0567db897da4))
+* ensure only staff need to accept turn it in EULA ([029c40b](https://github.com/macite/doubtfire-deploy/commit/029c40b556bb1709e75547615b2d1a1109997a74))
+* ensure pdf actions loads after pdf loaded ([0425c54](https://github.com/macite/doubtfire-deploy/commit/0425c5465a678509e1a8d719fef39975c4d8e9e5))
+* ensure similarities without files still view ([5794e2f](https://github.com/macite/doubtfire-deploy/commit/5794e2fb345328396517a7d2f945cfabb1c37173))
+* ensure task pdf viewer works ([d3d1bf8](https://github.com/macite/doubtfire-deploy/commit/d3d1bf8564c6e6134130b44df90bef42430f4654))
+* ensure task submission status updated on init ([ca77c92](https://github.com/macite/doubtfire-deploy/commit/ca77c92d251bf4087964886579de642f6f300b9a))
+* ensure that timeout state not re-routed ([c16ee90](https://github.com/macite/doubtfire-deploy/commit/c16ee90c2c372ea1889d3470e2be510aefd2245f))
+* ensure welcome page still can go to timeout ([5253f2e](https://github.com/macite/doubtfire-deploy/commit/5253f2eb6fce1de1b6df585589f1cc2594ac87a8))
+* excessive spacing below unit tags on home page ([1bfaa21](https://github.com/macite/doubtfire-deploy/commit/1bfaa216440d880d82875f519e9b3f0f59ddcc23))
+* fix few type errors ([8a96e5b](https://github.com/macite/doubtfire-deploy/commit/8a96e5b33a095cd70222719b33d7dc853d67f347))
+* fix file drop to support click to upload ([599cd9e](https://github.com/macite/doubtfire-deploy/commit/599cd9e82c1518113374f0675fc54dd1483fcc85))
+* fix footer height not resetting on similarity ([19c43d7](https://github.com/macite/doubtfire-deploy/commit/19c43d7945c5848d1ca511e146fefdfa9735c49b))
+* fix incorrect closing tag ([ad28818](https://github.com/macite/doubtfire-deploy/commit/ad28818fba9dac552a2adf14785c5bbf98b4e206))
+* fix page height recalculation trigger ([8f219c3](https://github.com/macite/doubtfire-deploy/commit/8f219c31e9a3461626a9344352c4d7aa68c57c43))
+* fix various build issues ([8b947ae](https://github.com/macite/doubtfire-deploy/commit/8b947aeea1cb0dfa4bac8e22ff5bdb2a9a82ec49))
+* fix various task comment composer/display issues ([5670bf1](https://github.com/macite/doubtfire-deploy/commit/5670bf1dcd77e8010fe88bf24662ec96e4e29847))
+* hide extension for staff if can't apply ([1699e50](https://github.com/macite/doubtfire-deploy/commit/1699e50f2d7424361e0f7d5a173bdd9fffd87c24))
+* initialise inbox on return ([1249e96](https://github.com/macite/doubtfire-deploy/commit/1249e96f53ef9544cd81e3f2c3f1d5acf4a628f3))
+* initialise inbox view ([1ae4ac9](https://github.com/macite/doubtfire-deploy/commit/1ae4ac9b304348f5528368d87ded3c26e8e5cf40))
+* issues with UI in photo spacing and text alignment ([716ead3](https://github.com/macite/doubtfire-deploy/commit/716ead3497a8a2ecd1050484bd289c003a47dffa))
+* make photo in chatbox fall to bottom ([aa4e814](https://github.com/macite/doubtfire-deploy/commit/aa4e81446546f1e62b08fd74ba8ac1e563e5efc8))
+* make read receipt smaller to fix message alignment ([c869458](https://github.com/macite/doubtfire-deploy/commit/c869458cd45334e009ae83ab3c911033bc1987b9))
+* null input checks on migrated cards ([7a192af](https://github.com/macite/doubtfire-deploy/commit/7a192af22bf1eef026d05a16edcc3a97c6abbebf))
+* pass selected task to footer's user icon ([28782b1](https://github.com/macite/doubtfire-deploy/commit/28782b134cb03f5c334df48e8887f81393661bda))
+* photo from below message to being inline ([0e97a03](https://github.com/macite/doubtfire-deploy/commit/0e97a03a491f4137ec301dd18a42130a845ebe37))
+* reduce user badge clickable region ([7305f86](https://github.com/macite/doubtfire-deploy/commit/7305f866a9582e10dd870fad1861de4ce209a4e0))
+* regenerate user icons on input changes ([257ab4e](https://github.com/macite/doubtfire-deploy/commit/257ab4eb63ec15de545193f8b60176ac33e17b01))
+* remove call to teaching period name ([1e2e019](https://github.com/macite/doubtfire-deploy/commit/1e2e0198a32acd59c11932fde2a2f14a5bacf48f))
+* remove dupe case in transition hook ([9808798](https://github.com/macite/doubtfire-deploy/commit/98087981e06296a1eb9a17f527c49ab9b27caef3))
+* remove incorrect aria hidden tags ([46bfe21](https://github.com/macite/doubtfire-deploy/commit/46bfe2109e4b912a146201572671ff759fc02226))
+* remove no PDF text from overlapping with icon ([c6543cf](https://github.com/macite/doubtfire-deploy/commit/c6543cf2f9be9644b7382eeb64699e15e461447a))
+* remove old teaching periods from home ([4f4a617](https://github.com/macite/doubtfire-deploy/commit/4f4a6175f39ac9df75c7efe920ffcc15576cc98e))
+* remove pct copy data ([6bb96b4](https://github.com/macite/doubtfire-deploy/commit/6bb96b49f436a7d4bd6f5e587b30a8528e6d75b7))
+* remove user badge from old task panel ([9129956](https://github.com/macite/doubtfire-deploy/commit/9129956f41b78a8e3e84ffe9a124a7941d8905c1))
+* require eula for any user ([daf7ba9](https://github.com/macite/doubtfire-deploy/commit/daf7ba9d9056c262cafc871b623c59a0ef837274))
+* resolved issue with intelligent discussion ([18cd1fc](https://github.com/macite/doubtfire-deploy/commit/18cd1fc6f0443c353fc5f49c81dafd2428901cbc))
+* resolved issue with intelligent-discussion-dialog component rendering ([1efa758](https://github.com/macite/doubtfire-deploy/commit/1efa758fd813751788cc79fe30e01ca8a09013d8))
+* shrink header menu on small screens ([580445d](https://github.com/macite/doubtfire-deploy/commit/580445d25573bf00671246269c61685917c34867))
+* spacing (of own/person messaging) is now right/left aligned respectively ([7d10aa0](https://github.com/macite/doubtfire-deploy/commit/7d10aa0f58e2d7c8e8fd45439d8c464fabe3508c))
+* split header onto seperate lines on small screens ([d8a9016](https://github.com/macite/doubtfire-deploy/commit/d8a90168e58ef8d71f31f76d999d4f6a59232987))
+* switch max pct to similarity flag in project ([094b418](https://github.com/macite/doubtfire-deploy/commit/094b418c1bff709e755bf7c61207ebf22bfc6106))
+* task explorer 405 error ([7ea516c](https://github.com/macite/doubtfire-deploy/commit/7ea516ce8e346d46e8acf68c8b41fa81485515ba))
+* task submission pdf downloading ([b0becb4](https://github.com/macite/doubtfire-deploy/commit/b0becb4c76e4e45f10782561a6b53a322eb43665))
+* tweak theme.scss file ([393770b](https://github.com/macite/doubtfire-deploy/commit/393770b35d1688d27bce47e1d6b94735a1822494))
+* update package lock ([674f3c7](https://github.com/macite/doubtfire-deploy/commit/674f3c70bd0a4c8c33e25d34beeab76c29f56325))
+* use angular 15 ([d0104cc](https://github.com/macite/doubtfire-deploy/commit/d0104cc57edda68a1a165bdf1fd7cf75bd74ec68))
+* use correct task object in task pinning ([a5fceb0](https://github.com/macite/doubtfire-deploy/commit/a5fceb048b931dbd5ccc3ad5d4fd898b146284fb))
+* use correct theming import ([b0d3232](https://github.com/macite/doubtfire-deploy/commit/b0d3232eaed2096296cf025437dda26ddcd595e0))
+* use disabled blinding ([628ca55](https://github.com/macite/doubtfire-deploy/commit/628ca55b4e8f569f751b78ead7a50fa9e086ccec))
+* use new state name in task dropdown ([3c2fe44](https://github.com/macite/doubtfire-deploy/commit/3c2fe444d398bcedb5c998a47683d04279996680))
+* use onChanges rather than input setter ([8069c21](https://github.com/macite/doubtfire-deploy/commit/8069c21d9ecfc412dea37cade8e8a37e79730f01))
+
 ### [8.0.9](https://github.com/doubtfire-lms/doubtfire-deploy/compare/v8.0.8...v8.0.9) (2024-05-31)
 
 
diff --git a/package-lock.json b/package-lock.json
index 396f5fee98..5ec5842fc2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.9",
+  "version": "8.0.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.9",
+      "version": "8.0.10",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 13d95e9bc7..a6af7f3bba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.9",
+  "version": "8.0.10",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 2f91e8fbba7902e1e22871cc82c87f4ff797b058 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 24 Jun 2024 13:28:40 +1000
Subject: [PATCH 078/776] fix: task date picker allows direct entry

---
 src/app/api/services/mapping-fn.ts  | 39 ++++++++++++++++++-----------
 src/app/doubtfire-angular.module.ts | 18 ++++++++++++-
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/app/api/services/mapping-fn.ts b/src/app/api/services/mapping-fn.ts
index 7302bb387f..9124152095 100644
--- a/src/app/api/services/mapping-fn.ts
+++ b/src/app/api/services/mapping-fn.ts
@@ -1,23 +1,34 @@
+import moment from 'moment';
+
 export class MappingFunctions {
-  public static mapDateToEndOfDay(data, key, entity, params?) {
+  public static mapDateToEndOfDay(data, key, _entity, _params?) {
     const jsonDate = new Date(data[key]);
-    return new Date(jsonDate.getFullYear(), jsonDate.getMonth(), jsonDate.getDate(), 23, 59, 59, 999);
+    return new Date(
+      jsonDate.getFullYear(),
+      jsonDate.getMonth(),
+      jsonDate.getDate(),
+      23, // all dates map to end of day
+      59,
+      59,
+      999,
+    );
   }
 
-  public static mapDateToDay(data, key, entity, params?) {
+  public static mapDateToDay(data, key: string, _entity, _params?) {
     const jsonDate = new Date(data[key]);
     return new Date(jsonDate.getFullYear(), jsonDate.getMonth(), jsonDate.getDate());
   }
 
-  public static mapDate(data, key, entity, params?) {
+  public static mapDate(data, key: string, _entity, _params?) {
     return new Date(data[key]);
   }
 
   public static mapDayToJson<T>(entity: T, key: string): string {
     if (entity[key]) {
-      const month = entity[key].getMonth() + 1;
-      const day = entity[key].getDate();
-      return `${entity[key].getFullYear()}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
+      const dateValue = moment.isMoment(entity[key]) ? entity[key].toDate() : entity[key];
+      const month = dateValue.getMonth() + 1;
+      const day = dateValue.getDate();
+      return `${dateValue.getFullYear()}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
     } else {
       return undefined;
     }
@@ -50,12 +61,12 @@ export class MappingFunctions {
   }
 
   /**
-     * Calculate the time between two dates
-     *
-     * @param date1 days from this date
-     * @param date2 to this date
-     * @returns the time from date1 to date2
-     */
+   * Calculate the time between two dates
+   *
+   * @param date1 days from this date
+   * @param date2 to this date
+   * @returns the time from date1 to date2
+   */
   public static timeBetween(date1: Date, date2: Date): number {
     return date2.getTime() - date1.getTime();
   }
@@ -67,7 +78,7 @@ export class MappingFunctions {
    * @param date2 to this date
    * @returns the days from date1 to date2
    */
-   public static daysBetween(date1: Date, date2: Date): number {
+  public static daysBetween(date1: Date, date2: Date): number {
     const diff = this.timeBetween(date1, date2);
     return Math.ceil(diff / (1000 * 3600 * 24));
   }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 9284745988..9be5408ace 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -95,8 +95,9 @@ import {ExtensionModalComponent} from './common/modals/extension-modal/extension
 import {CalendarModalComponent} from './common/modals/calendar-modal/calendar-modal.component';
 import {MatRadioModule} from '@angular/material/radio';
 import {MatButtonToggleModule} from '@angular/material/button-toggle';
-import {MAT_DATE_LOCALE, MatOptionModule} from '@angular/material/core';
+import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatOptionModule} from '@angular/material/core';
 import {MatDatepickerModule} from '@angular/material/datepicker';
+import {MomentDateAdapter} from '@angular/material-moment-adapter';
 import {doubtfireStates} from './doubtfire.states';
 import {MatTableModule} from '@angular/material/table';
 import {MatTabsModule} from '@angular/material/tabs';
@@ -225,6 +226,19 @@ import {TasksViewerComponent} from './units/states/tasks/tasks-viewer/tasks-view
 import {UnitCodeComponent} from './common/unit-code/unit-code.component';
 import {GradeService} from './common/services/grade.service';
 
+// See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
+const MY_DATE_FORMAT = {
+  parse: {
+    dateInput: 'DD/MM/YYYY', // this is how your date will be parsed from Input
+  },
+  display: {
+    dateInput: 'DD/MM/YYYY', // this is how your date will get displayed on the Input
+    monthYearLabel: 'MMMM YYYY',
+    dateA11yLabel: 'LL',
+    monthYearA11yLabel: 'MMMM YYYY',
+  },
+};
+
 @NgModule({
   // Components we declare
   declarations: [
@@ -369,6 +383,8 @@ import {GradeService} from './common/services/grade.service';
     CsvUploadModalProvider,
     CsvResultModalProvider,
     {provide: MAT_DATE_LOCALE, useValue: 'en-AU'},
+    {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
+    {provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMAT},
     UnitStudentEnrolmentModalProvider,
     TaskCommentService,
     AudioRecorderProvider,

From 8a6424b6eecc08c4625e8fb36a85c79bc3a023dc Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 24 Jun 2024 13:30:10 +1000
Subject: [PATCH 079/776] chore: tidy up file downloader

---
 .../file-downloader/file-downloader.service.ts     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/common/file-downloader/file-downloader.service.ts b/src/app/common/file-downloader/file-downloader.service.ts
index 0ec8b90e34..681e4bde8e 100644
--- a/src/app/common/file-downloader/file-downloader.service.ts
+++ b/src/app/common/file-downloader/file-downloader.service.ts
@@ -3,13 +3,13 @@ import {Injectable} from '@angular/core';
 import {AlertService} from '../services/alert.service';
 
 interface FileDownloaderData {
-  url: string,
-  response: HttpResponse<Blob>,
-  success: (url: string, response: HttpResponse<Blob>) => void,
+  url: string;
+  response: HttpResponse<Blob>;
+  success: (url: string, response: HttpResponse<Blob>) => void;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  failure: (error: any) => void,
+  failure: (error: any) => void;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  binaryData: Blob[],
+  binaryData: Blob[];
 }
 
 @Injectable({
@@ -100,7 +100,7 @@ export class FileDownloaderService {
   public downloadBlob(
     url: string,
     success: (url: string, response: HttpResponse<Blob>) => void,
-    failure: (error: any) => void,
+    failure: (error) => void,
   ) {
     // Declare binary data outside of the subscription so that it can be accessed in the second requests when partial content is returned
     const binaryData = [];
@@ -146,7 +146,7 @@ export class FileDownloaderService {
         downloadLink.click();
         downloadLink.parentNode.removeChild(downloadLink);
       },
-      (error: any) => {
+      (error) => {
         this.alerts.error(`Error downloading file - ${error}`);
       },
     );

From 3a81688904159c8c9e3efdde8f3605aa5677630f Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 24 Jun 2024 13:39:53 +1000
Subject: [PATCH 080/776] fix: ensure turn it in only appears to task editor
 when enabled

---
 .../task-definition-upload.component.html             | 10 +++++-----
 .../task-definition-upload.component.ts               | 11 +++++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
index fe96cfb2df..8607e6c719 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
@@ -25,12 +25,12 @@
   <ng-container matColumnDef="tii-check" sticky>
     <th style="width: 20%" mat-header-cell *matHeaderCellDef>Check Similarity</th>
     <td style="width: 20%" mat-cell *matCellDef="let upreq">
-      @if (upreq.type === 'document') {
-<mat-checkbox [(ngModel)]="upreq.tiiCheck">TurnItIn</mat-checkbox>
-}
+      @if (upreq.type === 'document' && tiiEnabled()) {
+        <mat-checkbox [(ngModel)]="upreq.tiiCheck">TurnItIn</mat-checkbox>
+      }
       @if (upreq.type === 'code') {
-<mat-checkbox [(ngModel)]="upreq.tiiCheck">Moss</mat-checkbox>
-}
+        <mat-checkbox [(ngModel)]="upreq.tiiCheck">Moss</mat-checkbox>
+      }
     </td>
   </ng-container>
 
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.ts
index a8915d843b..a6d049446a 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.ts
@@ -2,6 +2,7 @@ import { Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/
 import { MatTable, MatTableDataSource } from '@angular/material/table';
 import { TaskDefinition, UploadRequirement } from 'src/app/api/models/task-definition';
 import { Unit } from 'src/app/api/models/unit';
+import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
 
 @Component({
   selector: 'f-task-definition-upload',
@@ -10,10 +11,12 @@ import { Unit } from 'src/app/api/models/unit';
 })
 export class TaskDefinitionUploadComponent {
   @Input() public taskDefinition: TaskDefinition;
-  @ViewChild('upreqTable', { static: true }) table: MatTable<any>;
+  @ViewChild('upreqTable', {static: true}) table: MatTable<UploadRequirement>;
 
   public columns: string[] = ['file-name', 'file-type', 'tii-check', 'flag-pct', 'row-actions'];
 
+  constructor(private constants: DoubtfireConstants) {}
+
   public get unit(): Unit {
     return this.taskDefinition?.unit;
   }
@@ -30,9 +33,13 @@ export class TaskDefinitionUploadComponent {
     this.table.renderRows();
   }
 
+  public tiiEnabled(): boolean {
+    return this.constants.IsTiiEnabled.value;
+  }
+
   public removeUpReq(upreq: UploadRequirement) {
     this.taskDefinition.uploadRequirements = this.taskDefinition.uploadRequirements.filter(
-      (anUpReq) => anUpReq.key != upreq.key
+      (anUpReq) => anUpReq.key != upreq.key,
     );
   }
 }

From c7ae09170fdc43c21452e8b2665f0f36e480dd4d Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 24 Jun 2024 13:40:07 +1000
Subject: [PATCH 081/776] chore(release): 8.0.11

---
 CHANGELOG.md      | 15 +++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76d7c600ff..54ea56c57d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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.
 
+### [8.0.11](https://github.com/macite/doubtfire-deploy/compare/v8.0.10...v8.0.11) (2024-06-24)
+
+
+### Bug Fixes
+
+* ensure turn it in only appears to task editor when enabled ([3a81688](https://github.com/macite/doubtfire-deploy/commit/3a81688904159c8c9e3efdde8f3605aa5677630f))
+* task date picker allows direct entry ([2f91e8f](https://github.com/macite/doubtfire-deploy/commit/2f91e8fbba7902e1e22871cc82c87f4ff797b058))
+
+### [7.0.24](https://github.com/macite/doubtfire-deploy/compare/v7.0.23...v7.0.24) (2024-06-05)
+
+
+### Bug Fixes
+
+* ensure download blob supports 206 responses ([6445f9f](https://github.com/macite/doubtfire-deploy/commit/6445f9f998db70fbe9b9abf723dc17fd298b5d2f))
+
 ### [8.0.10](https://github.com/macite/doubtfire-deploy/compare/v7.0.23...v8.0.10) (2024-06-21)
 
 
diff --git a/package-lock.json b/package-lock.json
index 5ec5842fc2..691cb53755 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.10",
+  "version": "8.0.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.10",
+      "version": "8.0.11",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index a6af7f3bba..fe9cf8dc2a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.10",
+  "version": "8.0.11",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 991230f7b527957116263b6abaa588ed43d3a787 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 25 Jun 2024 15:37:00 +1000
Subject: [PATCH 082/776] fix: reinstate unit import for teaching period

---
 .../teaching-period-list.component.html       | 42 ++++++++++++++--
 .../teaching-period-list.component.ts         | 49 +++++++++++++++++--
 src/app/doubtfire-angularjs.module.ts         |  5 --
 3 files changed, 84 insertions(+), 12 deletions(-)

diff --git a/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.html b/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.html
index 5abff6ce87..5f009464f4 100644
--- a/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.html
+++ b/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.html
@@ -2,9 +2,20 @@
   <div class="flex items-center my-10">
     <h1 class="my-0">Teaching periods</h1>
     <span class="grow"></span>
-    <button mat-flat-button color="primary" (click)="addTeachingPeriod()">Add new teaching period</button>
+    <button mat-flat-button color="primary" (click)="addTeachingPeriod()">
+      Add new teaching period
+    </button>
   </div>
-  <table #table mat-table [dataSource]="dataSource" class="f-table selectable" matSort>
+  <table
+    #table
+    mat-table
+    [dataSource]="dataSource"
+    class="f-table selectable"
+    matSort
+    matSortActive="startDate"
+    matSortDirection="desc"
+    (matSortChange)="sortTableData($event)"
+  >
     <ng-container matColumnDef="active">
       <th mat-header-cell *matHeaderCellDef>Active</th>
       <td mat-cell *matCellDef="let element">
@@ -32,6 +43,26 @@ <h1 class="my-0">Teaching periods</h1>
       <td mat-cell *matCellDef="let element">{{ element.activeUntil | date }}</td>
     </ng-container>
 
+    <ng-container matColumnDef="actions">
+      <th mat-header-cell *matHeaderCellDef>Actions</th>
+      <td mat-cell *matCellDef="let element">
+        <div class="edit-actions right">
+          <span>
+            <button mat-icon-button (click)="importUnits(element)" aria-label="import units">
+            <mat-icon>input</mat-icon>
+            </button>
+            <button
+              mat-icon-button
+              (click)="selectTeachingPeriod(element)"
+              aria-label="select teaching period"
+            >
+              <mat-icon>edit</mat-icon>
+            </button>
+          </span>
+        </div>
+      </td>
+    </ng-container>
+
     <td mat-footer-cell *matFooterCellDef>
       <div class="edit-actions right">
         <button mat-icon-button (click)="submit()">
@@ -41,7 +72,10 @@ <h1 class="my-0">Teaching periods</h1>
     </td>
 
     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-    <tr mat-row (click)="selectTeachingPeriod(row)" *matRowDef="let row; columns: displayedColumns"></tr>
+    <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
   </table>
-  <mat-paginator [pageSizeOptions]="[10, 25, 100]" aria-label="Select page of teaching periods"></mat-paginator>
+  <mat-paginator
+    [pageSizeOptions]="[10, 25, 100]"
+    aria-label="Select page of teaching periods"
+  ></mat-paginator>
 </div>
diff --git a/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts b/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts
index 87be5fbef8..17dc7efdf9 100644
--- a/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts
+++ b/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts
@@ -2,12 +2,13 @@ import { Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { MatSort } from '@angular/material/sort';
+import { MatSort, Sort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { TeachingPeriodBreak } from 'src/app/api/models/teaching-period';
 import { TeachingPeriod } from 'src/app/api/models/teaching-period';
 import { TeachingPeriodBreakService } from 'src/app/api/services/teaching-period-break.service';
 import { TeachingPeriodService } from 'src/app/api/services/teaching-period.service';
+import { TeachingPeriodUnitImportService } from '../teaching-period-unit-import/teaching-period-unit-import.dialog';
 
 @Component({
   selector: 'f-teaching-period-list',
@@ -20,8 +21,13 @@ export class TeachingPeriodListComponent implements OnInit {
 
   public dataSource = new MatTableDataSource<TeachingPeriod>();
 
-  displayedColumns: string[] = ['active', 'name', 'startDate', 'endDate', 'activeUntil'];
-  constructor(private teachingPeriodsService: TeachingPeriodService, public dialog: MatDialog) {}
+  displayedColumns: string[] = ['active', 'name', 'startDate', 'endDate', 'activeUntil', 'actions'];
+
+  constructor(
+    private teachingPeriodsService: TeachingPeriodService,
+    public dialog: MatDialog,
+    public teachingPeriodUnitImportService: TeachingPeriodUnitImportService,
+  ) {}
 
   ngOnInit(): void {
     // update the Teaching Periods
@@ -35,6 +41,10 @@ export class TeachingPeriodListComponent implements OnInit {
     });
   }
 
+  importUnits(teachingPeriod: TeachingPeriod) {
+    this.teachingPeriodUnitImportService.openImportUnitsDialog(teachingPeriod);
+  }
+
   addTeachingPeriod() {
     this.dialog.open(NewTeachingPeriodDialogComponent, {
       data: {},
@@ -46,6 +56,39 @@ export class TeachingPeriodListComponent implements OnInit {
       this.dialog.open(NewTeachingPeriodDialogComponent, { data: { teachingPeriod: teachingPeriod } });
     });
   }
+
+  /**
+   * Function used by implemented sortTableData to determine the order
+   * of values within the EntityForm once sorting has been triggered.
+   *
+   * @param aValue value to be compared against bValue.
+   * @param bValue value to be compared against aValue.
+   *
+   * @returns truthy comparison between aValue and bValue.
+   */
+  protected sortCompare(aValue: number | string, bValue: number | string, isAsc: boolean) {
+    return (aValue < bValue ? -1 : 1) * (isAsc ? 1 : -1);
+  }
+
+  // Sorting function to sort data when sort
+  // event is triggered
+  sortTableData(sort: Sort) {
+    if (!sort.active || sort.direction === '') {
+      return;
+    }
+    switch (sort.active) {
+      case 'active':
+      case 'name':
+      case 'startDate':
+      case 'endDate':
+      case 'activeUntil':
+        this.dataSource.data = this.dataSource.data.sort((a, b) => {
+          const isAsc = sort.direction === 'asc';
+          return this.sortCompare(a[sort.active], b[sort.active], isAsc);
+        });
+        return;
+    }
+  }
 }
 
 @Component({
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 868e381213..304e0bf747 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -213,7 +213,6 @@ import {InboxComponent} from './units/states/tasks/inbox/inbox.component';
 import {TaskDefinitionEditorComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component';
 import {UnitAnalyticsComponent} from './units/states/analytics/unit-analytics-route.component';
 import {UnitTaskEditorComponent} from './units/states/edit/directives/unit-tasks-editor/unit-task-editor.component';
-import {TeachingPeriodUnitImportService} from './admin/states/teaching-periods/teaching-period-unit-import/teaching-period-unit-import.dialog';
 import {CreateNewUnitModal} from './admin/modals/create-new-unit-modal/create-new-unit-modal.component';
 import {FUsersComponent} from './admin/states/f-users/f-users.component';
 import {FUnitTaskListComponent} from './units/states/tasks/viewer/directives/f-unit-task-list/f-unit-task-list.component';
@@ -240,10 +239,6 @@ export const DoubtfireAngularJSModule = angular.module('doubtfire', [
 // Downgrade angular modules that we need...
 // factory -> service
 DoubtfireAngularJSModule.factory('AboutDoubtfireModal', downgradeInjectable(AboutDoubtfireModal));
-DoubtfireAngularJSModule.factory(
-  'TeachingPeriodUnitImportService',
-  downgradeInjectable(TeachingPeriodUnitImportService),
-);
 DoubtfireAngularJSModule.factory('DoubtfireConstants', downgradeInjectable(DoubtfireConstants));
 DoubtfireAngularJSModule.factory('ExtensionModal', downgradeInjectable(ExtensionModalService));
 DoubtfireAngularJSModule.factory('Marked', downgradeInjectable(MarkedPipe));

From 32046e89eaaf2a9b36e88f078a7b695b1506886d Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 25 Jun 2024 20:05:16 +1000
Subject: [PATCH 083/776] fix: ensure null fields will not break in entity
 mapping

---
 src/app/api/models/task-definition.ts         |  2 +-
 src/app/api/services/project.service.ts       | 20 +++++++++++--------
 src/app/api/services/task-comment.service.ts  |  4 ++--
 .../api/services/task-definition.service.ts   | 14 +++++++++----
 src/app/api/services/unit.service.ts          |  8 ++++----
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 1b49a2e856..0766f85eb6 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -21,7 +21,7 @@ export class TaskDefinition extends Entity {
   targetDate: Date;
   dueDate: Date;
   startDate: Date;
-  uploadRequirements: UploadRequirement[];
+  uploadRequirements: UploadRequirement[] = [];
   tutorialStream: TutorialStream = null;
   plagiarismChecks: SimilarityCheck[] = [];
   plagiarismReportUrl: string;
diff --git a/src/app/api/services/project.service.ts b/src/app/api/services/project.service.ts
index e9ffc791ed..6bb50481a3 100644
--- a/src/app/api/services/project.service.ts
+++ b/src/app/api/services/project.service.ts
@@ -143,7 +143,7 @@ export class ProjectService extends CachedEntityService<Project> {
         keys: 'tutorialEnrolments',
         toEntityOp: (data: object, key: string, project: Project, params?: any) => {
           const unit: Unit = project.unit;
-          data[key].forEach((tutorialEnrolment: { tutorial_id: number; }) => {
+          data[key]?.forEach((tutorialEnrolment: {tutorial_id: number}) => {
             if (tutorialEnrolment.tutorial_id) {
               const tutorial = unit.tutorialsCache.get(tutorialEnrolment.tutorial_id);
               project.tutorialEnrolmentsCache.add(tutorial);
@@ -154,12 +154,16 @@ export class ProjectService extends CachedEntityService<Project> {
       {
         keys: 'groups',
         toEntityOp: (data: object, key: string, project: Project, params?: any) => {
-          data[key].forEach((group) => {
-            const theGroup = project.unit.groupSetsCache.get(group.group_set_id).groupsCache.getOrCreate(group.id, this.groupService, group, {constructorParams: project.unit});
+          data[key]?.forEach((group) => {
+            const theGroup = project.unit.groupSetsCache
+              .get(group.group_set_id)
+              .groupsCache.getOrCreate(group.id, this.groupService, group, {
+                constructorParams: project.unit,
+              });
 
             project.groupCache.add(theGroup);
             theGroup.projectsCache.add(project);
-          })
+          });
         },
         toJsonFn: (entity: Project, key: string) => {
           return entity.unit?.id;
@@ -169,7 +173,7 @@ export class ProjectService extends CachedEntityService<Project> {
         keys: 'tasks',
         toEntityOp: (data: object, key: string, project: Project, params?: any) => {
           // create tasks from json
-          data['tasks'].forEach(taskData => {
+          data['tasks']?.forEach((taskData) => {
             project.taskCache.getOrCreate(taskData['id'], this.taskService, taskData, {constructorParams: project});
           });
 
@@ -179,14 +183,14 @@ export class ProjectService extends CachedEntityService<Project> {
       {
         keys: 'taskOutcomeAlignments',
         toEntityOp: (data: object, key: string, project: Project, params?: any) => {
-          data[key].forEach(alignment => {
+          data[key]?.forEach((alignment) => {
             project.taskOutcomeAlignmentsCache.getOrCreate(
               alignment['id'],
               taskOutcomeAlignmentService,
               alignment,
               {
-                constructorParams: project
-              }
+                constructorParams: project,
+              },
             );
           });
         }
diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index 9e646be77d..7fdf94bc88 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -41,7 +41,7 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
       {
         keys: 'author',
         toEntityFn: (data: object, key: string, comment: TaskComment) => {
-          const user = this.userService.cache.getOrCreate(data[key].id, userService, data[key]);
+          const user = this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
           comment.initials = `${user.firstName[0]}${user.lastName[0]}`.toUpperCase();
           return user;
         }
@@ -49,7 +49,7 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
       {
         keys: 'recipient',
         toEntityFn: (data: object, key: string, comment: TaskComment) => {
-          return this.userService.cache.getOrCreate(data[key].id, userService, data[key]);
+          return this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
         }
       },
       'recipientReadTime',
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 13a1dd2797..b2499251ea 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -41,7 +41,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
         keys: 'uploadRequirements',
         toJsonFn: (taskDef: TaskDefinition, key: string) => {
           return JSON.stringify(
-            taskDef.uploadRequirements.map((upreq) => {
+            taskDef.uploadRequirements?.map((upreq) => {
               return {
                 key: upreq.key,
                 name: upreq.name,
@@ -49,13 +49,19 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
                 tii_check: upreq.tiiCheck,
                 tii_pct: upreq.tiiPct,
               };
-            })
+            }),
           );
         },
         toEntityFn: (data: object, key: string, taskDef: TaskDefinition, params?: any) => {
           return (
-            data[key] as Array<{ key: string; name: string; type: string; tii_check: boolean; tii_pct: number }>
-          ).map((upreq) => {
+            data[key] as Array<{
+              key: string;
+              name: string;
+              type: string;
+              tii_check: boolean;
+              tii_pct: number;
+            }>
+          )?.map((upreq) => {
             return {
               key: upreq.key,
               name: upreq.name,
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index 740e9b6cc1..4f6e896495 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -58,7 +58,7 @@ export class UnitService extends CachedEntityService<Unit> {
           const unitRoleService = AppInjector.get(UnitRoleService);
           // Add staff
           entity.staffCache.clear();
-          data[key].forEach(staff => {
+          data[key]?.forEach(staff => {
             entity.staffCache.add(unitRoleService.buildInstance(staff));
           });
         }
@@ -133,7 +133,7 @@ export class UnitService extends CachedEntityService<Unit> {
       {
         keys: 'ilos',
         toEntityOp: (data: object, key: string, unit: Unit) => {
-          data[key].forEach(ilo => {
+          data[key]?.forEach(ilo => {
             unit.learningOutcomesCache.getOrCreate(ilo['id'], this.learningOutcomeService, ilo);
           });
         }
@@ -160,7 +160,7 @@ export class UnitService extends CachedEntityService<Unit> {
       {
         keys: 'groupSets',
         toEntityOp: (data, key, unit) => {
-          data[key].forEach((groupSetJson: object) => {
+          data[key]?.forEach((groupSetJson: object) => {
             unit.groupSetsCache.add(this.groupSetService.buildInstance(groupSetJson, {constructorParams: unit}));
           });
         }
@@ -168,7 +168,7 @@ export class UnitService extends CachedEntityService<Unit> {
       {
         keys: 'groups',
         toEntityOp: (data, key, unit) => {
-          data[key].forEach((groupJson: object) => {
+          data[key]?.forEach((groupJson: object) => {
             const group = this.groupService.buildInstance(groupJson, {constructorParams: unit});
             group.groupSet.groupsCache.add(group);
           });

From 0bb4869aafb633a74b417e6c5b0d819d99dc60aa Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 25 Jun 2024 20:25:35 +1000
Subject: [PATCH 084/776] chore(release): 8.0.12

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54ea56c57d..cae648d1cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+### [8.0.12](https://github.com/macite/doubtfire-deploy/compare/v8.0.11...v8.0.12) (2024-06-25)
+
+
+### Bug Fixes
+
+* ensure null fields will not break in entity mapping ([32046e8](https://github.com/macite/doubtfire-deploy/commit/32046e89eaaf2a9b36e88f078a7b695b1506886d))
+* reinstate unit import for teaching period ([991230f](https://github.com/macite/doubtfire-deploy/commit/991230f7b527957116263b6abaa588ed43d3a787))
+
 ### [8.0.11](https://github.com/macite/doubtfire-deploy/compare/v8.0.10...v8.0.11) (2024-06-24)
 
 
diff --git a/package-lock.json b/package-lock.json
index 691cb53755..5ba9364f0e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.11",
+  "version": "8.0.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.11",
+      "version": "8.0.12",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index fe9cf8dc2a..0492d4a2db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.11",
+  "version": "8.0.12",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 8fe2f9e9ca60c02e55c24d0f2bb3eb6dbea8217c Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 27 Jun 2024 02:13:51 +1000
Subject: [PATCH 085/776] feat: get unique token for scorm asset retrieval

---
 src/app/api/models/user/user.ts                |  1 +
 src/app/api/services/authentication.service.ts | 18 ++++++++++++++++++
 .../scorm-player/scorm-player.component.ts     | 18 ++++++++++++++++--
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/app/api/models/user/user.ts b/src/app/api/models/user/user.ts
index 10357a1898..552066cfd1 100644
--- a/src/app/api/models/user/user.ts
+++ b/src/app/api/models/user/user.ts
@@ -22,6 +22,7 @@ export class User extends Entity {
   receiveFeedbackNotifications: boolean;
   hasRunFirstTimeSetup: boolean;
   authenticationToken: string;
+  scormAuthenticationToken: string;
   pronouns: string | null;
   acceptedTiiEula: boolean;
 
diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index b2cb12f402..fe2b8d0b1c 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -191,4 +191,22 @@ export class AuthenticationService {
       setTimeout(() => this.router.stateService.go('timeout'), 500);
     }
   }
+
+  public getScormToken(): Observable<any> {
+    return this.httpClient.get(this.AUTH_URL + '/scorm').pipe(
+      map((response) => {
+        this.userService.currentUser.scormAuthenticationToken = response['scorm_auth_token'];
+        localStorage.setItem(this.USERNAME_KEY, JSON.stringify(this.userService.currentUser));
+
+        // Token expires after 2 hours
+        setTimeout(
+          () => {
+            this.userService.currentUser.scormAuthenticationToken = '';
+            localStorage.setItem(this.USERNAME_KEY, JSON.stringify(this.userService.currentUser));
+          },
+          1000 * 60 * 60 * 2,
+        );
+      }),
+    );
+  }
 }
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index 4a32eb0ac7..b7f9b1b5a6 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -1,6 +1,10 @@
 import {Component, OnInit, Input, HostListener} from '@angular/core';
 import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
-import {ScormPlayerContext} from 'src/app/api/models/doubtfire-model';
+import {
+  AuthenticationService,
+  ScormPlayerContext,
+  UserService,
+} from 'src/app/api/models/doubtfire-model';
 import {ScormAdapterService} from 'src/app/api/services/scorm-adapter.service';
 import {AppInjector} from 'src/app/app-injector';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
@@ -37,6 +41,8 @@ export class ScormPlayerComponent implements OnInit {
   constructor(
     private globalState: GlobalStateService,
     private scormAdapter: ScormAdapterService,
+    private userService: UserService,
+    private authService: AuthenticationService,
     private sanitizer: DomSanitizer,
   ) {}
 
@@ -44,6 +50,14 @@ export class ScormPlayerComponent implements OnInit {
     this.globalState.setView(ViewType.OTHER);
     this.globalState.hideHeader();
 
+    if (this.userService.currentUser.scormAuthenticationToken) {
+      this.setupScorm();
+    } else {
+      this.authService.getScormToken().subscribe(() => this.setupScorm());
+    }
+  }
+
+  setupScorm(): void {
     this.scormAdapter.mode = this.mode;
     if (this.mode === 'normal') {
       this.scormAdapter.projectId = this.projectId;
@@ -64,7 +78,7 @@ export class ScormPlayerComponent implements OnInit {
     };
 
     this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(
-      `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.taskDefId}/index.html`,
+      `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.taskDefId}/${this.userService.currentUser.username}/${this.userService.currentUser.scormAuthenticationToken}/index.html`,
     );
   }
 

From 7b5d35c89a577d0408a51d8390400f44615591eb Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 27 Jun 2024 14:51:01 +1000
Subject: [PATCH 086/776] fix: update discuss text to promote use

---
 src/app/api/models/task-status.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts
index 0ab0f8f2d9..7470b9b143 100644
--- a/src/app/api/models/task-status.ts
+++ b/src/app/api/models/task-status.ts
@@ -287,17 +287,18 @@ export class TaskStatus {
     [
       'discuss',
       {
-        detail: "You're almost complete!",
-        reason: 'Your work looks good and your tutor believes it is complete.',
-        action: 'To mark as complete, attend class and discuss it with your tutor.',
+        detail: 'Your work needs to be discussed further.',
+        reason: 'Your work looks good and your tutor believes it is on track.',
+        action: 'For this to be marked as complete, attend class and discuss it with your tutor.',
       },
     ],
     [
       'demonstrate',
       {
-        detail: "You're almost complete!",
-        reason: 'Your work looks good and your tutor believes it is complete.',
-        action: 'To mark as complete, attend class and demonstrate how your submission works to your tutor.',
+        detail: 'Your work needs to be demonstrated.',
+        reason: 'Your work looks good and your tutor believes it is on track.',
+        action:
+          'For this to be marked as complete you need to attend class and demonstrate how your submission works for your tutor.',
       },
     ],
     [

From dbb3a682639c959e946e1f3273d9e5f2996683db Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 27 Jun 2024 15:17:57 +1000
Subject: [PATCH 087/776] chore(release): 8.0.13

---
 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 cae648d1cf..fed8da62dd 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.
 
+### [8.0.13](https://github.com/macite/doubtfire-deploy/compare/v8.0.12...v8.0.13) (2024-06-27)
+
+
+### Bug Fixes
+
+* update discuss text to promote use ([7b5d35c](https://github.com/macite/doubtfire-deploy/commit/7b5d35c89a577d0408a51d8390400f44615591eb))
+
 ### [8.0.12](https://github.com/macite/doubtfire-deploy/compare/v8.0.11...v8.0.12) (2024-06-25)
 
 
diff --git a/package-lock.json b/package-lock.json
index 5ba9364f0e..351f4d773e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.12",
+  "version": "8.0.13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.12",
+      "version": "8.0.13",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 0492d4a2db..3ade29c77a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.12",
+  "version": "8.0.13",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 01013d3d16ab5b704acc589d34975693030def0b Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 27 Jun 2024 22:37:17 +1000
Subject: [PATCH 088/776] fix: ensure unit import allows unit code change

---
 .../teaching-period-unit-import.dialog.ts                     | 4 ++++
 1 file changed, 4 insertions(+)

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 2925b4b59e..1a89a5538d 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
@@ -126,6 +126,10 @@ export class TeachingPeriodUnitImportDialogComponent implements OnInit {
 
   public codeChange(code: string, value: UnitImportData) {
     value.relatedUnits = this.relatedUnits(code);
+    // add source unit to realted units - so that it is retained on code change
+    if (value.sourceUnit && !value.relatedUnits.find((u) => u.value.id === value.sourceUnit.id)) {
+      value.relatedUnits.unshift({value: value.sourceUnit, text: value.sourceUnit.codeAndPeriod});
+    }
     value.sourceUnit = value.relatedUnits.length > 0 ? value.relatedUnits[0].value : null;
   }
 

From 4c966245d270af46107aae94bdd38e84b2188b65 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 27 Jun 2024 22:37:37 +1000
Subject: [PATCH 089/776] fix: ensure unit load sets main convenor user in all
 cases

---
 src/app/api/services/unit.service.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index 4f6e896495..c3c38c7406 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -66,7 +66,9 @@ export class UnitService extends CachedEntityService<Unit> {
       {
         keys: ['mainConvenor', 'main_convenor_id'],
         toEntityFn: (data, key, entity) => {
-          return entity.staffCache.get(data[key]);
+          let result = entity.staffCache.get(data[key]);
+          entity.mainConvenorUser = result?.user;
+          return result;
         },
         toJsonFn: (unit: Unit, key: string) => {
           return unit.mainConvenor?.id;

From 1dc58ce230e67c4a682600fb4b8153fc82586461 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 27 Jun 2024 22:46:27 +1000
Subject: [PATCH 090/776] chore(release): 8.0.14

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fed8da62dd..9081badf55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+### [8.0.14](https://github.com/macite/doubtfire-deploy/compare/v8.0.13...v8.0.14) (2024-06-27)
+
+
+### Bug Fixes
+
+* ensure unit import allows unit code change ([01013d3](https://github.com/macite/doubtfire-deploy/commit/01013d3d16ab5b704acc589d34975693030def0b))
+* ensure unit load sets main convenor user in all cases ([4c96624](https://github.com/macite/doubtfire-deploy/commit/4c966245d270af46107aae94bdd38e84b2188b65))
+
 ### [8.0.13](https://github.com/macite/doubtfire-deploy/compare/v8.0.12...v8.0.13) (2024-06-27)
 
 
diff --git a/package-lock.json b/package-lock.json
index 351f4d773e..56e93ef1bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.13",
+  "version": "8.0.14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.13",
+      "version": "8.0.14",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 3ade29c77a..c1de295951 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.13",
+  "version": "8.0.14",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 1857bdc708c81dc39d467f42c9e316a8664dc080 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 28 Jun 2024 19:06:54 +1000
Subject: [PATCH 091/776] fix: ensure zip uploads work on windows

---
 .../task-definition-overseer.component.html   | 14 +++++++++++--
 .../task-definition-overseer.component.ts     |  4 +++-
 .../task-definition-resources.component.ts    |  4 ++--
 .../unit-task-editor.component.html           | 21 -------------------
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
index 92ef121ff3..31c683077f 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
@@ -1,5 +1,10 @@
 <div class="flex flex-col gap-4">
-  <mat-checkbox matInput required [(ngModel)]="taskDefinition.assessmentEnabled" [disabled]="!overseerEnabled">
+  <mat-checkbox
+    matInput
+    required
+    [(ngModel)]="taskDefinition.assessmentEnabled"
+    [disabled]="!overseerEnabled"
+  >
     Automation Enabled
   </mat-checkbox>
 
@@ -13,7 +18,12 @@
     <mat-hint>Docker image for Overseer</mat-hint>
   </mat-form-field>
 
-  <f-file-drop mode="event" (filesDropped)="uploadOverseerResources($event)" accept="application/zip" [desiredFileName]="'Task ' + taskDefinition.abbreviation + ' Overseer zip'" />
+  <f-file-drop
+    mode="event"
+    (filesDropped)="uploadOverseerResources($event)"
+    accept="application/zip,application/x-zip-compressed"
+    [desiredFileName]="'Task ' + taskDefinition.abbreviation + ' Overseer zip'"
+  />
 
   <div class="flex flex-row gap-4">
     <button
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
index f9b30dde0d..0cf7764274 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
@@ -87,7 +87,9 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
   }
 
   public uploadOverseerResources(files: FileList) {
-    const validFiles = Array.from(files as ArrayLike<File>).filter((f) => f.type === 'application/zip');
+    const validFiles = Array.from(files as ArrayLike<File>).filter(
+      (f) => f.type === 'application/zip' || f.type === 'application/x-zip-compressed',
+    );
     if (validFiles.length > 0) {
       const file = validFiles[0];
       this.taskDefinitionService.uploadTaskResources(this.taskDefinition, file).subscribe({
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.ts
index aa62abe87f..b7b2fa9564 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.ts
@@ -71,7 +71,7 @@ export class TaskDefinitionResourcesComponent {
 
   public uploadTaskResources(files: FileList) {
     const validFiles = Array.from(files as ArrayLike<File>).filter(
-      (f) => f.type === 'application/zip',
+      (f) => f.type === 'application/zip' || f.type === 'application/x-zip-compressed',
     );
     if (validFiles.length > 0) {
       const file = validFiles[0];
@@ -83,7 +83,7 @@ export class TaskDefinitionResourcesComponent {
         error: (message) => this.alerts.error(message, 6000),
       });
     } else {
-      this.alerts.error('Please drop a PDF to upload for this task', 6000);
+      this.alerts.error('Please drop a Zip to upload for this task', 6000);
     }
   }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
index d346b1ce84..37191fb944 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
@@ -139,25 +139,4 @@ <h3>Task List</h3>
       ></f-task-definition-editor>
     }
   </div>
-  <!-- <div class="flex flex-col gap-4">
-    <h3>Batch Upload Tasks</h3>
-    <p>Batch upload task definitions with a CSV. Download to get format.</p>
-
-    <f-file-drop
-      mode="endpoint"
-      [endpoint]="unit.getTaskDefinitionBatchUploadUrl()"
-      desiredFileName="Task Definition csv"
-      accept="text/csv"
-      (uploadSuccess)="onSuccessTaskDefinitionBatchUpload($event)"
-    />
-
-    <h3>Download Tasks</h3>
-    <p>Download all task definitions for this unit.</p>
-
-
-
-    <h3>Batch Upload Task PDFs</h3>
-    <p>Upload all of the task PDFs in a Zip file.</p>
-    <f-file-drop [endpoint]="unit.taskUploadUrl" accept="application/zip" desiredFileName="Task PDFs in zip" (uploadSuccess)="onSuccessTaskZipUpload($event)" />
-  </div> -->
 </div>

From a5690871a448f5b3aeb442df47a410ee2e3ca1a0 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 28 Jun 2024 19:07:01 +1000
Subject: [PATCH 092/776] chore(release): 8.0.15

---
 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 9081badf55..362eaeac79 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.
 
+### [8.0.15](https://github.com/macite/doubtfire-deploy/compare/v8.0.14...v8.0.15) (2024-06-28)
+
+
+### Bug Fixes
+
+* ensure zip uploads work on windows ([1857bdc](https://github.com/macite/doubtfire-deploy/commit/1857bdc708c81dc39d467f42c9e316a8664dc080))
+
 ### [8.0.14](https://github.com/macite/doubtfire-deploy/compare/v8.0.13...v8.0.14) (2024-06-27)
 
 
diff --git a/package-lock.json b/package-lock.json
index 56e93ef1bd..1bcdf3b7fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.14",
+  "version": "8.0.15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.14",
+      "version": "8.0.15",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index c1de295951..fb492d216c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.14",
+  "version": "8.0.15",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From f0505d7b62b97f1b821b19b1c4178973503789da Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 28 Jun 2024 19:31:49 +1000
Subject: [PATCH 093/776] fix: ensure drop works on task resource upload in
 windows

---
 .../task-definition-resources.component.html                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.html
index 82ae176482..51bf4db54f 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component.html
@@ -19,7 +19,7 @@
     <f-file-drop
       mode="event"
       (filesDropped)="uploadTaskResources($event)"
-      accept="application/zip"
+      accept="application/zip,application/x-zip-compressed"
       [desiredFileName]="'Task ' + taskDefinition.abbreviation + ' zip'"
     />
     @if (taskDefinition.hasTaskResources) {

From 576076f1a7871f458526253ab18eade70fbd316a Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 28 Jun 2024 19:31:58 +1000
Subject: [PATCH 094/776] chore(release): 8.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 362eaeac79..0ccd7cdc27 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.
 
+### [8.0.16](https://github.com/macite/doubtfire-deploy/compare/v8.0.15...v8.0.16) (2024-06-28)
+
+
+### Bug Fixes
+
+* ensure drop works on task resource upload in windows ([f0505d7](https://github.com/macite/doubtfire-deploy/commit/f0505d7b62b97f1b821b19b1c4178973503789da))
+
 ### [8.0.15](https://github.com/macite/doubtfire-deploy/compare/v8.0.14...v8.0.15) (2024-06-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index 1bcdf3b7fe..53a1fccd78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.15",
+  "version": "8.0.16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.15",
+      "version": "8.0.16",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index fb492d216c..254a8eb450 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.15",
+  "version": "8.0.16",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 2394efb07c03da18fb8114d87b0c89e68bf7fd2d Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 1 Jul 2024 17:04:31 +1000
Subject: [PATCH 095/776] fix: switch date formats to date-fns

Issues with moment caused failure to load task edit page.
---
 package-lock.json                             | 52 +++++++++++++------
 package.json                                  |  6 ++-
 src/app/doubtfire-angular.module.ts           | 20 ++++---
 .../unit-task-editor.component.ts             |  3 +-
 4 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 53a1fccd78..f31a23897f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,8 +16,8 @@
         "@angular/compiler": "^17.3.6",
         "@angular/core": "^17.3.6",
         "@angular/forms": "^17.3.6",
-        "@angular/material": "^17.3.6",
-        "@angular/material-moment-adapter": "^17.3.6",
+        "@angular/material": "^17.3.10",
+        "@angular/material-date-fns-adapter": "^17.3.10",
         "@angular/platform-browser": "^17.3.6",
         "@angular/platform-browser-dynamic": "^17.3.6",
         "@angular/router": "^17.3.6",
@@ -52,6 +52,7 @@
         "codemirror": "5.65.0",
         "core-js": "^3.21.1",
         "d3": "3.5.17",
+        "date-fns": "^3.6.0",
         "es5-shim": "^4.5.12",
         "file-saver": "^2.0.5",
         "font-awesome": "~4.7.0",
@@ -604,8 +605,9 @@
       }
     },
     "node_modules/@angular/cdk": {
-      "version": "17.3.8",
-      "license": "MIT",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-17.3.10.tgz",
+      "integrity": "sha512-b1qktT2c1TTTe5nTji/kFAVW92fULK0YhYAvJ+BjZTPKu2FniZNe8o4qqQ0pUuvtMu+ZQxp/QqFYoidIVCjScg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -790,8 +792,9 @@
       }
     },
     "node_modules/@angular/material": {
-      "version": "17.3.8",
-      "license": "MIT",
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-17.3.10.tgz",
+      "integrity": "sha512-hHMQES0tQPH5JW33W+mpBPuM8ybsloDTqFPuRV8cboDjosAWfJhzAKF3ozICpNlUrs62La/2Wu/756GcQrxebg==",
       "dependencies": {
         "@material/animation": "15.0.0-canary.7f224ddd4.0",
         "@material/auto-init": "15.0.0-canary.7f224ddd4.0",
@@ -844,7 +847,7 @@
       },
       "peerDependencies": {
         "@angular/animations": "^17.0.0 || ^18.0.0",
-        "@angular/cdk": "17.3.8",
+        "@angular/cdk": "17.3.10",
         "@angular/common": "^17.0.0 || ^18.0.0",
         "@angular/core": "^17.0.0 || ^18.0.0",
         "@angular/forms": "^17.0.0 || ^18.0.0",
@@ -852,16 +855,17 @@
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
-    "node_modules/@angular/material-moment-adapter": {
-      "version": "17.3.8",
-      "license": "MIT",
+    "node_modules/@angular/material-date-fns-adapter": {
+      "version": "17.3.10",
+      "resolved": "https://registry.npmjs.org/@angular/material-date-fns-adapter/-/material-date-fns-adapter-17.3.10.tgz",
+      "integrity": "sha512-Q4QAPGImZTjKW9ZhLSTkBeQX21I0dtak3JbexYx4CN/pHxKRpen6KaVAEqiORqq6vNUP2Kwb7cZznQyj6L7oQw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
         "@angular/core": "^17.0.0 || ^18.0.0",
-        "@angular/material": "17.3.8",
-        "moment": "^2.18.1"
+        "@angular/material": "17.3.10",
+        "date-fns": ">2.20.0 <4.0"
       }
     },
     "node_modules/@angular/platform-browser": {
@@ -8067,6 +8071,12 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/concurrently/node_modules/date-fns": {
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
+      "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
+      "dev": true
+    },
     "node_modules/concurrently/node_modules/has-flag": {
       "version": "1.0.0",
       "dev": true,
@@ -8651,9 +8661,13 @@
       }
     },
     "node_modules/date-fns": {
-      "version": "1.30.1",
-      "dev": true,
-      "license": "MIT"
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
+      "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
+      }
     },
     "node_modules/date-format": {
       "version": "4.0.14",
@@ -12917,6 +12931,14 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/install": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/install/-/install-0.13.0.tgz",
+      "integrity": "sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/internal-slot": {
       "version": "1.0.7",
       "dev": true,
diff --git a/package.json b/package.json
index 254a8eb450..df30c7bebd 100644
--- a/package.json
+++ b/package.json
@@ -33,8 +33,8 @@
     "@angular/compiler": "^17.3.6",
     "@angular/core": "^17.3.6",
     "@angular/forms": "^17.3.6",
-    "@angular/material": "^17.3.6",
-    "@angular/material-moment-adapter": "^17.3.6",
+    "@angular/material": "^17.3.10",
+    "@angular/material-date-fns-adapter": "^17.3.10",
     "@angular/platform-browser": "^17.3.6",
     "@angular/platform-browser-dynamic": "^17.3.6",
     "@angular/router": "^17.3.6",
@@ -69,9 +69,11 @@
     "codemirror": "5.65.0",
     "core-js": "^3.21.1",
     "d3": "3.5.17",
+    "date-fns": "^3.6.0",
     "es5-shim": "^4.5.12",
     "file-saver": "^2.0.5",
     "font-awesome": "~4.7.0",
+    "install": "^0.13.0",
     "jquery": "2.1.4",
     "lodash": "~4.17",
     "lottie-web": "^5.12.2",
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 9be5408ace..69acaf196e 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -97,7 +97,11 @@ import {MatRadioModule} from '@angular/material/radio';
 import {MatButtonToggleModule} from '@angular/material/button-toggle';
 import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatOptionModule} from '@angular/material/core';
 import {MatDatepickerModule} from '@angular/material/datepicker';
-import {MomentDateAdapter} from '@angular/material-moment-adapter';
+
+import { DateFnsAdapter, MAT_DATE_FNS_FORMATS } from '@angular/material-date-fns-adapter';
+import { enAU } from 'date-fns/locale';
+
+
 import {doubtfireStates} from './doubtfire.states';
 import {MatTableModule} from '@angular/material/table';
 import {MatTabsModule} from '@angular/material/tabs';
@@ -229,13 +233,13 @@ import {GradeService} from './common/services/grade.service';
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
   parse: {
-    dateInput: 'DD/MM/YYYY', // this is how your date will be parsed from Input
+    dateInput: 'dd/MM/yyyy', // this is how your date will be parsed from Input
   },
   display: {
-    dateInput: 'DD/MM/YYYY', // this is how your date will get displayed on the Input
-    monthYearLabel: 'MMMM YYYY',
-    dateA11yLabel: 'LL',
-    monthYearA11yLabel: 'MMMM YYYY',
+    dateInput: 'dd/MM/yyyy', // this is how your date will get displayed on the Input
+    monthYearLabel: 'MMMM yyyy',
+    dateA11yLabel: 'do MMMM yyyy',
+    monthYearA11yLabel: 'MMMM yyyy',
   },
 };
 
@@ -382,8 +386,8 @@ const MY_DATE_FORMAT = {
     dateServiceProvider,
     CsvUploadModalProvider,
     CsvResultModalProvider,
-    {provide: MAT_DATE_LOCALE, useValue: 'en-AU'},
-    {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
+    {provide: MAT_DATE_LOCALE, useValue: enAU},
+    {provide: DateAdapter, useClass: DateFnsAdapter, deps: [MAT_DATE_LOCALE]},
     {provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMAT},
     UnitStudentEnrolmentModalProvider,
     TaskCommentService,
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
index ee0f135c26..72c309371d 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
@@ -8,6 +8,7 @@ import { TaskDefinition } from 'src/app/api/models/task-definition';
 import { Unit } from 'src/app/api/models/unit';
 import { TaskDefinitionService } from 'src/app/api/services/task-definition.service';
 import { AlertService } from 'src/app/common/services/alert.service';
+import { addWeeks } from 'date-fns';
 
 @Component({
   selector: 'f-unit-task-editor',
@@ -183,7 +184,7 @@ export class UnitTaskEditorComponent implements AfterViewInit {
     task.abbreviation = abbr;
     task.description = 'New Description';
     task.startDate = new Date();
-    task.targetDate = new Date();
+    task.targetDate = addWeeks(new Date(), 2);
     task.uploadRequirements = [];
     task.weighting = 4;
     task.targetGrade = 0;

From 4d81fa1fabb07e40d0d42068f23b8e756f4cdf4b Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 1 Jul 2024 17:08:20 +1000
Subject: [PATCH 096/776] fix: correct broken template in activities list

---
 .../activity-type-list.component.html         | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/app/admin/institution-settings/activity-type-list/activity-type-list.component.html b/src/app/admin/institution-settings/activity-type-list/activity-type-list.component.html
index 9b294d5597..9c91b329f7 100644
--- a/src/app/admin/institution-settings/activity-type-list/activity-type-list.component.html
+++ b/src/app/admin/institution-settings/activity-type-list/activity-type-list.component.html
@@ -15,27 +15,10 @@ <h1 class="mb-1">Activities</h1>
           {{ activityType.name }}
         </div>
         } @else {
-
-        <div class="edit-actions right">
-          <span>
-            <button mat-icon-button color="warn" (click)="cancelEdit()" aria-label="cancel edit">
-              <mat-icon>cancel</mat-icon>
-            </button>
-            <button mat-icon-button color="primary" (click)="submit()" aria-label="submit changes">
-              <mat-icon>save</mat-icon>
-            </button>
-            <button mat-icon-button (click)="deleteActivity(activityType)" aria-label="delete activity type">
-              <mat-icon color="primary">delete</mat-icon>
-            </button>
-          </span>
-        </div>
-
-        }
-        <ng-template #edit>
           <mat-form-field appearance="outline" class="data-entry">
             <input matInput required formControlName="name" placeholder="Name" />
           </mat-form-field>
-        </ng-template>
+        }
       </td>
       <td mat-footer-cell *matFooterCellDef>
         <mat-form-field appearance="outline" class="data-entry">
@@ -52,12 +35,11 @@ <h1 class="mb-1">Activities</h1>
         <div>
           {{ activityType.abbreviation }}
         </div>
-        } @else { #edit| }
-        <ng-template #edit>
+        } @else {
           <mat-form-field appearance="outline" class="data-entry">
             <input matInput required formControlName="abbreviation" placeholder="Abbreviation" />
           </mat-form-field>
-        </ng-template>
+        }
       </td>
       <td mat-footer-cell *matFooterCellDef>
         <mat-form-field appearance="outline" class="data-entry">
@@ -76,8 +58,7 @@ <h1 class="mb-1">Activities</h1>
             <mat-icon>edit</mat-icon>
           </button>
         </div>
-        } @else { #edit| }
-        <ng-template #edit>
+        } @else {
           <div class="edit-actions right">
             <span>
               <button mat-icon-button color="warn" (click)="cancelEdit()" aria-label="cancel edit">
@@ -91,7 +72,7 @@ <h1 class="mb-1">Activities</h1>
               </button>
             </span>
           </div>
-        </ng-template>
+        }
       </td>
       <td mat-footer-cell *matFooterCellDef>
         <div class="edit-actions right">

From 17958955f65bab2b268826f2a7e19f311071615b Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 1 Jul 2024 17:11:09 +1000
Subject: [PATCH 097/776] fix: correct campus list templates

---
 .../campus-list/campus-list.component.html    | 63 +++++++------------
 1 file changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.html b/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.html
index a97dcd2e16..3fe38272ec 100644
--- a/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.html
+++ b/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.html
@@ -11,31 +11,14 @@ <h1 class="mb-1">Campuses</h1>
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Name</th>
       <td mat-cell *matCellDef="let campus">
         @if (!editing(campus)) {
-        <div>
-          {{ campus.name }}
-        </div>
+          <div>
+            {{ campus.name }}
+          </div>
         } @else {
-
-        <div class="edit-actions right">
-          <span>
-            <button mat-icon-button color="warn" (click)="cancelEdit()" aria-label="cancel edit">
-              <mat-icon>cancel</mat-icon>
-            </button>
-            <button mat-icon-button color="primary" (click)="submit()" aria-label="submit changes">
-              <mat-icon>save</mat-icon>
-            </button>
-            <button mat-icon-button color="warn" (click)="deleteCampus(campus)" aria-label="delete campus">
-              <mat-icon>delete</mat-icon>
-            </button>
-          </span>
-        </div>
-
-        }
-        <ng-template #edit>
           <mat-form-field appearance="outline" class="data-entry">
             <input matInput required formControlName="name" placeholder="Name" />
           </mat-form-field>
-        </ng-template>
+        }
       </td>
       <td mat-footer-cell *matFooterCellDef>
         <mat-form-field appearance="outline" class="data-entry">
@@ -49,15 +32,14 @@ <h1 class="mb-1">Campuses</h1>
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Abbreviation</th>
       <td mat-cell *matCellDef="let campus">
         @if (!editing(campus)) {
-        <div>
-          {{ campus.abbreviation }}
-        </div>
-        } @else { #edit| }
-        <ng-template #edit>
+          <div>
+            {{ campus.abbreviation }}
+          </div>
+        } @else {
           <mat-form-field appearance="outline" class="data-entry">
             <input matInput required formControlName="abbreviation" placeholder="Abbreviation" />
           </mat-form-field>
-        </ng-template>
+        }
       </td>
       <td mat-footer-cell *matFooterCellDef>
         <mat-form-field appearance="outline" class="data-entry">
@@ -71,11 +53,10 @@ <h1 class="mb-1">Campuses</h1>
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Default Sync Mode</th>
       <td mat-cell *matCellDef="let campus">
         @if (!editing(campus)) {
-        <div>
-          {{ campus.mode | titlecase }}
-        </div>
-        } @else { #edit| }
-        <ng-template #edit>
+          <div>
+            {{ campus.mode | titlecase }}
+          </div>
+        } @else {
           <mat-form-field appearance="outline" class="data-entry">
             <mat-label>Default Sync Mode</mat-label>
             <mat-select required formControlName="mode">
@@ -86,7 +67,7 @@ <h1 class="mb-1">Campuses</h1>
               }
             </mat-select>
           </mat-form-field>
-        </ng-template>
+        }
       </td>
       <td mat-footer-cell *matFooterCellDef>
         <mat-form-field appearance="outline" class="data-entry">
@@ -107,13 +88,12 @@ <h1 class="mb-1">Campuses</h1>
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Active</th>
       <td mat-cell *matCellDef="let campus">
         @if (!editing(campus)) {
-        <div>
-          <mat-checkbox [checked]="campus.active" disabled> </mat-checkbox>
-        </div>
-        } @else { #edit| }
-        <ng-template #edit>
+          <div>
+            <mat-checkbox [checked]="campus.active" disabled> </mat-checkbox>
+          </div>
+        } @else {
           <mat-checkbox [checked]="campus.active" formControlName="active"> </mat-checkbox>
-        </ng-template>
+        }
       </td>
       <td mat-footer-cell *matFooterCellDef>
         <mat-checkbox formControlName="active"> </mat-checkbox>
@@ -135,8 +115,7 @@ <h1 class="mb-1">Campuses</h1>
           </button>
           <!-- </mat-menu> -->
         </div>
-        } @else { #edit| }
-        <ng-template #edit>
+        } @else {
           <div class="edit-actions right">
             <span>
               <button mat-icon-button color="warn" (click)="cancelEdit()" aria-label="cancel edit">
@@ -150,7 +129,7 @@ <h1 class="mb-1">Campuses</h1>
               </button>
             </span>
           </div>
-        </ng-template>
+        }
       </td>
       <td mat-footer-cell *matFooterCellDef>
         <div class="edit-actions right">

From a2c5a4490224ab49cfb4ff966e86bb3dd44afaf5 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 1 Jul 2024 17:11:32 +1000
Subject: [PATCH 098/776] chore(release): 8.0.17

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ccd7cdc27..b578191a4d 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.
 
+### [8.0.17](https://github.com/macite/doubtfire-deploy/compare/v8.0.16...v8.0.17) (2024-07-01)
+
+
+### Bug Fixes
+
+* correct broken template in activities list ([4d81fa1](https://github.com/macite/doubtfire-deploy/commit/4d81fa1fabb07e40d0d42068f23b8e756f4cdf4b))
+* correct campus list templates ([1795895](https://github.com/macite/doubtfire-deploy/commit/17958955f65bab2b268826f2a7e19f311071615b))
+* switch date formats to date-fns ([2394efb](https://github.com/macite/doubtfire-deploy/commit/2394efb07c03da18fb8114d87b0c89e68bf7fd2d))
+
 ### [8.0.16](https://github.com/macite/doubtfire-deploy/compare/v8.0.15...v8.0.16) (2024-06-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index f31a23897f..8236e0d60d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.16",
+  "version": "8.0.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.16",
+      "version": "8.0.17",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index df30c7bebd..47e0c6b97a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.16",
+  "version": "8.0.17",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 1b1710f5015456cefad1d74617305981a22962ad Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 3 Jul 2024 12:47:16 +1000
Subject: [PATCH 099/776] refactor: center scorm comments if no review button

---
 .../scorm-comment/scorm-comment.component.html              | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
index edde1e057c..0c44be728c 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.html
@@ -8,7 +8,11 @@
   >
     Review
   </button>
-  <div class="markdown-to-html flex-grow" [innerHTML]="comment.text"></div>
+  @if (!user.isStaff && !task.definition.scormAllowReview) {
+    <div class="markdown-to-html m-auto mb-1 mt-1" [innerHTML]="comment.text"></div>
+  } @else {
+    <div class="markdown-to-html flex-grow" [innerHTML]="comment.text"></div>
+  }
   <button
     #menuState="matMenuTrigger"
     mat-icon-button

From ff1456b67e0bb331bfc8bdec4539bb59bba5b6b0 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 3 Jul 2024 17:17:21 +1000
Subject: [PATCH 100/776] chore: fix package file

remove inadvertant install package inclusion
---
 package-lock.json | 8 --------
 package.json      | 1 -
 2 files changed, 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8236e0d60d..de4d5c00ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12931,14 +12931,6 @@
         "tslib": "^2.1.0"
       }
     },
-    "node_modules/install": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.13.0.tgz",
-      "integrity": "sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/internal-slot": {
       "version": "1.0.7",
       "dev": true,
diff --git a/package.json b/package.json
index 47e0c6b97a..c932968ec8 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,6 @@
     "es5-shim": "^4.5.12",
     "file-saver": "^2.0.5",
     "font-awesome": "~4.7.0",
-    "install": "^0.13.0",
     "jquery": "2.1.4",
     "lodash": "~4.17",
     "lottie-web": "^5.12.2",

From d47d10561bd7bfad495f878ebb0bab399ce144b7 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 3 Jul 2024 17:18:45 +1000
Subject: [PATCH 101/776] feat: add ability to set unit code on import from
 rollover

---
 .../teaching-period-unit-import.dialog.ts     | 67 ++++++++++---------
 src/app/api/models/unit.ts                    |  4 +-
 2 files changed, 39 insertions(+), 32 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 1a89a5538d..53416abcc8 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
@@ -201,36 +201,43 @@ export class TeachingPeriodUnitImportDialogComponent implements OnInit {
   }
 
   private importExistingUnit(unitToImport: UnitImportData, idx: number) {
-    unitToImport.sourceUnit.rolloverTo({ teaching_period_id: this.data.teachingPeriod.id }).subscribe({
-      next: (newUnit: Unit) => {
-        unitToImport.done = true;
-        // Employ the convenor
-        if (unitToImport.convenor && unitToImport.convenor !== newUnit.mainConvenorUser) {
-          newUnit.addStaff(unitToImport.convenor, 'Convenor').subscribe({
-            next: (newRole) => {
-              console.log(`Employed ${unitToImport.convenor.name} in ${newUnit.code}`);
-              newUnit.changeMainConvenor(newRole).subscribe({
-                next: () => {
-                  console.log(`Set ${unitToImport.convenor.name} as main convenor in ${newUnit.code}`);
-                },
-                error: (failure) => {
-                  console.log(failure);
-                },
-              });
-            },
-            error: (failure) => {
-              console.log(failure);
-            },
-          });
-        }
-        this.importUnit(idx + 1);
-      },
-      error: (failure) => {
-        console.log(failure);
-        unitToImport.done = false;
-        this.importUnit(idx + 1);
-      },
-    });
+    unitToImport.sourceUnit
+      .rolloverTo({
+        new_unit_code: unitToImport.unitCode,
+        teaching_period_id: this.data.teachingPeriod.id,
+      })
+      .subscribe({
+        next: (newUnit: Unit) => {
+          unitToImport.done = true;
+          // Employ the convenor
+          if (unitToImport.convenor && unitToImport.convenor !== newUnit.mainConvenorUser) {
+            newUnit.addStaff(unitToImport.convenor, 'Convenor').subscribe({
+              next: (newRole) => {
+                console.log(`Employed ${unitToImport.convenor.name} in ${newUnit.code}`);
+                newUnit.changeMainConvenor(newRole).subscribe({
+                  next: () => {
+                    console.log(
+                      `Set ${unitToImport.convenor.name} as main convenor in ${newUnit.code}`,
+                    );
+                  },
+                  error: (failure) => {
+                    console.log(failure);
+                  },
+                });
+              },
+              error: (failure) => {
+                console.log(failure);
+              },
+            });
+          }
+          this.importUnit(idx + 1);
+        },
+        error: (failure) => {
+          console.log(failure);
+          unitToImport.done = false;
+          this.importUnit(idx + 1);
+        },
+      });
   }
 
   private createNewUnit(unitToImport: UnitImportData, idx: number) {
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 5c70a6eb42..b27159832e 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -231,8 +231,8 @@ export class Unit extends Entity {
     return Math.round((startToNow / totalDuration) * 100);
   }
 
-  public rolloverTo(body: {start_date: Date; end_date: Date}): Observable<Unit>;
-  public rolloverTo(body: {teaching_period_id: number}): Observable<Unit>;
+  public rolloverTo(body: {new_unit_code?: string, start_date: Date; end_date: Date}): Observable<Unit>;
+  public rolloverTo(body: {new_unit_code?: string, teaching_period_id: number}): Observable<Unit>;
   public rolloverTo(body: any): Observable<Unit> {
     const unitService = AppInjector.get(UnitService);
 

From 0aaeb4ec897712e7950202c098cb0318ab5cd706 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 3 Jul 2024 17:18:52 +1000
Subject: [PATCH 102/776] chore(release): 8.0.18

---
 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 b578191a4d..f108796bd4 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.
 
+### [8.0.18](https://github.com/macite/doubtfire-deploy/compare/v8.0.17...v8.0.18) (2024-07-03)
+
+
+### Features
+
+* add ability to set unit code on import from rollover ([d47d105](https://github.com/macite/doubtfire-deploy/commit/d47d10561bd7bfad495f878ebb0bab399ce144b7))
+
 ### [8.0.17](https://github.com/macite/doubtfire-deploy/compare/v8.0.16...v8.0.17) (2024-07-01)
 
 
diff --git a/package-lock.json b/package-lock.json
index de4d5c00ec..52445d86a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.17",
+  "version": "8.0.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.17",
+      "version": "8.0.18",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index c932968ec8..8529506a2d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.17",
+  "version": "8.0.18",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 534947caf6c4647bfe69b7219d7f8e0a8e4c87a8 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 5 Jul 2024 23:45:15 +1000
Subject: [PATCH 103/776] refactor: comment out debug logs

---
 src/app/api/models/scorm-datamodel.ts         |  10 +-
 src/app/api/services/scorm-adapter.service.ts | 110 ++++++++----------
 .../scorm-player/scorm-player.component.ts    |   2 +-
 .../task-definition-scorm.component.ts        |   2 +-
 4 files changed, 58 insertions(+), 66 deletions(-)

diff --git a/src/app/api/models/scorm-datamodel.ts b/src/app/api/models/scorm-datamodel.ts
index 7559318eb5..0fdc2d3a06 100644
--- a/src/app/api/models/scorm-datamodel.ts
+++ b/src/app/api/models/scorm-datamodel.ts
@@ -7,7 +7,7 @@ export class ScormDataModel {
   }
 
   public restore(dataModel: string) {
-    console.log(this.msgPrefix + 'restoring DataModel with provided data');
+    // console.log(this.msgPrefix + 'restoring DataModel with provided data');
     this.dataModel = JSON.parse(dataModel);
   }
 
@@ -27,22 +27,22 @@ export class ScormDataModel {
       // cmi.interactions._count must be incremented after a new interaction is created
       const interactionPath = key.match('cmi.interactions.\\d+');
       const objectivesCounterForInteraction = interactionPath.toString() + '.objectives._count';
-      console.log('Incrementing cmi.interactions._count');
+      // console.log('Incrementing cmi.interactions._count');
       this.dataModel['cmi.interactions._count']++;
       // cmi.interactions.n.objectives._count must be initialized after an interaction is created
-      console.log(`Initializing ${objectivesCounterForInteraction}`);
+      // console.log(`Initializing ${objectivesCounterForInteraction}`);
       this.dataModel[objectivesCounterForInteraction] = 0;
     }
     if (key.match('cmi.interactions.\\d+.objectives.\\d+.id')) {
       const interactionPath = key.match('cmi.interactions.\\d+.objectives');
       const objectivesCounterForInteraction = interactionPath.toString() + '._count';
       // cmi.interactions.n.objectives._count must be incremented after objective creation
-      console.log(`Incrementing ${objectivesCounterForInteraction}`);
+      // console.log(`Incrementing ${objectivesCounterForInteraction}`);
       this.dataModel[objectivesCounterForInteraction.toString()]++;
     }
     if (key.match('cmi.objectives.\\d+.id')) {
       // cmi.objectives._count must be incremented after a new objective is created
-      console.log('Incrementing cmi.objectives._count');
+      // console.log('Incrementing cmi.objectives._count');
       this.dataModel['cmi.objectives._count']++;
     }
     return 'true';
diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index 085d41610b..702fc72f40 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -43,17 +43,17 @@ export class ScormAdapterService {
   }
 
   Initialize(): string {
-    console.log('API_1484_11: Initialize');
+    // console.log('API_1484_11: Initialize');
 
     // TODO: error handling and reporting
     switch (this.context.state) {
       case 'Initialized':
         this.context.errorCode = 103;
-        console.log('Already Initialized');
+        // console.log('Already Initialized');
         break;
       case 'Terminated':
         this.context.errorCode = 104;
-        console.log('Content Instance Terminated');
+        // console.log('Content Instance Terminated');
         break;
     }
 
@@ -62,23 +62,12 @@ export class ScormAdapterService {
       this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
       this.xhr.setRequestHeader('Username', this.context.user.username);
 
-      this.xhr.onload = () => {
-        if (this.xhr.status >= 200 && this.xhr.status < 400) {
-          console.log('Retrieved the attempt.');
-        } else if (this.xhr.status == 404) {
-          console.log('Not found.');
-          noTestFound = true;
-        } else {
-          console.error('Error saving DataModel:', this.xhr.responseText);
-        }
-      };
-
       this.xhr.send();
-      console.log(this.xhr.responseText);
+      // console.log(this.xhr.responseText);
 
       const reviewSession = JSON.parse(this.xhr.responseText);
       this.dataModel.restore(reviewSession.cmi_datamodel);
-      console.log(this.dataModel.dump());
+      // console.log(this.dataModel.dump());
 
       this.context.state = 'Initialized';
       return 'true';
@@ -97,22 +86,26 @@ export class ScormAdapterService {
     let startNewTest = false;
 
     this.xhr.onload = () => {
-      if (this.xhr.status >= 200 && this.xhr.status < 400) {
-        console.log('Retrieved the latest attempt.');
-      } else if (this.xhr.status == 404) {
-        console.log('Not found.');
+      if (this.xhr.status == 404) {
         noTestFound = true;
-      } else {
-        console.error('Error saving DataModel:', this.xhr.responseText);
       }
+
+      // if (this.xhr.status >= 200 && this.xhr.status < 400) {
+      //   console.log('Retrieved the latest attempt.');
+      // } else if (this.xhr.status == 404) {
+      //   console.log('Not found.');
+      //   noTestFound = true;
+      // } else {
+      //   console.error('Error saving DataModel:', this.xhr.responseText);
+      // }
     };
 
     this.xhr.send();
-    console.log(this.xhr.responseText);
+    // console.log(this.xhr.responseText);
 
     if (!noTestFound) {
       const latestSession = JSON.parse(this.xhr.responseText);
-      console.log('Latest exam session:', latestSession);
+      // console.log('Latest exam session:', latestSession);
       this.context.attemptId = latestSession.id;
       if (latestSession.completion_status) {
         startNewTest = true;
@@ -126,13 +119,13 @@ export class ScormAdapterService {
       this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
       this.xhr.setRequestHeader('Username', this.context.user.username);
       this.xhr.send();
-      console.log(this.xhr.responseText);
+      // console.log(this.xhr.responseText);
 
       const currentSession = JSON.parse(this.xhr.responseText);
-      console.log('Current exam session:', currentSession);
+      // console.log('Current exam session:', currentSession);
       this.context.attemptId = currentSession.id;
       this.dataModel.restore(currentSession.cmi_datamodel);
-      console.log(this.dataModel.dump());
+      // console.log(this.dataModel.dump());
     } else {
       this.xhr.open(
         'POST',
@@ -142,13 +135,13 @@ export class ScormAdapterService {
       this.xhr.setRequestHeader('Auth-Token', this.context.user.authenticationToken);
       this.xhr.setRequestHeader('Username', this.context.user.username);
       this.xhr.send();
-      console.log(this.xhr.responseText);
+      // console.log(this.xhr.responseText);
 
       const currentSession = JSON.parse(this.xhr.responseText);
-      console.log('Current exam session:', currentSession);
+      // console.log('Current exam session:', currentSession);
       this.context.attemptId = currentSession.id;
       this.dataModel.restore(currentSession.cmi_datamodel);
-      console.log(this.dataModel.dump());
+      // console.log(this.dataModel.dump());
     }
 
     this.context.state = 'Initialized';
@@ -156,17 +149,17 @@ export class ScormAdapterService {
   }
 
   Terminate(): string {
-    console.log('API_1484_11: Terminate');
+    // console.log('API_1484_11: Terminate');
 
     // TODO: error handling and reporting
     switch (this.context.state) {
       case 'Uninitialized':
         this.context.errorCode = 112;
-        console.log('Termination Before Initialization');
+        // console.log('Termination Before Initialization');
         break;
       case 'Terminated':
         this.context.errorCode = 113;
-        console.log('Termination After Termination');
+        // console.log('Termination After Termination');
         break;
     }
 
@@ -179,7 +172,7 @@ export class ScormAdapterService {
       terminated: true,
     };
     this.xhr.send(JSON.stringify(requestData));
-    console.log(this.xhr.responseText);
+    // console.log(this.xhr.responseText);
 
     // all done, clearing datamodel and setting state to terminated
     this.dataModel = new ScormDataModel();
@@ -195,31 +188,31 @@ export class ScormAdapterService {
     switch (this.context.state) {
       case 'Uninitialized':
         this.context.errorCode = 122;
-        console.log('Retrieve Data Before Initialization');
+        // console.log('Retrieve Data Before Initialization');
         break;
       case 'Terminated':
         this.context.errorCode = 123;
-        console.log('Retrieve Data After Termination');
+        // console.log('Retrieve Data After Termination');
         break;
     }
 
-    console.log(`API_1484_11: GetValue:`, element, value);
+    // console.log(`API_1484_11: GetValue:`, element, value);
     return value;
   }
 
   SetValue(element: string, value: any): string {
-    console.log(`API_1484_11: SetValue:`, element, value);
+    // console.log(`API_1484_11: SetValue:`, element, value);
 
     // TODO: error reporting
     // TODO: can't set until init is done
     switch (this.context.state) {
       case 'Uninitialized':
         this.context.errorCode = 132;
-        console.log('Store Data Before Initialization');
+        // console.log('Store Data Before Initialization');
         break;
       case 'Terminated':
         this.context.errorCode = 133;
-        console.log('Store Data After Termination');
+        // console.log('Store Data After Termination');
         break;
     }
 
@@ -228,18 +221,18 @@ export class ScormAdapterService {
   }
 
   Commit(): string {
-    console.log('API_1484_11: Commit');
+    // console.log('API_1484_11: Commit');
 
     // TODO: error reporting
     // TODO: can't commit until init is done
     switch (this.context.state) {
       case 'Uninitialized':
         this.context.errorCode = 142;
-        console.log('Commit Before Initialization');
+        // console.log('Commit Before Initialization');
         break;
       case 'Terminated':
         this.context.errorCode = 143;
-        console.log('Commit After Termination');
+        // console.log('Commit After Termination');
         break;
     }
 
@@ -250,19 +243,18 @@ export class ScormAdapterService {
     const requestData = {
       cmi_datamodel: JSON.stringify(this.dataModel.dump()),
     };
-    
 
-    this.xhr.onload = () => {
-      if (this.xhr.status >= 200 && this.xhr.status < 400) {
-        console.log('DataModel saved successfully.');
-      } else {
-        console.error('Error saving DataModel:', this.xhr.responseText);
-      }
-    };
+    // this.xhr.onload = () => {
+    //   if (this.xhr.status >= 200 && this.xhr.status < 400) {
+    //     console.log('DataModel saved successfully.');
+    //   } else {
+    //     console.error('Error saving DataModel:', this.xhr.responseText);
+    //   }
+    // };
 
-    this.xhr.onerror = () => {
-      console.error('Request failed.');
-    };
+    // this.xhr.onerror = () => {
+    //   console.error('Request failed.');
+    // };
 
     this.xhr.send(JSON.stringify(requestData));
     this.context.errorCode = 0;
@@ -271,21 +263,21 @@ export class ScormAdapterService {
 
   GetLastError(): string {
     const lastError = this.context.errorCode.toString();
-    if (lastError !== '0') {
-      console.log(`API_1484_11: GetLastError: ${lastError}`);
-    }
+    // if (lastError !== '0') {
+    //   console.log(`API_1484_11: GetLastError: ${lastError}`);
+    // }
     return lastError;
   }
 
   GetErrorString(errorCode: string): string {
     const errorString = this.context.getErrorMessage(errorCode);
-    console.log(`API_1484_11: GetErrorString:`, errorCode, errorString);
+    // console.log(`API_1484_11: GetErrorString:`, errorCode, errorString);
     return errorString;
   }
 
   GetDiagnostic(errorCode: string): string {
     // TODO: implement this
-    console.log(`API_1484_11: GetDiagnostic:`, errorCode);
+    // console.log(`API_1484_11: GetDiagnostic:`, errorCode);
     return 'GetDiagnostic is currently not implemented';
   }
 }
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index b7f9b1b5a6..a7de380195 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -85,7 +85,7 @@ export class ScormPlayerComponent implements OnInit {
   @HostListener('window:beforeunload', ['$event'])
   beforeUnload($event: any): void {
     if (this.scormAdapter.state == 'Initialized') {
-      console.log('SCORM player closing during an initialized session, commiting DataModel');
+      // console.log('SCORM player closing during an initialized session, commiting DataModel');
       this.scormAdapter.Commit();
     }
   }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
index 3ebd0d2a6d..6a8708d25d 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
@@ -41,7 +41,7 @@ export class TaskDefinitionScormComponent {
   }
 
   public uploadScormData(files: FileList) {
-    console.log(Array.from(files).map((f) => f.type));
+    // console.log(Array.from(files).map((f) => f.type));
     const validMimeTypes = ['application/zip', 'application/x-zip-compressed', 'multipart/x-zip'];
     const validFiles = Array.from(files as ArrayLike<File>).filter((f) =>
       validMimeTypes.includes(f.type),

From 22a26165c9f2ef634b3e79d1e5d5d6b74e6f2731 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 10 Jul 2024 16:40:46 +1000
Subject: [PATCH 104/776] fix: task def editor so save is not over fields and
 header visible for task being edited

---
 .../task-definition-editor.component.html     | 218 +++++++++---------
 .../task-definition-editor.component.scss     |   5 +
 .../task-definition-options.component.html    |   7 +-
 3 files changed, 123 insertions(+), 107 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 5bbf1e64e5..202ec4f9dc 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -1,146 +1,154 @@
-<div class="flex-col pr-32">
-  <div class="flex mt-10">
-    <div class="mr-6">
-      <div
-        class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-      >
-        1
+<div id="task-def-head" class="w-full sticky top-0">
+  <h3>Details for {{ taskDefinition.abbreviation }} - {{ taskDefinition.name }}</h3>
+  <mat-divider></mat-divider>
+</div>
+<div class="flex flex-row">
+  <div class="flex-col grow mr-4">
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          1
+        </div>
       </div>
-    </div>
 
-    <div class="w-full">
-      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task details</h3>
-      <p class="font-normal text-gray-700">Name the task and set target grade</p>
-      <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-        <f-task-definition-general [taskDefinition]="taskDefinition"></f-task-definition-general>
+      <div class="w-full">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task details</h3>
+        <p class="font-normal text-gray-700">Name the task and set target grade</p>
+        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+          <f-task-definition-general [taskDefinition]="taskDefinition"></f-task-definition-general>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="flex mt-10">
-    <div class="mr-6">
-      <div
-        class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-      >
-        2
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          2
+        </div>
       </div>
-    </div>
 
-    <div class="w-full">
-      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Inbox</h3>
-      <p class="font-normal text-gray-700">
-        Who assesses {{ unit.hasGroupwork() ? 'and submits ' : '' }}this task?
-      </p>
-      <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-        <f-task-definition-who [taskDefinition]="taskDefinition"></f-task-definition-who>
+      <div class="w-full">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Inbox</h3>
+        <p class="font-normal text-gray-700">
+          Who assesses {{ unit.hasGroupwork() ? 'and submits ' : '' }}this task?
+        </p>
+        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+          <f-task-definition-who [taskDefinition]="taskDefinition"></f-task-definition-who>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="flex mt-10">
-    <div class="mr-6">
-      <div
-        class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-      >
-        3
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          3
+        </div>
       </div>
-    </div>
 
-    <div class="w-full">
-      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Due dates</h3>
-      <p class="font-normal text-gray-700">When is this task due?</p>
-      <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-        <f-task-definition-dates [taskDefinition]="taskDefinition"></f-task-definition-dates>
+      <div class="w-full">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Due dates</h3>
+        <p class="font-normal text-gray-700">When is this task due?</p>
+        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+          <f-task-definition-dates [taskDefinition]="taskDefinition"></f-task-definition-dates>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="flex mt-10">
-    <div class="mr-6">
-      <div
-        class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-      >
-        4
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          4
+        </div>
       </div>
-    </div>
 
-    <div class="w-full">
-      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Upload requirements</h3>
-      <p class="font-normal text-gray-700">What do students need to upload?</p>
-      <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-        <f-task-definition-upload [taskDefinition]="taskDefinition"></f-task-definition-upload>
+      <div class="w-full">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Upload requirements</h3>
+        <p class="font-normal text-gray-700">What do students need to upload?</p>
+        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+          <f-task-definition-upload [taskDefinition]="taskDefinition"></f-task-definition-upload>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="flex mt-10">
-    <div class="mr-6">
-      <div
-        class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-      >
-        5
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          5
+        </div>
       </div>
-    </div>
 
-    <div class="w-full">
-      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
-        Task description and resources
-      </h3>
-      <p class="font-normal text-gray-700">Upload task descriptions and resources</p>
-      <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-        <f-task-definition-resources
-          [taskDefinition]="taskDefinition"
-        ></f-task-definition-resources>
+      <div class="w-full">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
+          Task description and resources
+        </h3>
+        <p class="font-normal text-gray-700">Upload task descriptions and resources</p>
+        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+          <f-task-definition-resources
+            [taskDefinition]="taskDefinition"
+          ></f-task-definition-resources>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="flex mt-10">
-    <div class="mr-6">
-      <div
-        class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-      >
-        6
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          6
+        </div>
       </div>
-    </div>
 
-    <div class="w-full">
-      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
-        Task assessment automation
-      </h3>
-      <p class="font-normal text-gray-700" *ngIf="!overseerEnabled">Automation is not enabled</p>
-      <p class="font-normal text-gray-700" *ngIf="overseerEnabled">
-        Configure automated assessment
-      </p>
-      <div class="bg-white border border-gray-200 rounded-xl shadow p-6" *ngIf="overseerEnabled">
-        <f-task-definition-overseer [taskDefinition]="taskDefinition"></f-task-definition-overseer>
+      <div class="w-full">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
+          Task assessment automation
+        </h3>
+        <p class="font-normal text-gray-700" *ngIf="!overseerEnabled">Automation is not enabled</p>
+        <p class="font-normal text-gray-700" *ngIf="overseerEnabled">
+          Configure automated assessment
+        </p>
+        <div class="bg-white border border-gray-200 rounded-xl shadow p-6" *ngIf="overseerEnabled">
+          <f-task-definition-overseer [taskDefinition]="taskDefinition"></f-task-definition-overseer>
+        </div>
       </div>
     </div>
-  </div>
 
-  <div class="flex mt-10">
-    <div class="mr-6">
-      <div
-        class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-      >
-        7
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          7
+        </div>
       </div>
-    </div>
 
-    <div class="w-full">
-      <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Optional settings</h3>
-      <p class="font-normal text-gray-700">Configure automated assessment</p>
-      <mat-accordion>
+      <div class="w-full mb-20">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Optional settings</h3>
+        <p class="font-normal text-gray-700">Apply other options</p>
         <mat-expansion-panel>
           <mat-expansion-panel-header>
             <mat-panel-title> Options </mat-panel-title>
           </mat-expansion-panel-header>
           <f-task-definition-options [taskDefinition]="taskDefinition"></f-task-definition-options>
         </mat-expansion-panel>
-      </mat-accordion>
+      </div>
+    </div>
+  </div>
+  <div class="place-content-end">
+    <div class="sticky bottom-16">
+      <button mat-fab color="primary" (click)="save()">
+        <mat-icon>save</mat-icon>
+      </button>
     </div>
   </div>
-</div>
-<div class="w-full flex flex-row place-content-end sticky bottom-16 z-10">
-  <button mat-fab color="primary" (click)="save()"><mat-icon>save</mat-icon></button>
 </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.scss
index 05e8bffddc..82dc723d88 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.scss
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.scss
@@ -8,3 +8,8 @@
 .form-group {
 
 }
+
+#task-def-head {
+  background-color: white;
+  z-index: 10;
+}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
index a479f20ce3..634c71a98c 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
@@ -18,7 +18,7 @@
 
   <div class="flex-grow flex flex-row gap-4">
     <mat-form-field appearance="outline" class="basis-1/2">
-      <mat-label>Maximum Score</mat-label>
+      <mat-label>Quality Stars</mat-label>
       <input
         matInput
         min="0"
@@ -27,6 +27,9 @@
         [(ngModel)]="taskDefinition.maxQualityPts"
       />
     </mat-form-field>
-    <span class="basis-1/2">Provide a score alongside the task status. We recommend avoiding this practice.</span>
+    <span class="basis-1/2"
+      >Provide a number of stars alongside the task status. Make sure you have a clear reason for
+      each star within your task description.</span
+    >
   </div>
 </div>

From f5388e45715597f0c92f252f721cf274bb8de0d5 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 10 Jul 2024 17:03:45 +1000
Subject: [PATCH 105/776] fix: ensure pdf is visible in task viewer
 mobile/narrow

---
 .../units/states/tasks/tasks-viewer/tasks-viewer.component.html  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/units/states/tasks/tasks-viewer/tasks-viewer.component.html b/src/app/units/states/tasks/tasks-viewer/tasks-viewer.component.html
index 845e7203a5..56e528f29e 100644
--- a/src/app/units/states/tasks/tasks-viewer/tasks-viewer.component.html
+++ b/src/app/units/states/tasks/tasks-viewer/tasks-viewer.component.html
@@ -36,5 +36,6 @@
     <div fxFlex class="vertical-panel mobile">
       <f-task-details-view [taskDef]="selectedTaskDef" [unit]="unit"></f-task-details-view>
     </div>
+    <f-task-sheet-view class="h-full" [taskDef]="selectedTaskDef"> </f-task-sheet-view>
   </div>
 </div>

From e9046400e827481e09492bcb458b00b4e3aca347 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 10 Jul 2024 17:04:29 +1000
Subject: [PATCH 106/776] feat: add ability to minimise task details in task
 viewer

---
 .../f-task-details-view.component.html             | 14 +++++++++++++-
 .../f-task-details-view.component.ts               |  4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/app/units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component.html b/src/app/units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component.html
index 2ee4198b7c..5ca7a38d06 100644
--- a/src/app/units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component.html
+++ b/src/app/units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component.html
@@ -1,6 +1,18 @@
 <div class="w-full h-full overflow-auto">
   <div [hidden]="!taskDef">
-    <f-task-description-card [taskDef]="taskDef" [unit]="unit"></f-task-description-card>
+    <mat-expansion-panel
+      [expanded]="true"
+      (opened)="panelOpenState.set(true)"
+      (closed)="panelOpenState.set(false)"
+    >
+      <mat-expansion-panel-header>
+        <mat-panel-title> Task Details </mat-panel-title>
+        <mat-panel-description>
+          {{ panelOpenState() ? 'Hide' : 'Show' }} task details
+        </mat-panel-description>
+      </mat-expansion-panel-header>
+      <f-task-description-card [taskDef]="taskDef" [unit]="unit"></f-task-description-card>
+    </mat-expansion-panel>
   </div>
 
   <div [hidden]="taskDef" fxFlexFill fxLayout="column" fxLayoutAlign="center center">
diff --git a/src/app/units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component.ts b/src/app/units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component.ts
index 57ea0b7993..8940b75542 100644
--- a/src/app/units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component.ts
+++ b/src/app/units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, signal } from '@angular/core';
 import { TaskDefinition } from 'src/app/api/models/task-definition';
 import { Unit } from 'src/app/api/models/unit';
 import { TasksViewerService } from '../../../tasks-viewer.service';
@@ -19,4 +19,6 @@ export class FTaskDetailsViewComponent implements OnInit {
       this.taskDef = taskDef;
     });
   }
+
+  public readonly panelOpenState = signal(false);
 }

From 71df80b88ca626776e8e41d6530fbad6fe1355ec Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 10 Jul 2024 22:14:30 +1000
Subject: [PATCH 107/776] chore(release): 8.0.19

---
 CHANGELOG.md      | 13 +++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f108796bd4..c73daa7f9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 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.
 
+### [8.0.19](https://github.com/macite/doubtfire-deploy/compare/v8.0.18...v8.0.19) (2024-07-10)
+
+
+### Features
+
+* add ability to minimise task details in task viewer ([e904640](https://github.com/macite/doubtfire-deploy/commit/e9046400e827481e09492bcb458b00b4e3aca347))
+
+
+### Bug Fixes
+
+* ensure pdf is visible in task viewer mobile/narrow ([f5388e4](https://github.com/macite/doubtfire-deploy/commit/f5388e45715597f0c92f252f721cf274bb8de0d5))
+* task def editor so save is not over fields and header visible for task being edited ([22a2616](https://github.com/macite/doubtfire-deploy/commit/22a26165c9f2ef634b3e79d1e5d5d6b74e6f2731))
+
 ### [8.0.18](https://github.com/macite/doubtfire-deploy/compare/v8.0.17...v8.0.18) (2024-07-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index 52445d86a0..4571e71e31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.18",
+  "version": "8.0.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.18",
+      "version": "8.0.19",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 8529506a2d..6237d6dae1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.18",
+  "version": "8.0.19",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 3d44c115b498366b80e5b8b99ccd3eaa660ff613 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 15 Jul 2024 19:51:28 +1000
Subject: [PATCH 108/776] fix: ensure turn it in eula is accessible by all

---
 src/app/doubtfire.states.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index b9f95e88af..c578d87b26 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -225,8 +225,8 @@ const EulaState: NgHybridStateDeclaration = {
     },
   },
   data: {
-    pageTitle: 'Teaching Periods',
-    roleWhitelist: ['Convenor', 'Admin'],
+    pageTitle: 'End User License Agreement',
+    roleWhitelist: ['Student', 'Tutor', 'Convenor', 'Admin', 'Auditor'],
   },
 };
 

From f4360977d42466dcf2706c487b7648cd0faa409b Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 15 Jul 2024 19:51:43 +1000
Subject: [PATCH 109/776] chore(release): 8.0.20

---
 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 c73daa7f9c..a5fe9f894e 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.
 
+### [8.0.20](https://github.com/macite/doubtfire-deploy/compare/v8.0.19...v8.0.20) (2024-07-15)
+
+
+### Bug Fixes
+
+* ensure turn it in eula is accessible by all ([3d44c11](https://github.com/macite/doubtfire-deploy/commit/3d44c115b498366b80e5b8b99ccd3eaa660ff613))
+
 ### [8.0.19](https://github.com/macite/doubtfire-deploy/compare/v8.0.18...v8.0.19) (2024-07-10)
 
 
diff --git a/package-lock.json b/package-lock.json
index 4571e71e31..d176f2345c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.19",
+  "version": "8.0.20",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.19",
+      "version": "8.0.20",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 6237d6dae1..762969722e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.19",
+  "version": "8.0.20",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 9436f57e327eaee86b192a7adccbe43d800d3146 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 20 Jul 2024 14:37:39 +1000
Subject: [PATCH 110/776] refactor: create initial files for migration of
 comments-modal

---
 .../comments-modal/comments-modal.component.html       |  0
 .../comments-modal/comments-modal.component.scss       |  0
 .../modals/comments-modal/comments-modal.component.ts  | 10 ++++++++++
 3 files changed, 10 insertions(+)
 create mode 100644 src/app/common/modals/comments-modal/comments-modal.component.html
 create mode 100644 src/app/common/modals/comments-modal/comments-modal.component.scss
 create mode 100644 src/app/common/modals/comments-modal/comments-modal.component.ts

diff --git a/src/app/common/modals/comments-modal/comments-modal.component.html b/src/app/common/modals/comments-modal/comments-modal.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/common/modals/comments-modal/comments-modal.component.scss b/src/app/common/modals/comments-modal/comments-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/common/modals/comments-modal/comments-modal.component.ts b/src/app/common/modals/comments-modal/comments-modal.component.ts
new file mode 100644
index 0000000000..993f67ce00
--- /dev/null
+++ b/src/app/common/modals/comments-modal/comments-modal.component.ts
@@ -0,0 +1,10 @@
+import {Component, Input, Inject} from '@angular/core';
+
+@Component({
+  selector: 'comments-modal',
+  templateUrl: 'comments-modal.component.html',
+  styleUrls: ['comments-modal.component.scss'],
+})
+export class CommentsModalComponent {
+  constructor() {}
+}

From 152b2fb30a6cbf0eaa9225bf04049b78c6161c4a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 20 Jul 2024 15:18:37 +1000
Subject: [PATCH 111/776] refactor: create service file for migration of
 comments-modal

---
 src/app/common/modals/comments-modal/comments-modal.service.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/app/common/modals/comments-modal/comments-modal.service.ts

diff --git a/src/app/common/modals/comments-modal/comments-modal.service.ts b/src/app/common/modals/comments-modal/comments-modal.service.ts
new file mode 100644
index 0000000000..e69de29bb2

From 13710e2fa17419f5c22940af87091d9c55dc0a87 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 20 Jul 2024 20:53:31 +1000
Subject: [PATCH 112/776] refactor: migrate comments-modal

---
 .../comments-modal.component.html             |  7 +++++++
 .../comments-modal.component.scss             | 17 +++++++++++++++++
 .../comments-modal.component.ts               | 19 ++++++++++++++-----
 .../comments-modal/comments-modal.service.ts  | 18 ++++++++++++++++++
 src/app/common/modals/modals.coffee           |  1 -
 src/app/doubtfire-angular.module.ts           |  2 ++
 src/app/doubtfire-angularjs.module.ts         |  5 +++--
 7 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/src/app/common/modals/comments-modal/comments-modal.component.html b/src/app/common/modals/comments-modal/comments-modal.component.html
index e69de29bb2..888da289d2 100644
--- a/src/app/common/modals/comments-modal/comments-modal.component.html
+++ b/src/app/common/modals/comments-modal/comments-modal.component.html
@@ -0,0 +1,7 @@
+<div class="modal-comment">
+  @if (commentType === 'image') {
+    <img class="image-comment" [src]="commentResourceUrl" />
+  } @else if (commentType === 'pdf') {
+    <iframe class="pdf-comment" [src]="commentResourceUrl | safe" type="application/pdf"></iframe>
+  }
+</div>
diff --git a/src/app/common/modals/comments-modal/comments-modal.component.scss b/src/app/common/modals/comments-modal/comments-modal.component.scss
index e69de29bb2..76d21e070f 100644
--- a/src/app/common/modals/comments-modal/comments-modal.component.scss
+++ b/src/app/common/modals/comments-modal/comments-modal.component.scss
@@ -0,0 +1,17 @@
+.modal-comment {
+  padding: 15px;
+
+  .image-comment {
+    width: 100%;
+    height: 100%;
+    align-content: center;
+    border-radius: 5px;
+    padding: 0;
+    border: none;
+  }
+  .pdf-comment {
+    width: 100%;
+    height: 80vh;
+    align-content: center;
+  }
+}
diff --git a/src/app/common/modals/comments-modal/comments-modal.component.ts b/src/app/common/modals/comments-modal/comments-modal.component.ts
index 993f67ce00..6fa5e57b01 100644
--- a/src/app/common/modals/comments-modal/comments-modal.component.ts
+++ b/src/app/common/modals/comments-modal/comments-modal.component.ts
@@ -1,10 +1,19 @@
-import {Component, Input, Inject} from '@angular/core';
+import {Component, Input, Inject, OnInit} from '@angular/core';
+import {MAT_DIALOG_DATA} from '@angular/material/dialog';
 
 @Component({
   selector: 'comments-modal',
-  templateUrl: 'comments-modal.component.html',
-  styleUrls: ['comments-modal.component.scss'],
+  templateUrl: './comments-modal.component.html',
+  styleUrls: ['./comments-modal.component.scss'],
 })
-export class CommentsModalComponent {
-  constructor() {}
+export class CommentsModalComponent implements OnInit {
+  @Input() commentType: string;
+  @Input() commentResourceUrl: string;
+
+  constructor(@Inject(MAT_DIALOG_DATA) public data: any) {}
+
+  ngOnInit(): void {
+    this.commentType = this.data.commentType;
+    this.commentResourceUrl = this.data.commentResourceUrl;
+  }
 }
diff --git a/src/app/common/modals/comments-modal/comments-modal.service.ts b/src/app/common/modals/comments-modal/comments-modal.service.ts
index e69de29bb2..d81a678160 100644
--- a/src/app/common/modals/comments-modal/comments-modal.service.ts
+++ b/src/app/common/modals/comments-modal/comments-modal.service.ts
@@ -0,0 +1,18 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {CommentsModalComponent} from './comments-modal.component';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class CommentsModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(commentResourceUrl: string, commentType: string) {
+    this.dialog.open(CommentsModalComponent, {
+      data: {commentResourceUrl, commentType},
+      width: '100%',
+      maxWidth: '800px',
+    });
+  }
+}
diff --git a/src/app/common/modals/modals.coffee b/src/app/common/modals/modals.coffee
index 16d2be1ec8..003a522629 100644
--- a/src/app/common/modals/modals.coffee
+++ b/src/app/common/modals/modals.coffee
@@ -1,5 +1,4 @@
 angular.module("doubtfire.common.modals", [
   'doubtfire.common.modals.csv-result-modal'
   'doubtfire.common.modals.confirmation-modal'
-  'doubtfire.common.modals.comments-modal'
 ])
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 9284745988..58dc8baa67 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -224,6 +224,7 @@ import {FTaskSheetViewComponent} from './units/states/tasks/viewer/directives/f-
 import {TasksViewerComponent} from './units/states/tasks/tasks-viewer/tasks-viewer.component';
 import {UnitCodeComponent} from './common/unit-code/unit-code.component';
 import {GradeService} from './common/services/grade.service';
+import {CommentsModalComponent} from './common/modals/comments-modal/comments-modal.component';
 
 @NgModule({
   // Components we declare
@@ -325,6 +326,7 @@ import {GradeService} from './common/services/grade.service';
     FUsersComponent,
     FTaskBadgeComponent,
     FUnitsComponent,
+    CommentsModalComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 868e381213..d58937e8ad 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -119,7 +119,6 @@ import 'build/src/app/units/states/analytics/analytics.js';
 import 'build/src/app/common/filters/filters.js';
 import 'build/src/app/common/content-editable/content-editable.js';
 import 'build/src/app/common/modals/confirmation-modal/confirmation-modal.js';
-import 'build/src/app/common/modals/comments-modal/comments-modal.js';
 import 'build/src/app/common/modals/csv-result-modal/csv-result-modal.js';
 import 'build/src/app/common/modals/modals.js';
 import 'build/src/app/common/grade-icon/grade-icon.js';
@@ -220,11 +219,12 @@ import {FUnitTaskListComponent} from './units/states/tasks/viewer/directives/f-u
 import {FTaskDetailsViewComponent} from './units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component';
 import {FTaskSheetViewComponent} from './units/states/tasks/viewer/directives/f-task-sheet-view/f-task-sheet-view.component';
 import {TasksViewerComponent} from './units/states/tasks/tasks-viewer/tasks-viewer.component';
-
 import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {MarkedPipe} from './common/pipes/marked.pipe';
 import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
+import {CommentsModalService} from './common/modals/comments-modal/comments-modal.service';
+
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
   'doubtfire.sessions',
@@ -306,6 +306,7 @@ DoubtfireAngularJSModule.factory(
   downgradeInjectable(EditProfileDialogService),
 );
 DoubtfireAngularJSModule.factory('CreateNewUnitModal', downgradeInjectable(CreateNewUnitModal));
+DoubtfireAngularJSModule.factory('CommentsModal', downgradeInjectable(CommentsModalService));
 
 // directive -> component
 DoubtfireAngularJSModule.directive(

From 4400a027d5388d2b14ae6e314d3fc973cd8012eb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 20 Jul 2024 20:56:57 +1000
Subject: [PATCH 113/776] refactor: remove old comments-modal files

---
 .../comments-modal/comments-modal.coffee      | 32 -------------------
 .../modals/comments-modal/comments-modal.scss | 15 ---------
 .../comments-modal/comments-modal.tpl.html    | 10 ------
 3 files changed, 57 deletions(-)
 delete mode 100644 src/app/common/modals/comments-modal/comments-modal.coffee
 delete mode 100644 src/app/common/modals/comments-modal/comments-modal.scss
 delete mode 100644 src/app/common/modals/comments-modal/comments-modal.tpl.html

diff --git a/src/app/common/modals/comments-modal/comments-modal.coffee b/src/app/common/modals/comments-modal/comments-modal.coffee
deleted file mode 100644
index 59874c47e1..0000000000
--- a/src/app/common/modals/comments-modal/comments-modal.coffee
+++ /dev/null
@@ -1,32 +0,0 @@
-angular.module("doubtfire.common.modals.comments-modal", [])
-#
-# Modal to contain an image used in user comments.
-#
-.factory("CommentsModal", ($modal) ->
-  CommentsModal = {}
-  CommentsModal.show = (commentResourceUrl, commentType) ->
-    $modal.open
-      templateUrl: 'common/modals/comments-modal/comments-modal.tpl.html'
-      controller: 'CommentsModalCtrl'
-      size: 'lg'
-      resolve:
-        commentResourceUrl: -> commentResourceUrl
-        commentType: -> commentType
-  CommentsModal
-)
-.controller("CommentsModalCtrl", ($scope, $modalInstance, $sce, commentResourceUrl, commentType, alertService, fileDownloaderService) ->
-  # $scope.commentResourceUrl = $sce.trustAsResourceUrl(commentResourceUrl)
-  $scope.commentType = commentType
-  $scope.close = ->
-    fileDownloaderService.releaseBlob($scope.rawResourceUrl)
-    $modalInstance.dismiss()
-
-  fileDownloaderService.downloadBlob(
-    commentResourceUrl,
-    (url, response) ->
-      $scope.rawResourceUrl = url
-      $scope.commentResourceUrl = $sce.trustAsResourceUrl(url)
-    (error) ->
-      alertService.error( "Error downloading comment: #{error}")
-  )
-)
diff --git a/src/app/common/modals/comments-modal/comments-modal.scss b/src/app/common/modals/comments-modal/comments-modal.scss
deleted file mode 100644
index 22ccacf4f8..0000000000
--- a/src/app/common/modals/comments-modal/comments-modal.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.modal-comment {
-  .image-comment {
-      width: 100%;
-      height: 100%;
-      align-content: center;
-      border-radius: 5px;
-      padding: 0;
-      border: none;
-  }
-  .pdf-comment {
-    width: 100%;
-    height: 80vh;
-    align-content: center;
-  }
-}
\ No newline at end of file
diff --git a/src/app/common/modals/comments-modal/comments-modal.tpl.html b/src/app/common/modals/comments-modal/comments-modal.tpl.html
deleted file mode 100644
index 59985945ff..0000000000
--- a/src/app/common/modals/comments-modal/comments-modal.tpl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="modal-comment">
-  <div class="modal-body">
-    <div ng-if="commentType == 'image'">
-      <img class="image-comment" ng-src="{{commentResourceUrl}}" />
-    </div>
-    <div ng-if="commentType == 'pdf'">
-      <iframe class="pdf-comment" ng-src="{{commentResourceUrl}}" type="application/pdf" />
-    </div>
-  </div>
-</div>

From 7edb445d7bc5f61daba1b47a3a36b633b551267e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 20 Jul 2024 21:25:33 +1000
Subject: [PATCH 114/776] fix: match comments-modals's original max width

---
 src/app/common/modals/comments-modal/comments-modal.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/modals/comments-modal/comments-modal.service.ts b/src/app/common/modals/comments-modal/comments-modal.service.ts
index d81a678160..6a69f220f5 100644
--- a/src/app/common/modals/comments-modal/comments-modal.service.ts
+++ b/src/app/common/modals/comments-modal/comments-modal.service.ts
@@ -12,7 +12,7 @@ export class CommentsModalService {
     this.dialog.open(CommentsModalComponent, {
       data: {commentResourceUrl, commentType},
       width: '100%',
-      maxWidth: '800px',
+      maxWidth: '900px',
     });
   }
 }

From 988a1bde2936b4d58615c782c382700674d31ef5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 22 Jul 2024 20:23:02 +1000
Subject: [PATCH 115/776] refactor: enforce type safety for data passed to
 comments-modal component

---
 .../comments-modal/comments-modal.component.html  |  4 ++--
 .../comments-modal/comments-modal.component.ts    | 12 +++++++++---
 .../comments-modal/comments-modal.service.ts      |  9 +++++----
 .../pdf-image-comment.component.ts                | 15 ++++++++-------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/app/common/modals/comments-modal/comments-modal.component.html b/src/app/common/modals/comments-modal/comments-modal.component.html
index 888da289d2..a242a07ceb 100644
--- a/src/app/common/modals/comments-modal/comments-modal.component.html
+++ b/src/app/common/modals/comments-modal/comments-modal.component.html
@@ -1,7 +1,7 @@
 <div class="modal-comment">
-  @if (commentType === 'image') {
+  @if (taskComment.commentType === 'image') {
     <img class="image-comment" [src]="commentResourceUrl" />
-  } @else if (commentType === 'pdf') {
+  } @else if (taskComment.commentType === 'pdf') {
     <iframe class="pdf-comment" [src]="commentResourceUrl | safe" type="application/pdf"></iframe>
   }
 </div>
diff --git a/src/app/common/modals/comments-modal/comments-modal.component.ts b/src/app/common/modals/comments-modal/comments-modal.component.ts
index 6fa5e57b01..221c7b2365 100644
--- a/src/app/common/modals/comments-modal/comments-modal.component.ts
+++ b/src/app/common/modals/comments-modal/comments-modal.component.ts
@@ -1,5 +1,11 @@
 import {Component, Input, Inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {TaskComment} from 'src/app/api/models/doubtfire-model';
+
+export interface CommentsModalData {
+  comment: TaskComment;
+  commentResourceUrl: string;
+}
 
 @Component({
   selector: 'comments-modal',
@@ -7,13 +13,13 @@ import {MAT_DIALOG_DATA} from '@angular/material/dialog';
   styleUrls: ['./comments-modal.component.scss'],
 })
 export class CommentsModalComponent implements OnInit {
-  @Input() commentType: string;
+  @Input() taskComment: TaskComment;
   @Input() commentResourceUrl: string;
 
-  constructor(@Inject(MAT_DIALOG_DATA) public data: any) {}
+  constructor(@Inject(MAT_DIALOG_DATA) public data: CommentsModalData) {}
 
   ngOnInit(): void {
-    this.commentType = this.data.commentType;
+    this.taskComment = this.data.comment;
     this.commentResourceUrl = this.data.commentResourceUrl;
   }
 }
diff --git a/src/app/common/modals/comments-modal/comments-modal.service.ts b/src/app/common/modals/comments-modal/comments-modal.service.ts
index 6a69f220f5..4540264f69 100644
--- a/src/app/common/modals/comments-modal/comments-modal.service.ts
+++ b/src/app/common/modals/comments-modal/comments-modal.service.ts
@@ -1,6 +1,7 @@
 import {Injectable} from '@angular/core';
 import {MatDialog} from '@angular/material/dialog';
-import {CommentsModalComponent} from './comments-modal.component';
+import {TaskComment} from 'src/app/api/models/doubtfire-model';
+import {CommentsModalComponent, CommentsModalData} from './comments-modal.component';
 
 @Injectable({
   providedIn: 'root',
@@ -8,9 +9,9 @@ import {CommentsModalComponent} from './comments-modal.component';
 export class CommentsModalService {
   constructor(public dialog: MatDialog) {}
 
-  public show(commentResourceUrl: string, commentType: string) {
-    this.dialog.open(CommentsModalComponent, {
-      data: {commentResourceUrl, commentType},
+  public show(commentResourceUrl: string, comment: TaskComment) {
+    this.dialog.open<CommentsModalComponent, CommentsModalData>(CommentsModalComponent, {
+      data: {commentResourceUrl, comment},
       width: '100%',
       maxWidth: '900px',
     });
diff --git a/src/app/tasks/task-comments-viewer/pdf-image-comment/pdf-image-comment.component.ts b/src/app/tasks/task-comments-viewer/pdf-image-comment/pdf-image-comment.component.ts
index c2b6e6761e..37631facda 100644
--- a/src/app/tasks/task-comments-viewer/pdf-image-comment/pdf-image-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/pdf-image-comment/pdf-image-comment.component.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit, Input, Inject, OnDestroy } from '@angular/core';
-import { commentsModal } from 'src/app/ajs-upgraded-providers';
-import { Project, TaskComment, Task } from 'src/app/api/models/doubtfire-model';
-import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
-import { AlertService } from 'src/app/common/services/alert.service';
+import {Component, OnInit, Input, Inject, OnDestroy} from '@angular/core';
+import {commentsModal} from 'src/app/ajs-upgraded-providers';
+import {Project, TaskComment, Task} from 'src/app/api/models/doubtfire-model';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import {CommentsModalService} from 'src/app/common/modals/comments-modal/comments-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
   selector: 'pdf-image-comment',
@@ -18,7 +19,7 @@ export class PdfImageCommentComponent implements OnInit, OnDestroy {
 
   constructor(
     private alerts: AlertService,
-    @Inject(commentsModal) private commentsModalRef: any,
+    @Inject(commentsModal) private commentsModalRef: CommentsModalService,
     private fileDownloaderService: FileDownloaderService,
   ) {}
 
@@ -48,7 +49,7 @@ export class PdfImageCommentComponent implements OnInit, OnDestroy {
 
   public openCommentsModal() {
     if (this.resourceUrl) {
-      this.commentsModalRef.show(this.resourceUrl, this.comment.commentType);
+      this.commentsModalRef.show(this.resourceUrl, this.comment);
     } else {
       this.downloadCommentResource(this.openCommentsModal.bind(this));
     }

From b67106589b71660bdfe01151deb68d3092b9091f Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 24 Jul 2024 21:57:49 +1000
Subject: [PATCH 116/776] fix: ensure groups can be locked

---
 src/app/groups/group-selector/group-selector.coffee | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/groups/group-selector/group-selector.coffee b/src/app/groups/group-selector/group-selector.coffee
index 0c79db4f74..f6e0a56745 100644
--- a/src/app/groups/group-selector/group-selector.coffee
+++ b/src/app/groups/group-selector/group-selector.coffee
@@ -195,11 +195,12 @@ angular.module('doubtfire.groups.group-selector', [])
     # Toggle lockable group
     $scope.toggleLocked = (group) ->
       group.locked = !group.locked
-      $scope.unit.updateGroup(group,
-        (success) ->
+      newGroupService.update(group).subscribe({
+        next: (success) ->
           group.locked = success.locked
           alertService.success( "Group updated", 2000)
-      )
+        error: () -> alertService.error( "Failed to lock group. #{message}", 6000)
+      })
 
     # Watch selected group set changes
     listeners.push $scope.$on 'UnitGroupSetEditor/SelectedGroupSetChanged', (evt, args) ->

From e00479271fbd70e6ac75bbee63fac559a94c5490 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 24 Jul 2024 21:58:31 +1000
Subject: [PATCH 117/776] chore(release): 8.0.21

---
 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 a5fe9f894e..70004dd00f 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.
 
+### [8.0.21](https://github.com/macite/doubtfire-deploy/compare/v8.0.20...v8.0.21) (2024-07-24)
+
+
+### Bug Fixes
+
+* ensure groups can be locked ([b671065](https://github.com/macite/doubtfire-deploy/commit/b67106589b71660bdfe01151deb68d3092b9091f))
+
 ### [8.0.20](https://github.com/macite/doubtfire-deploy/compare/v8.0.19...v8.0.20) (2024-07-15)
 
 
diff --git a/package-lock.json b/package-lock.json
index d176f2345c..86fdc3b04b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.20",
+  "version": "8.0.21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.20",
+      "version": "8.0.21",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 762969722e..265a5a30bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.20",
+  "version": "8.0.21",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From dca03a41f502947136e301e51242570169826dd9 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 26 Jul 2024 15:01:21 +1000
Subject: [PATCH 118/776] fix: correct duplicate shortcut registration

---
 src/app/units/states/tasks/inbox/inbox.component.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/app/units/states/tasks/inbox/inbox.component.ts b/src/app/units/states/tasks/inbox/inbox.component.ts
index 41716a3e40..568df3744d 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.ts
+++ b/src/app/units/states/tasks/inbox/inbox.component.ts
@@ -25,7 +25,7 @@ import {UserService} from 'src/app/api/services/user.service';
   templateUrl: './inbox.component.html',
   styleUrls: ['./inbox.component.scss'],
 })
-export class InboxComponent implements OnInit, AfterViewInit {
+export class InboxComponent implements OnInit {
   @Input() unit: Unit;
   @Input() unitRole: UnitRole;
   @Input() taskData: {selectedTask: Task; any};
@@ -67,11 +67,11 @@ export class InboxComponent implements OnInit, AfterViewInit {
       this.taskSelected = task != null;
     });
   }
-  ngAfterViewInit(): void {
-    console.log('ngAfterViewInit');
-    const markers = ['Admin', 'Convenor', 'Tutor', 'Student'];
 
-    if (markers.includes(this.userService.currentUser?.role)) {
+  ngOnInit(): void {
+    const registeredHotkeys = this.hotkeys.getHotkeys().map((hotkey) => hotkey.keys);
+
+    if (!registeredHotkeys.includes('shift.?')) {
       this.hotkeys.registerHelpModal(() => {
         const ref = this.dialog.open(HotkeysHelpComponent, {
           // width: '250px',
@@ -80,9 +80,7 @@ export class InboxComponent implements OnInit, AfterViewInit {
         ref.componentInstance.dismiss.subscribe(() => ref.close());
       });
     }
-  }
 
-  ngOnInit(): void {
     // this.hotkeys
     //   .addShortcut({
     //     keys: 'control.c',

From 00d10e1328fff75140525c7a80d3d8be2e39b049 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 26 Jul 2024 17:20:34 +1000
Subject: [PATCH 119/776] chore(release): 8.0.22

---
 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 70004dd00f..e6f408ac0b 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.
 
+### [8.0.22](https://github.com/macite/doubtfire-deploy/compare/v8.0.21...v8.0.22) (2024-07-26)
+
+
+### Bug Fixes
+
+* correct duplicate shortcut registration ([dca03a4](https://github.com/macite/doubtfire-deploy/commit/dca03a41f502947136e301e51242570169826dd9))
+
 ### [8.0.21](https://github.com/macite/doubtfire-deploy/compare/v8.0.20...v8.0.21) (2024-07-24)
 
 
diff --git a/package-lock.json b/package-lock.json
index 86fdc3b04b..610086b7e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.21",
+  "version": "8.0.22",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.21",
+      "version": "8.0.22",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 265a5a30bd..5959c70f0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.21",
+  "version": "8.0.22",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 8ff67d2f8e483813bc3af0dc2429b58fe16f8f2b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:09:49 +1000
Subject: [PATCH 120/776] fix: allow oversized images to be scrollable

---
 src/app/common/modals/comments-modal/comments-modal.service.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/common/modals/comments-modal/comments-modal.service.ts b/src/app/common/modals/comments-modal/comments-modal.service.ts
index 4540264f69..1e5c0c832d 100644
--- a/src/app/common/modals/comments-modal/comments-modal.service.ts
+++ b/src/app/common/modals/comments-modal/comments-modal.service.ts
@@ -14,6 +14,7 @@ export class CommentsModalService {
       data: {commentResourceUrl, comment},
       width: '100%',
       maxWidth: '900px',
+      panelClass: 'overflow-y-scroll',
     });
   }
 }

From 6efdaef1c457d66b7b96c890359322e8eeaad959 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:25:53 +1000
Subject: [PATCH 121/776] refactor: replace sass with tailwind css

---
 .../comments-modal.component.html               | 10 +++++++---
 .../comments-modal.component.scss               | 17 -----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/app/common/modals/comments-modal/comments-modal.component.html b/src/app/common/modals/comments-modal/comments-modal.component.html
index a242a07ceb..1831477b8d 100644
--- a/src/app/common/modals/comments-modal/comments-modal.component.html
+++ b/src/app/common/modals/comments-modal/comments-modal.component.html
@@ -1,7 +1,11 @@
-<div class="modal-comment">
+<div class="p-6">
   @if (taskComment.commentType === 'image') {
-    <img class="image-comment" [src]="commentResourceUrl" />
+    <img class="w-full h-full p-0 rounded border-none" [src]="commentResourceUrl" />
   } @else if (taskComment.commentType === 'pdf') {
-    <iframe class="pdf-comment" [src]="commentResourceUrl | safe" type="application/pdf"></iframe>
+    <iframe
+      class="w-full h-[80vh]"
+      [src]="commentResourceUrl | safe"
+      type="application/pdf"
+    ></iframe>
   }
 </div>
diff --git a/src/app/common/modals/comments-modal/comments-modal.component.scss b/src/app/common/modals/comments-modal/comments-modal.component.scss
index 76d21e070f..e69de29bb2 100644
--- a/src/app/common/modals/comments-modal/comments-modal.component.scss
+++ b/src/app/common/modals/comments-modal/comments-modal.component.scss
@@ -1,17 +0,0 @@
-.modal-comment {
-  padding: 15px;
-
-  .image-comment {
-    width: 100%;
-    height: 100%;
-    align-content: center;
-    border-radius: 5px;
-    padding: 0;
-    border: none;
-  }
-  .pdf-comment {
-    width: 100%;
-    height: 80vh;
-    align-content: center;
-  }
-}

From d40ba25c4a57a36f1c6d6ff39a381ff889181e28 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 2 Aug 2024 10:47:01 +1000
Subject: [PATCH 122/776] refactor: only reveal scrollbar on oversized images

---
 src/app/common/modals/comments-modal/comments-modal.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/modals/comments-modal/comments-modal.service.ts b/src/app/common/modals/comments-modal/comments-modal.service.ts
index 1e5c0c832d..353c9c6c37 100644
--- a/src/app/common/modals/comments-modal/comments-modal.service.ts
+++ b/src/app/common/modals/comments-modal/comments-modal.service.ts
@@ -14,7 +14,7 @@ export class CommentsModalService {
       data: {commentResourceUrl, comment},
       width: '100%',
       maxWidth: '900px',
-      panelClass: 'overflow-y-scroll',
+      panelClass: 'overflow-y-auto',
     });
   }
 }

From 16ac9c8bc488607025ee95dbb4b41134a5346b00 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 2 Aug 2024 16:45:04 +1000
Subject: [PATCH 123/776] feat: allow pdf download and switch to native viewer

---
 .../file-downloader.service.ts                |  34 ++++--
 .../pdf-viewer/pdf-viewer.component.html      | 101 +++++++++++-------
 .../pdf-viewer/pdf-viewer.component.scss      |  24 +++++
 .../common/pdf-viewer/pdf-viewer.component.ts |  23 ++--
 4 files changed, 125 insertions(+), 57 deletions(-)

diff --git a/src/app/common/file-downloader/file-downloader.service.ts b/src/app/common/file-downloader/file-downloader.service.ts
index 681e4bde8e..57b8fff783 100644
--- a/src/app/common/file-downloader/file-downloader.service.ts
+++ b/src/app/common/file-downloader/file-downloader.service.ts
@@ -125,26 +125,40 @@ export class FileDownloaderService {
     window.URL.revokeObjectURL(url);
   }
 
+  /**
+   * Download or save a blob to a file. This will trigger the user to "download"
+   * the blob, with the suggested filename.
+   *
+   * @param blobUrl the url of the blob to download/save to file
+   * @param filename the name of the file
+   */
+  public downloadBlobToFile(blobUrl: string, filename: string): void {
+    const downloadLink = document.createElement('a');
+    downloadLink.href = blobUrl;
+    downloadLink.target = '_blank';
+    downloadLink.setAttribute('download', filename);
+    document.body.appendChild(downloadLink);
+
+    downloadLink.click();
+    downloadLink.parentNode.removeChild(downloadLink);
+  }
+
   public downloadFile(url: string, defaultFilename: string) {
     this.downloadBlob(
       url,
       (resourceUrl: string, response: HttpResponse<Blob>) => {
-        const downloadLink = document.createElement('a');
-        downloadLink.href = resourceUrl;
-        downloadLink.target = '_blank';
         const filenameRegex = /filename[^;=\n]*=((['']).*?\2|[^;\n]*)/;
+
         const matches = filenameRegex.exec(response.headers.get('Content-Disposition'));
+        let filename: string;
+
         if (matches != null && matches[1]) {
-          const filename = matches[1].replace(/['']/g, '');
-          downloadLink.setAttribute('download', filename);
+          filename = matches[1].replace(/['']/g, '');
         } else {
-          downloadLink.setAttribute('download', defaultFilename);
+          filename = defaultFilename;
         }
 
-        document.body.appendChild(downloadLink);
-
-        downloadLink.click();
-        downloadLink.parentNode.removeChild(downloadLink);
+        this.downloadBlobToFile(resourceUrl, filename);
       },
       (error) => {
         this.alerts.error(`Error downloading file - ${error}`);
diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.html b/src/app/common/pdf-viewer/pdf-viewer.component.html
index 87dc97c996..b060046125 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.html
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.html
@@ -1,46 +1,67 @@
 <div id="pdfContainer">
-  <div id="pdfActions" [hidden]="!loaded">
-    <form #loginForm="ngForm">
-      <mat-form-field floatLabel="never" appearance="outline" class="pdf-form-field" ngSubmit>
-        <mat-icon matPrefix>search</mat-icon>
-        <input
-          matInput
-          type="text"
-          placeholder="Search PDF"
-          [(ngModel)]="pdfSearchString"
-          (ngModelChange)="searchPdf(pdfSearchString)"
-          name="pdfSearchString"
-        />
+  <div id="actionBar">
+    <div id="pdfViewActions" [hidden]="!pdfBlobUrl">
+      <button mat-icon-button aria-label="Switch viewer" (click)="toggleNativePdfViewer()">
+        @if (useNativePdfViewer) {
+          <mat-icon>toggle_on</mat-icon>
+        } @else {
+          <mat-icon>toggle_off</mat-icon>
+        }
+      </button>
+      <button mat-icon-button aria-label="Download pdf" (click)="downloadPdf()">
+        <mat-icon>download</mat-icon>
+      </button>
+    </div>
+    <div id="pdfActions" [hidden]="!loaded || useNativePdfViewer">
+      <form #loginForm="ngForm">
+        <mat-form-field floatLabel="never" appearance="outline" class="pdf-form-field" ngSubmit>
+          <mat-icon matPrefix>search</mat-icon>
+          <input
+            matInput
+            type="text"
+            placeholder="Search PDF"
+            [(ngModel)]="pdfSearchString"
+            (ngModelChange)="searchPdf(pdfSearchString)"
+            name="pdfSearchString"
+          />
 
-        <button
-          matSuffix
-          mat-icon-button
-          type="button"
-          (click)="zoomOut()"
-          aria-label="Zoom in PDF button"
-        >
-          <mat-icon>zoom_out</mat-icon>
-        </button>
-        <button
-          matSuffix
-          mat-icon-button
-          type="button"
-          (click)="zoomIn()"
-          aria-label="Zoom in PDF button"
-        >
-          <mat-icon>zoom_in</mat-icon>
-        </button>
-      </mat-form-field>
-    </form>
+          <button
+            matSuffix
+            mat-icon-button
+            type="button"
+            (click)="zoomOut()"
+            aria-label="Zoom in PDF button"
+          >
+            <mat-icon>zoom_out</mat-icon>
+          </button>
+          <button
+            matSuffix
+            mat-icon-button
+            type="button"
+            (click)="zoomIn()"
+            aria-label="Zoom in PDF button"
+          >
+            <mat-icon>zoom_in</mat-icon>
+          </button>
+        </mat-form-field>
+      </form>
+    </div>
   </div>
+
   @if (pdfBlobUrl) {
-    <pdf-viewer
-      [zoom]="zoomValue"
-      [src]="pdfBlobUrl"
-      [render-text]="true"
-      [original-size]="false"
-      (after-load-complete)="onLoaded()"
-      (page-rendered)="loaded = true"
-    ></pdf-viewer>
+    @if (useNativePdfViewer) {
+      <object [data]="pdfBlobUrl | safe" *ngIf="pdfBlobUrl"></object>
+    } @else {
+      <pdf-viewer
+        [zoom]="zoomValue"
+        [src]="pdfBlobUrl"
+        [render-text]="true"
+        [original-size]="false"
+        (after-load-complete)="onLoaded()"
+        (page-rendered)="loaded = true"
+      ></pdf-viewer>
+    }
+  } @else {
+    <mat-spinner strokeWidth="2" diameter="100" color="accent"></mat-spinner>
   }
 </div>
diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.scss b/src/app/common/pdf-viewer/pdf-viewer.component.scss
index 6942d03e8b..da9fc20f12 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.scss
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.scss
@@ -12,6 +12,30 @@
   align-items: center;
 }
 
+#actionBar {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+}
+
+object {
+  height: 100%;
+  min-width: 100%;
+  width: 100%;
+}
+
+#pdfViewActions {
+  padding-top: 1rem;
+  padding-left: 1rem;
+  margin-right: auto;
+
+  button {
+    margin-bottom: 28px;
+  }
+}
+
 #pdfActions {
   padding-top: 1rem;
   padding-right: 1rem;
diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.ts b/src/app/common/pdf-viewer/pdf-viewer.component.ts
index 5cd893b5a9..8f21f8e47c 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.ts
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.ts
@@ -7,7 +7,6 @@ import {
   SimpleChanges,
   OnChanges,
   ViewChild,
-  OnInit,
   AfterViewInit,
 } from '@angular/core';
 import {PdfViewerComponent} from 'ng2-pdf-viewer';
@@ -22,6 +21,8 @@ import {AlertService} from '../services/alert.service';
 export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit {
   private _pdfUrl: string;
   public pdfBlobUrl: string;
+  public useNativePdfViewer = false;
+
   @Input() pdfUrl: string;
   @ViewChild(PdfViewerComponent) private pdfComponent: PdfViewerComponent;
   pdfSearchString: string;
@@ -41,8 +42,7 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
   }
 
   ngAfterViewInit(): void {
-    console.log("pdfUrl");
-    console.log(this.pdfUrl);
+    this.useNativePdfViewer = localStorage.getItem('useNativePdfViewer') === 'true';
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -75,24 +75,33 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
     });
   }
 
-  zoomIn() {
+  public zoomIn() {
     if (this.zoomValue < 2.5) {
       this.zoomValue += 0.1;
     }
   }
-  zoomOut() {
+  public zoomOut() {
     if (this.zoomValue > 0.5) {
       this.zoomValue -= 0.1;
     }
   }
 
+  public downloadPdf() {
+    this.fileDownloader.downloadBlobToFile(this.pdfBlobUrl, 'displayed-pdf.pdf');
+  }
+
+  public toggleNativePdfViewer() {
+    this.useNativePdfViewer = !this.useNativePdfViewer;
+    localStorage.setItem('useNativePdfViewer', this.useNativePdfViewer.toString());
+  }
+
   private downloadBlob(downloadUrl: string): void {
     this.fileDownloader.downloadBlob(
       downloadUrl,
-      (url: string, response: HttpResponse<Blob>) => {
+      (url: string, _response: HttpResponse<Blob>) => {
         this.pdfBlobUrl = url;
       },
-      (error: any) => {
+      (error: unknown) => {
         this.alerts.error(`Error downloading PDF. ${error}`, 6000);
       },
     );

From c04e9fe3a824e316a632b3f7b53b08887e57c831 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 2 Aug 2024 16:54:30 +1000
Subject: [PATCH 124/776] fix: ensure overseer menu only shows when active for
 task

---
 .../directives/task-dashboard/task-dashboard.coffee        | 2 +-
 .../directives/task-dashboard/task-dashboard.tpl.html      | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
index 62292ad919..b36e94e005 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
@@ -10,7 +10,7 @@ angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard',
     showFooter: '@?'
     showSubmission: '@?'
   controller: ($scope, $stateParams, listenerService, newTaskService, DoubtfireConstants, TaskAssessmentModal, fileDownloaderService) ->
-    $scope.overseerEnabled = DoubtfireConstants.IsOverseerEnabled
+    # $scope.overseerEnabled = DoubtfireConstants.IsOverseerEnabled
 
     $scope.overseerEnabled = () ->
       DoubtfireConstants.IsOverseerEnabled.value && $scope.task?.overseerEnabled
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index 0962ddd82a..84da532b5b 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -3,11 +3,10 @@
     <div class="panel-title">
       <span ng-hide="tutor || showFooter">{{task.definition.name}}</span>
       <span ng-show="tutor || showFooter" style="display: inline-flex">{{task.definition.name}} </span>
-
       <div
         class="dropdown pull-right"
         dropdown
-        ng-show="task.hasPdf || task.definition.hasTaskSheet || overseerEnabled.value"
+        ng-show="task.hasPdf || task.definition.hasTaskSheet || overseerEnabled()"
       >
         <button class="btn btn-default dropdown-toggle" dropdown-toggle>
           <i class="fa fa-search"></i>
@@ -30,8 +29,8 @@
           <li ng-show="task.hasPdf">
             <a ng-click="downloadSubmittedFiles()">Download Submitted Files</a>
           </li>
-          <li ng-if="overseerEnabled">
-            <a ng-click="showSubmissionHistoryModal()">View Submission History</a>
+          <li ng-if="overseerEnabled()">
+            <a ng-click="showSubmissionHistoryModal()">Execution History</a>
           </li>
         </ul>
       </div>

From 2965b680772b138656bf58ff8bd697e0d68e5a12 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 2 Aug 2024 16:54:41 +1000
Subject: [PATCH 125/776] chore(release): 8.0.23

---
 CHANGELOG.md      | 12 ++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6f408ac0b..1839482f34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 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.
 
+### [8.0.23](https://github.com/macite/doubtfire-deploy/compare/v8.0.22...v8.0.23) (2024-08-02)
+
+
+### Features
+
+* allow pdf download and switch to native viewer ([16ac9c8](https://github.com/macite/doubtfire-deploy/commit/16ac9c8bc488607025ee95dbb4b41134a5346b00))
+
+
+### Bug Fixes
+
+* ensure overseer menu only shows when active for task ([c04e9fe](https://github.com/macite/doubtfire-deploy/commit/c04e9fe3a824e316a632b3f7b53b08887e57c831))
+
 ### [8.0.22](https://github.com/macite/doubtfire-deploy/compare/v8.0.21...v8.0.22) (2024-07-26)
 
 
diff --git a/package-lock.json b/package-lock.json
index 610086b7e2..391ed15dac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.22",
+  "version": "8.0.23",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.22",
+      "version": "8.0.23",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 5959c70f0e..e90b3ba27c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.22",
+  "version": "8.0.23",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From bb78f23bfdd99521f9907697e1763e2f576cd0a4 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 8 Aug 2024 15:05:58 +1000
Subject: [PATCH 126/776] chore: switch to port 4200 for api with angular proxy

---
 docker-compose.yml                 | 6 +++---
 package.json                       | 2 +-
 proxy.conf.json                    | 6 ++++++
 src/app/config/constants/apiURL.ts | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 proxy.conf.json

diff --git a/docker-compose.yml b/docker-compose.yml
index b97ff4e52c..9019dbcc4b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       RAILS_ENV: 'development'
 
       DF_STUDENT_WORK_DIR: /student-work
-      DF_INSTITUTION_HOST: http://localhost:3000
+      DF_INSTITUTION_HOST: http://localhost:4200
       DF_INSTITUTION_PRODUCT_NAME: OnTrack
 
       DF_SECRET_KEY_BASE: test-secret-key-test-secret-key!
@@ -24,8 +24,8 @@ services:
       # Authentication method - can set to AAF or ldap
       DF_AUTH_METHOD: database
       DF_AAF_ISSUER_URL: https://rapid.test.aaf.edu.au
-      DF_AAF_AUDIENCE_URL: http://localhost:3000
-      DF_AAF_CALLBACK_URL: http://localhost:3000/api/auth/jwt
+      DF_AAF_AUDIENCE_URL: http://localhost:4200
+      DF_AAF_CALLBACK_URL: http://localhost:4200/api/auth/jwt
       DF_AAF_IDENTITY_PROVIDER_URL: https://signon-uat.deakin.edu.au/idp/shibboleth
       DF_AAF_UNIQUE_URL: https://rapid.test.aaf.edu.au/jwt/authnrequest/research/Ag4EJJhjf0zXHqlKvKZEbg
       DF_AAF_AUTH_SIGNOUT_URL: https://sync-uat.deakin.edu.au/auth/logout
diff --git a/package.json b/package.json
index e90b3ba27c..691c8a62fb 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "build:angular17": "ng build",
     "lint:fix": "ng lint --fix",
     "lint": "ng lint",
-    "serve:angular17": "export NODE_OPTIONS=--max_old_space_size=4096 && ng serve --configuration $NODE_ENV",
+    "serve:angular17": "export NODE_OPTIONS=--max_old_space_size=4096 && ng serve --configuration $NODE_ENV --proxy-config proxy.conf.json",
     "start": "npm-run-all -l -s build:angular1 -p watch:angular1 serve:angular17",
     "watch:angular1": "grunt delta",
     "deploy:build2api": "ng build --delete-output-path=true --optimization=true --configuration production --output-path dist",
diff --git a/proxy.conf.json b/proxy.conf.json
new file mode 100644
index 0000000000..63dd627501
--- /dev/null
+++ b/proxy.conf.json
@@ -0,0 +1,6 @@
+{
+  "/api": {
+    "target": "http://localhost:3000",
+    "secure": false
+  }
+}
diff --git a/src/app/config/constants/apiURL.ts b/src/app/config/constants/apiURL.ts
index 737aad40bd..a4d39f05f2 100644
--- a/src/app/config/constants/apiURL.ts
+++ b/src/app/config/constants/apiURL.ts
@@ -1,4 +1,4 @@
 let API_URL: string;
 
-API_URL = `${window.location.protocol}//${window.location.hostname}:3000/api`;
+API_URL = `${window.location.protocol}//${window.location.hostname}:4200/api`;
 export default API_URL;

From c8fc702bde6f1c448fc585042e5265625552bae8 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 8 Aug 2024 20:11:39 +1000
Subject: [PATCH 127/776] fix: remove saved scorm token and always get

---
 src/app/api/models/user/user.ts                    |  1 -
 src/app/api/services/authentication.service.ts     | 14 ++------------
 .../common/scorm-player/scorm-player.component.ts  | 11 +++--------
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/app/api/models/user/user.ts b/src/app/api/models/user/user.ts
index 552066cfd1..10357a1898 100644
--- a/src/app/api/models/user/user.ts
+++ b/src/app/api/models/user/user.ts
@@ -22,7 +22,6 @@ export class User extends Entity {
   receiveFeedbackNotifications: boolean;
   hasRunFirstTimeSetup: boolean;
   authenticationToken: string;
-  scormAuthenticationToken: string;
   pronouns: string | null;
   acceptedTiiEula: boolean;
 
diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index fe2b8d0b1c..a83637b236 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -192,20 +192,10 @@ export class AuthenticationService {
     }
   }
 
-  public getScormToken(): Observable<any> {
+  public getScormToken(): Observable<string> {
     return this.httpClient.get(this.AUTH_URL + '/scorm').pipe(
       map((response) => {
-        this.userService.currentUser.scormAuthenticationToken = response['scorm_auth_token'];
-        localStorage.setItem(this.USERNAME_KEY, JSON.stringify(this.userService.currentUser));
-
-        // Token expires after 2 hours
-        setTimeout(
-          () => {
-            this.userService.currentUser.scormAuthenticationToken = '';
-            localStorage.setItem(this.USERNAME_KEY, JSON.stringify(this.userService.currentUser));
-          },
-          1000 * 60 * 60 * 2,
-        );
+        return response['scorm_auth_token'];
       }),
     );
   }
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index a7de380195..f63a64acfc 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -49,15 +49,10 @@ export class ScormPlayerComponent implements OnInit {
   ngOnInit(): void {
     this.globalState.setView(ViewType.OTHER);
     this.globalState.hideHeader();
-
-    if (this.userService.currentUser.scormAuthenticationToken) {
-      this.setupScorm();
-    } else {
-      this.authService.getScormToken().subscribe(() => this.setupScorm());
-    }
+    this.authService.getScormToken().subscribe((value: string) => this.setupScorm(value));
   }
 
-  setupScorm(): void {
+  private setupScorm(token: string): void {
     this.scormAdapter.mode = this.mode;
     if (this.mode === 'normal') {
       this.scormAdapter.projectId = this.projectId;
@@ -78,7 +73,7 @@ export class ScormPlayerComponent implements OnInit {
     };
 
     this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(
-      `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.taskDefId}/${this.userService.currentUser.username}/${this.userService.currentUser.scormAuthenticationToken}/index.html`,
+      `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.taskDefId}/${this.userService.currentUser.username}/${token}/index.html`,
     );
   }
 

From 6ae42954162996acf145cef211981153381ff49d Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 9 Aug 2024 11:54:52 +1000
Subject: [PATCH 128/776] fix: ensure scorm frame loads when src is available

---
 src/app/common/scorm-player/scorm-player.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/scorm-player/scorm-player.component.html b/src/app/common/scorm-player/scorm-player.component.html
index 4855cf4d2b..990a9ef4a7 100644
--- a/src/app/common/scorm-player/scorm-player.component.html
+++ b/src/app/common/scorm-player/scorm-player.component.html
@@ -1 +1 @@
-<iframe [src]="iframeSrc"></iframe>
+<iframe [src]="iframeSrc" *ngIf="iframeSrc"></iframe>

From 7ffbea9f56c393d44571c18f30735e090701b554 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 9 Aug 2024 12:48:56 +1000
Subject: [PATCH 129/776] feat: add ability to preview scorm test

---
 src/app/api/models/scorm-player-context.ts    |  2 +-
 src/app/api/models/task-definition.ts         |  7 ++++
 src/app/api/models/task.ts                    |  8 ++++
 src/app/api/models/test-attempt.ts            |  9 ++++
 src/app/api/services/scorm-adapter.service.ts |  2 +-
 src/app/api/services/task-comment.service.ts  |  3 ++
 .../scorm-player/scorm-player.component.ts    | 41 ++++++++++++-------
 src/app/doubtfire.states.ts                   | 39 +++++++++++++++---
 .../task-scorm-card.component.ts              | 10 +----
 .../scorm-comment/scorm-comment.component.ts  |  5 +--
 .../task-definition-scorm.component.html      | 40 +++++++++---------
 .../task-definition-scorm.component.ts        |  9 +++-
 12 files changed, 120 insertions(+), 55 deletions(-)

diff --git a/src/app/api/models/scorm-player-context.ts b/src/app/api/models/scorm-player-context.ts
index 195bc3cd4c..e8eed9b12e 100644
--- a/src/app/api/models/scorm-player-context.ts
+++ b/src/app/api/models/scorm-player-context.ts
@@ -33,7 +33,7 @@ const CMIErrorCodes: DataModelError = {
 };
 
 export class ScormPlayerContext {
-  mode: 'browse' | 'normal' | 'review';
+  mode: 'browse' | 'normal' | 'review' | 'preview';
   state: DataModelState;
 
   private _errorCode: number;
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index ff679f140e..b848686768 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -165,6 +165,13 @@ export class TaskDefinition extends Entity {
     }`;
   }
 
+  /**
+   * Open the SCORM test in a new tab - using preview mode.
+   */
+  public previewScormTest(): void {
+    window.open(`#/task_def_id/${this.id}/preview-scorm`, '_blank');
+  }
+
   public get targetGradeText(): string {
     return Grade.GRADES[this.targetGrade];
   }
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 0643f99732..4283e3d25f 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -531,6 +531,14 @@ export class Task extends Entity {
     return false;
   }
 
+  /**
+   * Launch the SCORM player for this task in a new window.
+   */
+  public launchScormPlayer(): void {
+    const url = `#/projects/${this.project.id}/task_def_id/${this.taskDefId}/scorm-player/normal`;
+    window.open(url, '_blank');
+  }
+
   public get isReadyForUpload(): boolean {
     return !this.scormEnabled || this.definition.scormBypassTest || this.scormPassed;
   }
diff --git a/src/app/api/models/test-attempt.ts b/src/app/api/models/test-attempt.ts
index 646b9ed64f..4497028a75 100644
--- a/src/app/api/models/test-attempt.ts
+++ b/src/app/api/models/test-attempt.ts
@@ -16,4 +16,13 @@ export class TestAttempt extends Entity {
     super();
     this.task = task;
   }
+
+  /**
+   * Open a test attempt window in review mode
+   */
+  public review() {
+    const url = `#/projects/${this.task.project.id}/task_def_id/${this.task.taskDefId}/scorm-player/review/${this.id}`;
+
+    window.open(url, '_blank');
+  }
 }
diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index 702fc72f40..0f1af9889c 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -25,7 +25,7 @@ export class ScormAdapterService {
     this.context.taskDefId = taskDefId;
   }
 
-  set mode(mode: 'browse' | 'normal' | 'review') {
+  set mode(mode: 'browse' | 'normal' | 'review' | 'preview') {
     this.context.mode = mode;
   }
 
diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index a33389efc3..4f178ce771 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -101,6 +101,9 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
             data[key].id,
             testAttemptService,
             data[key],
+            {
+              constructorParams: comment.task,
+            },
           );
           return testAttempt;
         },
diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index f63a64acfc..d20b76f00f 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -12,7 +12,16 @@ import {GlobalStateService, ViewType} from 'src/app/projects/states/index/global
 
 declare global {
   interface Window {
-    API_1484_11: any;
+    API_1484_11: {
+      Initialize: () => void;
+      Terminate: () => void;
+      GetValue: (element: string) => string;
+      SetValue: (element: string, value: string) => void;
+      Commit: () => void;
+      GetLastError: () => string;
+      GetErrorString: (errorCode: string) => string;
+      GetDiagnostic: (errorCode: string) => string;
+    };
   }
 }
 
@@ -31,7 +40,7 @@ export class ScormPlayerComponent implements OnInit {
   taskDefId: number;
 
   @Input()
-  mode: 'browse' | 'normal' | 'review';
+  mode: 'browse' | 'normal' | 'review' | 'preview';
 
   @Input()
   testAttemptId: number;
@@ -61,16 +70,20 @@ export class ScormPlayerComponent implements OnInit {
       this.scormAdapter.testAttemptId = this.testAttemptId;
     }
 
-    window.API_1484_11 = {
-      Initialize: () => this.scormAdapter.Initialize(),
-      Terminate: () => this.scormAdapter.Terminate(),
-      GetValue: (element: string) => this.scormAdapter.GetValue(element),
-      SetValue: (element: string, value: string) => this.scormAdapter.SetValue(element, value),
-      Commit: () => this.scormAdapter.Commit(),
-      GetLastError: () => this.scormAdapter.GetLastError(),
-      GetErrorString: (errorCode: string) => this.scormAdapter.GetErrorString(errorCode),
-      GetDiagnostic: (errorCode: string) => this.scormAdapter.GetDiagnostic(errorCode),
-    };
+    if (this.mode !== 'preview') {
+      window.API_1484_11 = {
+        Initialize: () => this.scormAdapter.Initialize(),
+        Terminate: () => this.scormAdapter.Terminate(),
+        GetValue: (element: string) => this.scormAdapter.GetValue(element),
+        SetValue: (element: string, value: string) => this.scormAdapter.SetValue(element, value),
+        Commit: () => this.scormAdapter.Commit(),
+        GetLastError: () => this.scormAdapter.GetLastError(),
+        GetErrorString: (errorCode: string) => this.scormAdapter.GetErrorString(errorCode),
+        GetDiagnostic: (errorCode: string) => this.scormAdapter.GetDiagnostic(errorCode),
+      };
+    } else {
+      window.API_1484_11 = undefined;
+    }
 
     this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(
       `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.taskDefId}/${this.userService.currentUser.username}/${token}/index.html`,
@@ -78,7 +91,7 @@ export class ScormPlayerComponent implements OnInit {
   }
 
   @HostListener('window:beforeunload', ['$event'])
-  beforeUnload($event: any): void {
+  beforeUnload(_event: Event): void {
     if (this.scormAdapter.state == 'Initialized') {
       // console.log('SCORM player closing during an initialized session, commiting DataModel');
       this.scormAdapter.Commit();
@@ -86,7 +99,7 @@ export class ScormPlayerComponent implements OnInit {
   }
 
   @HostListener('window:unload', ['$event'])
-  onUnload($event: any): void {
+  onUnload(_event: Event): void {
     this.scormAdapter.destroy();
   }
 }
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index ce4dd84210..7f95af1f04 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -299,10 +299,10 @@ const ScormPlayerNormalState: NgHybridStateDeclaration = {
   name: 'scorm-player-normal',
   url: '/projects/:project_id/task_def_id/:task_definition_id/scorm-player/normal',
   resolve: {
-    projectId: function ($stateParams) {
+    projectId: function ($stateParams: {project_id: number}) {
       return $stateParams.project_id;
     },
-    taskDefId: function ($stateParams) {
+    taskDefId: function ($stateParams: {task_definition_id: number}) {
       return $stateParams.task_definition_id;
     },
     mode: function () {
@@ -320,10 +320,16 @@ const ScormPlayerNormalState: NgHybridStateDeclaration = {
   },
 };
 
-const ScormPlayerReviewState: NgHybridStateDeclaration = {
-  name: 'scorm-player-review',
-  url: '/task_def_id/:task_definition_id/scorm-player/review/:test_attempt_id',
+/**
+ * Define the SCORM Player state.
+ */
+const ScormPlayerStudentReviewState: NgHybridStateDeclaration = {
+  name: 'scorm-player-student-review',
+  url: '/projects/:project_id/task_def_id/:task_definition_id/scorm-player/review/:test_attempt_id',
   resolve: {
+    projectId: function ($stateParams) {
+      return $stateParams.project_id;
+    },
     taskDefId: function ($stateParams) {
       return $stateParams.task_definition_id;
     },
@@ -345,6 +351,28 @@ const ScormPlayerReviewState: NgHybridStateDeclaration = {
   },
 };
 
+const ScormPlayerReviewState: NgHybridStateDeclaration = {
+  name: 'scorm-preview',
+  url: '/task_def_id/:task_definition_id/preview-scorm',
+  resolve: {
+    taskDefId: function ($stateParams) {
+      return $stateParams.task_definition_id;
+    },
+    mode: function () {
+      return 'preview';
+    },
+  },
+  views: {
+    main: {
+      component: ScormPlayerComponent,
+    },
+  },
+  data: {
+    pageTitle: 'Preview Scorm Test',
+    roleWhitelist: ['Tutor', 'Convenor', 'Admin'],
+  },
+};
+
 /**
  * Export the list of states we have created in angular
  */
@@ -362,4 +390,5 @@ export const doubtfireStates = [
   AdministerUnits,
   ScormPlayerNormalState,
   ScormPlayerReviewState,
+  ScormPlayerStudentReviewState,
 ];
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
index 9860d47741..377b89c2f4 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -44,17 +44,11 @@ export class TaskScormCardComponent implements OnChanges {
   }
 
   launchScormPlayer(): void {
-    window.open(
-      `#/projects/${this.task.project.id}/task_def_id/${this.task.taskDefId}/scorm-player/normal`,
-      '_blank',
-    );
+    this.task.launchScormPlayer();
   }
 
   reviewLatestCompletedAttempt(): void {
-    window.open(
-      `#/task_def_id/${this.task.taskDefId}/scorm-player/review/${this.task.latestCompletedTestAttempt.id}`,
-      '_blank',
-    );
+    this.task.latestCompletedTestAttempt.review();
   }
 
   requestExtraAttempt(): void {
diff --git a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
index d26b914f7e..869b79aa51 100644
--- a/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/scorm-comment/scorm-comment.component.ts
@@ -28,10 +28,7 @@ export class ScormCommentComponent {
   }
 
   reviewScormTest() {
-    window.open(
-      `#/task_def_id/${this.task.taskDefId}/scorm-player/review/${this.comment.testAttempt.id}`,
-      '_blank',
-    );
+    this.comment.testAttempt.review();
   }
 
   passScormAttempt() {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
index c2b89f9d7b..fb02d119a2 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.html
@@ -4,24 +4,25 @@
   </mat-checkbox>
 
   @if (taskDefinition.scormEnabled) {
-    <div class="basis-1/2 flex flex-col">
-      <f-file-drop
-        mode="event"
-        (filesDropped)="uploadScormData($event)"
-        accept="application/zip"
-        [desiredFileName]="'SCORM zip'"
-      />
-      @if (taskDefinition.hasScormData) {
-        <div class="flex flex-row gap-4 pt-4">
-          <button mat-flat-button color="warn" (click)="removeScormData()" class="flex-grow me-4">
-            Delete SCORM Zip
-          </button>
-          <button mat-flat-button color="accent" (click)="downloadScormData()" class="flex-grow ms-4">
-            Download SCORM Zip
-          </button>
-        </div>
-      }
-    </div>
+    <f-file-drop
+      mode="event"
+      (filesDropped)="uploadScormData($event)"
+      accept="application/zip"
+      [desiredFileName]="'SCORM zip'"
+    />
+    @if (taskDefinition.hasScormData) {
+      <div class="flex flex-row gap-4 pt-4">
+        <button mat-flat-button color="warn" (click)="removeScormData()" class="flex-grow me-4">
+          Delete SCORM Zip
+        </button>
+        <button mat-flat-button color="accent" (click)="downloadScormData()" class="flex-grow ms-4 me-4">
+          Download SCORM Zip
+        </button>
+        <button mat-flat-button color="accent" (click)="previewScormTest()" class="flex-grow me-4">
+          Preview SCORM Test
+        </button>
+      </div>
+    }
 
     <div class="flex-grow flex flex-row gap-4 pt-4">
       <div class="basis-1/2">
@@ -33,14 +34,13 @@
         </mat-checkbox>
       </div>
       <mat-form-field appearance="outline" class="basis-1/2">
-        <mat-label>Attempt limit</mat-label>
+        <mat-label>Limit to this number of attempts - 0 is unlimited</mat-label>
         <input
           matInput
           min="0"
           max="100"
           type="number"
           [(ngModel)]="taskDefinition.scormAttemptLimit"
-          [formControl]="attemptLimitControl"
         />
       </mat-form-field>
     </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
index 6a8708d25d..8dee18a297 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component.ts
@@ -20,12 +20,17 @@ export class TaskDefinitionScormComponent {
     private taskDefinitionService: TaskDefinitionService,
   ) {}
 
-  public attemptLimitControl = new FormControl('', [Validators.max(100), Validators.min(0)]);
-
   public get unit(): Unit {
     return this.taskDefinition?.unit;
   }
 
+  /**
+   * Open the SCORM test in a new tab - using preview mode.
+   */
+  public previewScormTest() {
+    this.taskDefinition.previewScormTest();
+  }
+
   public downloadScormData() {
     this.fileDownloaderService.downloadFile(
       this.taskDefinition.getScormDataUrl(true),

From 1e056037562753dd8628b1df83f913ca06af2dff Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 9 Aug 2024 13:04:07 +1000
Subject: [PATCH 130/776] chore(release): 8.0.24

---
 CHANGELOG.md      | 62 +++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |  4 +--
 package.json      |  2 +-
 3 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1839482f34..830c69392a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,68 @@
 
 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.
 
+### [8.0.24](https://github.com/doubtfire-lms/doubtfire-deploy/compare/v8.0.23...v8.0.24) (2024-08-09)
+
+
+### Features
+
+* add ability to preview scorm test ([7ffbea9](https://github.com/doubtfire-lms/doubtfire-deploy/commit/7ffbea9f56c393d44571c18f30735e090701b554))
+* add new Numbas Feature ([6f1ac4e](https://github.com/doubtfire-lms/doubtfire-deploy/commit/6f1ac4e4c1a78115c426838bce350bce286e44f0))
+* add new Numbas Feature ([8eba913](https://github.com/doubtfire-lms/doubtfire-deploy/commit/8eba913ec4462e1c252a8a698b4b6de67c4ec25f))
+* add numbas component ([7c1734b](https://github.com/doubtfire-lms/doubtfire-deploy/commit/7c1734b137ac369b3b605b38749c845df38b9a78))
+* add Numbas config options to task def service keys ([ff28e48](https://github.com/doubtfire-lms/doubtfire-deploy/commit/ff28e4802b86dc22be339cc196ef82ade67934f7))
+* add Numbas test attempt model ([097df79](https://github.com/doubtfire-lms/doubtfire-deploy/commit/097df7960d34a8c905ee495b8c6c8b8843e43b36))
+* add Numbas test section on ready for feedback ([e61295c](https://github.com/doubtfire-lms/doubtfire-deploy/commit/e61295c50006dbc89cfc0639bb3c68a09a3cda9d))
+* add Numbas test upload section and reorder editor sections ([edbd536](https://github.com/doubtfire-lms/doubtfire-deploy/commit/edbd536e73ace8b6b4cced1481c809fd36524dce))
+* add Numbas upload component and related functions to task-definition model ([4ecaee8](https://github.com/doubtfire-lms/doubtfire-deploy/commit/4ecaee8ad1c0caed9a5d848066a173000989f79b))
+* add test attempt service ([a576f48](https://github.com/doubtfire-lms/doubtfire-deploy/commit/a576f484bc434728eab9632c022bccf1ed26cb01))
+* add test attempt service and minor numbas related changes ([0652b56](https://github.com/doubtfire-lms/doubtfire-deploy/commit/0652b56f69eb850c2dfb43be54d07beb4c4eb469))
+* added numbas-lms service code ([471d344](https://github.com/doubtfire-lms/doubtfire-deploy/commit/471d34486f2582e95aac84469187f087277cc079))
+* allow changing scorm review config and add minor UI changes ([fc023af](https://github.com/doubtfire-lms/doubtfire-deploy/commit/fc023af462656e3557e2970f211fa4d59ee1e3d5))
+* change Numbas time delay config to enable incremental delays ([0afa719](https://github.com/doubtfire-lms/doubtfire-deploy/commit/0afa7197293c90a154c1716db91ecadae3677d53))
+* disable attempt button if passed and add button to review latest attempt in card ([703563c](https://github.com/doubtfire-lms/doubtfire-deploy/commit/703563c86253c60ad30d451ee2d8e0fa7ebbfabb))
+* display numbas task comments ([48a31da](https://github.com/doubtfire-lms/doubtfire-deploy/commit/48a31da1442f1e14f497c614053d9002c9f2631b))
+* enable reviewing, passing, deleting test attempts and add test attempt model and service ([561b924](https://github.com/doubtfire-lms/doubtfire-deploy/commit/561b9241c2f44fd69d3f09c656a025f514bbaf3a))
+* enable students to request extra scorm attempt ([d904ffd](https://github.com/doubtfire-lms/doubtfire-deploy/commit/d904ffd6fd674f6e61894d517f5aa147d1db6d29))
+* get unique token for scorm asset retrieval ([8fe2f9e](https://github.com/doubtfire-lms/doubtfire-deploy/commit/8fe2f9e9ca60c02e55c24d0f2bb3eb6dbea8217c))
+* implement numbas test data upload in task definition service ([2c7dab5](https://github.com/doubtfire-lms/doubtfire-deploy/commit/2c7dab555fc9a226b980a8dae96f5738bf517b1b))
+* insert Numbas test rules options in the task editor ([7e52ad5](https://github.com/doubtfire-lms/doubtfire-deploy/commit/7e52ad5e5759291d7d61805070ec482eb49c90be))
+* numbas-test-numbas-service ([cee13b7](https://github.com/doubtfire-lms/doubtfire-deploy/commit/cee13b727b35f804fc16070885f0e57c422c9982))
+* prevent uploading files until scorm passed ([ec86e4e](https://github.com/doubtfire-lms/doubtfire-deploy/commit/ec86e4eca8e9c50ebdaf54c34c302da88dd44b31))
+* show banner based on scorm success status ([db16172](https://github.com/doubtfire-lms/doubtfire-deploy/commit/db161721fab1359694c44d8df7237cd01892938b))
+* show launch button on ready for feedback if Numbas test is enabled for the task ([17af5b7](https://github.com/doubtfire-lms/doubtfire-deploy/commit/17af5b7fe9e1fbc8e5f18e2fece6e029b017408c))
+* use confirmation modal when passing or deleting test attempts ([3fb25bb](https://github.com/doubtfire-lms/doubtfire-deploy/commit/3fb25bb373acab837a3ef787620dd654bfd6803f))
+
+
+### Bug Fixes
+
+* add accepted Numbas file types ([bcaa8af](https://github.com/doubtfire-lms/doubtfire-deploy/commit/bcaa8af150aaf68b5cf5fb07ad9cb72037212d5d))
+* add auth headers to scorm adapter xhr requests ([97e1ea1](https://github.com/doubtfire-lms/doubtfire-deploy/commit/97e1ea187b769a51ebb66b82d76f21193bb29386))
+* adjusted edit profile accidental change ([316abc7](https://github.com/doubtfire-lms/doubtfire-deploy/commit/316abc775eeba6ca846c7c742bc88bec61d05a5e))
+* change success status descriptions ([20da042](https://github.com/doubtfire-lms/doubtfire-deploy/commit/20da0423450fe3b9b8006660bf6f5e06670f520c))
+* delete comment as well as test attempt ([b6887e8](https://github.com/doubtfire-lms/doubtfire-deploy/commit/b6887e85b7a06b166519924dd682ef57650a4e32))
+* disable launch scorm test button if user is staff ([9bc48b0](https://github.com/doubtfire-lms/doubtfire-deploy/commit/9bc48b03905c0a839d78ea13be9817ca73ba54cf))
+* ensure counters are incremented after object creation ([2b1dcfc](https://github.com/doubtfire-lms/doubtfire-deploy/commit/2b1dcfc717eb770dd623c62ac99d8d961d1c3124))
+* ensure datamodel is updated on termination ([2ac487f](https://github.com/doubtfire-lms/doubtfire-deploy/commit/2ac487f13c3743f2b5b805521964bdcbca7cdc15))
+* ensure scorm frame loads when src is available ([6ae4295](https://github.com/doubtfire-lms/doubtfire-deploy/commit/6ae42954162996acf145cef211981153381ff49d))
+* hide config options if numbas test is disabled ([0b15b1c](https://github.com/doubtfire-lms/doubtfire-deploy/commit/0b15b1c38b8f09a30f53bb42dccd1971109bce01))
+* indicate task def has scorm data when zip is uploaded ([4b983ba](https://github.com/doubtfire-lms/doubtfire-deploy/commit/4b983bae1f522013f750b8c36d5e1a52624abbbc))
+* initialise SCORM API wrapper before iframe loads ([5d0606c](https://github.com/doubtfire-lms/doubtfire-deploy/commit/5d0606c56eaeb929d5873cae7038ce729581512c))
+* integrate Numbas services well with the existing system ([d47b8ed](https://github.com/doubtfire-lms/doubtfire-deploy/commit/d47b8edc745660801984346c4fa67d6bb371f4cb))
+* remove attempt number field ([f0ff40b](https://github.com/doubtfire-lms/doubtfire-deploy/commit/f0ff40bfd7e86b904adae94bf8cbe5d56371e011))
+* remove saved scorm token and always get ([c8fc702](https://github.com/doubtfire-lms/doubtfire-deploy/commit/c8fc702bde6f1c448fc585042e5265625552bae8))
+* retrieve test attempt data correctly ([2810ce6](https://github.com/doubtfire-lms/doubtfire-deploy/commit/2810ce65d423a137600d621a98bf27dbc221921c))
+* send task id with numbas completed attempt data ([e46214d](https://github.com/doubtfire-lms/doubtfire-deploy/commit/e46214dd59d86014bb04d1c31f3a3bf21240e32b))
+* show correct attempts left and allow tutor to review attempt always ([58c24c3](https://github.com/doubtfire-lms/doubtfire-deploy/commit/58c24c3a6760af168a918bc099e755f475eac5f0))
+* show correct Numbas test from the task def with all assets loaded ([bee0a0b](https://github.com/doubtfire-lms/doubtfire-deploy/commit/bee0a0bb1eb905c964caf7888419effe70553520))
+* show delete and download buttons in editor when Numbas test exists ([821feb9](https://github.com/doubtfire-lms/doubtfire-deploy/commit/821feb93a8a40d095ef4f50adedbfd9216278fa9))
+* show Numbas button component and modify iframe request ([c9c2fbe](https://github.com/doubtfire-lms/doubtfire-deploy/commit/c9c2fbe10db156512946355f3cabfe54461f0eba))
+* show Numbas iframe on top of other elements ([f53befd](https://github.com/doubtfire-lms/doubtfire-deploy/commit/f53befd82b52bba24bc8c593a9266c11f9155d32))
+* show previously configured Numbas attempt limit ([56e1a5d](https://github.com/doubtfire-lms/doubtfire-deploy/commit/56e1a5de44ee275f9544b77909b7472f1020c2c3))
+* update numbas api path ([3df59dc](https://github.com/doubtfire-lms/doubtfire-deploy/commit/3df59dcc58f021ef16d81938d1d05473818bc75e))
+* use modal for Numbas and enable authentication ([64b1bfb](https://github.com/doubtfire-lms/doubtfire-deploy/commit/64b1bfb2918993e58a6659948d9621fc7d0b8ba4))
+* use nullish coalescing when retrieving data from the datamodel ([226d919](https://github.com/doubtfire-lms/doubtfire-deploy/commit/226d9193251fb675c92bec8265508477857a4ec9))
+
 ### [8.0.23](https://github.com/macite/doubtfire-deploy/compare/v8.0.22...v8.0.23) (2024-08-02)
 
 
diff --git a/package-lock.json b/package-lock.json
index 391ed15dac..89ded24609 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.23",
+  "version": "8.0.24",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.23",
+      "version": "8.0.24",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 691c8a62fb..ed0887c53a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.23",
+  "version": "8.0.24",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From a0c1185bf4af3acb8f58c97cc27021c952861603 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 9 Aug 2024 14:15:19 +1000
Subject: [PATCH 131/776] fix: switch to control shift

alt shift fails to be registered on macos...
---
 .../staff-task-list.component.ts              | 16 ++--
 .../states/tasks/inbox/inbox.component.ts     | 74 +++++++++++--------
 2 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 5e427de56e..db6049a027 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -122,27 +122,28 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
       this.refreshData();
     }
   }
+
   ngOnDestroy(): void {
-    this.hotkeys.removeShortcuts('alt.shift.arrowdown');
-    this.hotkeys.removeShortcuts('alt.shift.arrowup');
+    this.hotkeys.removeShortcuts('control.shift.arrowdown');
+    this.hotkeys.removeShortcuts('control.shift.arrowup');
   }
 
   ngOnInit(): void {
     const registeredHotkeys = this.hotkeys.getHotkeys().map((hotkey) => hotkey.keys);
 
-    if (!registeredHotkeys.includes('alt.shift..arrowdown')) {
+    if (!registeredHotkeys.includes('control.shift.arrowdown')) {
       this.hotkeys
         .addShortcut({
-          keys: 'alt.shift.arrowdown',
+          keys: 'control.shift.arrowdown',
           description: 'Select next task',
         })
         .subscribe(() => this.nextTask());
     }
 
-    if (!registeredHotkeys.includes('alt.shift.arrowup')) {
+    if (!registeredHotkeys.includes('control.shift.arrowup')) {
       this.hotkeys
         .addShortcut({
-          keys: 'alt.shift.arrowup',
+          keys: 'control.shift.arrowup',
           description: 'Select previous task',
         })
         .subscribe(() => this.previousTask());
@@ -385,6 +386,9 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   nextTask(): void {
+    if (!this.filteredTasks) {
+      return;
+    }
     const currentTaskIndex = this.filteredTasks.findIndex((task) => this.isSelectedTask(task));
     if (currentTaskIndex >= this.filteredTasks.length) {
       return;
diff --git a/src/app/units/states/tasks/inbox/inbox.component.ts b/src/app/units/states/tasks/inbox/inbox.component.ts
index ce178918da..d09d725176 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.ts
+++ b/src/app/units/states/tasks/inbox/inbox.component.ts
@@ -1,6 +1,5 @@
 import {CdkDragEnd, CdkDragStart, CdkDragMove} from '@angular/cdk/drag-drop';
 import {
-  AfterViewInit,
   Component,
   ElementRef,
   Input,
@@ -26,7 +25,7 @@ import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
   templateUrl: './inbox.component.html',
   styleUrls: ['./inbox.component.scss'],
 })
-export class InboxComponent implements OnInit {
+export class InboxComponent implements OnInit, OnDestroy {
   @Input() unit: Unit;
   @Input() unitRole: UnitRole;
   @Input() taskData: {selectedTask: Task; any};
@@ -78,38 +77,48 @@ export class InboxComponent implements OnInit {
         const ref = this.dialog.open(HotkeysHelpComponent, {
           // width: '250px',
         });
-        ref.componentInstance.title = `${this.constants.ExternalName.value} Marking Shortcuts`;
+        ref.componentInstance.title = `${this.constants.ExternalName.value} Feedback Shortcuts`;
         ref.componentInstance.dismiss.subscribe(() => ref.close());
       });
     }
 
-    this.hotkeys
-      .addShortcut({
-        keys: 'alt.shift.r',
-        description: 'Mark selected task as redo',
-      })
-      .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('redo'));
-
-    this.hotkeys
-      .addShortcut({
-        keys: 'alt.shift.f',
-        description: 'Mark selected task as fix',
-      })
-      .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('fix_and_resubmit'));
-
-    this.hotkeys
-      .addShortcut({
-        keys: 'alt.shift.c',
-        description: 'Mark selected task as complete',
-      })
-      .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('complete'));
-
-    this.hotkeys
-      .addShortcut({
-        keys: 'alt.shift.d',
-        description: 'Mark selected task as discuss',
-      })
-      .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('discuss'));
+    if (!registeredHotkeys.includes('control.shift.r')) {
+      this.hotkeys
+        .addShortcut({
+          keys: 'control.shift.r',
+          description: 'Mark selected task as redo',
+        })
+        .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('redo'));
+    }
+
+    if (!registeredHotkeys.includes('control.shift.f')) {
+      this.hotkeys
+        .addShortcut({
+          keys: 'control.shift.f',
+          description: 'Mark selected task as fix',
+        })
+        .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('fix_and_resubmit'));
+    }
+
+    if (!registeredHotkeys.includes('altleft.shift.c')) {
+      this.hotkeys
+        .addShortcut({
+          keys: 'control.Shift.c',
+          description: 'Mark selected task as complete',
+        })
+        .subscribe(() =>
+          this.selectedTask.selectedTask?.updateTaskStatus('complete')
+      );
+    }
+
+    if (!registeredHotkeys.includes('control.shift.d')) {
+      this.hotkeys
+        .addShortcut({
+          keys: 'control.shift.d',
+          description: 'Mark selected task as discuss',
+        })
+        .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('discuss'));
+    }
 
     this.dragMoveAudited$ = this.dragMove$.pipe(
       withLatestFrom(this.inboxStartSize$),
@@ -142,6 +151,11 @@ export class InboxComponent implements OnInit {
     window.dispatchEvent(new Event('resize'));
   }
 
+  ngOnDestroy(): void {
+    this.hotkeys.removeShortcuts('control.shift.arrowdown');
+    this.hotkeys.removeShortcuts('control.shift.arrowup');
+  }
+
   startedDragging(event: CdkDragStart, div: HTMLDivElement) {
     event.source.element.nativeElement.classList.add('hovering');
     const w = div.getBoundingClientRect().width;

From 8a2ce3bfe32d99be1bc0667ca1aba55d36f987d2 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 9 Aug 2024 16:13:53 +1000
Subject: [PATCH 132/776] fix: adjust shortcuts and unregister on inbox destroy

---
 .../units/states/tasks/inbox/inbox.component.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/app/units/states/tasks/inbox/inbox.component.ts b/src/app/units/states/tasks/inbox/inbox.component.ts
index d09d725176..7e73fcccb1 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.ts
+++ b/src/app/units/states/tasks/inbox/inbox.component.ts
@@ -82,15 +82,6 @@ export class InboxComponent implements OnInit, OnDestroy {
       });
     }
 
-    if (!registeredHotkeys.includes('control.shift.r')) {
-      this.hotkeys
-        .addShortcut({
-          keys: 'control.shift.r',
-          description: 'Mark selected task as redo',
-        })
-        .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('redo'));
-    }
-
     if (!registeredHotkeys.includes('control.shift.f')) {
       this.hotkeys
         .addShortcut({
@@ -100,7 +91,7 @@ export class InboxComponent implements OnInit, OnDestroy {
         .subscribe(() => this.selectedTask.selectedTask?.updateTaskStatus('fix_and_resubmit'));
     }
 
-    if (!registeredHotkeys.includes('altleft.shift.c')) {
+    if (!registeredHotkeys.includes('control.shift.c')) {
       this.hotkeys
         .addShortcut({
           keys: 'control.Shift.c',
@@ -152,8 +143,10 @@ export class InboxComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    this.hotkeys.removeShortcuts('control.shift.arrowdown');
-    this.hotkeys.removeShortcuts('control.shift.arrowup');
+    this.hotkeys.removeShortcuts('control.shift.d');
+    this.hotkeys.removeShortcuts('control.shift.f');
+    this.hotkeys.removeShortcuts('control.shift.c');
+    this.hotkeys.removeShortcuts('shift.?');
   }
 
   startedDragging(event: CdkDragStart, div: HTMLDivElement) {

From fe94f0440a2c1ce457413536481cd2ffc1717247 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 9 Aug 2024 16:22:46 +1000
Subject: [PATCH 133/776] chore(release): 8.0.25

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 830c69392a..4f765d1e4a 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.
 
+### [8.0.25](https://github.com/macite/doubtfire-deploy/compare/v8.0.24...v8.0.25) (2024-08-09)
+
+
+### Bug Fixes
+
+* adjust shortcuts and unregister on inbox destroy ([8a2ce3b](https://github.com/macite/doubtfire-deploy/commit/8a2ce3bfe32d99be1bc0667ca1aba55d36f987d2))
+* marking shortcuts no longer conflict with common browser shortcuts ([ec7524a](https://github.com/macite/doubtfire-deploy/commit/ec7524aaae040794de76521363c2d885a0425db0))
+* switch to control shift ([a0c1185](https://github.com/macite/doubtfire-deploy/commit/a0c1185bf4af3acb8f58c97cc27021c952861603))
+
 ### [8.0.24](https://github.com/doubtfire-lms/doubtfire-deploy/compare/v8.0.23...v8.0.24) (2024-08-09)
 
 
diff --git a/package-lock.json b/package-lock.json
index 89ded24609..a7032b1481 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.24",
+  "version": "8.0.25",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.24",
+      "version": "8.0.25",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index ed0887c53a..031c7b1a2a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.24",
+  "version": "8.0.25",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 64e41f4aedcf519a2786d7fe4929900f86731896 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 9 Aug 2024 23:06:22 +1000
Subject: [PATCH 134/776] fix: register service names in state resolve
 functions

---
 src/app/doubtfire.states.ts | 55 ++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 7f95af1f04..86b9f2b4d8 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -270,7 +270,6 @@ const AdministerUnits: NgHybridStateDeclaration = {
   },
 };
 
-
 const ViewAllUnits: NgHybridStateDeclaration = {
   name: 'view-all-units',
   url: '/view-all-units',
@@ -299,12 +298,18 @@ const ScormPlayerNormalState: NgHybridStateDeclaration = {
   name: 'scorm-player-normal',
   url: '/projects/:project_id/task_def_id/:task_definition_id/scorm-player/normal',
   resolve: {
-    projectId: function ($stateParams: {project_id: number}) {
-      return $stateParams.project_id;
-    },
-    taskDefId: function ($stateParams: {task_definition_id: number}) {
-      return $stateParams.task_definition_id;
-    },
+    projectId: [
+      '$stateParams',
+      function ($stateParams: {project_id: number}) {
+        return $stateParams.project_id;
+      }
+    ],
+    taskDefId: [
+      '$stateParams',
+      function ($stateParams: {task_definition_id: number}) {
+        return $stateParams.task_definition_id;
+      }
+    ],
     mode: function () {
       return 'normal';
     },
@@ -327,15 +332,24 @@ const ScormPlayerStudentReviewState: NgHybridStateDeclaration = {
   name: 'scorm-player-student-review',
   url: '/projects/:project_id/task_def_id/:task_definition_id/scorm-player/review/:test_attempt_id',
   resolve: {
-    projectId: function ($stateParams) {
-      return $stateParams.project_id;
-    },
-    taskDefId: function ($stateParams) {
-      return $stateParams.task_definition_id;
-    },
-    testAttemptId: function ($stateParams) {
-      return $stateParams.test_attempt_id;
-    },
+    projectId: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.project_id;
+      }
+    ],
+    taskDefId: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.task_definition_id;
+      }
+    ],
+    testAttemptId: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.test_attempt_id;
+      }
+    ],
     mode: function () {
       return 'review';
     },
@@ -355,9 +369,12 @@ const ScormPlayerReviewState: NgHybridStateDeclaration = {
   name: 'scorm-preview',
   url: '/task_def_id/:task_definition_id/preview-scorm',
   resolve: {
-    taskDefId: function ($stateParams) {
-      return $stateParams.task_definition_id;
-    },
+    taskDefId: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.task_definition_id;
+      }
+    ],
     mode: function () {
       return 'preview';
     },

From 349730ea9d4998ed2d87f7ec6c88daae6b336a2e Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 9 Aug 2024 23:06:41 +1000
Subject: [PATCH 135/776] chore(release): 8.0.26

---
 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 4f765d1e4a..c0f61e572b 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.
 
+### [8.0.26](https://github.com/macite/doubtfire-deploy/compare/v8.0.25...v8.0.26) (2024-08-09)
+
+
+### Bug Fixes
+
+* register service names in state resolve functions ([64e41f4](https://github.com/macite/doubtfire-deploy/commit/64e41f4aedcf519a2786d7fe4929900f86731896))
+
 ### [8.0.25](https://github.com/macite/doubtfire-deploy/compare/v8.0.24...v8.0.25) (2024-08-09)
 
 
diff --git a/package-lock.json b/package-lock.json
index a7032b1481..895dc9d7c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.25",
+  "version": "8.0.26",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.25",
+      "version": "8.0.26",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 031c7b1a2a..bcfbae280b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.25",
+  "version": "8.0.26",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 1ec175419ab3ef80f22ac8a6384f6ed40a17c217 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Sat, 10 Aug 2024 00:27:07 +1000
Subject: [PATCH 136/776] fix: encode . in the username in scorm player

---
 src/app/common/scorm-player/scorm-player.component.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/common/scorm-player/scorm-player.component.ts b/src/app/common/scorm-player/scorm-player.component.ts
index d20b76f00f..6c2bdadd20 100644
--- a/src/app/common/scorm-player/scorm-player.component.ts
+++ b/src/app/common/scorm-player/scorm-player.component.ts
@@ -85,8 +85,11 @@ export class ScormPlayerComponent implements OnInit {
       window.API_1484_11 = undefined;
     }
 
+    // Encode . as %2e to avoid issue with grape treating the username as a file extension
+    const username = this.userService.currentUser.username.replaceAll('.', '%2e');
+
     this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(
-      `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.taskDefId}/${this.userService.currentUser.username}/${token}/index.html`,
+      `${AppInjector.get(DoubtfireConstants).API_URL}/scorm/${this.taskDefId}/${username}/${token}/index.html`,
     );
   }
 

From 57359b34686de49bc36b4f97ae35cea085b6e9cc Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Sat, 10 Aug 2024 00:27:25 +1000
Subject: [PATCH 137/776] chore(release): 8.0.27

---
 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 c0f61e572b..4dc8e1bc57 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.
 
+### [8.0.27](https://github.com/macite/doubtfire-deploy/compare/v8.0.26...v8.0.27) (2024-08-09)
+
+
+### Bug Fixes
+
+* encode . in the username in scorm player ([1ec1754](https://github.com/macite/doubtfire-deploy/commit/1ec175419ab3ef80f22ac8a6384f6ed40a17c217))
+
 ### [8.0.26](https://github.com/macite/doubtfire-deploy/compare/v8.0.25...v8.0.26) (2024-08-09)
 
 
diff --git a/package-lock.json b/package-lock.json
index 895dc9d7c8..55ece4bb8f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.26",
+  "version": "8.0.27",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.26",
+      "version": "8.0.27",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index bcfbae280b..d39e2bd7f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.26",
+  "version": "8.0.27",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From d2c730c62df60598eb84a068cbac5c39534174d5 Mon Sep 17 00:00:00 2001
From: Minh Tho DUONG <s223749059@deakin.edu.au>
Date: Tue, 14 May 2024 13:29:13 +1000
Subject: [PATCH 138/776] refactor: migrate the confirmation-model component

---
 .../confirmation-modal.coffee                 | 35 ----------------
 ...html => confirmation-modal.component.html} |  6 +--
 ...scss => confirmation-modal.component.scss} |  4 +-
 .../confirmation-modal.component.ts           | 41 +++++++++++++++++++
 .../confirmation-modal.service.ts             | 19 +++++++++
 src/app/common/modals/modals.coffee           |  1 -
 src/app/doubtfire-angular.module.ts           |  2 +
 src/app/doubtfire-angularjs.module.ts         |  3 +-
 8 files changed, 69 insertions(+), 42 deletions(-)
 delete mode 100644 src/app/common/modals/confirmation-modal/confirmation-modal.coffee
 rename src/app/common/modals/confirmation-modal/{confirmation-modal.tpl.html => confirmation-modal.component.html} (74%)
 rename src/app/common/modals/confirmation-modal/{confirmation-modal.scss => confirmation-modal.component.scss} (57%)
 create mode 100644 src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
 create mode 100644 src/app/common/modals/confirmation-modal/confirmation-modal.service.ts

diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.coffee b/src/app/common/modals/confirmation-modal/confirmation-modal.coffee
deleted file mode 100644
index c7999098cf..0000000000
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.coffee
+++ /dev/null
@@ -1,35 +0,0 @@
-angular.module("doubtfire.common.modals.confirmation-modal", [])
-
-.factory("ConfirmationModal", ($modal) ->
-  ConfirmationModal = {}
-
-  #
-  # Show a modal asking the user to confirm their indicated action.
-  #
-  ConfirmationModal.show = (title, message, action) ->
-    modalInstance = $modal.open
-      templateUrl: 'common/modals/confirmation-modal/confirmation-modal.tpl.html'
-      controller: 'ConfirmationModalCtrl'
-      resolve:
-        title: -> title
-        message: -> message
-        action: -> action
-
-  ConfirmationModal
-)
-
-#
-# Controller for confirmation modal
-#
-.controller('ConfirmationModalCtrl', ($scope, $modalInstance, title, message, action, alertService) ->
-  $scope.title = title
-  $scope.message = message
-
-  $scope.confirmAction = ->
-    action()
-    $modalInstance.dismiss()
-
-  $scope.cancelAction = ->
-    alertService.message "#{title} action cancelled", 3000
-    $modalInstance.dismiss()
-)
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.tpl.html b/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
similarity index 74%
rename from src/app/common/modals/confirmation-modal/confirmation-modal.tpl.html
rename to src/app/common/modals/confirmation-modal/confirmation-modal.component.html
index 4bd87f6868..ec66dcf72f 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.tpl.html
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
@@ -6,15 +6,15 @@ <h3 class="modal-title">
       <small>Please confirm that you want to perform this action.</small>
     </h3>
   </div>
-  <div class="modal-body">
+  <div class="modal-body" style="font-size: 1.5em;">
     {{message}}
   </div>
   <div class="modal-footer clearfix">
     <div class="btn-group">
-      <label class="btn btn-success" ng-click="confirmAction()">
+      <label class="btn btn-success" (click)="confirmAction()">
         <i class="fa fa-check"></i> Confirm
       </label>
-      <label class="btn btn-danger" ng-click="cancelAction()">
+      <label class="btn btn-danger" (click)="cancelAction()">
         <i class="fa fa-times"></i> Cancel
       </label>
     </div>
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.scss b/src/app/common/modals/confirmation-modal/confirmation-modal.component.scss
similarity index 57%
rename from src/app/common/modals/confirmation-modal/confirmation-modal.scss
rename to src/app/common/modals/confirmation-modal/confirmation-modal.component.scss
index f30b0e345c..9afc6bd60f 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.scss
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.scss
@@ -1,3 +1,3 @@
 .confirmation-modal .modal-body {
-  font-size: 1.5em;
-}
+    font-size: 1.5em;
+  }
\ No newline at end of file
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts b/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
new file mode 100644
index 0000000000..e65776a4b4
--- /dev/null
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
@@ -0,0 +1,41 @@
+import { Component, OnInit, Input, Inject} from '@angular/core';
+import { alertService } from 'src/app/ajs-upgraded-providers';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+@Component({
+  selector: 'confirmation-modal',
+  templateUrl: './confirmation-modal.component.html',
+  styleUrls: ['./confirmation-modal.component.scss'],
+})
+export class ConfirmationModalComponent implements OnInit {
+  @Input() title: string;
+  @Input() message: string;
+  @Input() action: () => void;
+
+  constructor(
+    @Inject(alertService) private alertService: any,
+    public dialogRef: MatDialogRef<ConfirmationModalComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: any,
+  ) {}
+
+  ngOnInit(): void {
+    console.log('confirmation-model ngOnInit()');
+  }
+
+  public confirmAction() {
+    console.log('confirmAction');
+    if (typeof this.action === 'function') {
+      this.action();
+    } else {
+      this.alertService.add("danger", `${this.title} action failed`, 3000);
+    }
+    /** note - page reload after closing **/
+    this.dialogRef.close();
+  }
+
+  public cancelAction() {
+    console.log('cancelAction');
+    this.alertService.add("info", `${this.title} action cancelled`, 3000);
+    this.dialogRef.close();
+  }
+}
\ No newline at end of file
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
new file mode 100644
index 0000000000..e6d9c6a5fd
--- /dev/null
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
@@ -0,0 +1,19 @@
+import { Injectable } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
+import { ConfirmationModalComponent } from './confirmation-modal.component';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ConfirmationModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(title: string, message: string, action?: any) {
+    let dialogRef: MatDialogRef<ConfirmationModalComponent, any>;
+    dialogRef = this.dialog.open(ConfirmationModalComponent, {position: {top: '2.5%'}});
+    dialogRef.updateSize("42.5%", "");
+    dialogRef.componentInstance.title = title;
+    dialogRef.componentInstance.message = message;
+    dialogRef.componentInstance.action = action;
+  }
+}
diff --git a/src/app/common/modals/modals.coffee b/src/app/common/modals/modals.coffee
index 16d2be1ec8..73aae8685b 100644
--- a/src/app/common/modals/modals.coffee
+++ b/src/app/common/modals/modals.coffee
@@ -1,5 +1,4 @@
 angular.module("doubtfire.common.modals", [
   'doubtfire.common.modals.csv-result-modal'
-  'doubtfire.common.modals.confirmation-modal'
   'doubtfire.common.modals.comments-modal'
 ])
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 9284745988..00064244ac 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -93,6 +93,7 @@ import {ExtensionCommentComponent} from './tasks/task-comments-viewer/extension-
 import {CampusListComponent} from './admin/institution-settings/campuses/campus-list/campus-list.component';
 import {ExtensionModalComponent} from './common/modals/extension-modal/extension-modal.component';
 import {CalendarModalComponent} from './common/modals/calendar-modal/calendar-modal.component';
+import { ConfirmationModalComponent } from './common/modals/confirmation-modal/confirmation-modal.component';
 import {MatRadioModule} from '@angular/material/radio';
 import {MatButtonToggleModule} from '@angular/material/button-toggle';
 import {MAT_DATE_LOCALE, MatOptionModule} from '@angular/material/core';
@@ -246,6 +247,7 @@ import {GradeService} from './common/services/grade.service';
     OverseerImageListComponent,
     ExtensionModalComponent,
     CalendarModalComponent,
+    ConfirmationModalComponent,
     InstitutionSettingsComponent,
     HomeComponent,
     CommentBubbleActionComponent,
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 868e381213..4cc5d980f6 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -118,7 +118,6 @@ import 'build/src/app/units/states/students-list/students-list.js';
 import 'build/src/app/units/states/analytics/analytics.js';
 import 'build/src/app/common/filters/filters.js';
 import 'build/src/app/common/content-editable/content-editable.js';
-import 'build/src/app/common/modals/confirmation-modal/confirmation-modal.js';
 import 'build/src/app/common/modals/comments-modal/comments-modal.js';
 import 'build/src/app/common/modals/csv-result-modal/csv-result-modal.js';
 import 'build/src/app/common/modals/modals.js';
@@ -154,6 +153,7 @@ import {ExtensionCommentComponent} from './tasks/task-comments-viewer/extension-
 import {TaskAssessmentCommentComponent} from './tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component';
 import {ExtensionModalService} from './common/modals/extension-modal/extension-modal.service';
 import {CalendarModalService} from './common/modals/calendar-modal/calendar-modal.service';
+import { ConfirmationModalService } from './common/modals/confirmation-modal/confirmation-modal.service';
 import {CampusListComponent} from './admin/institution-settings/campuses/campus-list/campus-list.component';
 import {ActivityTypeListComponent} from './admin/institution-settings/activity-type-list/activity-type-list.component';
 import {InstitutionSettingsComponent} from './admin/institution-settings/institution-settings.component';
@@ -248,6 +248,7 @@ DoubtfireAngularJSModule.factory('DoubtfireConstants', downgradeInjectable(Doubt
 DoubtfireAngularJSModule.factory('ExtensionModal', downgradeInjectable(ExtensionModalService));
 DoubtfireAngularJSModule.factory('Marked', downgradeInjectable(MarkedPipe));
 DoubtfireAngularJSModule.factory('CalendarModal', downgradeInjectable(CalendarModalService));
+DoubtfireAngularJSModule.factory('ConfirmationModal', downgradeInjectable(ConfirmationModalService));
 DoubtfireAngularJSModule.factory('TaskCommentService', downgradeInjectable(TaskCommentService));
 DoubtfireAngularJSModule.factory('alertService', downgradeInjectable(AlertService));
 DoubtfireAngularJSModule.factory('tutorialService', downgradeInjectable(TutorialService));

From 875c17cbe4b1b3439676096ad597c4e400cc7e63 Mon Sep 17 00:00:00 2001
From: Minh Tho DUONG <s223749059@deakin.edu.au>
Date: Tue, 14 May 2024 14:18:31 +1000
Subject: [PATCH 139/776] refactor: migrate the confirmation-model component -
 updates

---
 .../confirmation-modal.component.ts           | 20 +++++++++----------
 .../confirmation-modal.service.ts             |  7 +++++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts b/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
index e65776a4b4..27f0d89d8c 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
@@ -1,6 +1,9 @@
+/* eslint-disable prettier/prettier */
+/* eslint-disable @angular-eslint/component-selector */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { Component, OnInit, Input, Inject} from '@angular/core';
-import { alertService } from 'src/app/ajs-upgraded-providers';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { AlertService } from '../../services/alert.service';
+import { MatDialogRef } from '@angular/material/dialog';
 
 @Component({
   selector: 'confirmation-modal',
@@ -13,9 +16,8 @@ export class ConfirmationModalComponent implements OnInit {
   @Input() action: () => void;
 
   constructor(
-    @Inject(alertService) private alertService: any,
+    @Inject(AlertService) private alertService: any,
     public dialogRef: MatDialogRef<ConfirmationModalComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: any,
   ) {}
 
   ngOnInit(): void {
@@ -23,19 +25,17 @@ export class ConfirmationModalComponent implements OnInit {
   }
 
   public confirmAction() {
-    console.log('confirmAction');
     if (typeof this.action === 'function') {
       this.action();
     } else {
-      this.alertService.add("danger", `${this.title} action failed`, 3000);
+      this.alertService.error(`${this.title} action failed.`);
     }
-    /** note - page reload after closing **/
+
     this.dialogRef.close();
   }
 
   public cancelAction() {
-    console.log('cancelAction');
-    this.alertService.add("info", `${this.title} action cancelled`, 3000);
+    this.alertService.success(`${this.title} action cancelled.`);
     this.dialogRef.close();
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
index e6d9c6a5fd..06c4da61e8 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
@@ -1,5 +1,8 @@
+/* eslint-disable prefer-const */
+/* eslint-disable prettier/prettier */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { Injectable } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
+import { MatDialogRef, MatDialog } from '@angular/material/dialog';
 import { ConfirmationModalComponent } from './confirmation-modal.component';
 
 @Injectable({
@@ -11,7 +14,7 @@ export class ConfirmationModalService {
   public show(title: string, message: string, action?: any) {
     let dialogRef: MatDialogRef<ConfirmationModalComponent, any>;
     dialogRef = this.dialog.open(ConfirmationModalComponent, {position: {top: '2.5%'}});
-    dialogRef.updateSize("42.5%", "");
+    dialogRef.updateSize('42.5%', '');
     dialogRef.componentInstance.title = title;
     dialogRef.componentInstance.message = message;
     dialogRef.componentInstance.action = action;

From 0a4f01c78d8f531d0fbeb59fa734dbd0a6c8ac9e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sun, 11 Aug 2024 19:10:25 +1000
Subject: [PATCH 140/776] refactor: replace bootstrap html with material
 components

---
 .../confirmation-modal.component.html         | 32 ++++++++-----------
 .../confirmation-modal.component.scss         |  3 --
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.component.html b/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
index ec66dcf72f..c2d7eb5cfe 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
@@ -1,22 +1,18 @@
 <div class="confirmation-modal">
-  <div class="modal-header clearfix">
-    <h3 class="modal-title">
+  <h3 mat-dialog-title>
+    <div class="flex items-center">
       <i class="fa fa-question-circle fa-2x pull-left"></i>
-      <div>{{title}}</div>
-      <small>Please confirm that you want to perform this action.</small>
-    </h3>
-  </div>
-  <div class="modal-body" style="font-size: 1.5em;">
-    {{message}}
-  </div>
-  <div class="modal-footer clearfix">
-    <div class="btn-group">
-      <label class="btn btn-success" (click)="confirmAction()">
-        <i class="fa fa-check"></i> Confirm
-      </label>
-      <label class="btn btn-danger" (click)="cancelAction()">
-        <i class="fa fa-times"></i> Cancel
-      </label>
+      <div>{{ title }}</div>
     </div>
-  </div>
+    <small>Please confirm that you want to perform this action.</small>
+  </h3>
+  <mat-dialog-content>
+    {{ message }}
+  </mat-dialog-content>
+  <mat-dialog-actions align="end">
+    <button mat-raised-button color="primary" (click)="confirmAction()">
+      <i class="fa fa-check"></i> Confirm
+    </button>
+    <button mat-button color="warn" (click)="cancelAction()">Cancel</button>
+  </mat-dialog-actions>
 </div>
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.component.scss b/src/app/common/modals/confirmation-modal/confirmation-modal.component.scss
index 9afc6bd60f..e69de29bb2 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.component.scss
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.scss
@@ -1,3 +0,0 @@
-.confirmation-modal .modal-body {
-    font-size: 1.5em;
-  }
\ No newline at end of file

From 9eca5ff0f23b14e169a93e7b1f7197f1b077f073 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sun, 11 Aug 2024 19:12:55 +1000
Subject: [PATCH 141/776] refactor: improve modal size

---
 .../confirmation-modal.component.ts           | 24 ++++++++++------
 .../confirmation-modal.service.ts             | 28 +++++++++++--------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts b/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
index 27f0d89d8c..f9506e5b8b 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
@@ -1,9 +1,12 @@
-/* eslint-disable prettier/prettier */
-/* eslint-disable @angular-eslint/component-selector */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { Component, OnInit, Input, Inject} from '@angular/core';
-import { AlertService } from '../../services/alert.service';
-import { MatDialogRef } from '@angular/material/dialog';
+import {Component, OnInit, Input, Inject} from '@angular/core';
+import {AlertService} from '../../services/alert.service';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+
+export interface ConfirmationModalData {
+  title: string;
+  message: string;
+  action?: any;
+}
 
 @Component({
   selector: 'confirmation-modal',
@@ -16,12 +19,16 @@ export class ConfirmationModalComponent implements OnInit {
   @Input() action: () => void;
 
   constructor(
-    @Inject(AlertService) private alertService: any,
+    @Inject(AlertService) private alertService: AlertService,
+    @Inject(MAT_DIALOG_DATA) public data: ConfirmationModalData,
+
     public dialogRef: MatDialogRef<ConfirmationModalComponent>,
   ) {}
 
   ngOnInit(): void {
-    console.log('confirmation-model ngOnInit()');
+    this.title = this.data.title;
+    this.message = this.data.message;
+    this.action = this.data.action;
   }
 
   public confirmAction() {
@@ -30,7 +37,6 @@ export class ConfirmationModalComponent implements OnInit {
     } else {
       this.alertService.error(`${this.title} action failed.`);
     }
-
     this.dialogRef.close();
   }
 
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
index 06c4da61e8..6257277eff 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
@@ -1,9 +1,6 @@
-/* eslint-disable prefer-const */
-/* eslint-disable prettier/prettier */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { Injectable } from '@angular/core';
-import { MatDialogRef, MatDialog } from '@angular/material/dialog';
-import { ConfirmationModalComponent } from './confirmation-modal.component';
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {ConfirmationModalComponent, ConfirmationModalData} from './confirmation-modal.component';
 
 @Injectable({
   providedIn: 'root',
@@ -12,11 +9,18 @@ export class ConfirmationModalService {
   constructor(public dialog: MatDialog) {}
 
   public show(title: string, message: string, action?: any) {
-    let dialogRef: MatDialogRef<ConfirmationModalComponent, any>;
-    dialogRef = this.dialog.open(ConfirmationModalComponent, {position: {top: '2.5%'}});
-    dialogRef.updateSize('42.5%', '');
-    dialogRef.componentInstance.title = title;
-    dialogRef.componentInstance.message = message;
-    dialogRef.componentInstance.action = action;
+    this.dialog.open<ConfirmationModalComponent, ConfirmationModalData>(
+      ConfirmationModalComponent,
+      {
+        data: {
+          title,
+          message,
+          action,
+        },
+        position: {top: '2.5%'},
+        width: '100%',
+        maxWidth: '650px',
+      },
+    );
   }
 }

From 955d0a17ae23be77954145ba189ac8bb0aa90da0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sun, 11 Aug 2024 19:18:08 +1000
Subject: [PATCH 142/776] fix: remove duplicate alert

---
 .../unit-tasks-editor/unit-task-editor.component.ts           | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
index ee0f135c26..bab5d97b37 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
@@ -137,9 +137,7 @@ export class UnitTaskEditorComponent implements AfterViewInit {
       () => {
         this.unit.deleteTaskDefinition(taskDefinition);
         //TODO: reinstate ProgressModal.show "Deleting Task #{task.abbreviation}", 'Please wait while student projects are updated.', promise
-
-        this.alerts.success('Task deleted');
-      }
+      },
     );
   }
 

From 27e9525147d8b500ac1a4df90080815cb32f67fe Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sun, 11 Aug 2024 19:24:09 +1000
Subject: [PATCH 143/776] refactor: align caption with modal title

---
 .../confirmation-modal/confirmation-modal.component.html  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.component.html b/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
index c2d7eb5cfe..3ec07fc729 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
@@ -1,10 +1,12 @@
 <div class="confirmation-modal">
   <h3 mat-dialog-title>
-    <div class="flex items-center">
+    <div class="flex flex-row items-center">
       <i class="fa fa-question-circle fa-2x pull-left"></i>
-      <div>{{ title }}</div>
+      <div class="flex flex-col">
+        <div>{{ title }}</div>
+        <small>Please confirm that you want to perform this action.</small>
+      </div>
     </div>
-    <small>Please confirm that you want to perform this action.</small>
   </h3>
   <mat-dialog-content>
     {{ message }}

From fb4a2ce527508fd64fe2fc6e89c10cc521234151 Mon Sep 17 00:00:00 2001
From: JackSCarroll <64730336+JackSCarroll@users.noreply.github.com>
Date: Tue, 20 Aug 2024 14:27:51 +1000
Subject: [PATCH 144/776] refactor: add button on frontend for future jplag
 report viewer

---
 src/app/common/footer/footer.component.html                | 4 ++++
 src/app/common/footer/footer.component.ts                  | 4 ++++
 src/app/projects/states/dashboard/selected-task.service.ts | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 7e28c72b32..d34e3c265f 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -108,6 +108,10 @@
           <mat-icon matListItemIcon aria-label="View Similarities">crisis_alert</mat-icon>
           View similarities
         </button>
+        <button mat-menu-item (click)="viewJPLAGReport()">
+          <mat-icon matListItemIcon aria-label="View JPLAG Report">preview</mat-icon>
+          View JPLAG report
+        </button>
         <mat-divider></mat-divider>
         <button mat-menu-item (click)="selectedTask?.updateTaskStatus('feedback_exceeded')">
           <mat-icon matListItemIcon aria-label="Switch to Feedback Exceeded">running_with_errors</mat-icon>
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 2e4d3ff1ef..224476afad 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -78,4 +78,8 @@ export class FooterComponent implements OnInit {
   viewSimilarity() {
     this.selectedTaskService.showSimilarity();
   }
+
+  viewJPLAGReport() {
+    this.selectedTaskService.showJPLAGReport();
+  }
 }
diff --git a/src/app/projects/states/dashboard/selected-task.service.ts b/src/app/projects/states/dashboard/selected-task.service.ts
index 6a6684c81c..27c16fa8b3 100644
--- a/src/app/projects/states/dashboard/selected-task.service.ts
+++ b/src/app/projects/states/dashboard/selected-task.service.ts
@@ -8,6 +8,7 @@ export enum DashboardViews {
   submission,
   task,
   similarity,
+  jplag,
 }
 
 @Injectable({
@@ -61,6 +62,10 @@ export class SelectedTaskService {
     this.currentView$.next(DashboardViews.similarity);
   }
 
+  public showJPLAGReport() {
+    this.currentView$.next(DashboardViews.jplag);
+  }
+
   public showSubmission() {
     if (!this.task$.value) return;
     this.currentPdfUrl$.next(this.task$.value.submissionUrl(false));

From 151ca04ca8da9059890d7846293bf34ae67f05c5 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 4 Sep 2024 16:20:24 +1000
Subject: [PATCH 145/776] feat: add support for the view language

---
 src/app/common/file-uploader/file-uploader.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/file-uploader/file-uploader.coffee b/src/app/common/file-uploader/file-uploader.coffee
index 9f8dac5ff9..c492dac115 100644
--- a/src/app/common/file-uploader/file-uploader.coffee
+++ b/src/app/common/file-uploader/file-uploader.coffee
@@ -68,7 +68,7 @@ angular.module('doubtfire.common.file-uploader', ["ngFileUpload"])
         extensions: ['pas', 'cpp', 'c', 'cs', 'csv', 'h', 'hpp', 'java', 'py', 'js', 'html', 'coffee', 'rb', 'css',
                     'scss', 'yaml', 'yml', 'xml', 'json', 'ts', 'r', 'rmd', 'rnw', 'rhtml', 'rpres', 'tex',
                     'vb', 'sql', 'txt', 'md', 'jack', 'hack', 'asm', 'hdl', 'tst', 'out', 'cmp', 'vm', 'sh', 'bat',
-                    'dat', 'ipynb', 'pml']
+                    'dat', 'ipynb', 'pml', 'vue']
         icon:       'fa-file-code-o'
         name:       'code'
       image:

From b4b36541943232f7df3ee4888bf4ca46c4c04018 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 4 Sep 2024 16:20:24 +1000
Subject: [PATCH 146/776] feat: add support for the view language

---
 src/app/common/file-uploader/file-uploader.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/file-uploader/file-uploader.coffee b/src/app/common/file-uploader/file-uploader.coffee
index 9f8dac5ff9..c492dac115 100644
--- a/src/app/common/file-uploader/file-uploader.coffee
+++ b/src/app/common/file-uploader/file-uploader.coffee
@@ -68,7 +68,7 @@ angular.module('doubtfire.common.file-uploader', ["ngFileUpload"])
         extensions: ['pas', 'cpp', 'c', 'cs', 'csv', 'h', 'hpp', 'java', 'py', 'js', 'html', 'coffee', 'rb', 'css',
                     'scss', 'yaml', 'yml', 'xml', 'json', 'ts', 'r', 'rmd', 'rnw', 'rhtml', 'rpres', 'tex',
                     'vb', 'sql', 'txt', 'md', 'jack', 'hack', 'asm', 'hdl', 'tst', 'out', 'cmp', 'vm', 'sh', 'bat',
-                    'dat', 'ipynb', 'pml']
+                    'dat', 'ipynb', 'pml', 'vue']
         icon:       'fa-file-code-o'
         name:       'code'
       image:

From 3f1a75207674b42e32c4ed7ddb1056b0dbab3407 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 5 Sep 2024 15:37:30 +1000
Subject: [PATCH 147/776] chore(release): 8.0.28

---
 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 1839482f34..67a49d5d89 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.
 
+### [8.0.28](https://github.com/macite/doubtfire-deploy/compare/v8.0.23...v8.0.28) (2024-09-05)
+
+
+### Features
+
+* add support for the view language ([b4b3654](https://github.com/macite/doubtfire-deploy/commit/b4b36541943232f7df3ee4888bf4ca46c4c04018))
+
 ### [8.0.23](https://github.com/macite/doubtfire-deploy/compare/v8.0.22...v8.0.23) (2024-08-02)
 
 
diff --git a/package-lock.json b/package-lock.json
index 391ed15dac..a02d52eb80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.23",
+  "version": "8.0.28",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.23",
+      "version": "8.0.28",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index e90b3ba27c..15405c0da0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.23",
+  "version": "8.0.28",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 2ec1b06b5330c5e142cc3fc01c49c2aded5411cb Mon Sep 17 00:00:00 2001
From: JackSCarroll <64730336+JackSCarroll@users.noreply.github.com>
Date: Wed, 11 Sep 2024 13:54:51 +1000
Subject: [PATCH 148/776] feat: add jplag report download button to student
 submission tutor teacher footer view

---
 src/app/api/models/task-definition.ts       |  6 ++++++
 src/app/api/models/task.ts                  |  6 ++++++
 src/app/common/footer/footer.component.html |  6 +++---
 src/app/common/footer/footer.component.ts   | 10 +++++++---
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 1b49a2e856..00efa72199 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -188,6 +188,12 @@ export class TaskDefinition extends Entity {
     }/task_assessment_resources.json`;
   }
 
+  // public getTaskJPLAGReportUrl(): string {
+  //   return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
+  //     this.id
+  //   }/jplag_report.json`;
+  // }
+
   public deleteTaskSheet(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
     return httpClient.delete(this.taskSheetUploadUrl).pipe(tap(() => (this.hasTaskSheet = false)));
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2aa167adfd..cc0779393c 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -513,6 +513,12 @@ export class Task extends Entity {
     }/task_def_id/${this.definition.id}/submission${asAttachment ? '?as_attachment=true' : ''}`;
   }
 
+  public jplagReportUrl(): string {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
+      this._unit.id
+    }/task_definitions/${this.definition.id}/jplag_report`;
+  }
+
   public testSubmissionUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
       this.definition.id
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index d34e3c265f..9d595ac33d 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -108,9 +108,9 @@
           <mat-icon matListItemIcon aria-label="View Similarities">crisis_alert</mat-icon>
           View similarities
         </button>
-        <button mat-menu-item (click)="viewJPLAGReport()">
-          <mat-icon matListItemIcon aria-label="View JPLAG Report">preview</mat-icon>
-          View JPLAG report
+        <button mat-menu-item (click)="downloadJPLAGReport()">
+          <mat-icon matListItemIcon aria-label="Download JPLAG Report">download</mat-icon>
+          Download JPLAG report
         </button>
         <mat-divider></mat-divider>
         <button mat-menu-item (click)="selectedTask?.updateTaskStatus('feedback_exceeded')">
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 224476afad..88966f9581 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -67,6 +67,13 @@ export class FooterComponent implements OnInit {
     );
   }
 
+  downloadJPLAGReport() {
+    this.fileDownloader.downloadFile(
+      this.selectedTask.jplagReportUrl(),
+      `${this.selectedTask.definition.name}-jplag-report.zip`,
+    );
+  }
+
   viewTaskSheet() {
     this.selectedTaskService.showTaskSheet();
   }
@@ -79,7 +86,4 @@ export class FooterComponent implements OnInit {
     this.selectedTaskService.showSimilarity();
   }
 
-  viewJPLAGReport() {
-    this.selectedTaskService.showJPLAGReport();
-  }
 }

From 16670a27d5dc544ae828da85cda48358cab4d75e Mon Sep 17 00:00:00 2001
From: JackSCarroll <64730336+JackSCarroll@users.noreply.github.com>
Date: Fri, 20 Sep 2024 20:49:01 +1000
Subject: [PATCH 149/776] feat: jplag report download button in task explorer
 view

---
 src/app/api/models/task-definition.ts         |   6 -
 .../staff-task-list.component.html            | 306 ++++++++++--------
 .../staff-task-list.component.ts              |  12 +
 3 files changed, 181 insertions(+), 143 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 00efa72199..1b49a2e856 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -188,12 +188,6 @@ export class TaskDefinition extends Entity {
     }/task_assessment_resources.json`;
   }
 
-  // public getTaskJPLAGReportUrl(): string {
-  //   return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
-  //     this.id
-  //   }/jplag_report.json`;
-  // }
-
   public deleteTaskSheet(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
     return httpClient.delete(this.taskSheetUploadUrl).pipe(tap(() => (this.hasTaskSheet = false)));
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index bb9c9ba8ce..544a86f66c 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -1,6 +1,9 @@
 <!-- The search bar template -->
 <ng-template #OmnisearchTemplate let-collapsable="collapsable" let-mobile="mobile">
-  <div class="omnisearch rounded-t-2xl md:rounded-2xl" [ngClass]="{ expanded: showSearchOptions, mobile: mobile }">
+  <div
+    class="omnisearch rounded-t-2xl md:rounded-2xl"
+    [ngClass]="{expanded: showSearchOptions, mobile: mobile}"
+  >
     <div class="flex items-center">
       <button mat-icon-button aria-label="Search Icon" disabled class="flex-none flex items-center">
         <mat-icon class="flex items-center" disabled>search</mat-icon>
@@ -18,42 +21,44 @@
         />
       </div>
       @if (collapsable) {
-      <button
-        class="flex-none flex items-center"
-        matTooltip="Filter options"
-        matTooltipPosition="below"
-        matTooltipShowDelay="400"
-        mat-icon-button
-        aria-label="Inbox search dropdown"
-        (click)="showSearchOptions = !showSearchOptions"
-      >
-        <mat-icon>{{ showSearchOptions ? 'arrow_drop_up' : 'arrow_drop_down' }}</mat-icon>
-      </button>
-      } @if (!isTaskDefMode) {
-      <button
-        class="flex-none flex items-center"
-        matTooltip="Refresh the task inbox"
-        matTooltipPosition="below"
-        matTooltipShowDelay="400"
-        matTooltip
-        mat-icon-button
-        aria-label="Refresh Inbox"
-        (click)="refreshTasks()"
-      >
-        <mat-icon>refresh</mat-icon>
-      </button>
-      } @if (isTaskDefMode) {
-      <button
-        class="flex items-center"
-        mat-icon-button
-        matTooltip="More options"
-        matTooltipPosition="below"
-        matTooltipShowDelay="400"
-        [matMenuTriggerFor]="menu"
-        aria-label="Menu to download submission files"
-      >
-        <mat-icon>more_vert</mat-icon>
-      </button>
+        <button
+          class="flex-none flex items-center"
+          matTooltip="Filter options"
+          matTooltipPosition="below"
+          matTooltipShowDelay="400"
+          mat-icon-button
+          aria-label="Inbox search dropdown"
+          (click)="showSearchOptions = !showSearchOptions"
+        >
+          <mat-icon>{{ showSearchOptions ? 'arrow_drop_up' : 'arrow_drop_down' }}</mat-icon>
+        </button>
+      }
+      @if (!isTaskDefMode) {
+        <button
+          class="flex-none flex items-center"
+          matTooltip="Refresh the task inbox"
+          matTooltipPosition="below"
+          matTooltipShowDelay="400"
+          matTooltip
+          mat-icon-button
+          aria-label="Refresh Inbox"
+          (click)="refreshTasks()"
+        >
+          <mat-icon>refresh</mat-icon>
+        </button>
+      }
+      @if (isTaskDefMode) {
+        <button
+          class="flex items-center"
+          mat-icon-button
+          matTooltip="More options"
+          matTooltipPosition="below"
+          matTooltipShowDelay="400"
+          [matMenuTriggerFor]="menu"
+          aria-label="Menu to download submission files"
+        >
+          <mat-icon>more_vert</mat-icon>
+        </button>
       }
       <mat-menu #menu="matMenu">
         <button
@@ -74,6 +79,10 @@
           <mat-icon>download</mat-icon>
           <span>Bulk Export Submission Files</span>
         </button>
+        <button mat-menu-item (click)="downloadJPLAGReport()">
+          <mat-icon>download</mat-icon>
+          <span>Download JPLAG Report</span>
+        </button>
       </mat-menu>
     </div>
     <mat-accordion>
@@ -93,16 +102,20 @@
                   name="taskDefID"
                   (selectionChange)="taskDefinitionIdChanged()"
                 >
-                  <mat-option value="" [hidden]="taskData.taskDefMode">All Task Definitions</mat-option>
+                  <mat-option value="" [hidden]="taskData.taskDefMode"
+                    >All Task Definitions</mat-option
+                  >
                   @for (td of unit.taskDefinitionCache.values | async; track td) {
-                  <mat-option [value]="td.id">
-                    <span class="truncate">{{ td.abbreviation + ' - ' + td.name }}</span>
-                  </mat-option>
+                    <mat-option [value]="td.id">
+                      <span class="truncate">{{ td.abbreviation + ' - ' + td.name }}</span>
+                    </mat-option>
                   }
                 </mat-select>
               </mat-form-field>
               <button
-                [disabled]="filters.taskDefinitionIdSelected || !filters.taskDefinitionIdSelected === ''"
+                [disabled]="
+                  filters.taskDefinitionIdSelected || !filters.taskDefinitionIdSelected === ''
+                "
                 mat-icon-button
                 aria-label="Sort by task definition icon"
                 (click)="toggleTaskDefSort()"
@@ -121,13 +134,18 @@
                 (selectionChange)="tutorialIdChanged()"
               >
                 @for (t of studentFilter; track t) {
-                <mat-option [value]="t.id">
-                  <span class="truncate">{{ t.inboxDescription }}</span>
-                </mat-option>
+                  <mat-option [value]="t.id">
+                    <span class="truncate">{{ t.inboxDescription }}</span>
+                  </mat-option>
                 }
               </mat-select>
             </mat-form-field>
-            <button disabled mat-icon-button aria-label="Sort by tutorial icon" (click)="toggleTutorialSort()">
+            <button
+              disabled
+              mat-icon-button
+              aria-label="Sort by tutorial icon"
+              (click)="toggleTutorialSort()"
+            >
               <mat-icon>{{ states[tutorialSort].icon }}</mat-icon>
             </button>
           </div>
@@ -140,14 +158,19 @@
 
 <!-- Narrow width search dialog template-->
 <ng-template #searchDialog>
-  <ng-container *ngTemplateOutlet="OmnisearchTemplate; context: { collapsable: false, mobile: true }"></ng-container>
+  <ng-container
+    *ngTemplateOutlet="OmnisearchTemplate; context: {collapsable: false, mobile: true}"
+  ></ng-container>
   <div mat-dialog-actions align="end">
     <button mat-button [mat-dialog-close]>OK</button>
   </div>
 </ng-template>
 
 <!-- Actual task-inbox -->
-<div class="task-inbox flex flex-col justify-normal" [ngClass]="isNarrow ? 'narrow-width' : 'full-width'">
+<div
+  class="task-inbox flex flex-col justify-normal"
+  [ngClass]="isNarrow ? 'narrow-width' : 'full-width'"
+>
   <div class="openSearchDialog" [hidden]="!isNarrow">
     <button mat-icon-button (click)="openDialog()" aria-label="Seach Button">
       <mat-icon>search</mat-icon>
@@ -155,9 +178,11 @@
   </div>
 
   @if (!isNarrow) {
-  <div>
-    <ng-container *ngTemplateOutlet="OmnisearchTemplate; context: { collapsable: true, mobile: false }"></ng-container>
-  </div>
+    <div>
+      <ng-container
+        *ngTemplateOutlet="OmnisearchTemplate; context: {collapsable: true, mobile: false}"
+      ></ng-container>
+    </div>
   }
 
   <div class="center-task-list" [hidden]="!loading || isNarrow">
@@ -170,44 +195,45 @@
 
   <!--/search-options-->
   @if (filteredTasks) {
-  <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60">
-    <mat-list class="m-0 p-0">
-      <mat-list-item
-        class="clearfix"
-        *cdkVirtualFor="let task of filteredTasks; templateCacheSize: 0"
-        style="padding: 0; height: 60px"
-      >
-        @if (task) {
-        <div
-          class="w-full"
-          id="{{ task.taskKeyToIdString() }}"
-          [ngClass]="{
-            selected: isSelectedTask(task),
-            'item-content': task.statusClass()
-          }"
+    <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60">
+      <mat-list class="m-0 p-0">
+        <mat-list-item
+          class="clearfix"
+          *cdkVirtualFor="let task of filteredTasks; templateCacheSize: 0"
+          style="padding: 0; height: 60px"
         >
-          <div
-            (click)="setSelectedTask(task)"
-            class="inbox-entry flex items-center"
-            [ngClass]="{ hover: task.hover }"
-            (mouseover)="task.hover = allowHover"
-            (mouseout)="task.hover = task.optionsOpened"
-          >
-            <span
-              class="notification"
+          @if (task) {
+            <div
+              class="w-full"
+              id="{{ task.taskKeyToIdString() }}"
               [ngClass]="{
-                active: task.numNewComments > 0 || task.similaritiesDetected,
-                similarities: task.similaritiesDetected
+                selected: isSelectedTask(task),
+                'item-content': task.statusClass(),
               }"
-            ></span>
-            <user-icon class="self-center" [user]="task.project.student" [size]="30"> </user-icon>
-            <div class="task-list-data truncate flex-1" [hidden]="isNarrow">
-              <h4 class="student-name">{{ task.project.student.name }}</h4>
-              <div class="task-details truncate">
-                {{ task.definition.abbreviation }} -
-                {{ task.definition.name }}
-              </div>
-              <!-- <div class="muted" [hidden]="!isSelectedTask(task)">
+            >
+              <div
+                (click)="setSelectedTask(task)"
+                class="inbox-entry flex items-center"
+                [ngClass]="{hover: task.hover}"
+                (mouseover)="task.hover = allowHover"
+                (mouseout)="task.hover = task.optionsOpened"
+              >
+                <span
+                  class="notification"
+                  [ngClass]="{
+                    active: task.numNewComments > 0 || task.similaritiesDetected,
+                    similarities: task.similaritiesDetected,
+                  }"
+                ></span>
+                <user-icon class="self-center" [user]="task.project.student" [size]="30">
+                </user-icon>
+                <div class="task-list-data truncate flex-1" [hidden]="isNarrow">
+                  <h4 class="student-name">{{ task.project.student.name }}</h4>
+                  <div class="task-details truncate">
+                    {{ task.definition.abbreviation }} -
+                    {{ task.definition.name }}
+                  </div>
+                  <!-- <div class="muted" [hidden]="!isSelectedTask(task)">
                 <p class="mat-small">
                   {{ task.shortTutorialDescription() }}
                 </p>
@@ -216,60 +242,66 @@ <h4 class="student-name">{{ task.project.student.name }}</h4>
                   Assessed {{ task.timesAssessed }} time{{ task.timesAssessed === 1 ? '' : 's' }}
                 </p>
               </div> -->
-            </div>
-            @if (task.hasGrade()) {
-            <div matTooltip="The grade assigned to the submission" matTooltipPosition="above">
-              <mat-chip-option style="margin-right: 6px" [hidden]="isNarrow">{{ task.gradeDesc() }} </mat-chip-option>
-            </div>
-            }
-            <status-icon
-              [hidden]="isNarrow"
-              matBadge="{{ task.qualityPts }}/{{ task.definition.maxQualityPts }}"
-              [matBadgeHidden]="!task.hasQualityPoints() || !task.qualityPts"
-              matBadgePosition="before"
-              [status]="task.status"
-              class="ml-3"
-            ></status-icon>
-            @if (!isTaskDefMode) {
-            <div class="overflow" [hidden]="isNarrow">
-              <button [hidden]="task.hover" mat-icon-button aria-label="task-overflow">
-                <!-- <mat-icon class="warn-icon" *ngIf="task.similaritiesDetected">remove_red_eye</mat-icon> -->
-
-                @if (task.pinned) {
-                <div class="pin-container">
-                  <mat-icon>push_pin</mat-icon>
                 </div>
+                @if (task.hasGrade()) {
+                  <div matTooltip="The grade assigned to the submission" matTooltipPosition="above">
+                    <mat-chip-option style="margin-right: 6px" [hidden]="isNarrow"
+                      >{{ task.gradeDesc() }}
+                    </mat-chip-option>
+                  </div>
                 }
-              </button>
-              <button
-                [hidden]="!task.hover"
-                mat-icon-button
-                aria-label="task overflow"
-                [matMenuTriggerFor]="overflowMenu"
-                (menuOpened)="setSelectedTask(task); task.optionsOpened = true"
-                (menuClosed)="task.hover = false; task.optionsOpened = false"
-                matTooltip="Submission options"
-                matTooltipPosition="right"
-                matTooltipShowDelay="400"
-              >
-                <mat-icon>more_horiz</mat-icon>
-              </button>
-              <mat-menu #overflowMenu="matMenu" yPosition="below">
-                <button mat-menu-item (click)="togglePin(task)" class="flex items-center">
-                  <mat-icon class="mr-0"> {{ task.pinned ? 'remove_circle' : 'add_alert' }} </mat-icon>
-                  <span class="ml-5">{{ task.pinned ? 'Unpin from inbox' : 'Pin to inbox' }} </span>
-                </button>
-              </mat-menu>
+                <status-icon
+                  [hidden]="isNarrow"
+                  matBadge="{{ task.qualityPts }}/{{ task.definition.maxQualityPts }}"
+                  [matBadgeHidden]="!task.hasQualityPoints() || !task.qualityPts"
+                  matBadgePosition="before"
+                  [status]="task.status"
+                  class="ml-3"
+                ></status-icon>
+                @if (!isTaskDefMode) {
+                  <div class="overflow" [hidden]="isNarrow">
+                    <button [hidden]="task.hover" mat-icon-button aria-label="task-overflow">
+                      <!-- <mat-icon class="warn-icon" *ngIf="task.similaritiesDetected">remove_red_eye</mat-icon> -->
+
+                      @if (task.pinned) {
+                        <div class="pin-container">
+                          <mat-icon>push_pin</mat-icon>
+                        </div>
+                      }
+                    </button>
+                    <button
+                      [hidden]="!task.hover"
+                      mat-icon-button
+                      aria-label="task overflow"
+                      [matMenuTriggerFor]="overflowMenu"
+                      (menuOpened)="setSelectedTask(task); task.optionsOpened = true"
+                      (menuClosed)="task.hover = false; task.optionsOpened = false"
+                      matTooltip="Submission options"
+                      matTooltipPosition="right"
+                      matTooltipShowDelay="400"
+                    >
+                      <mat-icon>more_horiz</mat-icon>
+                    </button>
+                    <mat-menu #overflowMenu="matMenu" yPosition="below">
+                      <button mat-menu-item (click)="togglePin(task)" class="flex items-center">
+                        <mat-icon class="mr-0">
+                          {{ task.pinned ? 'remove_circle' : 'add_alert' }}
+                        </mat-icon>
+                        <span class="ml-5"
+                          >{{ task.pinned ? 'Unpin from inbox' : 'Pin to inbox' }}
+                        </span>
+                      </button>
+                    </mat-menu>
+                  </div>
+                }
+              </div>
+              <!--/badges-->
             </div>
-            }
-          </div>
-          <!--/badges-->
-        </div>
-        }
-      </mat-list-item>
+          }
+        </mat-list-item>
 
-      <!--/task-->
-    </mat-list>
-  </cdk-virtual-scroll-viewport>
+        <!--/task-->
+      </mat-list>
+    </cdk-virtual-scroll-viewport>
   }
 </div>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 95b498af20..a6d26643c2 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -226,6 +226,18 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     );
   }
 
+  downloadJPLAGReport() {
+    const taskDef = this.filters.taskDefinition;
+    this.fileDownloaderService.downloadFile(
+      //this.taskData.selectedTask.jplagReportUrl()
+      `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
+        this.unit.id
+      }/task_definitions/${taskDef.id}/jplag_report`,
+      `${this.unit.code}-${taskDef.abbreviation}-jplag-report.zip`,
+    );
+    window.open('https://jplag.github.io/JPlag/', '_blank');
+  }
+
   openDialog() {
     const dialogRef = this.dialog.open(this.searchDialog);
 

From 1ef531644cf34957640c8c002a7bf4655b4f505d Mon Sep 17 00:00:00 2001
From: JackSCarroll <64730336+JackSCarroll@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:02:46 +1000
Subject: [PATCH 150/776] chore: commit edited files

---
 src/app/common/footer/footer.component.html       |  4 ----
 src/app/common/footer/footer.component.ts         |  1 -
 .../states/dashboard/selected-task.service.ts     |  5 -----
 .../task-definition-upload.component.html         |  2 ++
 .../staff-task-list.component.html                |  6 +++++-
 .../staff-task-list/staff-task-list.component.ts  | 15 +++++++++++++++
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 9d595ac33d..7e28c72b32 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -108,10 +108,6 @@
           <mat-icon matListItemIcon aria-label="View Similarities">crisis_alert</mat-icon>
           View similarities
         </button>
-        <button mat-menu-item (click)="downloadJPLAGReport()">
-          <mat-icon matListItemIcon aria-label="Download JPLAG Report">download</mat-icon>
-          Download JPLAG report
-        </button>
         <mat-divider></mat-divider>
         <button mat-menu-item (click)="selectedTask?.updateTaskStatus('feedback_exceeded')">
           <mat-icon matListItemIcon aria-label="Switch to Feedback Exceeded">running_with_errors</mat-icon>
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 88966f9581..a18fec6bc7 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -85,5 +85,4 @@ export class FooterComponent implements OnInit {
   viewSimilarity() {
     this.selectedTaskService.showSimilarity();
   }
-
 }
diff --git a/src/app/projects/states/dashboard/selected-task.service.ts b/src/app/projects/states/dashboard/selected-task.service.ts
index 27c16fa8b3..6a6684c81c 100644
--- a/src/app/projects/states/dashboard/selected-task.service.ts
+++ b/src/app/projects/states/dashboard/selected-task.service.ts
@@ -8,7 +8,6 @@ export enum DashboardViews {
   submission,
   task,
   similarity,
-  jplag,
 }
 
 @Injectable({
@@ -62,10 +61,6 @@ export class SelectedTaskService {
     this.currentView$.next(DashboardViews.similarity);
   }
 
-  public showJPLAGReport() {
-    this.currentView$.next(DashboardViews.jplag);
-  }
-
   public showSubmission() {
     if (!this.task$.value) return;
     this.currentPdfUrl$.next(this.task$.value.submissionUrl(false));
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
index fe96cfb2df..62521091e6 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
@@ -79,6 +79,8 @@
   <mat-form-field appearance="outline" class="basis-1/2">
     <mat-label>Language used for Moss checks</mat-label>
     <mat-select [(ngModel)]="taskDefinition.mossLanguage">
+      <!-- If more language options added, unit-similarity-module.rb will need to be updated if moss and jplag -->
+      <!-- language option names differ -->
       <mat-option value="moss c">C</mat-option>
       <mat-option value="moss csharp">C#</mat-option>
       <mat-option value="moss cc">C++</mat-option>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index 544a86f66c..8a14e19f2e 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -79,7 +79,11 @@
           <mat-icon>download</mat-icon>
           <span>Bulk Export Submission Files</span>
         </button>
-        <button mat-menu-item (click)="downloadJPLAGReport()">
+        <button
+          mat-menu-item
+          (click)="downloadJPLAGReport()"
+          [hidden]="false"
+        >
           <mat-icon>download</mat-icon>
           <span>Download JPLAG Report</span>
         </button>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index a6d26643c2..12e1148714 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -206,6 +206,21 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     return this.taskData.taskDefMode;
   }
 
+  // public get taskHasJplagReport(): boolean {
+  //   console.log('taskHasSimilarityChecks getter called');
+  //   if (!this.selectedTask.hasSimilarity()) {
+  //     console.error('filters.taskDefinition is not defined');
+  //     return false;
+  //   }
+  //   if (typeof this.filters.taskDefinition.hasPlagiarismCheck !== 'function') {
+  //     console.error('hasPlagiarismCheck is not a function');
+  //     return false;
+  //   }
+  //   const result = this.filters.taskDefinition.hasPlagiarismCheck();
+  //   console.log('taskHasSimilarityChecks result:', result);
+  //   return result;
+  // }
+
   downloadSubmissionPdfs() {
     const taskDef = this.filters.taskDefinition;
     this.fileDownloaderService.downloadFile(

From d9c64b09e4b8770091157594bef97613460d918e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 28 Sep 2024 16:41:10 +1000
Subject: [PATCH 151/776] refactor: replace iframe with native pdf-viewer

---
 .../modals/comments-modal/comments-modal.component.html     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/common/modals/comments-modal/comments-modal.component.html b/src/app/common/modals/comments-modal/comments-modal.component.html
index 1831477b8d..707bcff36c 100644
--- a/src/app/common/modals/comments-modal/comments-modal.component.html
+++ b/src/app/common/modals/comments-modal/comments-modal.component.html
@@ -2,10 +2,6 @@
   @if (taskComment.commentType === 'image') {
     <img class="w-full h-full p-0 rounded border-none" [src]="commentResourceUrl" />
   } @else if (taskComment.commentType === 'pdf') {
-    <iframe
-      class="w-full h-[80vh]"
-      [src]="commentResourceUrl | safe"
-      type="application/pdf"
-    ></iframe>
+    <f-pdf-viewer class="w-full h-[85vh] block" [pdfUrl]="commentResourceUrl"> </f-pdf-viewer>
   }
 </div>

From 90830cdba73bcfe564362015b5abaf2c40810f5f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 28 Sep 2024 17:02:52 +1000
Subject: [PATCH 152/776] feat: add startpage property to auto scroll to on pdf
 render

---
 .../common/pdf-viewer/pdf-viewer.component.html |  2 +-
 .../common/pdf-viewer/pdf-viewer.component.ts   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.html b/src/app/common/pdf-viewer/pdf-viewer.component.html
index b060046125..ed361fecd8 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.html
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.html
@@ -58,7 +58,7 @@
         [render-text]="true"
         [original-size]="false"
         (after-load-complete)="onLoaded()"
-        (page-rendered)="loaded = true"
+        (page-rendered)="onPageRendered()"
       ></pdf-viewer>
     }
   } @else {
diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.ts b/src/app/common/pdf-viewer/pdf-viewer.component.ts
index 8f21f8e47c..b1b3945acb 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.ts
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.ts
@@ -24,6 +24,8 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
   public useNativePdfViewer = false;
 
   @Input() pdfUrl: string;
+  @Input() startPage: number = 1;
+
   @ViewChild(PdfViewerComponent) private pdfComponent: PdfViewerComponent;
   pdfSearchString: string;
   zoomValue = 1;
@@ -75,6 +77,14 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
     });
   }
 
+  scrollToPage(pageNumber: number) {
+    if (pageNumber <= this.pdfComponent.pdfViewer.pagesCount) {
+      this.pdfComponent.pdfViewer.scrollPageIntoView({
+        pageNumber,
+      });
+    }
+  }
+
   public zoomIn() {
     if (this.zoomValue < 2.5) {
       this.zoomValue += 0.1;
@@ -111,4 +121,11 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
     this.loaded = true;
     window.dispatchEvent(new Event('resize'));
   }
+
+  onPageRendered() {
+    this.loaded = true;
+    if (this.startPage > 1) {
+      this.scrollToPage(this.startPage);
+    }
+  }
 }

From 45cc89e18cff8fcde66480448eea178940d316a2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 28 Sep 2024 17:04:27 +1000
Subject: [PATCH 153/776] feat: init pdf viewer on page 2 for student
 submissions

---
 .../task-dashboard/task-dashboard.component.html       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
index b2d723387c..835fead6ca 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
@@ -1,11 +1,15 @@
 <div class="w-full h-full overflow-auto">
   <ng-container [ngSwitch]="currentView">
     <ng-template [ngSwitchCase]="DashboardViews.task">
-      <ng-container *ngIf="selectedTaskService.hasTaskSheet; then pdfViewer; else noPdfUrl"></ng-container>
+      <ng-container
+        *ngIf="selectedTaskService.hasTaskSheet; then pdfViewer; else noPdfUrl"
+      ></ng-container>
     </ng-template>
 
     <ng-template [ngSwitchCase]="DashboardViews.submission">
-      <ng-container *ngIf="selectedTaskService.hasSubmissionPdf; then pdfViewer; else noPdfUrl"></ng-container>
+      <ng-container
+        *ngIf="selectedTaskService.hasSubmissionPdf; then pdfViewer; else noPdfUrl"
+      ></ng-container>
     </ng-template>
 
     <ng-template [ngSwitchCase]="DashboardViews.similarity">
@@ -15,7 +19,7 @@
 
   <!-- The PDF Viewer -->
   <ng-template #pdfViewer>
-    <f-pdf-viewer [pdfUrl]="pdfUrl"></f-pdf-viewer>
+    <f-pdf-viewer [pdfUrl]="pdfUrl" [startPage]="2"></f-pdf-viewer>
   </ng-template>
 
   <!-- Render if no PDF URL is available for the current view -->

From 1348da2d345b080002a62a24d717fac15c4b0a92 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 5 Aug 2024 21:22:03 +1000
Subject: [PATCH 154/776] feat: persistent pdf zoom level

---
 src/app/common/pdf-viewer/pdf-viewer.component.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.ts b/src/app/common/pdf-viewer/pdf-viewer.component.ts
index 8f21f8e47c..17f6d85fbd 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.ts
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.ts
@@ -19,6 +19,9 @@ import {AlertService} from '../services/alert.service';
   styleUrls: ['./pdf-viewer.component.scss'],
 })
 export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit {
+  private readonly ZOOM_MIN = 0.5;
+  private readonly ZOOM_MAX = 2.5;
+
   private _pdfUrl: string;
   public pdfBlobUrl: string;
   public useNativePdfViewer = false;
@@ -43,6 +46,9 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
 
   ngAfterViewInit(): void {
     this.useNativePdfViewer = localStorage.getItem('useNativePdfViewer') === 'true';
+    const storedZoomValue = parseFloat(localStorage.getItem('pdfViewerZoom')) || 1;
+    // Clamp zoom value between ZOOM_MIN and ZOOM_MAX
+    this.zoomValue = Math.min(Math.max(storedZoomValue, this.ZOOM_MIN), this.ZOOM_MAX);
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -76,13 +82,15 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
   }
 
   public zoomIn() {
-    if (this.zoomValue < 2.5) {
+    if (this.zoomValue < this.ZOOM_MAX) {
       this.zoomValue += 0.1;
+      localStorage.setItem('pdfViewerZoom', this.zoomValue.toString());
     }
   }
   public zoomOut() {
-    if (this.zoomValue > 0.5) {
+    if (this.zoomValue > this.ZOOM_MIN) {
       this.zoomValue -= 0.1;
+      localStorage.setItem('pdfViewerZoom', this.zoomValue.toString());
     }
   }
 

From 8549817a48f46f81ffc7918c194d815870ac080a Mon Sep 17 00:00:00 2001
From: JackSCarroll <64730336+JackSCarroll@users.noreply.github.com>
Date: Fri, 11 Oct 2024 19:48:40 +1100
Subject: [PATCH 155/776] refactor: add features for jplag report download

---
 src/app/api/models/task-definition.ts         |  4 +--
 src/app/api/models/task-similarity.ts         |  6 ++---
 .../api/services/task-definition.service.ts   |  2 +-
 .../task-similarity-view.component.html       | 27 +++++++++++++------
 .../task-similarity-view.component.ts         | 18 ++++++++++++-
 .../task-definition-upload.component.html     | 20 +++++++-------
 6 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 1b49a2e856..48ce4699fa 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -36,7 +36,7 @@ export class TaskDefinition extends Entity {
   maxQualityPts: number;
   overseerImageId: number;
   assessmentEnabled: boolean;
-  mossLanguage: string = 'moss c';
+  jplagLanguage: string = 'c';
 
   readonly unit: Unit;
 
@@ -160,7 +160,7 @@ export class TaskDefinition extends Entity {
     return this.plagiarismChecks?.length > 0;
   }
 
-  public get needsMoss(): boolean {
+  public get needsJplag(): boolean {
     return this.uploadRequirements.some((upreq) => upreq.type === 'code' && upreq.tiiCheck);
   }
 
diff --git a/src/app/api/models/task-similarity.ts b/src/app/api/models/task-similarity.ts
index c3a72e556f..be8b3d9b09 100644
--- a/src/app/api/models/task-similarity.ts
+++ b/src/app/api/models/task-similarity.ts
@@ -5,7 +5,7 @@ import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants
 import { Observable } from 'rxjs';
 
 export enum TaskSimilarityType {
-  Moss = 'MossTaskSimilarity',
+  Jplag = 'JplagTaskSimilarity',
   TurnItIn = 'TiiTaskSimilarity',
 }
 
@@ -62,8 +62,8 @@ export class TaskSimilarity extends Entity {
 
   public get friendlyTypeName(): string {
     switch (this.type) {
-      case TaskSimilarityType.Moss:
-        return 'MOSS';
+      case TaskSimilarityType.Jplag:
+        return 'JPLAG';
       case TaskSimilarityType.TurnItIn:
         return 'TurnItIn';
     }
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 13a1dd2797..e0b685c20b 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -21,7 +21,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'description',
       'weighting',
       'targetGrade',
-      'mossLanguage',
+      'jplagLanguage',
       {
         keys: 'targetDate',
         toEntityFn: MappingFunctions.mapDateToEndOfDay,
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index f068cb609f..2f42a7974d 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -23,14 +23,25 @@ <h1 class="mat-headline"></h1>
             </mat-panel-title>
             <mat-panel-description> {{ part.description }} </mat-panel-description>
             @if (similarity.readyForViewer) {
-              <button
-                matTooltip="View report for this similarity"
-                mat-icon-button
-                aria-label="View Detailed Report"
-                (click)="openReport($event, similarity)"
-              >
-                <mat-icon>summarize</mat-icon>
-              </button>
+              @if (similarity.type === 'JplagTaskSimilarity') {
+                <button
+                  matTooltip="Download report for this similarity"
+                  mat-icon-button
+                  aria-label="View Detailed Report"
+                  (click)="downloadJPLAGReport()"
+                >
+                  <mat-icon>download</mat-icon>
+                </button>
+              } @else {
+                <button
+                  matTooltip="View similarity for this part"
+                  mat-icon-button
+                  aria-label="View Similarity"
+                  (click)="openViewer($event, similarity, part)"
+                >
+                  <mat-icon>summarize</mat-icon>
+                </button>
+              }
             }
             @if (i === 0) {
               <button
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index 2a6739207a..272b456af7 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -5,6 +5,9 @@ import { TaskSimilarity } from 'src/app/api/models/task-similarity';
 import { TaskSimilarityService } from 'src/app/api/services/task-similarity.service';
 import { AlertService } from 'src/app/common/services/alert.service';
 import { SelectedTaskService } from '../../../../selected-task.service';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import { AppInjector } from 'src/app/app-injector';
 
 @Component({
   selector: 'f-task-similarity-view',
@@ -19,7 +22,8 @@ export class TaskSimilarityViewComponent implements OnChanges {
   constructor(
     private taskSimilarityService: TaskSimilarityService,
     private alertsService: AlertService,
-    private selectedTaskService: SelectedTaskService
+    private selectedTaskService: SelectedTaskService,
+    private fileDownloaderService: FileDownloaderService,
   ) {}
 
   ngOnChanges(changes: SimpleChanges) {
@@ -54,4 +58,16 @@ export class TaskSimilarityViewComponent implements OnChanges {
       window.open(url, '_blank');
     });
   }
+
+  downloadJPLAGReport() {
+    const taskDef = this.task.definition;
+    this.fileDownloaderService.downloadFile(
+      //this.taskData.selectedTask.jplagReportUrl()
+      `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
+        this.task.unit.id
+      }/task_definitions/${taskDef.id}/jplag_report`,
+      `${this.task.unit.code}-${taskDef.abbreviation}-jplag-report.zip`,
+    );
+    window.open('https://jplag.github.io/JPlag/', '_blank');
+  }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
index 62521091e6..fdd804b8c9 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
@@ -29,7 +29,7 @@
 <mat-checkbox [(ngModel)]="upreq.tiiCheck">TurnItIn</mat-checkbox>
 }
       @if (upreq.type === 'code') {
-<mat-checkbox [(ngModel)]="upreq.tiiCheck">Moss</mat-checkbox>
+<mat-checkbox [(ngModel)]="upreq.tiiCheck">Jplag</mat-checkbox>
 }
     </td>
   </ng-container>
@@ -74,21 +74,19 @@
   <tr mat-footer-row *matFooterRowDef="['actions']"></tr>
 </table>
 
-@if (taskDefinition.needsMoss) {
+@if (taskDefinition.needsJplag) {
 <div class="flex-grow flex flex-row gap-4">
   <mat-form-field appearance="outline" class="basis-1/2">
-    <mat-label>Language used for Moss checks</mat-label>
-    <mat-select [(ngModel)]="taskDefinition.mossLanguage">
-      <!-- If more language options added, unit-similarity-module.rb will need to be updated if moss and jplag -->
-      <!-- language option names differ -->
-      <mat-option value="moss c">C</mat-option>
-      <mat-option value="moss csharp">C#</mat-option>
-      <mat-option value="moss cc">C++</mat-option>
-      <mat-option value="moss python">Python</mat-option>
+    <mat-label>Language used for JPLAG checks</mat-label>
+    <mat-select [(ngModel)]="taskDefinition.jplagLanguage">
+      <mat-option value="c">C</mat-option>
+      <mat-option value="csharp">C#</mat-option>
+      <mat-option value="cpp">C++</mat-option>
+      <mat-option value="python">Python</mat-option>
     </mat-select>
   </mat-form-field>
   <mat-form-field appearance="outline" class="basis-1/2">
-    <mat-label>Similarity percent to flag for Moss checks</mat-label>
+    <mat-label>Similarity percent to flag for JPLAG checks</mat-label>
     <input matInput [(ngModel)]="taskDefinition.plagiarismWarnPct" type="number" />
   </mat-form-field>
 </div>

From 7984b393752381e0a219dbbdafc0e7b44c3fcdb3 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 18 Oct 2024 13:59:51 +1100
Subject: [PATCH 156/776] fix: correct task scroll into view

---
 src/app/api/models/task.ts                                      | 2 +-
 .../directives/student-task-list/student-task-list.coffee       | 2 +-
 .../directives/staff-task-list/staff-task-list.component.ts     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2aa167adfd..ee5d521d2b 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -396,7 +396,7 @@ export class Task extends Entity {
 
   public taskKeyToIdString(): string {
     const key = this.taskKey();
-    return `task-key-${key.studentId}-${key.taskDefAbbr}`.replace(/[.#]/g, '-');
+    return `task-key-${key.studentId}-${key.taskDefAbbr}`.replace(/[.# ]/g, '-');
   }
 
   public get similaritiesDetected(): boolean {
diff --git a/src/app/projects/states/dashboard/directives/student-task-list/student-task-list.coffee b/src/app/projects/states/dashboard/directives/student-task-list/student-task-list.coffee
index a504f3f1c6..b4212fa09b 100644
--- a/src/app/projects/states/dashboard/directives/student-task-list/student-task-list.coffee
+++ b/src/app/projects/states/dashboard/directives/student-task-list/student-task-list.coffee
@@ -44,7 +44,7 @@ angular.module('doubtfire.projects.states.dashboard.directives.student-task-list
       $scope.taskData.onSelectedTaskChange?(task)
       scrollToTaskInList(task) if task?
     scrollToTaskInList = (task) ->
-      taskEl = document.querySelector("student-task-list-#{task.taskKeyToIdString()}")
+      taskEl = document.querySelector("##{task.taskKeyToIdString()}")
       return unless taskEl?
       funcName = if taskEl.scrollIntoViewIfNeeded? then 'scrollIntoViewIfNeeded' else if taskEl.scrollIntoView? then 'scrollIntoView'
       return unless funcName?
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 95b498af20..e40367f623 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -363,7 +363,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   private scrollToTaskInList(task) {
-    const taskEl = document.querySelector(`staff-task-list #${task.taskKeyToIdString()}`) as any;
+    const taskEl = document.querySelector(`#${task.taskKeyToIdString()}`) as any;
     if (!taskEl) {
       return;
     }

From 780eb67a3a6be02a77b9e4b4687103ab45adacdf Mon Sep 17 00:00:00 2001
From: JackSCarroll <64730336+JackSCarroll@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:52:02 +1100
Subject: [PATCH 157/776] chore: comment out staff task list jplag report
 download button until fix

---
 src/app/api/models/task-definition.ts         | 52 ++++++++++++++-----
 src/app/api/models/task.ts                    |  6 ---
 src/app/common/footer/footer.component.ts     |  7 ---
 .../staff-task-list.component.html            |  9 ++--
 .../staff-task-list.component.ts              | 33 +++++++-----
 5 files changed, 60 insertions(+), 47 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 48ce4699fa..8e9ed910b9 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -1,14 +1,20 @@
-import { HttpClient } from '@angular/common/http';
-import { Entity, EntityMapping } from 'ngx-entity-service';
-import { Observable, tap } from 'rxjs';
-import { AppInjector } from 'src/app/app-injector';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { Grade, GroupSet, TutorialStream, Unit } from './doubtfire-model';
-import { TaskDefinitionService } from '../services/task-definition.service';
-
-export type UploadRequirement = { key: string; name: string; type: string; tiiCheck?: boolean; tiiPct?: number };
+import {HttpClient, HttpResponse} from '@angular/common/http';
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {firstValueFrom, Observable, tap} from 'rxjs';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {Grade, GroupSet, TutorialStream, Unit} from './doubtfire-model';
+import {TaskDefinitionService} from '../services/task-definition.service';
+
+export type UploadRequirement = {
+  key: string;
+  name: string;
+  type: string;
+  tiiCheck?: boolean;
+  tiiPct?: number;
+};
 
-export type SimilarityCheck = { key: string; type: string; pattern: string };
+export type SimilarityCheck = {key: string; type: string; pattern: string};
 
 export class TaskDefinition extends Entity {
   id: number;
@@ -67,7 +73,7 @@ export class TaskDefinition extends Entity {
           entity: this,
           cache: this.unit.taskDefinitionCache,
           constructorParams: this.unit,
-        }
+        },
       );
     } else {
       return svc.update(
@@ -75,7 +81,7 @@ export class TaskDefinition extends Entity {
           unitId: this.unit.id,
           id: this.id,
         },
-        { entity: this }
+        {entity: this},
       );
     }
   }
@@ -122,7 +128,10 @@ export class TaskDefinition extends Entity {
   }
 
   public matches(text: string): boolean {
-    return this.abbreviation.toLowerCase().indexOf(text) !== -1 || this.name.toLowerCase().indexOf(text) !== -1;
+    return (
+      this.abbreviation.toLowerCase().indexOf(text) !== -1 ||
+      this.name.toLowerCase().indexOf(text) !== -1
+    );
   }
 
   /**
@@ -188,6 +197,19 @@ export class TaskDefinition extends Entity {
     }/task_assessment_resources.json`;
   }
 
+  public async hasJplagReport(): Promise<boolean> {
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${this.id}/has_jplag_report`;
+    //console.log(url);
+    try {
+      const response = await fetch(url);
+      const result = await response.json();
+      return result === 'true';
+    } catch (error) {
+      console.error('Error fetching JPLAG report:', error);
+      return false;
+    }
+  }
+
   public deleteTaskSheet(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
     return httpClient.delete(this.taskSheetUploadUrl).pipe(tap(() => (this.hasTaskSheet = false)));
@@ -195,7 +217,9 @@ export class TaskDefinition extends Entity {
 
   public deleteTaskResources(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
-    return httpClient.delete(this.taskResourcesUploadUrl).pipe(tap(() => (this.hasTaskResources = false)));
+    return httpClient
+      .delete(this.taskResourcesUploadUrl)
+      .pipe(tap(() => (this.hasTaskResources = false)));
   }
 
   public deleteTaskAssessmentResources(): Observable<any> {
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index cc0779393c..2aa167adfd 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -513,12 +513,6 @@ export class Task extends Entity {
     }/task_def_id/${this.definition.id}/submission${asAttachment ? '?as_attachment=true' : ''}`;
   }
 
-  public jplagReportUrl(): string {
-    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
-      this._unit.id
-    }/task_definitions/${this.definition.id}/jplag_report`;
-  }
-
   public testSubmissionUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
       this.definition.id
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index a18fec6bc7..2e4d3ff1ef 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -67,13 +67,6 @@ export class FooterComponent implements OnInit {
     );
   }
 
-  downloadJPLAGReport() {
-    this.fileDownloader.downloadFile(
-      this.selectedTask.jplagReportUrl(),
-      `${this.selectedTask.definition.name}-jplag-report.zip`,
-    );
-  }
-
   viewTaskSheet() {
     this.selectedTaskService.showTaskSheet();
   }
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index 8a14e19f2e..0752b1a528 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -79,14 +79,11 @@
           <mat-icon>download</mat-icon>
           <span>Bulk Export Submission Files</span>
         </button>
-        <button
-          mat-menu-item
-          (click)="downloadJPLAGReport()"
-          [hidden]="false"
-        >
+        <!-- Commented out until hasJplagReport check works correctly -->
+        <!-- <button mat-menu-item (click)="downloadJPLAGReport()" [disabled]="hasJplagReport">
           <mat-icon>download</mat-icon>
           <span>Download JPLAG Report</span>
-        </button>
+        </button> -->
       </mat-menu>
     </div>
     <mat-accordion>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 12e1148714..2b2c032869 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -77,6 +77,8 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
 
   tasks: any[] = null;
 
+  hasJplagReport: boolean;
+
   watchingTaskKey: any;
 
   panelOpenState = false;
@@ -206,20 +208,19 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     return this.taskData.taskDefMode;
   }
 
-  // public get taskHasJplagReport(): boolean {
-  //   console.log('taskHasSimilarityChecks getter called');
-  //   if (!this.selectedTask.hasSimilarity()) {
-  //     console.error('filters.taskDefinition is not defined');
-  //     return false;
-  //   }
-  //   if (typeof this.filters.taskDefinition.hasPlagiarismCheck !== 'function') {
-  //     console.error('hasPlagiarismCheck is not a function');
-  //     return false;
-  //   }
-  //   const result = this.filters.taskDefinition.hasPlagiarismCheck();
-  //   console.log('taskHasSimilarityChecks result:', result);
-  //   return result;
-  // }
+  // TODO: Get this to return correct value from the API
+  public async taskHasJplagReport(): Promise<boolean> {
+    const taskDef = this.filters.taskDefinition;
+    return taskDef
+      .hasJplagReport()
+      .then((hasReport) => {
+        return hasReport ?? false;
+      })
+      .catch((error) => {
+        console.error(error);
+        return false;
+      });
+  }
 
   downloadSubmissionPdfs() {
     const taskDef = this.filters.taskDefinition;
@@ -376,6 +377,10 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
         this.alertService.error(message, 6000);
       },
     });
+    this.taskHasJplagReport().then((hasReport) => {
+      this.hasJplagReport = hasReport;
+    });
+    console.log('HAS JPLAG REPORT:', this.hasJplagReport);
   }
 
   setSelectedTask(task: Task) {

From a5316c47842a80f4e7bb0bbf1a84e27ccdc24e2d Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 25 Oct 2024 21:14:39 +1100
Subject: [PATCH 158/776] chore(release): 8.0.29

---
 CHANGELOG.md      | 97 +++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |  4 +-
 package.json      |  2 +-
 3 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67a49d5d89..28577a1a4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,103 @@
 
 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.
 
+### [8.0.29](https://github.com/macite/doubtfire-deploy/compare/v8.0.28...v8.0.29) (2024-10-25)
+
+
+### Features
+
+* add support for the view language ([151ca04](https://github.com/macite/doubtfire-deploy/commit/151ca04ca8da9059890d7846293bf34ae67f05c5))
+
+
+### Bug Fixes
+
+* correct task scroll into view ([7984b39](https://github.com/macite/doubtfire-deploy/commit/7984b393752381e0a219dbbdafc0e7b44c3fcdb3))
+
+### [8.0.27](https://github.com/macite/doubtfire-deploy/compare/v8.0.26...v8.0.27) (2024-08-09)
+
+
+### Bug Fixes
+
+* encode . in the username in scorm player ([1ec1754](https://github.com/macite/doubtfire-deploy/commit/1ec175419ab3ef80f22ac8a6384f6ed40a17c217))
+
+### [8.0.26](https://github.com/macite/doubtfire-deploy/compare/v8.0.25...v8.0.26) (2024-08-09)
+
+
+### Bug Fixes
+
+* register service names in state resolve functions ([64e41f4](https://github.com/macite/doubtfire-deploy/commit/64e41f4aedcf519a2786d7fe4929900f86731896))
+
+### [8.0.25](https://github.com/macite/doubtfire-deploy/compare/v8.0.24...v8.0.25) (2024-08-09)
+
+
+### Bug Fixes
+
+* adjust shortcuts and unregister on inbox destroy ([8a2ce3b](https://github.com/macite/doubtfire-deploy/commit/8a2ce3bfe32d99be1bc0667ca1aba55d36f987d2))
+* switch to control shift ([a0c1185](https://github.com/macite/doubtfire-deploy/commit/a0c1185bf4af3acb8f58c97cc27021c952861603))
+
+### [8.0.24](https://github.com/macite/doubtfire-deploy/compare/v8.0.23...v8.0.24) (2024-08-09)
+
+
+### Features
+
+* add ability to preview scorm test ([7ffbea9](https://github.com/macite/doubtfire-deploy/commit/7ffbea9f56c393d44571c18f30735e090701b554))
+* add new Numbas Feature ([6f1ac4e](https://github.com/macite/doubtfire-deploy/commit/6f1ac4e4c1a78115c426838bce350bce286e44f0))
+* add new Numbas Feature ([8eba913](https://github.com/macite/doubtfire-deploy/commit/8eba913ec4462e1c252a8a698b4b6de67c4ec25f))
+* add numbas component ([7c1734b](https://github.com/macite/doubtfire-deploy/commit/7c1734b137ac369b3b605b38749c845df38b9a78))
+* add Numbas config options to task def service keys ([ff28e48](https://github.com/macite/doubtfire-deploy/commit/ff28e4802b86dc22be339cc196ef82ade67934f7))
+* add Numbas test attempt model ([097df79](https://github.com/macite/doubtfire-deploy/commit/097df7960d34a8c905ee495b8c6c8b8843e43b36))
+* add Numbas test section on ready for feedback ([e61295c](https://github.com/macite/doubtfire-deploy/commit/e61295c50006dbc89cfc0639bb3c68a09a3cda9d))
+* add Numbas test upload section and reorder editor sections ([edbd536](https://github.com/macite/doubtfire-deploy/commit/edbd536e73ace8b6b4cced1481c809fd36524dce))
+* add Numbas upload component and related functions to task-definition model ([4ecaee8](https://github.com/macite/doubtfire-deploy/commit/4ecaee8ad1c0caed9a5d848066a173000989f79b))
+* add test attempt service ([a576f48](https://github.com/macite/doubtfire-deploy/commit/a576f484bc434728eab9632c022bccf1ed26cb01))
+* add test attempt service and minor numbas related changes ([0652b56](https://github.com/macite/doubtfire-deploy/commit/0652b56f69eb850c2dfb43be54d07beb4c4eb469))
+* added numbas-lms service code ([471d344](https://github.com/macite/doubtfire-deploy/commit/471d34486f2582e95aac84469187f087277cc079))
+* allow changing scorm review config and add minor UI changes ([fc023af](https://github.com/macite/doubtfire-deploy/commit/fc023af462656e3557e2970f211fa4d59ee1e3d5))
+* change Numbas time delay config to enable incremental delays ([0afa719](https://github.com/macite/doubtfire-deploy/commit/0afa7197293c90a154c1716db91ecadae3677d53))
+* disable attempt button if passed and add button to review latest attempt in card ([703563c](https://github.com/macite/doubtfire-deploy/commit/703563c86253c60ad30d451ee2d8e0fa7ebbfabb))
+* display numbas task comments ([48a31da](https://github.com/macite/doubtfire-deploy/commit/48a31da1442f1e14f497c614053d9002c9f2631b))
+* enable reviewing, passing, deleting test attempts and add test attempt model and service ([561b924](https://github.com/macite/doubtfire-deploy/commit/561b9241c2f44fd69d3f09c656a025f514bbaf3a))
+* enable students to request extra scorm attempt ([d904ffd](https://github.com/macite/doubtfire-deploy/commit/d904ffd6fd674f6e61894d517f5aa147d1db6d29))
+* get unique token for scorm asset retrieval ([8fe2f9e](https://github.com/macite/doubtfire-deploy/commit/8fe2f9e9ca60c02e55c24d0f2bb3eb6dbea8217c))
+* implement numbas test data upload in task definition service ([2c7dab5](https://github.com/macite/doubtfire-deploy/commit/2c7dab555fc9a226b980a8dae96f5738bf517b1b))
+* insert Numbas test rules options in the task editor ([7e52ad5](https://github.com/macite/doubtfire-deploy/commit/7e52ad5e5759291d7d61805070ec482eb49c90be))
+* numbas-test-numbas-service ([cee13b7](https://github.com/macite/doubtfire-deploy/commit/cee13b727b35f804fc16070885f0e57c422c9982))
+* prevent uploading files until scorm passed ([ec86e4e](https://github.com/macite/doubtfire-deploy/commit/ec86e4eca8e9c50ebdaf54c34c302da88dd44b31))
+* show banner based on scorm success status ([db16172](https://github.com/macite/doubtfire-deploy/commit/db161721fab1359694c44d8df7237cd01892938b))
+* show launch button on ready for feedback if Numbas test is enabled for the task ([17af5b7](https://github.com/macite/doubtfire-deploy/commit/17af5b7fe9e1fbc8e5f18e2fece6e029b017408c))
+* use confirmation modal when passing or deleting test attempts ([3fb25bb](https://github.com/macite/doubtfire-deploy/commit/3fb25bb373acab837a3ef787620dd654bfd6803f))
+
+
+### Bug Fixes
+
+* add accepted Numbas file types ([bcaa8af](https://github.com/macite/doubtfire-deploy/commit/bcaa8af150aaf68b5cf5fb07ad9cb72037212d5d))
+* add auth headers to scorm adapter xhr requests ([97e1ea1](https://github.com/macite/doubtfire-deploy/commit/97e1ea187b769a51ebb66b82d76f21193bb29386))
+* adjusted edit profile accidental change ([316abc7](https://github.com/macite/doubtfire-deploy/commit/316abc775eeba6ca846c7c742bc88bec61d05a5e))
+* change success status descriptions ([20da042](https://github.com/macite/doubtfire-deploy/commit/20da0423450fe3b9b8006660bf6f5e06670f520c))
+* delete comment as well as test attempt ([b6887e8](https://github.com/macite/doubtfire-deploy/commit/b6887e85b7a06b166519924dd682ef57650a4e32))
+* disable launch scorm test button if user is staff ([9bc48b0](https://github.com/macite/doubtfire-deploy/commit/9bc48b03905c0a839d78ea13be9817ca73ba54cf))
+* ensure counters are incremented after object creation ([2b1dcfc](https://github.com/macite/doubtfire-deploy/commit/2b1dcfc717eb770dd623c62ac99d8d961d1c3124))
+* ensure datamodel is updated on termination ([2ac487f](https://github.com/macite/doubtfire-deploy/commit/2ac487f13c3743f2b5b805521964bdcbca7cdc15))
+* ensure scorm frame loads when src is available ([6ae4295](https://github.com/macite/doubtfire-deploy/commit/6ae42954162996acf145cef211981153381ff49d))
+* hide config options if numbas test is disabled ([0b15b1c](https://github.com/macite/doubtfire-deploy/commit/0b15b1c38b8f09a30f53bb42dccd1971109bce01))
+* indicate task def has scorm data when zip is uploaded ([4b983ba](https://github.com/macite/doubtfire-deploy/commit/4b983bae1f522013f750b8c36d5e1a52624abbbc))
+* initialise SCORM API wrapper before iframe loads ([5d0606c](https://github.com/macite/doubtfire-deploy/commit/5d0606c56eaeb929d5873cae7038ce729581512c))
+* integrate Numbas services well with the existing system ([d47b8ed](https://github.com/macite/doubtfire-deploy/commit/d47b8edc745660801984346c4fa67d6bb371f4cb))
+* marking shortcuts no longer conflict with common browser shortcuts ([ec7524a](https://github.com/macite/doubtfire-deploy/commit/ec7524aaae040794de76521363c2d885a0425db0))
+* remove attempt number field ([f0ff40b](https://github.com/macite/doubtfire-deploy/commit/f0ff40bfd7e86b904adae94bf8cbe5d56371e011))
+* remove saved scorm token and always get ([c8fc702](https://github.com/macite/doubtfire-deploy/commit/c8fc702bde6f1c448fc585042e5265625552bae8))
+* retrieve test attempt data correctly ([2810ce6](https://github.com/macite/doubtfire-deploy/commit/2810ce65d423a137600d621a98bf27dbc221921c))
+* send task id with numbas completed attempt data ([e46214d](https://github.com/macite/doubtfire-deploy/commit/e46214dd59d86014bb04d1c31f3a3bf21240e32b))
+* show correct attempts left and allow tutor to review attempt always ([58c24c3](https://github.com/macite/doubtfire-deploy/commit/58c24c3a6760af168a918bc099e755f475eac5f0))
+* show correct Numbas test from the task def with all assets loaded ([bee0a0b](https://github.com/macite/doubtfire-deploy/commit/bee0a0bb1eb905c964caf7888419effe70553520))
+* show delete and download buttons in editor when Numbas test exists ([821feb9](https://github.com/macite/doubtfire-deploy/commit/821feb93a8a40d095ef4f50adedbfd9216278fa9))
+* show Numbas button component and modify iframe request ([c9c2fbe](https://github.com/macite/doubtfire-deploy/commit/c9c2fbe10db156512946355f3cabfe54461f0eba))
+* show Numbas iframe on top of other elements ([f53befd](https://github.com/macite/doubtfire-deploy/commit/f53befd82b52bba24bc8c593a9266c11f9155d32))
+* show previously configured Numbas attempt limit ([56e1a5d](https://github.com/macite/doubtfire-deploy/commit/56e1a5de44ee275f9544b77909b7472f1020c2c3))
+* update numbas api path ([3df59dc](https://github.com/macite/doubtfire-deploy/commit/3df59dcc58f021ef16d81938d1d05473818bc75e))
+* use modal for Numbas and enable authentication ([64b1bfb](https://github.com/macite/doubtfire-deploy/commit/64b1bfb2918993e58a6659948d9621fc7d0b8ba4))
+* use nullish coalescing when retrieving data from the datamodel ([226d919](https://github.com/macite/doubtfire-deploy/commit/226d9193251fb675c92bec8265508477857a4ec9))
+
 ### [8.0.28](https://github.com/macite/doubtfire-deploy/compare/v8.0.23...v8.0.28) (2024-09-05)
 
 
diff --git a/package-lock.json b/package-lock.json
index a02d52eb80..7ff345e6cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.28",
+  "version": "8.0.29",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.28",
+      "version": "8.0.29",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index eb6a1b46be..db93e90aad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.28",
+  "version": "8.0.29",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From ce7e69f2aa43b409bbf91eec29273e9cd19cd973 Mon Sep 17 00:00:00 2001
From: ShounakB <65479699+Shounaks@users.noreply.github.com>
Date: Wed, 13 Nov 2024 17:29:57 +1100
Subject: [PATCH 159/776] rebase migration:grade-icon onto origin/8.0.x

---
 src/app/common/common.coffee                  |   1 -
 src/app/common/grade-icon/grade-icon.coffee   |  16 -
 .../grade-icon/grade-icon.component.html      |  16 +
 .../grade-icon/grade-icon.component.scss      |  20 +
 .../common/grade-icon/grade-icon.component.ts |  35 ++
 src/app/common/grade-icon/grade-icon.scss     |  48 ---
 src/app/common/grade-icon/grade-icon.tpl.html |   8 -
 src/app/doubtfire-angular.module.ts           |   2 +
 src/app/doubtfire-angularjs.module.ts         |   3 +-
 ...roup-member-contribution-assigner.tpl.html |  82 ++--
 .../project-progress-dashboard.tpl.html       |   2 +-
 .../grade-task-modal.tpl.html                 |  54 +--
 .../states/portfolios/portfolios.tpl.html     |   6 +-
 .../students-list/students-list.tpl.html      | 364 +++++++++---------
 14 files changed, 329 insertions(+), 328 deletions(-)
 delete mode 100644 src/app/common/grade-icon/grade-icon.coffee
 create mode 100644 src/app/common/grade-icon/grade-icon.component.html
 create mode 100644 src/app/common/grade-icon/grade-icon.component.scss
 create mode 100644 src/app/common/grade-icon/grade-icon.component.ts
 delete mode 100644 src/app/common/grade-icon/grade-icon.scss
 delete mode 100644 src/app/common/grade-icon/grade-icon.tpl.html

diff --git a/src/app/common/common.coffee b/src/app/common/common.coffee
index e5bbea48a2..f330d8f6ac 100644
--- a/src/app/common/common.coffee
+++ b/src/app/common/common.coffee
@@ -3,6 +3,5 @@ angular.module("doubtfire.common", [
   'doubtfire.common.filters'
   'doubtfire.common.modals'
   'doubtfire.common.file-uploader'
-  'doubtfire.common.grade-icon'
   'doubtfire.common.content-editable'
 ])
diff --git a/src/app/common/grade-icon/grade-icon.coffee b/src/app/common/grade-icon/grade-icon.coffee
deleted file mode 100644
index f35f7fbfa4..0000000000
--- a/src/app/common/grade-icon/grade-icon.coffee
+++ /dev/null
@@ -1,16 +0,0 @@
-angular.module('doubtfire.common.grade-icon', [])
-
-.directive 'gradeIcon', ->
-  restrict: 'E'
-  replace: true
-  templateUrl: 'common/grade-icon/grade-icon.tpl.html'
-  scope:
-    inputGrade: '=?grade'
-    colorful: '=?'
-  controller: ($scope, gradeService) ->
-    $scope.$watch 'inputGrade', (newGrade) ->
-      $scope.grade = if _.isString($scope.inputGrade) then gradeService.stringToGrade($scope.inputGrade) else $scope.inputGrade
-      $scope.gradeText = (grade) ->
-        if grade? then gradeService.grades[grade] or "Grade"
-      $scope.gradeLetter = (grade) ->
-        gradeService.gradeAcronyms[grade] or 'G'
diff --git a/src/app/common/grade-icon/grade-icon.component.html b/src/app/common/grade-icon/grade-icon.component.html
new file mode 100644
index 0000000000..2cb10af9d8
--- /dev/null
+++ b/src/app/common/grade-icon/grade-icon.component.html
@@ -0,0 +1,16 @@
+<div class="grade-icon">
+  <span
+    class="grade-icon"
+    ng-class="{
+      colorful: colorful,
+      'grade-0': grade == 0,
+      'grade-1': grade == 1,
+      'grade-2': grade == 2,
+      'grade-3': grade == 3,
+    }"
+    matTooltipPosition="above"
+    matTooltip="{{ gradeText }}"
+  >
+    {{ gradeLetter }}
+  </span>
+</div>
diff --git a/src/app/common/grade-icon/grade-icon.component.scss b/src/app/common/grade-icon/grade-icon.component.scss
new file mode 100644
index 0000000000..76ea15e629
--- /dev/null
+++ b/src/app/common/grade-icon/grade-icon.component.scss
@@ -0,0 +1,20 @@
+.grade-icon {
+  color: #fff;
+  font-size: 1em;
+  background-color: #333333;
+  border-radius: 100%;
+  width: 2.25em;
+  height: 2.25em;
+  font-weight: 100;
+  font-size: 1em;
+  margin: 0 auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.text-left .grade-icon {
+  margin-left: 0;
+}
+.text-right .grade-icon {
+ margin-right: 0;
+}
diff --git a/src/app/common/grade-icon/grade-icon.component.ts b/src/app/common/grade-icon/grade-icon.component.ts
new file mode 100644
index 0000000000..5c539d5ead
--- /dev/null
+++ b/src/app/common/grade-icon/grade-icon.component.ts
@@ -0,0 +1,35 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { Component, Inject, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
+import { GradeService } from '../services/grade.service';
+import { Project } from 'src/app/api/models/project';
+
+@Component({
+  selector: 'grade-icon',
+  templateUrl: './grade-icon.component.html',
+  styleUrls: ['./grade-icon.component.scss'],
+})
+export class GradeIconComponent implements OnInit, OnChanges {
+  @Input() grade?: number;
+  @Input() colorful: boolean = false;
+
+  InputGrade?: number;
+  gradeText: string = 'Grade';
+  gradeLetter: string = 'G';
+
+  constructor(private gradeService: GradeService) {}
+
+  ngOnInit(): void {
+    this.updateGrade();
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes['grade']) {
+      this.updateGrade();
+    }
+  }
+
+  private updateGrade(): void {
+    this.gradeText = this.gradeService.grades[this.grade] || 'Grade';
+    this.gradeLetter = this.gradeService.gradeAcronyms[this.grade] || 'G';
+  }
+}
diff --git a/src/app/common/grade-icon/grade-icon.scss b/src/app/common/grade-icon/grade-icon.scss
deleted file mode 100644
index 08db661a8b..0000000000
--- a/src/app/common/grade-icon/grade-icon.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-.grade-icon.text-muted {
-  background-color: $text-muted;
-}
-.grade-icon.text-primary {
-  background-color: $brand-primary;
-}
-.grade-icon.text-success {
-  background-color: $brand-success;
-}
-.grade-icon.text-danger {
-  background-color: $brand-danger;
-}
-.grade-icon.text-info {
-  background-color: $brand-info;
-}
-.grade-icon.text-warning {
-  background-color: $brand-warning;
-}
-a .grade-icon:hover {
-  background-color: $link-hover-color;
-}
-.grade-icon {
-  color: #fff;
-  font-size: 1em;
-  background-color: $text-color;
-  border-radius: 100%;
-  width: 2.25em;
-  height: 2.25em;
-  font-weight: 100;
-  font-size: 1em;
-  @include no-select;
-  margin: 0 auto;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.grade-icon.colorful {
-  &.grade-0 { background-color: $grade-color-p;  }
-  &.grade-1 { background-color: $grade-color-c;  }
-  &.grade-2 { background-color: $grade-color-d;  }
-  &.grade-3 { background-color: $grade-color-hd; }
-}
-.text-left .grade-icon {
-  margin-left: 0;
-}
-.text-right .grade-icon {
-  margin-right: 0;
-}
diff --git a/src/app/common/grade-icon/grade-icon.tpl.html b/src/app/common/grade-icon/grade-icon.tpl.html
deleted file mode 100644
index 1939b21361..0000000000
--- a/src/app/common/grade-icon/grade-icon.tpl.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="grade-icon">
-  <span
-    class="grade-icon"
-    ng-class="{colorful: colorful, 'grade-0': grade == 0, 'grade-1': grade == 1, 'grade-2': grade == 2, 'grade-3': grade == 3}"
-    tooltip="{{gradeText(grade)}}">
-    {{gradeLetter(grade)}}
-  </span>
-</div>
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 991ac397b4..4b06266dc1 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -170,6 +170,7 @@ import {TaskAssessmentModalComponent} from './common/modals/task-assessment-moda
 import {TaskSubmissionHistoryComponent} from './tasks/task-submission-history/task-submission-history.component';
 import {HomeComponent} from './home/states/home/home.component';
 import {IsActiveUnitRole} from './common/pipes/is-active-unit-role.pipe';
+import {GradeIconComponent} from './common/grade-icon/grade-icon.component';
 import {HeaderComponent} from './common/header/header.component';
 import {UnitDropdownComponent} from './common/header/unit-dropdown/unit-dropdown.component';
 import {TaskDropdownComponent} from './common/header/task-dropdown/task-dropdown.component';
@@ -316,6 +317,7 @@ const MY_DATE_FORMAT = {
     TaskAssessmentCommentComponent,
     TaskAssessmentModalComponent,
     TaskSubmissionHistoryComponent,
+    GradeIconComponent,
     HeaderComponent,
     UnitDropdownComponent,
     TaskDropdownComponent,
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index e14fdbb545..1f42ca4907 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -122,7 +122,6 @@ import 'build/src/app/common/modals/confirmation-modal/confirmation-modal.js';
 import 'build/src/app/common/modals/comments-modal/comments-modal.js';
 import 'build/src/app/common/modals/csv-result-modal/csv-result-modal.js';
 import 'build/src/app/common/modals/modals.js';
-import 'build/src/app/common/grade-icon/grade-icon.js';
 import 'build/src/app/common/file-uploader/file-uploader.js';
 import 'build/src/app/common/common.js';
 import 'build/src/app/common/services/listener-service.js';
@@ -193,6 +192,7 @@ import {CheckForUpdateService} from './sessions/service-worker-updater/check-for
 import {TaskSubmissionService} from './common/services/task-submission.service';
 import {TaskAssessmentModalService} from './common/modals/task-assessment-modal/task-assessment-modal.service';
 import {TaskSubmissionHistoryComponent} from './tasks/task-submission-history/task-submission-history.component';
+import {GradeIconComponent} from './common/grade-icon/grade-icon.component';
 import {HeaderComponent} from './common/header/header.component';
 import {SplashScreenComponent} from './home/splash-screen/splash-screen.component';
 import {GlobalStateService} from './projects/states/index/global-state.service';
@@ -313,6 +313,7 @@ DoubtfireAngularJSModule.directive(
   'objectSelect',
   downgradeComponent({component: ObjectSelectComponent}),
 );
+DoubtfireAngularJSModule.directive('gradeIcon', downgradeComponent({component: GradeIconComponent}));
 DoubtfireAngularJSModule.directive('appHeader', downgradeComponent({component: HeaderComponent}));
 DoubtfireAngularJSModule.directive(
   'splashScreen',
diff --git a/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.tpl.html b/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.tpl.html
index 4caab308f5..149ebb8a13 100644
--- a/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.tpl.html
+++ b/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.tpl.html
@@ -1,41 +1,41 @@
-<div class="group-member-contribution-assigner">
-  <table class="table table-condensed table-hover">
-    <thead>
-      <tr>
-        <th><a ng-click="memberSortOrder='student_name'; reverse=!reverse">Team Member</a></th>
-        <th><a ng-click="memberSortOrder='targetGrade'; reverse=!reverse">Target Grade</a></th>
-        <th class="col-sm-4"><a ng-click="memberSortOrder='rating'; reverse=!reverse">Contribution</a></th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr ng-repeat="contrib in team.memberContributions | orderBy:memberSortOrder:reverse">
-        <td>{{contrib.project.student.name}}</td>
-        <td class="text-left">
-          <grade-icon grade="contrib.project.targetGrade"></grade-icon>
-        </td>
-        <td>
-          <rating
-            class="group-member-contribution-rating"
-            ng-click="checkClearRating(contrib)"
-            ng-model="contrib.rating"
-            on-hover="hoveringOver(contrib, value)"
-            on-leave="hoveringOver(contrib, null)"
-            max="numStars"
-            state-on="'fa fa-child rating-outline'"
-            state-off="'fa fa-child rating-disabled'">
-          </rating>
-          <span
-            class="label {{percentClass(contrib.percent)}}"
-            ng-show="contrib.overStar">
-            <span ng-show="contrib.percent > 0">
-              {{contrib.percent}} % effort
-            </span>
-            <span ng-hide="contrib.percent > 0">
-              No effort
-            </span>
-          </span>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</div>
+<div class="group-member-contribution-assigner">
+  <table class="table table-condensed table-hover">
+    <thead>
+      <tr>
+        <th><a ng-click="memberSortOrder='student_name'; reverse=!reverse">Team Member</a></th>
+        <th><a ng-click="memberSortOrder='targetGrade'; reverse=!reverse">Target Grade</a></th>
+        <th class="col-sm-4"><a ng-click="memberSortOrder='rating'; reverse=!reverse">Contribution</a></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr ng-repeat="contrib in team.memberContributions | orderBy:memberSortOrder:reverse">
+        <td>{{contrib.project.student.name}}</td>
+        <td class="text-left">
+          <grade-icon [grade]="contrib.project.targetGrade"></grade-icon>
+        </td>
+        <td>
+          <rating
+            class="group-member-contribution-rating"
+            ng-click="checkClearRating(contrib)"
+            ng-model="contrib.rating"
+            on-hover="hoveringOver(contrib, value)"
+            on-leave="hoveringOver(contrib, null)"
+            max="numStars"
+            state-on="'fa fa-child rating-outline'"
+            state-off="'fa fa-child rating-disabled'">
+          </rating>
+          <span
+            class="label {{percentClass(contrib.percent)}}"
+            ng-show="contrib.overStar">
+            <span ng-show="contrib.percent > 0">
+              {{contrib.percent}} % effort
+            </span>
+            <span ng-hide="contrib.percent > 0">
+              No effort
+            </span>
+          </span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/src/app/projects/project-progress-dashboard/project-progress-dashboard.tpl.html b/src/app/projects/project-progress-dashboard/project-progress-dashboard.tpl.html
index 5dc40dc5b0..7e59cac17b 100644
--- a/src/app/projects/project-progress-dashboard/project-progress-dashboard.tpl.html
+++ b/src/app/projects/project-progress-dashboard/project-progress-dashboard.tpl.html
@@ -22,7 +22,7 @@ <h3 class="panel-title">Target Grade</h3>
           <div class="panel-body text-center">
             <p class="btn-group">
               <label ng-repeat="grade in grades" ng-if="$index != 4" ng-click="chooseGrade($index)" class="btn btn-default col-sm-3 text-center" ng-model="project.targetGrade" btn-radio="{{$index}}">
-                <grade-icon grade="grade" tooltip="Select a {{grade}} as your target grade" tooltip-append-to-body="true" class="text-{{$index == project.targetGrade ? 'primary' : 'muted'}}"></grade-icon>
+                <grade-icon [grade]="grade" tooltip="Select a {{grade}} as your target grade" tooltip-append-to-body="true" class="text-{{$index == project.targetGrade ? 'primary' : 'muted'}}"></grade-icon>
               </label>
             </p>
           </div>
diff --git a/src/app/tasks/modals/grade-task-modal/grade-task-modal.tpl.html b/src/app/tasks/modals/grade-task-modal/grade-task-modal.tpl.html
index 0906d7b593..4d02cce31f 100644
--- a/src/app/tasks/modals/grade-task-modal/grade-task-modal.tpl.html
+++ b/src/app/tasks/modals/grade-task-modal/grade-task-modal.tpl.html
@@ -1,27 +1,27 @@
-<div class="grade-task-modal">
-  <div class="modal-header">
-    <h3>Assess Task Quality</h3>
-  </div>
-  <div class="modal-body text-center">
-    <div ng-if="task.definition.isGraded">
-      <p>Please provide a grade to change the student's status for task <label class="label label-info">{{task.definition.abbreviation}}</label>.</p>
-      <p class="btn-group">
-        <label ng-repeat="idx in gradeValues" class="btn btn-default col-sm-15 text-center" ng-model="data.desiredGrade" btn-radio="{{idx}}">
-          <grade-icon grade="grades[idx]" tooltip="This student completed the task to a {{grades[idx]}} standard" tooltip-append-to-body="true"></grade-icon>
-        </label>
-      </p>
-    </div>
-    <div ng-if="task.definition.maxQualityPts > 0">
-      <p>Please provide a quality rating for task <label class="label label-info">{{task.definition.abbreviation}}</label>.</p>
-      <rating class="task-quality-rating" ng-click="checkClearRating()" ng-model="data.rating" on-hover="hoveringOver(value)" on-leave="hoveringOver(null)" max="numStars" state-on="'fa fa-3x fa-star icon-colorful'" state-off="'fa fa-3x fa-star icon-disable'"></rating>
-    </div>
-  </div>
-  <div class="modal-footer">
-    <button class="btn btn-default" ng-click="dismiss()">
-      <i class="fa fa-times"></i>
-    </button>
-    <button class="btn btn-primary" ng-click="close()" ng-disabled="task.isGraded && data.desiredGrade == null">
-      <i class="fa fa-check"></i>
-    </button>
-  </div>
-</div>
+<div class="grade-task-modal">
+  <div class="modal-header">
+    <h3>Assess Task Quality</h3>
+  </div>
+  <div class="modal-body text-center">
+    <div ng-if="task.definition.isGraded">
+      <p>Please provide a grade to change the student's status for task <label class="label label-info">{{task.definition.abbreviation}}</label>.</p>
+      <p class="btn-group">
+        <label ng-repeat="idx in gradeValues" class="btn btn-default col-sm-15 text-center" ng-model="data.desiredGrade" btn-radio="{{idx}}">
+          <grade-icon [grade]="grades[idx]" tooltip="This student completed the task to a {{grades[idx]}} standard" tooltip-append-to-body="true"></grade-icon>
+        </label>
+      </p>
+    </div>
+    <div ng-if="task.definition.maxQualityPts > 0">
+      <p>Please provide a quality rating for task <label class="label label-info">{{task.definition.abbreviation}}</label>.</p>
+      <rating class="task-quality-rating" ng-click="checkClearRating()" ng-model="data.rating" on-hover="hoveringOver(value)" on-leave="hoveringOver(null)" max="numStars" state-on="'fa fa-3x fa-star icon-colorful'" state-off="'fa fa-3x fa-star icon-disable'"></rating>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <button class="btn btn-default" ng-click="dismiss()">
+      <i class="fa fa-times"></i>
+    </button>
+    <button class="btn btn-primary" ng-click="close()" ng-disabled="task.isGraded && data.desiredGrade == null">
+      <i class="fa fa-check"></i>
+    </button>
+  </div>
+</div>
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index 2b8a2277eb..800d4f4cbe 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -65,7 +65,7 @@ <h4 class="panel-title">Mark Portfolios</h4>
               btn-radio="{{$index}}"
             >
               <grade-icon
-                grade="grade"
+                [grade]="grade"
                 tooltip="Select to show student's aiming for {{grades[grade]}}"
                 tooltip-append-to-body="true"
                 class="text-{{$index == filterOptions.selectedGrade ? 'primary' : 'muted'}}"
@@ -194,10 +194,10 @@ <h4 class="panel-title">Mark Portfolios</h4>
             <td>{{student.tutorNames()}}</td>
             <td>{{student.shortTutorialDescription()}}</td>
             <td class="flags-data">
-              <grade-icon grade="student.targetGrade"></grade-icon>
+              <grade-icon [grade]="student.targetGrade"></grade-icon>
             </td>
             <td class="flags-data">
-              <grade-icon grade="student.submittedGrade"></grade-icon>
+              <grade-icon [grade]="student.submittedGrade"></grade-icon>
             </td>
             <td class="task-progress-bar">
               <progress class="task-progress" animate="true">
diff --git a/src/app/units/states/students-list/students-list.tpl.html b/src/app/units/states/students-list/students-list.tpl.html
index 929cefe386..d81fdb4cd6 100644
--- a/src/app/units/states/students-list/students-list.tpl.html
+++ b/src/app/units/states/students-list/students-list.tpl.html
@@ -1,182 +1,182 @@
-<div id="students-list" class="container">
-  <div class="panel panel-primary">
-    <div class="panel-heading">
-      <div class="input-group">
-        <input
-          class="form-control input-lg"
-          placeholder="Search for students or tutors..."
-          type="search"
-          ng-model="searchText"
-          ng-change="searchTextChanged()"
-          typeahead-on-select="searchTextChanged()"
-          typeahead="text for text in
-            unit.studentFilterTypeAheadData |
-            filter:$viewValue |
-            limitTo:8"
-          typeahead-wait-ms="200"
-          autofocus><!--/search-text-->
-          <span class="input-group-btn">
-            <button class="btn btn-default btn-lg" type="button" ng-model="showSearchOptions" btn-checkbox>
-              <i class="fa fa-chevron-{{showSearchOptions ? 'up' : 'down'}}"></i>
-            </button>
-          </span><!--/search-options-toggle-->
-        </div>
-      </h4>
-    </div><!--/search-header-->
-    <form class="panel-body panel-collapseable search-options" ng-show="showSearchOptions">
-      <div class="form-group staff-filter">
-        <label>Show Students From...</label>
-        <div class="input-group">
-          <div class="btn-group">
-            <button class="btn btn-default col-sm-6" ng-model="staffFilter" ng-click="staffFilterChanged('all')" btn-radio="'all'">
-              <i class="fa fa-university"></i> All Tutorials
-            </button>
-            <button class="btn btn-default col-sm-6" ng-model="staffFilter" ng-click="staffFilterChanged('mine')" btn-radio="'mine'">
-              <i class="fa fa-pencil"></i> My Tutorials
-            </button>
-          </div>
-        </div>
-      </div><!--/staff-filter-button-group-->
-      <div class="form-group flag-sort">
-        <label>Sort Flags By...</label>
-        <div class="input-group">
-          <div class="btn-group">
-            <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('targetGrade')" btn-radio="'targetGrade'">
-              <i class="fa fa-check"></i> Grade
-            </button>
-            <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('similarityFlag')" btn-radio="'similarityFlag'">
-              <i class="fa fa-eye"></i> Plagiarism
-            </button>
-            <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('portfolioStatus')" btn-radio="'portfolioStatus'">
-              <i class="fa fa-book"></i> Portfolio Status
-            </button>
-          </div>
-        </div>
-        <p class="help-block">
-          Click the button twice to reverse the sort ordering.
-        </p>
-      </div><!--/flag-sort-button-group-->
-    </form><!--/search-options-->
-    <div class="panel-body" ng-show="filteredProjects.length == 0">
-      <div class="callout callout-primary">
-        <h4>No students found</h4>
-        <p>
-          No students were found using the filters specified.
-        </p>
-      </div>
-    </div><!--/no-students-found-->
-    <table ng-show="filteredProjects.length > 0" class="table table-condensed table-hover table-pointer">
-      <thead>
-        <tr>
-          <th class="avatar"></th>
-          <th class="username">
-            <a ng-click="sortTableBy('student.username')">
-              Username <i ng-show="tableSort.order == 'student.username'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
-            </a>
-          </th><!--/id-column-header-->
-          <th class="name">
-            <a ng-click="sortTableBy('student.name')">
-              Name <i ng-show="tableSort.order == 'student.name'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
-            </a>
-          </th><!--/name-column-header-->
-          <th class="stats">
-            <a ng-click="sortTableBy('orderScale')">
-              Stats <i ng-show="tableSort.order == 'orderScale'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
-            </a>
-          </th><!--/stats-column-header-->
-          <th class="flags">
-            <a ng-click="sortTableBy('flags')">
-              Flags
-              <i ng-show="
-                tableSort.order == 'similarityFlag' ||
-                tableSort.order == 'targetGrade' ||
-                tableSort.order == 'portfolioStatus'"
-                class="ng-hide fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
-            </a>
-          </th><!--/flags-column-header-->
-          <th class="campus">
-            <a ng-click="sortTableBy('campus.name')">
-              Campus <i ng-show="tableSort.order == 'campus'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
-            </a>
-          </th><!--/campus-column-header-->
-          <th class="tutorial">
-            <a ng-click="sortTableBy('tutorial.abbreviation')">
-              Tutorial <i ng-show="tableSort.order == 'tutorial.abbreviation'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
-            </a>
-          </th><!--/tutorial-column-header-->
-        </tr><!--/column-headers-row-->
-      </thead>
-      <tbody>
-        <tr class="task-progress-row pl-12" ng-repeat="project in filteredProjects">
-          <td class="avatar pl-8" ng-click="viewStudent(project)">
-            <user-icon [size]="30" [user]="project.student"></user-icon>
-          </td>
-          <td ng-click="viewStudent(project)">
-            {{project.student.username || "N/A"}}
-          </td><!--/username-column-->
-          <td ng-click="viewStudent(project)">
-            <span class="truncate">{{project.student.name}}</span>
-          </td><!--/name-column-->
-          <td ng-click="viewStudent(project)" class="task-progress-bar">
-            <progress class="task-progress" animate="true">
-              <bar
-                ng-repeat="bar in project.taskStats"
-                value="bar.value"
-                type="{{statusClass(bar.key)}}">
-                <span ng-hide="bar.value < 10">{{bar.value !== bar.value ? 'No Interaction' : (bar.value + '%')}}</span>
-              </bar>
-            </progress>
-          </td><!--/progress-column-->
-          <td class="text-left" ng-click="viewStudent(project)">
-            <span class="flags">
-              <span class="flag">
-                <grade-icon grade="project.targetGrade"></grade-icon>
-              </span>
-              <span ng-show="project.similarityFlag" class="flag">
-                <i class="fa fa-eye fa-2x" ></i>
-              </span>
-              <span ng-show="project.hasPortfolio" class="flag">
-                <i class="fa fa-book fa-2x" ng-class="{'text-muted': project.compilePortfolio}"></i>
-              </span>
-            </span>
-          </td><!--/flags-column-->
-          <td>
-            <student-campus-select [unit]="unit" [student]="project" [update]="true"></student-campus-select>
-          </td><!--/campus-column-->
-          <td>
-            <student-tutorial-select class="pr-8" [unit]="unit" [student]="project"></student-tutorial-select>
-          </td><!--/tutorial-column-->
-        </tr><!--/student-row-->
-      </tbody>
-    </table><!--/student-table-->
-    <div class="panel-footer">
-      <div class="pull-right">
-        <button
-          type="button"
-          class="btn btn-default"
-          ng-csv="getCSVData"
-          lazy-load="true"
-          csv-header="getCSVHeader()"
-          filename="student-project-export.csv"
-          target="_blank">
-          <i class="fa fa-file-excel-o"></i>
-          <i class="fa fa-download"></i> Export CSV
-        </button>
-        <button type="button" class="btn btn-default" ng-click="showEnrolModal()">
-          <i class="fa fa-user"></i>
-          <i class="fa fa-plus"></i> Enrol Student
-        </button>
-      </div><!--/export-buttons-->
-      <pagination
-        total-items="pagination.totalSize"
-        ng-change="pagination.onChange()"
-        ng-model="pagination.currentPage"
-        items-per-page="pagination.pageSize"
-        max-size="pagination.maxSize"
-        class="pagination-sm"
-        boundary-links="true"
-        rotate="false">
-      </pagination><!--/pagination-->
-    </div><!--/panel-footer-->
-  </div>
-</div>
+<div id="students-list" class="container">
+  <div class="panel panel-primary">
+    <div class="panel-heading">
+      <div class="input-group">
+        <input
+          class="form-control input-lg"
+          placeholder="Search for students or tutors..."
+          type="search"
+          ng-model="searchText"
+          ng-change="searchTextChanged()"
+          typeahead-on-select="searchTextChanged()"
+          typeahead="text for text in
+            unit.studentFilterTypeAheadData |
+            filter:$viewValue |
+            limitTo:8"
+          typeahead-wait-ms="200"
+          autofocus><!--/search-text-->
+          <span class="input-group-btn">
+            <button class="btn btn-default btn-lg" type="button" ng-model="showSearchOptions" btn-checkbox>
+              <i class="fa fa-chevron-{{showSearchOptions ? 'up' : 'down'}}"></i>
+            </button>
+          </span><!--/search-options-toggle-->
+        </div>
+      </h4>
+    </div><!--/search-header-->
+    <form class="panel-body panel-collapseable search-options" ng-show="showSearchOptions">
+      <div class="form-group staff-filter">
+        <label>Show Students From...</label>
+        <div class="input-group">
+          <div class="btn-group">
+            <button class="btn btn-default col-sm-6" ng-model="staffFilter" ng-click="staffFilterChanged('all')" btn-radio="'all'">
+              <i class="fa fa-university"></i> All Tutorials
+            </button>
+            <button class="btn btn-default col-sm-6" ng-model="staffFilter" ng-click="staffFilterChanged('mine')" btn-radio="'mine'">
+              <i class="fa fa-pencil"></i> My Tutorials
+            </button>
+          </div>
+        </div>
+      </div><!--/staff-filter-button-group-->
+      <div class="form-group flag-sort">
+        <label>Sort Flags By...</label>
+        <div class="input-group">
+          <div class="btn-group">
+            <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('targetGrade')" btn-radio="'targetGrade'">
+              <i class="fa fa-check"></i> Grade
+            </button>
+            <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('similarityFlag')" btn-radio="'similarityFlag'">
+              <i class="fa fa-eye"></i> Plagiarism
+            </button>
+            <button class="btn btn-default" ng-model="tableSort.order" ng-click="sortTableBy('portfolioStatus')" btn-radio="'portfolioStatus'">
+              <i class="fa fa-book"></i> Portfolio Status
+            </button>
+          </div>
+        </div>
+        <p class="help-block">
+          Click the button twice to reverse the sort ordering.
+        </p>
+      </div><!--/flag-sort-button-group-->
+    </form><!--/search-options-->
+    <div class="panel-body" ng-show="filteredProjects.length == 0">
+      <div class="callout callout-primary">
+        <h4>No students found</h4>
+        <p>
+          No students were found using the filters specified.
+        </p>
+      </div>
+    </div><!--/no-students-found-->
+    <table ng-show="filteredProjects.length > 0" class="table table-condensed table-hover table-pointer">
+      <thead>
+        <tr>
+          <th class="avatar"></th>
+          <th class="username">
+            <a ng-click="sortTableBy('student.username')">
+              Username <i ng-show="tableSort.order == 'student.username'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
+            </a>
+          </th><!--/id-column-header-->
+          <th class="name">
+            <a ng-click="sortTableBy('student.name')">
+              Name <i ng-show="tableSort.order == 'student.name'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
+            </a>
+          </th><!--/name-column-header-->
+          <th class="stats">
+            <a ng-click="sortTableBy('orderScale')">
+              Stats <i ng-show="tableSort.order == 'orderScale'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
+            </a>
+          </th><!--/stats-column-header-->
+          <th class="flags">
+            <a ng-click="sortTableBy('flags')">
+              Flags
+              <i ng-show="
+                tableSort.order == 'similarityFlag' ||
+                tableSort.order == 'targetGrade' ||
+                tableSort.order == 'portfolioStatus'"
+                class="ng-hide fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
+            </a>
+          </th><!--/flags-column-header-->
+          <th class="campus">
+            <a ng-click="sortTableBy('campus.name')">
+              Campus <i ng-show="tableSort.order == 'campus'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
+            </a>
+          </th><!--/campus-column-header-->
+          <th class="tutorial">
+            <a ng-click="sortTableBy('tutorial.abbreviation')">
+              Tutorial <i ng-show="tableSort.order == 'tutorial.abbreviation'" class="fa fa-caret-{{tableSort.reverse ? 'down' : 'up'}}"></i>
+            </a>
+          </th><!--/tutorial-column-header-->
+        </tr><!--/column-headers-row-->
+      </thead>
+      <tbody>
+        <tr class="task-progress-row pl-12" ng-repeat="project in filteredProjects">
+          <td class="avatar pl-8" ng-click="viewStudent(project)">
+            <user-icon [size]="30" [user]="project.student"></user-icon>
+          </td>
+          <td ng-click="viewStudent(project)">
+            {{project.student.username || "N/A"}}
+          </td><!--/username-column-->
+          <td ng-click="viewStudent(project)">
+            <span class="truncate">{{project.student.name}}</span>
+          </td><!--/name-column-->
+          <td ng-click="viewStudent(project)" class="task-progress-bar">
+            <progress class="task-progress" animate="true">
+              <bar
+                ng-repeat="bar in project.taskStats"
+                value="bar.value"
+                type="{{statusClass(bar.key)}}">
+                <span ng-hide="bar.value < 10">{{bar.value !== bar.value ? 'No Interaction' : (bar.value + '%')}}</span>
+              </bar>
+            </progress>
+          </td><!--/progress-column-->
+          <td class="text-left" ng-click="viewStudent(project)">
+            <span class="flags">
+              <span class="flag">
+                <grade-icon [grade]="project.targetGrade"></grade-icon>
+              </span>
+              <span ng-show="project.similarityFlag" class="flag">
+                <i class="fa fa-eye fa-2x" ></i>
+              </span>
+              <span ng-show="project.hasPortfolio" class="flag">
+                <i class="fa fa-book fa-2x" ng-class="{'text-muted': project.compilePortfolio}"></i>
+              </span>
+            </span>
+          </td><!--/flags-column-->
+          <td>
+            <student-campus-select [unit]="unit" [student]="project" [update]="true"></student-campus-select>
+          </td><!--/campus-column-->
+          <td>
+            <student-tutorial-select class="pr-8" [unit]="unit" [student]="project"></student-tutorial-select>
+          </td><!--/tutorial-column-->
+        </tr><!--/student-row-->
+      </tbody>
+    </table><!--/student-table-->
+    <div class="panel-footer">
+      <div class="pull-right">
+        <button
+          type="button"
+          class="btn btn-default"
+          ng-csv="getCSVData"
+          lazy-load="true"
+          csv-header="getCSVHeader()"
+          filename="student-project-export.csv"
+          target="_blank">
+          <i class="fa fa-file-excel-o"></i>
+          <i class="fa fa-download"></i> Export CSV
+        </button>
+        <button type="button" class="btn btn-default" ng-click="showEnrolModal()">
+          <i class="fa fa-user"></i>
+          <i class="fa fa-plus"></i> Enrol Student
+        </button>
+      </div><!--/export-buttons-->
+      <pagination
+        total-items="pagination.totalSize"
+        ng-change="pagination.onChange()"
+        ng-model="pagination.currentPage"
+        items-per-page="pagination.pageSize"
+        max-size="pagination.maxSize"
+        class="pagination-sm"
+        boundary-links="true"
+        rotate="false">
+      </pagination><!--/pagination-->
+    </div><!--/panel-footer-->
+  </div>
+</div>

From 91b42988188a2e9ebfdfbcca338382da656a7e32 Mon Sep 17 00:00:00 2001
From: ShounakB <65479699+Shounaks@users.noreply.github.com>
Date: Mon, 18 Nov 2024 21:21:41 +1100
Subject: [PATCH 160/776] Fixing All components and CSS Cleanup

---
 .../common/grade-icon/grade-icon.component.html | 14 +++++++-------
 .../common/grade-icon/grade-icon.component.scss | 14 --------------
 .../common/grade-icon/grade-icon.component.ts   | 17 +++++++++--------
 src/app/doubtfire-angularjs.module.ts           |  2 +-
 .../group-member-contribution-assigner.tpl.html |  2 +-
 .../group-member-list.tpl.html                  |  2 +-
 .../project-progress-dashboard.tpl.html         |  2 +-
 .../portfolio-grade-select-step.tpl.html        |  6 +++---
 .../grade-task-modal/grade-task-modal.tpl.html  |  2 +-
 .../units/states/portfolios/portfolios.tpl.html |  8 ++++----
 .../states/students-list/students-list.tpl.html |  2 +-
 11 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/src/app/common/grade-icon/grade-icon.component.html b/src/app/common/grade-icon/grade-icon.component.html
index 2cb10af9d8..7af15c0ba3 100644
--- a/src/app/common/grade-icon/grade-icon.component.html
+++ b/src/app/common/grade-icon/grade-icon.component.html
@@ -1,12 +1,12 @@
-<div class="grade-icon">
+<div>
   <span
-    class="grade-icon"
-    ng-class="{
+    class="text-white bg-[#333] rounded-full font-[100] text-[1em] flex justify-center items-center w-[2.25em] h-[2.25em] m-0"
+    [ngClass]="{
       colorful: colorful,
-      'grade-0': grade == 0,
-      'grade-1': grade == 1,
-      'grade-2': grade == 2,
-      'grade-3': grade == 3,
+      'grade-0': grade === 0,
+      'grade-1': grade === 1,
+      'grade-2': grade === 2,
+      'grade-3': grade === 3
     }"
     matTooltipPosition="above"
     matTooltip="{{ gradeText }}"
diff --git a/src/app/common/grade-icon/grade-icon.component.scss b/src/app/common/grade-icon/grade-icon.component.scss
index 76ea15e629..7bcb77deaa 100644
--- a/src/app/common/grade-icon/grade-icon.component.scss
+++ b/src/app/common/grade-icon/grade-icon.component.scss
@@ -1,17 +1,3 @@
-.grade-icon {
-  color: #fff;
-  font-size: 1em;
-  background-color: #333333;
-  border-radius: 100%;
-  width: 2.25em;
-  height: 2.25em;
-  font-weight: 100;
-  font-size: 1em;
-  margin: 0 auto;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
 .text-left .grade-icon {
   margin-left: 0;
 }
diff --git a/src/app/common/grade-icon/grade-icon.component.ts b/src/app/common/grade-icon/grade-icon.component.ts
index 5c539d5ead..d90bc6298c 100644
--- a/src/app/common/grade-icon/grade-icon.component.ts
+++ b/src/app/common/grade-icon/grade-icon.component.ts
@@ -1,19 +1,17 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { Component, Inject, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-import { GradeService } from '../services/grade.service';
-import { Project } from 'src/app/api/models/project';
+import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
+import {GradeService} from '../services/grade.service';
 
 @Component({
-  selector: 'grade-icon',
+  selector: 'f-grade-icon',
   templateUrl: './grade-icon.component.html',
   styleUrls: ['./grade-icon.component.scss'],
 })
 export class GradeIconComponent implements OnInit, OnChanges {
-  @Input() grade?: number;
+  @Input() grade?: number | string;
   @Input() colorful: boolean = false;
 
-  InputGrade?: number;
-  gradeText: string = 'Grade';
+  gradeText: number | string = 'Grade';
   gradeLetter: string = 'G';
 
   constructor(private gradeService: GradeService) {}
@@ -29,7 +27,10 @@ export class GradeIconComponent implements OnInit, OnChanges {
   }
 
   private updateGrade(): void {
-    this.gradeText = this.gradeService.grades[this.grade] || 'Grade';
+    this.gradeText =
+      typeof this.grade === 'string'
+        ? this.gradeService.stringToGrade(this.grade)
+        : this.gradeService.grades[this.grade] || 'Grade';
     this.gradeLetter = this.gradeService.gradeAcronyms[this.grade] || 'G';
   }
 }
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 1f42ca4907..d6b60ef342 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -313,7 +313,7 @@ DoubtfireAngularJSModule.directive(
   'objectSelect',
   downgradeComponent({component: ObjectSelectComponent}),
 );
-DoubtfireAngularJSModule.directive('gradeIcon', downgradeComponent({component: GradeIconComponent}));
+DoubtfireAngularJSModule.directive('fGradeIcon', downgradeComponent({component: GradeIconComponent}));
 DoubtfireAngularJSModule.directive('appHeader', downgradeComponent({component: HeaderComponent}));
 DoubtfireAngularJSModule.directive(
   'splashScreen',
diff --git a/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.tpl.html b/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.tpl.html
index 149ebb8a13..92c4f2ef43 100644
--- a/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.tpl.html
+++ b/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.tpl.html
@@ -11,7 +11,7 @@
       <tr ng-repeat="contrib in team.memberContributions | orderBy:memberSortOrder:reverse">
         <td>{{contrib.project.student.name}}</td>
         <td class="text-left">
-          <grade-icon [grade]="contrib.project.targetGrade"></grade-icon>
+          <f-grade-icon [grade]="contrib.project.targetGrade"></f-grade-icon>
         </td>
         <td>
           <rating
diff --git a/src/app/groups/group-member-list/group-member-list.tpl.html b/src/app/groups/group-member-list/group-member-list.tpl.html
index f483b4acbd..fd28367eb5 100644
--- a/src/app/groups/group-member-list/group-member-list.tpl.html
+++ b/src/app/groups/group-member-list/group-member-list.tpl.html
@@ -38,7 +38,7 @@ <h4>No members in group</h4>
       <td class="student-id" ng-show="unitRole">{{member.student.username || "N/A"}}</td>
       <td class="student-name">{{member.student.name}}</td>
       <td ng-show="unitRole" class="student-grade text-left">
-        <grade-icon grade="member.targetGrade"></grade-icon>
+        <f-grade-icon [grade]="member.targetGrade"></f-grade-icon>
       </td>
       <td class="actions" ng-if="canRemoveMembers">
         <button ng-click="removeMember(member)" class="btn btn-sm btn-danger" ng-hide="project">
diff --git a/src/app/projects/project-progress-dashboard/project-progress-dashboard.tpl.html b/src/app/projects/project-progress-dashboard/project-progress-dashboard.tpl.html
index 7e59cac17b..4570c5fb1c 100644
--- a/src/app/projects/project-progress-dashboard/project-progress-dashboard.tpl.html
+++ b/src/app/projects/project-progress-dashboard/project-progress-dashboard.tpl.html
@@ -22,7 +22,7 @@ <h3 class="panel-title">Target Grade</h3>
           <div class="panel-body text-center">
             <p class="btn-group">
               <label ng-repeat="grade in grades" ng-if="$index != 4" ng-click="chooseGrade($index)" class="btn btn-default col-sm-3 text-center" ng-model="project.targetGrade" btn-radio="{{$index}}">
-                <grade-icon [grade]="grade" tooltip="Select a {{grade}} as your target grade" tooltip-append-to-body="true" class="text-{{$index == project.targetGrade ? 'primary' : 'muted'}}"></grade-icon>
+                <f-grade-icon [grade]="grade" tooltip="Select a {{grade}} as your target grade" tooltip-append-to-body="true" class="text-{{$index == project.targetGrade ? 'primary' : 'muted'}}"></f-grade-icon>
               </label>
             </p>
           </div>
diff --git a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.tpl.html b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.tpl.html
index 244c110857..5e512edf25 100644
--- a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.tpl.html
+++ b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.tpl.html
@@ -34,10 +34,10 @@ <h4>Grade Application</h4>
             ng-model="project.submittedGrade"
             btn-radio="{{$index}}"
           >
-            <grade-icon
-              grade="grade"
+            <f-grade-icon
+              [grade]="grade"
               class="text-{{project.submittedGrade == grades.indexOf(grade) ? 'success' : 'muted'}}"
-            ></grade-icon>
+            ></f-grade-icon>
           </label>
         </div>
         <p class="help-block">
diff --git a/src/app/tasks/modals/grade-task-modal/grade-task-modal.tpl.html b/src/app/tasks/modals/grade-task-modal/grade-task-modal.tpl.html
index 4d02cce31f..7fa8e7055e 100644
--- a/src/app/tasks/modals/grade-task-modal/grade-task-modal.tpl.html
+++ b/src/app/tasks/modals/grade-task-modal/grade-task-modal.tpl.html
@@ -7,7 +7,7 @@ <h3>Assess Task Quality</h3>
       <p>Please provide a grade to change the student's status for task <label class="label label-info">{{task.definition.abbreviation}}</label>.</p>
       <p class="btn-group">
         <label ng-repeat="idx in gradeValues" class="btn btn-default col-sm-15 text-center" ng-model="data.desiredGrade" btn-radio="{{idx}}">
-          <grade-icon [grade]="grades[idx]" tooltip="This student completed the task to a {{grades[idx]}} standard" tooltip-append-to-body="true"></grade-icon>
+          <f-grade-icon [grade]="grades[idx]" tooltip="This student completed the task to a {{grades[idx]}} standard" tooltip-append-to-body="true"></f-grade-icon>
         </label>
       </p>
     </div>
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index 800d4f4cbe..c67b13e400 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -64,12 +64,12 @@ <h4 class="panel-title">Mark Portfolios</h4>
               ng-model="filterOptions.selectedGrade"
               btn-radio="{{$index}}"
             >
-              <grade-icon
+              <f-grade-icon
                 [grade]="grade"
                 tooltip="Select to show student's aiming for {{grades[grade]}}"
                 tooltip-append-to-body="true"
                 class="text-{{$index == filterOptions.selectedGrade ? 'primary' : 'muted'}}"
-              ></grade-icon>
+              ></f-grade-icon>
             </label>
           </div>
         </div>
@@ -194,10 +194,10 @@ <h4 class="panel-title">Mark Portfolios</h4>
             <td>{{student.tutorNames()}}</td>
             <td>{{student.shortTutorialDescription()}}</td>
             <td class="flags-data">
-              <grade-icon [grade]="student.targetGrade"></grade-icon>
+              <f-grade-icon [grade]="student.targetGrade"></f-grade-icon>
             </td>
             <td class="flags-data">
-              <grade-icon [grade]="student.submittedGrade"></grade-icon>
+              <f-grade-icon [grade]="student.submittedGrade"></f-grade-icon>
             </td>
             <td class="task-progress-bar">
               <progress class="task-progress" animate="true">
diff --git a/src/app/units/states/students-list/students-list.tpl.html b/src/app/units/states/students-list/students-list.tpl.html
index d81fdb4cd6..830d0a4c3f 100644
--- a/src/app/units/states/students-list/students-list.tpl.html
+++ b/src/app/units/states/students-list/students-list.tpl.html
@@ -130,7 +130,7 @@ <h4>No students found</h4>
           <td class="text-left" ng-click="viewStudent(project)">
             <span class="flags">
               <span class="flag">
-                <grade-icon [grade]="project.targetGrade"></grade-icon>
+                <f-grade-icon [grade]="project.targetGrade"></f-grade-icon>
               </span>
               <span ng-show="project.similarityFlag" class="flag">
                 <i class="fa fa-eye fa-2x" ></i>

From 3da7a4b54a5892ea99cd365ae439677b0f52ed6f Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:40:38 +1100
Subject: [PATCH 161/776] feat: add editor for task feedback templates

---
 src/app/api/models/doubtfire-model.ts         |   2 +-
 src/app/api/models/feedback-template.ts       |  78 +++++++++
 src/app/api/models/task-definition.ts         |   7 +-
 .../api/services/feedback-template.service.ts |  28 +++
 src/app/doubtfire-angular.module.ts           |   4 +
 .../task-definition-editor.component.html     |  21 ++-
 .../task-definition-feedback.component.html   | 127 ++++++++++++++
 .../task-definition-feedback.component.scss   |   0
 .../task-definition-feedback.component.ts     | 163 ++++++++++++++++++
 9 files changed, 426 insertions(+), 4 deletions(-)
 create mode 100644 src/app/api/models/feedback-template.ts
 create mode 100644 src/app/api/services/feedback-template.service.ts
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.html
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.scss
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.ts

diff --git a/src/app/api/models/doubtfire-model.ts b/src/app/api/models/doubtfire-model.ts
index fffc361a4e..38b886a2ae 100644
--- a/src/app/api/models/doubtfire-model.ts
+++ b/src/app/api/models/doubtfire-model.ts
@@ -37,6 +37,7 @@ export * from './scorm-player-context';
 export * from './test-attempt';
 export * from './task-comment/scorm-comment';
 export * from './task-comment/scorm-extension-comment';
+export * from './feedback-template';
 
 // Users -- are students or staff
 export * from './user/user';
@@ -44,7 +45,6 @@ export * from './user/user';
 // WebCal -- calendars used to track task due dates
 export * from './webcal/webcal';
 
-
 export * from '../services/authentication.service';
 export * from '../services/unit.service';
 export * from '../services/project.service';
diff --git a/src/app/api/models/feedback-template.ts b/src/app/api/models/feedback-template.ts
new file mode 100644
index 0000000000..85da6af509
--- /dev/null
+++ b/src/app/api/models/feedback-template.ts
@@ -0,0 +1,78 @@
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {Observable} from 'rxjs';
+import {AppInjector} from 'src/app/app-injector';
+import {TaskDefinition} from './task-definition';
+import {FeedbackTemplateService} from '../services/feedback-template.service';
+
+export class FeedbackTemplate extends Entity {
+  id: number;
+  learningOutcome: string;
+  chipText: string;
+  description: string;
+  commentText: string;
+  summaryText: string;
+
+  readonly taskDefinition: TaskDefinition;
+
+  constructor(taskDef: TaskDefinition) {
+    super();
+    this.taskDefinition = taskDef;
+  }
+
+  public toJson<T extends Entity>(mappingData: EntityMapping<T>, ignoreKeys?: string[]): object {
+    return {
+      feedback_template: super.toJson(mappingData, ignoreKeys),
+    };
+  }
+
+  public save(): Observable<FeedbackTemplate> {
+    const svc = AppInjector.get(FeedbackTemplateService);
+
+    if (this.isNew) {
+      return svc.create(
+        {
+          taskDefId: this.taskDefinition.id,
+        },
+        {
+          entity: this,
+          cache: this.taskDefinition.feedbackTemplateCache,
+          constructorParams: this.taskDefinition,
+        },
+      );
+    } else {
+      return svc.update(
+        {
+          taskDefId: this.taskDefinition.id,
+          id: this.id,
+        },
+        {entity: this},
+      );
+    }
+  }
+
+  private originalSaveData: string;
+
+  public get hasOriginalSaveData(): boolean {
+    return this.originalSaveData !== undefined && this.originalSaveData !== null;
+  }
+
+  public setOriginalSaveData(mapping: EntityMapping<FeedbackTemplate>) {
+    this.originalSaveData = JSON.stringify(this.toJson(mapping));
+  }
+
+  public hasChanges<T extends Entity>(mapping: EntityMapping<T>): boolean {
+    if (!this.originalSaveData) {
+      return false;
+    }
+
+    return this.originalSaveData != JSON.stringify(this.toJson(mapping));
+  }
+
+  public get isNew(): boolean {
+    return !this.id;
+  }
+
+  public get taskDefId(): number {
+    return this.taskDefinition.id;
+  }
+}
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index b848686768..2e17ac6cda 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -1,9 +1,9 @@
 import { HttpClient } from '@angular/common/http';
-import { Entity, EntityMapping } from 'ngx-entity-service';
+import { Entity, EntityCache, EntityMapping } from 'ngx-entity-service';
 import { Observable, tap } from 'rxjs';
 import { AppInjector } from 'src/app/app-injector';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { Grade, GroupSet, TutorialStream, Unit } from './doubtfire-model';
+import { FeedbackTemplate, Grade, GroupSet, TutorialStream, Unit } from './doubtfire-model';
 import { TaskDefinitionService } from '../services/task-definition.service';
 
 export type UploadRequirement = { key: string; name: string; type: string; tiiCheck?: boolean; tiiPct?: number };
@@ -44,6 +44,9 @@ export class TaskDefinition extends Entity {
   assessmentEnabled: boolean;
   mossLanguage: string = 'moss c';
 
+  public readonly feedbackTemplateCache: EntityCache<FeedbackTemplate> =
+    new EntityCache<FeedbackTemplate>();
+
   readonly unit: Unit;
 
   constructor(unit: Unit) {
diff --git a/src/app/api/services/feedback-template.service.ts b/src/app/api/services/feedback-template.service.ts
new file mode 100644
index 0000000000..4d0bef50de
--- /dev/null
+++ b/src/app/api/services/feedback-template.service.ts
@@ -0,0 +1,28 @@
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import {FeedbackTemplate} from '../models/feedback-template';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiURL';
+import {TaskDefinition} from '../models/task-definition';
+
+@Injectable()
+export class FeedbackTemplateService extends CachedEntityService<FeedbackTemplate> {
+  protected readonly endpointFormat = 'feedback_templates/';
+
+  constructor(httpClient: HttpClient) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys(
+      'id',
+      'learningOutcome',
+      'chipText',
+      'description',
+      'commentText',
+      'summaryText',
+    );
+  }
+
+  public override createInstanceFrom(json: object, other?: any): FeedbackTemplate {
+    return new FeedbackTemplate(other as TaskDefinition);
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 991ac397b4..fe50c5a40b 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -207,6 +207,7 @@ import {TaskDefinitionDatesComponent} from './units/states/edit/directives/unit-
 import {TaskDefinitionUploadComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component';
 import {TaskDefinitionOptionsComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component';
 import {TaskDefinitionResourcesComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component';
+import {TaskDefinitionFeedbackComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component';
 import {TaskDefinitionOverseerComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component';
 import {TaskDefinitionScormComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component';
 import {UnitAnalyticsComponent} from './units/states/analytics/unit-analytics-route.component';
@@ -237,6 +238,7 @@ import {TaskScormCardComponent} from './projects/states/dashboard/directives/tas
 import {TestAttemptService} from './api/services/test-attempt.service';
 import {ScormExtensionCommentComponent} from './tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component';
 import {ScormExtensionModalComponent} from './common/modals/scorm-extension-modal/scorm-extension-modal.component';
+import {FeedbackTemplateService} from './api/services/feedback-template.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -287,6 +289,7 @@ const MY_DATE_FORMAT = {
     TaskDefinitionUploadComponent,
     TaskDefinitionOptionsComponent,
     TaskDefinitionResourcesComponent,
+    TaskDefinitionFeedbackComponent,
     TaskDefinitionOverseerComponent,
     TaskDefinitionScormComponent,
     UnitAnalyticsComponent,
@@ -435,6 +438,7 @@ const MY_DATE_FORMAT = {
     provideLottieOptions({
       player: () => player,
     }),
+    FeedbackTemplateService,
   ],
   imports: [
     FlexLayoutModule,
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 7d6224f343..e33ba9297f 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -133,6 +133,25 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
           7
         </div>
       </div>
+      <div class="w-full">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task feedback templates</h3>
+        <p class="font-normal text-gray-700">
+          Upload feedback templates for tutors
+        </p>
+        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+          <f-task-definition-feedback [taskDefinition]="taskDefinition"></f-task-definition-feedback>
+        </div>
+      </div>
+    </div>
+
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          8
+        </div>
+      </div>
       <div class="w-full">
         <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">SCORM test</h3>
         <p class="font-normal text-gray-700">
@@ -149,7 +168,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">SCORM test</h3>
         <div
           class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
         >
-          8
+          9
         </div>
       </div>
 
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.html
new file mode 100644
index 0000000000..8cdecc7f46
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.html
@@ -0,0 +1,127 @@
+<div class="flex flex-col gap-8">
+  <div class="flex flex-row">
+    <mat-checkbox matInput required> Enable feedback templates </mat-checkbox>
+    <span class="flex-grow"></span>
+    <div>
+      <mat-form-field appearance="outline">
+        <input
+          matInput
+          (keyup)="applyFilter($event.target.value)"
+          placeholder="Filter"
+          [(ngModel)]="filter"
+        />
+      </mat-form-field>
+    </div>
+  </div>
+
+  <table
+    class="flex-grow f-table selectable"
+    mat-table
+    [dataSource]="feedbackTemplateSource"
+    matSort
+    (matSortChange)="sortData($event)"
+  >
+    <ng-container matColumnDef="learningOutcome" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Learning Outcome</th>
+      <td
+        mat-cell
+        *matCellDef="let feedbackTemplate"
+        (click)="selectFeedbackTemplate(feedbackTemplate)"
+      >
+        {{ feedbackTemplate.learningOutcome }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="chipText" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Chip Text</th>
+      <td
+        mat-cell
+        *matCellDef="let feedbackTemplate"
+        (click)="selectFeedbackTemplate(feedbackTemplate)"
+      >
+        {{ feedbackTemplate.chipText }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="description" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
+      <td
+        mat-cell
+        *matCellDef="let feedbackTemplate"
+        (click)="selectFeedbackTemplate(feedbackTemplate)"
+      >
+        {{ feedbackTemplate.description }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="commentText" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Comment Text</th>
+      <td
+        mat-cell
+        *matCellDef="let feedbackTemplate"
+        (click)="selectFeedbackTemplate(feedbackTemplate)"
+      >
+        {{ feedbackTemplate.commentText }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="summaryText" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Summary Text</th>
+      <td
+        mat-cell
+        *matCellDef="let feedbackTemplate"
+        (click)="selectFeedbackTemplate(feedbackTemplate)"
+      >
+        {{ feedbackTemplate.summaryText }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="feedbackTemplateAction" sticky>
+      <th mat-header-cell *matHeaderCellDef></th>
+      <td
+        mat-cell
+        *matCellDef="let feedbackTemplate"
+        (click)="selectFeedbackTemplate(feedbackTemplate)"
+      >
+        @if (feedbackTemplateHasChanges(feedbackTemplate)) {
+          <button
+            mat-icon-button
+            aria-label="save feedback template"
+            color="primary"
+            (click)="saveFeedbackTemplate(feedbackTemplate)"
+          >
+            <mat-icon>save</mat-icon>
+          </button>
+        }
+        <button
+          mat-icon-button
+          aria-label="delete feedback template"
+          color="warn"
+          (click)="deleteFeedbackTemplate(feedbackTemplate)"
+        >
+          <mat-icon>delete</mat-icon>
+        </button>
+      </td>
+    </ng-container>
+
+    <!-- Action footer row -->
+    <ng-container matColumnDef="actions">
+      <td mat-footer-cell *matFooterCellDef [colSpan]="columns.length"></td>
+    </ng-container>
+
+    <tr mat-header-row *matHeaderRowDef="columns"></tr>
+    <tr
+      mat-row
+      *matRowDef="let row; columns: columns"
+      [style.background]="selectedFeedbackTemplate === row ? 'lightblue' : ''"
+    ></tr>
+  </table>
+  <span class="flex items-center">
+    <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+    <span class="flex-grow"></span>
+    <label>Feedback Templates CSV</label>
+    <button mat-icon-button>
+      <mat-icon>download</mat-icon>
+    </button>
+    <button mat-icon-button (click)="uploadFeedbackTemplatesCsv()">
+      <mat-icon>upload_file</mat-icon>
+    </button>
+    <span class="flex-grow"></span>
+    <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">Add Template</button>
+  </span>
+</div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.ts
new file mode 100644
index 0000000000..7036148564
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.ts
@@ -0,0 +1,163 @@
+import {AfterViewInit, Component, Inject, Input, ViewChild} from '@angular/core';
+import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {MatPaginator} from '@angular/material/paginator';
+import {TaskDefinition, FeedbackTemplate, Unit} from 'src/app/api/models/doubtfire-model';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {MatSort, Sort} from '@angular/material/sort';
+import {
+  confirmationModal,
+  csvResultModalService,
+  csvUploadModalService,
+} from 'src/app/ajs-upgraded-providers';
+import {Subscription} from 'rxjs';
+import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
+
+@Component({
+  selector: 'f-task-definition-feedback',
+  templateUrl: 'task-definition-feedback.component.html',
+  styleUrls: ['task-definition-feedback.component.scss'],
+})
+export class TaskDefinitionFeedbackComponent implements AfterViewInit {
+  @ViewChild(MatTable, {static: false}) table: MatTable<FeedbackTemplate>;
+  @ViewChild(MatSort, {static: false}) sort: MatSort;
+  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
+
+  @Input() taskDefinition: TaskDefinition;
+
+  public feedbackTemplateSource: MatTableDataSource<FeedbackTemplate>;
+  public columns: string[] = [
+    'learningOutcome',
+    'chipText',
+    'description',
+    'commentText',
+    'summaryText',
+    'feedbackTemplateAction',
+  ];
+  public filter: string;
+  public selectedFeedbackTemplate: FeedbackTemplate;
+
+  constructor(
+    private alerts: AlertService,
+    private taskDefinitionService: TaskDefinitionService,
+    private feedbackTemplateService: FeedbackTemplateService,
+    @Inject(csvResultModalService) private csvResultModalService: any,
+    @Inject(csvUploadModalService) private csvUploadModal: any,
+    @Inject(confirmationModal) private confirmationModal: any,
+  ) {}
+
+  public get unit(): Unit {
+    return this.taskDefinition?.unit;
+  }
+
+  ngAfterViewInit(): void {
+    this.subscriptions.push(
+      this.taskDefinition.feedbackTemplateCache.values.subscribe((feedbackTemplates) => {
+        this.feedbackTemplateSource = new MatTableDataSource<FeedbackTemplate>(feedbackTemplates);
+        this.feedbackTemplateSource.paginator = this.paginator;
+        this.feedbackTemplateSource.sort = this.sort;
+        this.feedbackTemplateSource.filterPredicate = (data: any, filter: string) =>
+          data.matches(filter);
+      }),
+    );
+  }
+
+  public saveFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    feedbackTemplate.save().subscribe(() => {
+      this.alerts.success('Template saved');
+      feedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+    });
+  }
+
+  private subscriptions: Subscription[] = [];
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((s) => s.unsubscribe());
+  }
+
+  public selectFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    if (this.selectedFeedbackTemplate === feedbackTemplate) {
+      this.selectedFeedbackTemplate = null;
+    } else {
+      this.selectedFeedbackTemplate = feedbackTemplate;
+
+      if (!this.selectedFeedbackTemplate.hasOriginalSaveData) {
+        this.selectedFeedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+      }
+    }
+  }
+
+  public sortData(sort: Sort) {
+    const data = this.feedbackTemplateSource.data;
+
+    if (!sort.active || sort.direction === '') {
+      this.feedbackTemplateSource.data = data;
+      return;
+    }
+
+    this.feedbackTemplateSource.data = data.sort((a, b) => {
+      const isAsc = sort.direction === 'asc';
+      switch (sort.active) {
+        case 'learningOutcome':
+          return this.compare(a.learningOutcome, b.learningOutcome, isAsc);
+        case 'chipText':
+          return this.compare(a.chipText, b.chipText, isAsc);
+        case 'description':
+          return this.compare(a.description, b.description, isAsc);
+        case 'commentText':
+          return this.compare(a.commentText, b.commentText, isAsc);
+        case 'summaryText':
+          return this.compare(a.summaryText, b.summaryText, isAsc);
+        default:
+          return 0;
+      }
+    });
+  }
+
+  public compare(a: number | string, b: number | string, isAsc: boolean): number {
+    return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
+  }
+
+  applyFilter(filterValue: string) {
+    this.feedbackTemplateSource.filter = filterValue.trim().toLowerCase();
+
+    if (this.feedbackTemplateSource.paginator) {
+      this.feedbackTemplateSource.paginator.firstPage();
+    }
+  }
+
+  public feedbackTemplateHasChanges(feedbackTemplate: FeedbackTemplate): boolean {
+    return feedbackTemplate.hasChanges(this.feedbackTemplateService.mapping);
+  }
+
+  public deleteFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    this.confirmationModal.show(
+      'Delete feedback template',
+      'Are you sure you want to delete this template? This action is final.',
+      () => {
+        this.alerts.success('Task deleted');
+      },
+    );
+  }
+
+  public uploadFeedbackTemplatesCsv() {
+    this.csvUploadModal.show(
+      'Upload Feedback Templates as CSV',
+      'Test message',
+      {file: {name: 'Feedback Template CSV Data', type: 'csv'}},
+      this.unit.getTaskDefinitionBatchUploadUrl(),
+      (response: any) => {},
+    );
+  }
+
+  public createFeedbackTemplate() {
+    const feedbackTemplate = new FeedbackTemplate(this.taskDefinition);
+
+    feedbackTemplate.learningOutcome = 'TLO';
+    feedbackTemplate.chipText = 'lorem';
+    feedbackTemplate.description = 'Lorem ipsum dolor';
+    feedbackTemplate.commentText = 'Lorem dolor';
+    feedbackTemplate.summaryText = 'Lorem ipsum';
+
+    this.selectedFeedbackTemplate = feedbackTemplate;
+  }
+}

From c12536bc4375b1ae5f19d4e54d0783b6948921eb Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:19:56 +1100
Subject: [PATCH 162/776] feat: combine outcome and template editor

---
 .../feedback-template-editor.component.html   | 258 +++++++++++++++++
 .../feedback-template-editor.component.ts     | 270 ++++++++++++++++++
 src/app/doubtfire-angular.module.ts           |   4 +-
 .../task-definition-editor.component.html     |  44 ++-
 .../task-definition-feedback.component.html   | 127 --------
 .../task-definition-feedback.component.scss   |   0
 .../task-definition-feedback.component.ts     | 163 -----------
 7 files changed, 551 insertions(+), 315 deletions(-)
 create mode 100644 src/app/common/feedback-template/feedback-template-editor.component.html
 create mode 100644 src/app/common/feedback-template/feedback-template-editor.component.ts
 delete mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.html
 delete mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.scss
 delete mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.ts

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
new file mode 100644
index 0000000000..6922dab4ed
--- /dev/null
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -0,0 +1,258 @@
+<div class="flex flex-col gap-8">
+  <table
+    class="flex-grow f-table selectable"
+    mat-table
+    [dataSource]="outcomeSource"
+    matSort
+    (matSortChange)="sortOutcomeData($event)"
+  >
+    <ng-container matColumnDef="number" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Number</th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        {{ learningOutcome.iloNumber }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="abbreviation" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Abbreviation</th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        {{ learningOutcome.abbreviation }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="name" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Name</th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        {{ learningOutcome.name }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="description" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        {{ learningOutcome.description }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="learningOutcomeAction" sticky>
+      <th mat-header-cell *matHeaderCellDef></th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        @if (learningOutcomeHasChanges(learningOutcome)) {
+          <button
+            mat-icon-button
+            aria-label="save learning outcome"
+            color="primary"
+            (click)="saveLearningOutcome(learningOutcome)"
+          >
+            <mat-icon>save</mat-icon>
+          </button>
+        }
+        <button
+          mat-icon-button
+          aria-label="delete learning outcome"
+          color="warn"
+          (click)="deleteLearningOutcome(learningOutcome)"
+        >
+          <mat-icon>delete</mat-icon>
+        </button>
+      </td>
+    </ng-container>
+
+    <!-- Action footer row -->
+    <ng-container matColumnDef="actions">
+      <td mat-footer-cell *matFooterCellDef [colSpan]="outcomeColumns.length"></td>
+    </ng-container>
+
+    <tr mat-header-row *matHeaderRowDef="outcomeColumns"></tr>
+    <tr
+      mat-row
+      *matRowDef="let row; columns: outcomeColumns"
+      [style.background]="selectedOutcome === row ? 'lightblue' : ''"
+    ></tr>
+  </table>
+  <span class="flex items-center">
+    <div class="h-20">
+      <mat-form-field appearance="outline">
+        <input
+          matInput
+          (keyup)="applyOutcomeFilter($event.target.value)"
+          placeholder="Filter"
+          [(ngModel)]="outcomeFilter"
+        />
+      </mat-form-field>
+    </div>
+    <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+    <span class="flex-grow"></span>
+    <label>Task Learning Outcomes CSV</label>
+    <button mat-icon-button>
+      <mat-icon>download</mat-icon>
+    </button>
+    <button mat-icon-button (click)="uploadLearningOutcomesCsv()">
+      <mat-icon>upload_file</mat-icon>
+    </button>
+    <span class="flex-grow"></span>
+    <button mat-raised-button color="primary" (click)="createLearningOutcome()">Add Outcome</button>
+  </span>
+  @if (selectedOutcome) {
+    <div class="flex flex-row gap-4">
+      <mat-form-field appearance="outline" class="basis-1/3">
+        <mat-label>Outcome Number</mat-label>
+        <input matInput required [(ngModel)]="selectedOutcome.iloNumber" />
+      </mat-form-field>
+
+      <mat-form-field appearance="outline" class="basis-1/3">
+        <mat-label>Abbreviation</mat-label>
+        <input matInput required [(ngModel)]="selectedOutcome.abbreviation" />
+      </mat-form-field>
+
+      <mat-form-field appearance="outline" class="flex-grow">
+        <mat-label>Name</mat-label>
+        <input matInput required [(ngModel)]="selectedOutcome.name" />
+      </mat-form-field>
+    </div>
+
+    <mat-form-field appearance="outline" class="flex flex-grow">
+      <mat-label>Description</mat-label>
+      <textarea matInput required [(ngModel)]="selectedOutcome.description"> </textarea>
+    </mat-form-field>
+
+    <div class="flex flex-col gap-8">
+      <table
+        class="flex-grow f-table selectable"
+        mat-table
+        [dataSource]="templateSource"
+        matSort
+        (matSortChange)="sortTemplateData($event)"
+      >
+        <ng-container matColumnDef="learningOutcome" sticky>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header>Learning Outcome</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ feedbackTemplate.learningOutcome }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="chipText" sticky>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header>Chip Text</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ feedbackTemplate.chipText }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="description" sticky>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ feedbackTemplate.description }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="commentText" sticky>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header>Comment Text</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ feedbackTemplate.commentText }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="summaryText" sticky>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header>Summary Text</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ feedbackTemplate.summaryText }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="feedbackTemplateAction" sticky>
+          <th mat-header-cell *matHeaderCellDef></th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            @if (feedbackTemplateHasChanges(feedbackTemplate)) {
+              <button
+                mat-icon-button
+                aria-label="save feedback template"
+                color="primary"
+                (click)="saveFeedbackTemplate(feedbackTemplate)"
+              >
+                <mat-icon>save</mat-icon>
+              </button>
+            }
+            <button
+              mat-icon-button
+              aria-label="delete feedback template"
+              color="warn"
+              (click)="deleteFeedbackTemplate(feedbackTemplate)"
+            >
+              <mat-icon>delete</mat-icon>
+            </button>
+          </td>
+        </ng-container>
+
+        <!-- Action footer row -->
+        <ng-container matColumnDef="actions">
+          <td mat-footer-cell *matFooterCellDef [colSpan]="templateColumns.length"></td>
+        </ng-container>
+
+        <tr mat-header-row *matHeaderRowDef="templateColumns"></tr>
+        <tr
+          mat-row
+          *matRowDef="let row; columns: templateColumns"
+          [style.background]="selectedTemplate === row ? 'lightblue' : ''"
+        ></tr>
+      </table>
+      <span class="flex items-center">
+        <div class="h-20">
+          <mat-form-field appearance="outline">
+            <input
+              matInput
+              (keyup)="applyTemplateFilter($event.target.value)"
+              placeholder="Filter"
+              [(ngModel)]="templateFilter"
+            />
+          </mat-form-field>
+        </div>
+        <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+        <span class="flex-grow"></span>
+        <label>Feedback Templates CSV</label>
+        <button mat-icon-button>
+          <mat-icon>download</mat-icon>
+        </button>
+        <button mat-icon-button (click)="uploadFeedbackTemplatesCsv()">
+          <mat-icon>upload_file</mat-icon>
+        </button>
+        <span class="flex-grow"></span>
+        <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">Add Template</button>
+      </span>
+    </div>
+  }
+</div>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
new file mode 100644
index 0000000000..b5a94b3e91
--- /dev/null
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -0,0 +1,270 @@
+import {AfterViewInit, Component, Inject, Input, ViewChild} from '@angular/core';
+import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {MatPaginator} from '@angular/material/paginator';
+import {TaskDefinition, Unit, LearningOutcome, LearningOutcomeService, FeedbackTemplate} from 'src/app/api/models/doubtfire-model';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {MatSort, Sort} from '@angular/material/sort';
+import {
+  confirmationModal,
+  csvResultModalService,
+  csvUploadModalService,
+} from 'src/app/ajs-upgraded-providers';
+import {Subscription} from 'rxjs';
+import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
+
+@Component({
+  selector: 'f-feedback-template-editor',
+  templateUrl: 'feedback-template-editor.component.html',
+})
+export class FeedbackTemplateEditorComponent implements AfterViewInit {
+  @Input() taskDefinition: TaskDefinition;
+
+  @ViewChild(MatTable, {static: false}) outcomeTable: MatTable<LearningOutcome>;
+  @ViewChild(MatSort, {static: false}) outcomeSort: MatSort;
+  @ViewChild(MatPaginator, {static: false}) outcomePaginator: MatPaginator;
+
+  public outcomeSource: MatTableDataSource<LearningOutcome>;
+  public outcomeColumns: string[] = [
+    'number',
+    'abbreviation',
+    'name',
+    'description',
+    'learningOutcomeAction',
+  ];
+  public outcomeFilter: string;
+  public selectedOutcome: LearningOutcome;
+
+  @ViewChild(MatTable, {static: false}) templateTable: MatTable<FeedbackTemplate>;
+  @ViewChild(MatSort, {static: false}) templateSort: MatSort;
+  @ViewChild(MatPaginator, {static: false}) templatePaginator: MatPaginator;
+
+  public templateSource: MatTableDataSource<FeedbackTemplate>;
+  public templateColumns: string[] = [
+    'learningOutcome',
+    'chipText',
+    'description',
+    'commentText',
+    'summaryText',
+    'feedbackTemplateAction',
+  ];
+  public templateFilter: string;
+  public selectedTemplate: FeedbackTemplate;
+
+  constructor(
+    private alerts: AlertService,
+    private taskDefinitionService: TaskDefinitionService,
+    private learningOutcomeService: LearningOutcomeService,
+    private feedbackTemplateService: FeedbackTemplateService,
+    @Inject(csvResultModalService) private csvResultModalService: any,
+    @Inject(csvUploadModalService) private csvUploadModal: any,
+    @Inject(confirmationModal) private confirmationModal: any,
+  ) {}
+
+  public get unit(): Unit {
+    return this.taskDefinition?.unit;
+  }
+
+  ngAfterViewInit(): void {
+    this.subscriptions.push(
+      this.unit.learningOutcomesCache.values.subscribe((learningOutcomes) => {
+        this.outcomeSource = new MatTableDataSource<LearningOutcome>(learningOutcomes);
+        this.outcomeSource.paginator = this.outcomePaginator;
+        this.outcomeSource.sort = this.outcomeSort;
+        this.outcomeSource.filterPredicate = (data: any, filter: string) => data.matches(filter);
+      }),
+      this.taskDefinition.feedbackTemplateCache.values.subscribe((feedbackTemplates) => {
+        this.templateSource = new MatTableDataSource<FeedbackTemplate>(feedbackTemplates);
+        this.templateSource.paginator = this.templatePaginator;
+        this.templateSource.sort = this.templateSort;
+        this.templateSource.filterPredicate = (data: any, filter: string) => data.matches(filter);
+      }),
+    );
+  }
+
+  public saveLearningOutcome(learningOutcome: LearningOutcome) {
+    // learningOutcome.save().subscribe(() => {
+    //   this.alerts.success('Outcome saved');
+    //   learningOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
+    // });
+  }
+
+  public saveFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    feedbackTemplate.save().subscribe(() => {
+      this.alerts.success('Template saved');
+      feedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+    });
+  }
+
+  private subscriptions: Subscription[] = [];
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((s) => s.unsubscribe());
+  }
+
+  public selectLearningOutcome(learningOutcome: LearningOutcome) {
+    if (this.selectedOutcome === learningOutcome) {
+      this.selectedOutcome = null;
+    } else {
+      this.selectedOutcome = learningOutcome;
+
+      // if (!this.selectedFeedbackTemplate.hasOriginalSaveData) {
+      //   this.selectedFeedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+      // }
+    }
+  }
+
+  public selectFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    if (this.selectedTemplate === feedbackTemplate) {
+      this.selectedTemplate = null;
+    } else {
+      this.selectedTemplate = feedbackTemplate;
+
+      if (!this.selectedTemplate.hasOriginalSaveData) {
+        this.selectedTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+      }
+    }
+  }
+
+  public sortOutcomeData(sort: Sort) {
+    const data = this.outcomeSource.data;
+
+    if (!sort.active || sort.direction === '') {
+      this.outcomeSource.data = data;
+      return;
+    }
+
+    this.outcomeSource.data = data.sort((a, b) => {
+      const isAsc = sort.direction === 'asc';
+      switch (sort.active) {
+        case 'number':
+          return this.compare(a.iloNumber, b.iloNumber, isAsc);
+        case 'abbreviation':
+          return this.compare(a.abbreviation, b.abbreviation, isAsc);
+        case 'name':
+          return this.compare(a.name, b.name, isAsc);
+        case 'description':
+          return this.compare(a.description, b.description, isAsc);
+        default:
+          return 0;
+      }
+    });
+  }
+
+  public sortTemplateData(sort: Sort) {
+    const data = this.templateSource.data;
+
+    if (!sort.active || sort.direction === '') {
+      this.templateSource.data = data;
+      return;
+    }
+
+    this.templateSource.data = data.sort((a, b) => {
+      const isAsc = sort.direction === 'asc';
+      switch (sort.active) {
+        case 'learningOutcome':
+          return this.compare(a.learningOutcome, b.learningOutcome, isAsc);
+        case 'chipText':
+          return this.compare(a.chipText, b.chipText, isAsc);
+        case 'description':
+          return this.compare(a.description, b.description, isAsc);
+        case 'commentText':
+          return this.compare(a.commentText, b.commentText, isAsc);
+        case 'summaryText':
+          return this.compare(a.summaryText, b.summaryText, isAsc);
+        default:
+          return 0;
+      }
+    });
+  }
+
+  public compare(a: number | string, b: number | string, isAsc: boolean): number {
+    return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
+  }
+
+  applyOutcomeFilter(filterValue: string) {
+    this.outcomeSource.filter = filterValue.trim().toLowerCase();
+
+    if (this.outcomeSource.paginator) {
+      this.outcomeSource.paginator.firstPage();
+    }
+  }
+
+  applyTemplateFilter(filterValue: string) {
+    this.templateSource.filter = filterValue.trim().toLowerCase();
+
+    if (this.templateSource.paginator) {
+      this.templateSource.paginator.firstPage();
+    }
+  }
+
+  public learningOutcomeHasChanges(learningOutcome: LearningOutcome): boolean {
+    return learningOutcome.hasChanges(this.learningOutcomeService.mapping);
+  }
+
+  public feedbackTemplateHasChanges(feedbackTemplate: FeedbackTemplate): boolean {
+    return feedbackTemplate.hasChanges(this.feedbackTemplateService.mapping);
+  }
+
+  public deleteLearningOutcome(learningOutcome: LearningOutcome) {
+    this.confirmationModal.show(
+      'Delete learning outcome',
+      'Are you sure you want to delete this outcome? This action is final.',
+      () => {
+        this.alerts.success('Outcome deleted');
+      },
+    );
+  }
+
+  public deleteFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    this.confirmationModal.show(
+      'Delete feedback template',
+      'Are you sure you want to delete this template? This action is final.',
+      () => {
+        this.alerts.success('Template deleted');
+      },
+    );
+  }
+
+  public uploadLearningOutcomesCsv() {
+    this.csvUploadModal.show(
+      'Upload Learning Outcomes as CSV',
+      'Test message',
+      {file: {name: 'Learning Outcome CSV Data', type: 'csv'}},
+      this.unit.getTaskDefinitionBatchUploadUrl(),
+      (response: any) => {},
+    );
+  }
+
+  public uploadFeedbackTemplatesCsv() {
+    this.csvUploadModal.show(
+      'Upload Feedback Templates as CSV',
+      'Test message',
+      {file: {name: 'Feedback Template CSV Data', type: 'csv'}},
+      this.unit.getTaskDefinitionBatchUploadUrl(),
+      (response: any) => {},
+    );
+  }
+
+  public createLearningOutcome() {
+    const learningOutcome = new LearningOutcome();
+
+    learningOutcome.iloNumber = 1;
+    learningOutcome.abbreviation = 'lm';
+    learningOutcome.name = 'lorem';
+    learningOutcome.description = 'Lorem ipsum dolor';
+
+    this.selectedOutcome = learningOutcome;
+  }
+
+  public createFeedbackTemplate() {
+    const feedbackTemplate = new FeedbackTemplate(this.taskDefinition);
+
+    feedbackTemplate.learningOutcome = 'TLO';
+    feedbackTemplate.chipText = 'lorem';
+    feedbackTemplate.description = 'Lorem ipsum dolor';
+    feedbackTemplate.commentText = 'Lorem dolor';
+    feedbackTemplate.summaryText = 'Lorem ipsum';
+
+    this.selectedTemplate = feedbackTemplate;
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index fe50c5a40b..07961095af 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -207,7 +207,6 @@ import {TaskDefinitionDatesComponent} from './units/states/edit/directives/unit-
 import {TaskDefinitionUploadComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component';
 import {TaskDefinitionOptionsComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component';
 import {TaskDefinitionResourcesComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-resources/task-definition-resources.component';
-import {TaskDefinitionFeedbackComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component';
 import {TaskDefinitionOverseerComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component';
 import {TaskDefinitionScormComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-scorm/task-definition-scorm.component';
 import {UnitAnalyticsComponent} from './units/states/analytics/unit-analytics-route.component';
@@ -239,6 +238,7 @@ import {TestAttemptService} from './api/services/test-attempt.service';
 import {ScormExtensionCommentComponent} from './tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component';
 import {ScormExtensionModalComponent} from './common/modals/scorm-extension-modal/scorm-extension-modal.component';
 import {FeedbackTemplateService} from './api/services/feedback-template.service';
+import {FeedbackTemplateEditorComponent} from './common/feedback-template/feedback-template-editor.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -289,7 +289,6 @@ const MY_DATE_FORMAT = {
     TaskDefinitionUploadComponent,
     TaskDefinitionOptionsComponent,
     TaskDefinitionResourcesComponent,
-    TaskDefinitionFeedbackComponent,
     TaskDefinitionOverseerComponent,
     TaskDefinitionScormComponent,
     UnitAnalyticsComponent,
@@ -360,6 +359,7 @@ const MY_DATE_FORMAT = {
     TaskScormCardComponent,
     ScormExtensionCommentComponent,
     ScormExtensionModalComponent,
+    FeedbackTemplateEditorComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index e33ba9297f..c56b29c055 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -30,6 +30,23 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task details</h
           2
         </div>
       </div>
+      <div class="w-full">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task Learning Outcomes</h3>
+        <p class="font-normal text-gray-700">Add learning outcomes for this task</p>
+        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+          <f-feedback-template-editor [taskDefinition]="taskDefinition"></f-feedback-template-editor>
+        </div>
+      </div>
+    </div>
+
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          3
+        </div>
+      </div>
 
       <div class="w-full">
         <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Inbox</h3>
@@ -47,7 +64,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Inbox</h3>
         <div
           class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
         >
-          3
+          4
         </div>
       </div>
 
@@ -65,7 +82,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Due dates</h3>
         <div
           class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
         >
-          4
+          5
         </div>
       </div>
 
@@ -83,7 +100,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Upload requirem
         <div
           class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
         >
-          5
+          6
         </div>
       </div>
 
@@ -105,7 +122,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
         <div
           class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
         >
-          6
+          7
         </div>
       </div>
 
@@ -125,25 +142,6 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
       </div>
     </div>
 
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          7
-        </div>
-      </div>
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task feedback templates</h3>
-        <p class="font-normal text-gray-700">
-          Upload feedback templates for tutors
-        </p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-feedback [taskDefinition]="taskDefinition"></f-task-definition-feedback>
-        </div>
-      </div>
-    </div>
-
     <div class="flex mt-10">
       <div class="mr-6">
         <div
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.html
deleted file mode 100644
index 8cdecc7f46..0000000000
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<div class="flex flex-col gap-8">
-  <div class="flex flex-row">
-    <mat-checkbox matInput required> Enable feedback templates </mat-checkbox>
-    <span class="flex-grow"></span>
-    <div>
-      <mat-form-field appearance="outline">
-        <input
-          matInput
-          (keyup)="applyFilter($event.target.value)"
-          placeholder="Filter"
-          [(ngModel)]="filter"
-        />
-      </mat-form-field>
-    </div>
-  </div>
-
-  <table
-    class="flex-grow f-table selectable"
-    mat-table
-    [dataSource]="feedbackTemplateSource"
-    matSort
-    (matSortChange)="sortData($event)"
-  >
-    <ng-container matColumnDef="learningOutcome" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Learning Outcome</th>
-      <td
-        mat-cell
-        *matCellDef="let feedbackTemplate"
-        (click)="selectFeedbackTemplate(feedbackTemplate)"
-      >
-        {{ feedbackTemplate.learningOutcome }}
-      </td>
-    </ng-container>
-    <ng-container matColumnDef="chipText" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Chip Text</th>
-      <td
-        mat-cell
-        *matCellDef="let feedbackTemplate"
-        (click)="selectFeedbackTemplate(feedbackTemplate)"
-      >
-        {{ feedbackTemplate.chipText }}
-      </td>
-    </ng-container>
-    <ng-container matColumnDef="description" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
-      <td
-        mat-cell
-        *matCellDef="let feedbackTemplate"
-        (click)="selectFeedbackTemplate(feedbackTemplate)"
-      >
-        {{ feedbackTemplate.description }}
-      </td>
-    </ng-container>
-    <ng-container matColumnDef="commentText" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Comment Text</th>
-      <td
-        mat-cell
-        *matCellDef="let feedbackTemplate"
-        (click)="selectFeedbackTemplate(feedbackTemplate)"
-      >
-        {{ feedbackTemplate.commentText }}
-      </td>
-    </ng-container>
-    <ng-container matColumnDef="summaryText" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Summary Text</th>
-      <td
-        mat-cell
-        *matCellDef="let feedbackTemplate"
-        (click)="selectFeedbackTemplate(feedbackTemplate)"
-      >
-        {{ feedbackTemplate.summaryText }}
-      </td>
-    </ng-container>
-    <ng-container matColumnDef="feedbackTemplateAction" sticky>
-      <th mat-header-cell *matHeaderCellDef></th>
-      <td
-        mat-cell
-        *matCellDef="let feedbackTemplate"
-        (click)="selectFeedbackTemplate(feedbackTemplate)"
-      >
-        @if (feedbackTemplateHasChanges(feedbackTemplate)) {
-          <button
-            mat-icon-button
-            aria-label="save feedback template"
-            color="primary"
-            (click)="saveFeedbackTemplate(feedbackTemplate)"
-          >
-            <mat-icon>save</mat-icon>
-          </button>
-        }
-        <button
-          mat-icon-button
-          aria-label="delete feedback template"
-          color="warn"
-          (click)="deleteFeedbackTemplate(feedbackTemplate)"
-        >
-          <mat-icon>delete</mat-icon>
-        </button>
-      </td>
-    </ng-container>
-
-    <!-- Action footer row -->
-    <ng-container matColumnDef="actions">
-      <td mat-footer-cell *matFooterCellDef [colSpan]="columns.length"></td>
-    </ng-container>
-
-    <tr mat-header-row *matHeaderRowDef="columns"></tr>
-    <tr
-      mat-row
-      *matRowDef="let row; columns: columns"
-      [style.background]="selectedFeedbackTemplate === row ? 'lightblue' : ''"
-    ></tr>
-  </table>
-  <span class="flex items-center">
-    <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
-    <span class="flex-grow"></span>
-    <label>Feedback Templates CSV</label>
-    <button mat-icon-button>
-      <mat-icon>download</mat-icon>
-    </button>
-    <button mat-icon-button (click)="uploadFeedbackTemplatesCsv()">
-      <mat-icon>upload_file</mat-icon>
-    </button>
-    <span class="flex-grow"></span>
-    <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">Add Template</button>
-  </span>
-</div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.ts
deleted file mode 100644
index 7036148564..0000000000
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-feedback/task-definition-feedback.component.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import {AfterViewInit, Component, Inject, Input, ViewChild} from '@angular/core';
-import {MatTable, MatTableDataSource} from '@angular/material/table';
-import {MatPaginator} from '@angular/material/paginator';
-import {TaskDefinition, FeedbackTemplate, Unit} from 'src/app/api/models/doubtfire-model';
-import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
-import {AlertService} from 'src/app/common/services/alert.service';
-import {MatSort, Sort} from '@angular/material/sort';
-import {
-  confirmationModal,
-  csvResultModalService,
-  csvUploadModalService,
-} from 'src/app/ajs-upgraded-providers';
-import {Subscription} from 'rxjs';
-import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
-
-@Component({
-  selector: 'f-task-definition-feedback',
-  templateUrl: 'task-definition-feedback.component.html',
-  styleUrls: ['task-definition-feedback.component.scss'],
-})
-export class TaskDefinitionFeedbackComponent implements AfterViewInit {
-  @ViewChild(MatTable, {static: false}) table: MatTable<FeedbackTemplate>;
-  @ViewChild(MatSort, {static: false}) sort: MatSort;
-  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
-
-  @Input() taskDefinition: TaskDefinition;
-
-  public feedbackTemplateSource: MatTableDataSource<FeedbackTemplate>;
-  public columns: string[] = [
-    'learningOutcome',
-    'chipText',
-    'description',
-    'commentText',
-    'summaryText',
-    'feedbackTemplateAction',
-  ];
-  public filter: string;
-  public selectedFeedbackTemplate: FeedbackTemplate;
-
-  constructor(
-    private alerts: AlertService,
-    private taskDefinitionService: TaskDefinitionService,
-    private feedbackTemplateService: FeedbackTemplateService,
-    @Inject(csvResultModalService) private csvResultModalService: any,
-    @Inject(csvUploadModalService) private csvUploadModal: any,
-    @Inject(confirmationModal) private confirmationModal: any,
-  ) {}
-
-  public get unit(): Unit {
-    return this.taskDefinition?.unit;
-  }
-
-  ngAfterViewInit(): void {
-    this.subscriptions.push(
-      this.taskDefinition.feedbackTemplateCache.values.subscribe((feedbackTemplates) => {
-        this.feedbackTemplateSource = new MatTableDataSource<FeedbackTemplate>(feedbackTemplates);
-        this.feedbackTemplateSource.paginator = this.paginator;
-        this.feedbackTemplateSource.sort = this.sort;
-        this.feedbackTemplateSource.filterPredicate = (data: any, filter: string) =>
-          data.matches(filter);
-      }),
-    );
-  }
-
-  public saveFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
-    feedbackTemplate.save().subscribe(() => {
-      this.alerts.success('Template saved');
-      feedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
-    });
-  }
-
-  private subscriptions: Subscription[] = [];
-  ngOnDestroy(): void {
-    this.subscriptions.forEach((s) => s.unsubscribe());
-  }
-
-  public selectFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
-    if (this.selectedFeedbackTemplate === feedbackTemplate) {
-      this.selectedFeedbackTemplate = null;
-    } else {
-      this.selectedFeedbackTemplate = feedbackTemplate;
-
-      if (!this.selectedFeedbackTemplate.hasOriginalSaveData) {
-        this.selectedFeedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
-      }
-    }
-  }
-
-  public sortData(sort: Sort) {
-    const data = this.feedbackTemplateSource.data;
-
-    if (!sort.active || sort.direction === '') {
-      this.feedbackTemplateSource.data = data;
-      return;
-    }
-
-    this.feedbackTemplateSource.data = data.sort((a, b) => {
-      const isAsc = sort.direction === 'asc';
-      switch (sort.active) {
-        case 'learningOutcome':
-          return this.compare(a.learningOutcome, b.learningOutcome, isAsc);
-        case 'chipText':
-          return this.compare(a.chipText, b.chipText, isAsc);
-        case 'description':
-          return this.compare(a.description, b.description, isAsc);
-        case 'commentText':
-          return this.compare(a.commentText, b.commentText, isAsc);
-        case 'summaryText':
-          return this.compare(a.summaryText, b.summaryText, isAsc);
-        default:
-          return 0;
-      }
-    });
-  }
-
-  public compare(a: number | string, b: number | string, isAsc: boolean): number {
-    return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
-  }
-
-  applyFilter(filterValue: string) {
-    this.feedbackTemplateSource.filter = filterValue.trim().toLowerCase();
-
-    if (this.feedbackTemplateSource.paginator) {
-      this.feedbackTemplateSource.paginator.firstPage();
-    }
-  }
-
-  public feedbackTemplateHasChanges(feedbackTemplate: FeedbackTemplate): boolean {
-    return feedbackTemplate.hasChanges(this.feedbackTemplateService.mapping);
-  }
-
-  public deleteFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
-    this.confirmationModal.show(
-      'Delete feedback template',
-      'Are you sure you want to delete this template? This action is final.',
-      () => {
-        this.alerts.success('Task deleted');
-      },
-    );
-  }
-
-  public uploadFeedbackTemplatesCsv() {
-    this.csvUploadModal.show(
-      'Upload Feedback Templates as CSV',
-      'Test message',
-      {file: {name: 'Feedback Template CSV Data', type: 'csv'}},
-      this.unit.getTaskDefinitionBatchUploadUrl(),
-      (response: any) => {},
-    );
-  }
-
-  public createFeedbackTemplate() {
-    const feedbackTemplate = new FeedbackTemplate(this.taskDefinition);
-
-    feedbackTemplate.learningOutcome = 'TLO';
-    feedbackTemplate.chipText = 'lorem';
-    feedbackTemplate.description = 'Lorem ipsum dolor';
-    feedbackTemplate.commentText = 'Lorem dolor';
-    feedbackTemplate.summaryText = 'Lorem ipsum';
-
-    this.selectedFeedbackTemplate = feedbackTemplate;
-  }
-}

From db2d2bc32b19165bac8ff6ba0282a16adffbb815 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:04:02 +1100
Subject: [PATCH 163/776] feat: add field to connect outcomes

---
 .../feedback-template-editor.component.html   | 48 +++++++++--
 .../feedback-template-editor.component.ts     | 81 +++++++++++++++++--
 2 files changed, 114 insertions(+), 15 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 6922dab4ed..51af89539a 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -16,8 +16,8 @@
         {{ learningOutcome.iloNumber }}
       </td>
     </ng-container>
-    <ng-container matColumnDef="abbreviation" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Abbreviation</th>
+    <ng-container matColumnDef="tag" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Tag</th>
       <td
         mat-cell
         *matCellDef="let learningOutcome"
@@ -132,6 +132,35 @@
       <textarea matInput required [(ngModel)]="selectedOutcome.description"> </textarea>
     </mat-form-field>
 
+    <mat-form-field appearance="outline" class="flex flex-grow">
+      <mat-label>Connected Learning Outcomes</mat-label>
+      <mat-chip-grid #chipGrid aria-label="Outcome selection">
+        @for (outcome of connectedOutcomes(); track $index) {
+          <mat-chip-row (removed)="remove(outcome)">
+            {{ outcome }}
+            <button matChipRemove [attr.aria-label]="'remove ' + outcome">
+              <mat-icon>cancel</mat-icon>
+            </button>
+          </mat-chip-row>
+        }
+      </mat-chip-grid>
+      <input
+        name="currentConnectedOutcome"
+        placeholder="Connect an outcome..."
+        #connectedOutcomeInput
+        [(ngModel)]="currentConnectedOutcome"
+        [matChipInputFor]="chipGrid"
+        [matAutocomplete]="auto"
+        [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+        (matChipInputTokenEnd)="add($event)"
+      />
+      <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)">
+        @for (outcome of filteredOutcomes(); track outcome) {
+          <mat-option [value]="outcome">{{ outcome }}</mat-option>
+        }
+      </mat-autocomplete>
+    </mat-form-field>
+
     <div class="flex flex-col gap-8">
       <table
         class="flex-grow f-table selectable"
@@ -140,14 +169,14 @@
         matSort
         (matSortChange)="sortTemplateData($event)"
       >
-        <ng-container matColumnDef="learningOutcome" sticky>
-          <th mat-header-cell *matHeaderCellDef mat-sort-header>Learning Outcome</th>
+        <ng-container matColumnDef="number" sticky>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header>Number</th>
           <td
             mat-cell
             *matCellDef="let feedbackTemplate"
             (click)="selectFeedbackTemplate(feedbackTemplate)"
           >
-            {{ feedbackTemplate.learningOutcome }}
+            {{ feedbackTemplate.id }}
           </td>
         </ng-container>
         <ng-container matColumnDef="chipText" sticky>
@@ -241,7 +270,10 @@
             />
           </mat-form-field>
         </div>
-        <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+        <mat-paginator
+          class="mat-elevation-z0"
+          [pageSizeOptions]="[5, 10, 25, 100]"
+        ></mat-paginator>
         <span class="flex-grow"></span>
         <label>Feedback Templates CSV</label>
         <button mat-icon-button>
@@ -251,7 +283,9 @@
           <mat-icon>upload_file</mat-icon>
         </button>
         <span class="flex-grow"></span>
-        <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">Add Template</button>
+        <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">
+          Add Template
+        </button>
       </span>
     </div>
   }
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index b5a94b3e91..fa8a82df27 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -1,7 +1,23 @@
-import {AfterViewInit, Component, Inject, Input, ViewChild} from '@angular/core';
+import {
+  AfterViewInit,
+  Component,
+  computed,
+  inject,
+  Inject,
+  Input,
+  model,
+  signal,
+  ViewChild,
+} from '@angular/core';
 import {MatTable, MatTableDataSource} from '@angular/material/table';
 import {MatPaginator} from '@angular/material/paginator';
-import {TaskDefinition, Unit, LearningOutcome, LearningOutcomeService, FeedbackTemplate} from 'src/app/api/models/doubtfire-model';
+import {
+  TaskDefinition,
+  Unit,
+  LearningOutcome,
+  LearningOutcomeService,
+  FeedbackTemplate,
+} from 'src/app/api/models/doubtfire-model';
 import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {MatSort, Sort} from '@angular/material/sort';
@@ -12,6 +28,10 @@ import {
 } from 'src/app/ajs-upgraded-providers';
 import {Subscription} from 'rxjs';
 import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
+import {COMMA, ENTER} from '@angular/cdk/keycodes';
+import {LiveAnnouncer} from '@angular/cdk/a11y';
+import {MatChipInputEvent} from '@angular/material/chips';
+import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
 
 @Component({
   selector: 'f-feedback-template-editor',
@@ -27,7 +47,7 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
   public outcomeSource: MatTableDataSource<LearningOutcome>;
   public outcomeColumns: string[] = [
     'number',
-    'abbreviation',
+    'tag',
     'name',
     'description',
     'learningOutcomeAction',
@@ -41,7 +61,7 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
 
   public templateSource: MatTableDataSource<FeedbackTemplate>;
   public templateColumns: string[] = [
-    'learningOutcome',
+    'number',
     'chipText',
     'description',
     'commentText',
@@ -138,7 +158,7 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
       switch (sort.active) {
         case 'number':
           return this.compare(a.iloNumber, b.iloNumber, isAsc);
-        case 'abbreviation':
+        case 'tag':
           return this.compare(a.abbreviation, b.abbreviation, isAsc);
         case 'name':
           return this.compare(a.name, b.name, isAsc);
@@ -161,8 +181,8 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     this.templateSource.data = data.sort((a, b) => {
       const isAsc = sort.direction === 'asc';
       switch (sort.active) {
-        case 'learningOutcome':
-          return this.compare(a.learningOutcome, b.learningOutcome, isAsc);
+        case 'number':
+          return this.compare(a.id, b.id, isAsc);
         case 'chipText':
           return this.compare(a.chipText, b.chipText, isAsc);
         case 'description':
@@ -259,7 +279,7 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
   public createFeedbackTemplate() {
     const feedbackTemplate = new FeedbackTemplate(this.taskDefinition);
 
-    feedbackTemplate.learningOutcome = 'TLO';
+    feedbackTemplate.id = 0;
     feedbackTemplate.chipText = 'lorem';
     feedbackTemplate.description = 'Lorem ipsum dolor';
     feedbackTemplate.commentText = 'Lorem dolor';
@@ -267,4 +287,49 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
 
     this.selectedTemplate = feedbackTemplate;
   }
+
+  readonly separatorKeysCodes: number[] = [ENTER, COMMA];
+  readonly currentConnectedOutcome = model('');
+  readonly connectedOutcomes = signal([]);
+  readonly allOutcomes: string[] = ['TLO1', 'TLO2', 'TLO3', 'ULO1', 'ULO2'];
+  readonly filteredOutcomes = computed(() => {
+    const currentOutcome = this.currentConnectedOutcome().toLowerCase();
+    return currentOutcome
+      ? this.allOutcomes.filter((outcome) => outcome.toLowerCase().includes(currentOutcome))
+      : this.allOutcomes.slice();
+  });
+
+  readonly announcer = inject(LiveAnnouncer);
+
+  add(event: MatChipInputEvent): void {
+    const value = (event.value || '').trim();
+
+    if (value) {
+      this.connectedOutcomes.update((connectedOutcomes) => [...connectedOutcomes, value]);
+    }
+
+    this.currentConnectedOutcome.set('');
+  }
+
+  remove(outcome: string): void {
+    this.connectedOutcomes.update((connectedOutcomes) => {
+      const index = connectedOutcomes.indexOf(outcome);
+      if (index < 0) {
+        return connectedOutcomes;
+      }
+
+      connectedOutcomes.splice(index, 1);
+      this.announcer.announce(`Removed ${outcome}`);
+      return [...connectedOutcomes];
+    });
+  }
+
+  selected(event: MatAutocompleteSelectedEvent): void {
+    this.connectedOutcomes.update((connectedOutcomes) => [
+      ...connectedOutcomes,
+      event.option.viewValue,
+    ]);
+    this.currentConnectedOutcome.set('');
+    event.option.deselect();
+  }
 }

From 9acc36502dc3fd2365817f73ccc742dd3947e293 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 22 Nov 2024 19:05:33 +1100
Subject: [PATCH 164/776] feat: add feedback template picker to comment
 composer

---
 src/app/doubtfire-angular.module.ts           |   2 +
 .../task-comment-composer.component.html      |  16 +++
 .../task-comment-composer.component.scss      |   7 ++
 .../task-comment-composer.component.ts        |   2 +
 .../task-feedback-templates.component.html    | 103 ++++++++++++++++++
 .../task-feedback-templates.component.ts      |  58 ++++++++++
 6 files changed, 188 insertions(+)
 create mode 100644 src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
 create mode 100644 src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 07961095af..21b56cc9e8 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -239,6 +239,7 @@ import {ScormExtensionCommentComponent} from './tasks/task-comments-viewer/scorm
 import {ScormExtensionModalComponent} from './common/modals/scorm-extension-modal/scorm-extension-modal.component';
 import {FeedbackTemplateService} from './api/services/feedback-template.service';
 import {FeedbackTemplateEditorComponent} from './common/feedback-template/feedback-template-editor.component';
+import {TaskFeedbackTemplatesComponent} from './tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -360,6 +361,7 @@ const MY_DATE_FORMAT = {
     ScormExtensionCommentComponent,
     ScormExtensionModalComponent,
     FeedbackTemplateEditorComponent,
+    TaskFeedbackTemplatesComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.html b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
index 448f88f46c..db1cc099ee 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.html
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
@@ -1,3 +1,8 @@
+<f-task-feedback-templates
+  [hidden]="!this.showFeedbackTemplatePicker"
+  class="feedback-template-picker"
+></f-task-feedback-templates>
+
 <emoji-mart
   [darkMode]="false"
   [isNative]="true"
@@ -173,6 +178,17 @@
           emoji_emotions</mat-icon
         >
       </div>
+      <div id="innerButtons" [hidden]="recording">
+        <mat-icon
+          matTooltip="Choose feedback templates"
+          matTooltipShowDelay="400"
+          id="feedbackTemplateButton"
+          (click)="this.showFeedbackTemplatePicker = !this.showFeedbackTemplatePicker"
+          aria-label="Feedback template button"
+        >
+          task</mat-icon
+        >
+      </div>
     </div>
   </div>
 </form>
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.scss b/src/app/tasks/task-comment-composer/task-comment-composer.component.scss
index a79e6a5be4..d17c924344 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.scss
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.scss
@@ -95,6 +95,13 @@ $emoji-color: lighten(
   border-color: darken($color: white, $amount: 10);
 }
 
+.feedback-template-picker {
+  z-index: 1060;
+  position: absolute;
+  right: 26px;
+  bottom: 150px;
+}
+
 #replyContainer {
   margin: 0.4em 1em -0.2em 1em;
   font-size: 14px;
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index 9a4a3297ea..ca4319969d 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -82,6 +82,7 @@ export class TaskCommentComposerComponent implements DoCheck {
   emojiRegex: RegExp = /(?:\:)(.*?)(?=\:|$)/;
   emojiSearchResults: EmojiData[] = [];
   emojiMatch: string;
+  showFeedbackTemplatePicker: boolean = false;
   recording = false;
   cagStartWidth: number;
 
@@ -155,6 +156,7 @@ export class TaskCommentComposerComponent implements DoCheck {
     e.preventDefault();
     this.emojiSearchMode = false;
     this.showEmojiPicker = false;
+    this.showFeedbackTemplatePicker = false;
     if (this.input.first.nativeElement.innerText.trim() !== '') {
       this.addComment();
     }
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
new file mode 100644
index 0000000000..f92a30ec03
--- /dev/null
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -0,0 +1,103 @@
+<mat-card
+  class="feedback-template-picker-card p-2 bg-white bg-opacity-90 rounded-lg border border-gray-300 shadow-none flex flex-col w-[338px] h-[423px]"
+>
+  <mat-tab-group (selectedTabChange)="scrollToSection($event)" class="category-tab-group">
+    <mat-tab *ngFor="let category of categories" [label]="category.name"></mat-tab>
+  </mat-tab-group>
+
+  <mat-form-field class="w-full">
+    <input
+      matInput
+      placeholder="Search templates"
+      [(ngModel)]="searchTerm"
+      (input)="filterTemplates()"
+    />
+    <button mat-icon-button matSuffix aria-label="Search">
+      <mat-icon>search</mat-icon>
+    </button>
+  </mat-form-field>
+
+  <div class="scrollable-content overflow-y-auto flex-grow">
+    <div #tloSection class="template-category mt-2">
+      <h4 class="text-gray-700 font-semibold">TLO</h4>
+      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
+        <mat-chip
+          *ngFor="let template of filteredCategories[0].templates"
+          (mouseenter)="onHoverTemplate(template)"
+          (mouseleave)="onHoverTemplate('')"
+          (click)="selectTemplate(template)"
+          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+        >
+          {{ template }}
+        </mat-chip>
+      </div>
+    </div>
+
+    <div #uloSection class="template-category mt-2">
+      <h4 class="text-gray-700 font-semibold">ULO</h4>
+      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
+        <mat-chip
+          *ngFor="let template of filteredCategories[1].templates"
+          (mouseenter)="onHoverTemplate(template)"
+          (mouseleave)="onHoverTemplate('')"
+          (click)="selectTemplate(template)"
+          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+        >
+          {{ template }}
+        </mat-chip>
+      </div>
+    </div>
+
+    <div #cloSection class="template-category mt-2">
+      <h4 class="text-gray-700 font-semibold">CLO</h4>
+      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
+        <mat-chip
+          *ngFor="let template of filteredCategories[2].templates"
+          (mouseenter)="onHoverTemplate(template)"
+          (mouseleave)="onHoverTemplate('')"
+          (click)="selectTemplate(template)"
+          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+        >
+          {{ template }}
+        </mat-chip>
+      </div>
+    </div>
+
+    <div #gloSection class="template-category mt-2">
+      <h4 class="text-gray-700 font-semibold">GLO</h4>
+      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
+        <mat-chip
+          *ngFor="let template of filteredCategories[3].templates"
+          (mouseenter)="onHoverTemplate(template)"
+          (mouseleave)="onHoverTemplate('')"
+          (click)="selectTemplate(template)"
+          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+        >
+          {{ template }}
+        </mat-chip>
+      </div>
+    </div>
+
+    <div #sectionSection class="template-category mt-2">
+      <h4 class="text-gray-700 font-semibold">Section</h4>
+      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
+        <mat-chip
+          *ngFor="let template of filteredCategories[4].templates"
+          (mouseenter)="onHoverTemplate(template)"
+          (mouseleave)="onHoverTemplate('')"
+          (click)="selectTemplate(template)"
+          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+        >
+          {{ template }}
+        </mat-chip>
+      </div>
+    </div>
+  </div>
+
+  <div class="hovered-template-display text-gray-600">
+    <p class="pt-5 mb-0">{{ hoveredTemplate || 'Template A1' }}</p>
+    <p class="pt-1 pb-2 mb-0">
+      This template will populate {{ hoveredTemplate || 'Template A1' }} text.
+    </p>
+  </div>
+</mat-card>
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
new file mode 100644
index 0000000000..6a2ea98608
--- /dev/null
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -0,0 +1,58 @@
+import {Component, ElementRef, ViewChild} from '@angular/core';
+
+@Component({
+  selector: 'f-task-feedback-templates',
+  templateUrl: './task-feedback-templates.component.html',
+})
+export class TaskFeedbackTemplatesComponent {
+  searchTerm: string = '';
+  hoveredTemplate: string = '';
+
+  categories = [
+    {name: 'TLO', templates: ['Template A1', 'Template A2', 'Template A3', 'Template A4']},
+    {name: 'ULO', templates: ['Template B1', 'Template B2', 'Template B3', 'Template B4']},
+    {name: 'CLO', templates: ['Template C1', 'Template C2', 'Template C3', 'Template C4']},
+    {name: 'GLO', templates: ['Template D1', 'Template D2', 'Template D3', 'Template D4']},
+    {name: 'Section', templates: ['Template E1', 'Template E2', 'Template E3', 'Template E4']},
+  ];
+
+  filteredCategories = [...this.categories];
+
+  filterTemplates() {
+    this.filteredCategories = this.categories.map((category) => ({
+      ...category,
+      templates: category.templates.filter((template) =>
+        template.toLowerCase().includes(this.searchTerm.toLowerCase()),
+      ),
+    }));
+  }
+
+  @ViewChild('tloSection') tloSection!: ElementRef;
+  @ViewChild('uloSection') uloSection!: ElementRef;
+  @ViewChild('cloSection') cloSection!: ElementRef;
+  @ViewChild('gloSection') gloSection!: ElementRef;
+  @ViewChild('sectionSection') sectionSection!: ElementRef;
+
+  scrollToSection(event: any) {
+    const sections = [
+      this.tloSection,
+      this.uloSection,
+      this.cloSection,
+      this.gloSection,
+      this.sectionSection,
+    ];
+    const selectedSection = sections[event.index];
+
+    if (selectedSection) {
+      selectedSection.nativeElement.scrollIntoView({behavior: 'smooth', block: 'start'});
+    }
+  }
+
+  selectTemplate(template: string) {
+    console.log('Selected template:', template);
+  }
+
+  onHoverTemplate(template: string) {
+    this.hoveredTemplate = template;
+  }
+}

From e3fdd3b0fafe1988e1f19346b11b18a5b4274072 Mon Sep 17 00:00:00 2001
From: ShounakB <65479699+Shounaks@users.noreply.github.com>
Date: Sat, 23 Nov 2024 00:46:19 +1100
Subject: [PATCH 165/776] Fixing updateGrade Method

---
 src/app/common/grade-icon/grade-icon.component.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/app/common/grade-icon/grade-icon.component.ts b/src/app/common/grade-icon/grade-icon.component.ts
index d90bc6298c..5f8f31c7bc 100644
--- a/src/app/common/grade-icon/grade-icon.component.ts
+++ b/src/app/common/grade-icon/grade-icon.component.ts
@@ -11,7 +11,7 @@ export class GradeIconComponent implements OnInit, OnChanges {
   @Input() grade?: number | string;
   @Input() colorful: boolean = false;
 
-  gradeText: number | string = 'Grade';
+  gradeText: string = 'Grade';
   gradeLetter: string = 'G';
 
   constructor(private gradeService: GradeService) {}
@@ -27,10 +27,9 @@ export class GradeIconComponent implements OnInit, OnChanges {
   }
 
   private updateGrade(): void {
-    this.gradeText =
-      typeof this.grade === 'string'
-        ? this.gradeService.stringToGrade(this.grade)
-        : this.gradeService.grades[this.grade] || 'Grade';
-    this.gradeLetter = this.gradeService.gradeAcronyms[this.grade] || 'G';
+    const grade: number =
+      typeof this.grade === 'string' ? this.gradeService.stringToGrade(this.grade) : this.grade;
+    this.gradeText = this.gradeService.grades[grade] || 'Grade';
+    this.gradeLetter = this.gradeService.gradeAcronyms[grade] || 'G';
   }
 }

From a42f177f61b3f7166edf3b9c93dfd2dcd3949df7 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 26 Nov 2024 01:21:41 +1100
Subject: [PATCH 166/776] feat: make template editor reusable across contexts

---
 src/app/api/models/feedback-template.ts       |  20 +-
 src/app/api/models/task-definition.ts         |  27 +-
 src/app/api/models/unit.ts                    |   7 +
 .../api/services/feedback-template.service.ts |   9 +-
 .../api/services/task-definition.service.ts   |  35 +-
 src/app/api/services/unit.service.ts          |  16 +-
 .../feedback-template-editor.component.html   | 384 ++++++++++--------
 .../feedback-template-editor.component.ts     | 123 ++++--
 src/app/doubtfire-angularjs.module.ts         |   5 +
 .../task-definition-editor.component.html     |   2 +-
 src/app/units/states/edit/edit.tpl.html       |   2 +-
 11 files changed, 395 insertions(+), 235 deletions(-)

diff --git a/src/app/api/models/feedback-template.ts b/src/app/api/models/feedback-template.ts
index 85da6af509..f0679a611f 100644
--- a/src/app/api/models/feedback-template.ts
+++ b/src/app/api/models/feedback-template.ts
@@ -1,7 +1,7 @@
 import {Entity, EntityMapping} from 'ngx-entity-service';
 import {Observable} from 'rxjs';
 import {AppInjector} from 'src/app/app-injector';
-import {TaskDefinition} from './task-definition';
+import {TaskDefinition, Unit} from './doubtfire-model';
 import {FeedbackTemplateService} from '../services/feedback-template.service';
 
 export class FeedbackTemplate extends Entity {
@@ -12,11 +12,11 @@ export class FeedbackTemplate extends Entity {
   commentText: string;
   summaryText: string;
 
-  readonly taskDefinition: TaskDefinition;
+  readonly context: TaskDefinition | Unit;
 
-  constructor(taskDef: TaskDefinition) {
+  constructor(context: TaskDefinition | Unit) {
     super();
-    this.taskDefinition = taskDef;
+    this.context = context;
   }
 
   public toJson<T extends Entity>(mappingData: EntityMapping<T>, ignoreKeys?: string[]): object {
@@ -31,18 +31,18 @@ export class FeedbackTemplate extends Entity {
     if (this.isNew) {
       return svc.create(
         {
-          taskDefId: this.taskDefinition.id,
+          contextId: this.context.id,
         },
         {
           entity: this,
-          cache: this.taskDefinition.feedbackTemplateCache,
-          constructorParams: this.taskDefinition,
+          cache: this.context.feedbackTemplateCache,
+          constructorParams: this.context,
         },
       );
     } else {
       return svc.update(
         {
-          taskDefId: this.taskDefinition.id,
+          contextId: this.context.id,
           id: this.id,
         },
         {entity: this},
@@ -72,7 +72,7 @@ export class FeedbackTemplate extends Entity {
     return !this.id;
   }
 
-  public get taskDefId(): number {
-    return this.taskDefinition.id;
+  public getContextId(): number {
+    return this.context.id;
   }
 }
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 2e17ac6cda..a2e9b85e73 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -3,8 +3,9 @@ import { Entity, EntityCache, EntityMapping } from 'ngx-entity-service';
 import { Observable, tap } from 'rxjs';
 import { AppInjector } from 'src/app/app-injector';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { FeedbackTemplate, Grade, GroupSet, TutorialStream, Unit } from './doubtfire-model';
+import { FeedbackTemplate, Grade, GroupSet, LearningOutcome, TutorialStream, Unit } from './doubtfire-model';
 import { TaskDefinitionService } from '../services/task-definition.service';
+import { AlertService } from 'src/app/common/services/alert.service';
 
 export type UploadRequirement = { key: string; name: string; type: string; tiiCheck?: boolean; tiiPct?: number };
 
@@ -44,6 +45,8 @@ export class TaskDefinition extends Entity {
   assessmentEnabled: boolean;
   mossLanguage: string = 'moss c';
 
+  public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
+    new EntityCache<LearningOutcome>();
   public readonly feedbackTemplateCache: EntityCache<FeedbackTemplate> =
     new EntityCache<FeedbackTemplate>();
 
@@ -114,6 +117,18 @@ export class TaskDefinition extends Entity {
     return this.originalSaveData != JSON.stringify(this.toJson(mapping));
   }
 
+  public refresh(): void {
+    const alerts = AppInjector.get(AlertService);
+    AppInjector.get(TaskDefinitionService)
+      .fetch(this.id)
+      .subscribe({
+        next: (taskDefinition) => {
+          console.log(taskDefinition.name);
+        },
+        error: (message) => alerts.error(message, 6000),
+      });
+  }
+
   public get isNew(): boolean {
     return !this.id;
   }
@@ -168,6 +183,16 @@ export class TaskDefinition extends Entity {
     }`;
   }
 
+  public getOutcomeBatchUploadUrl(): string {
+    const constants = AppInjector.get(DoubtfireConstants);
+    return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/outcomes/csv`;
+  }
+
+  public getFeedbackTemplateBatchUploadUrl(): string {
+    const constants = AppInjector.get(DoubtfireConstants);
+    return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/feedback_templates/csv`;
+  }
+
   /**
    * Open the SCORM test in a new tab - using preview mode.
    */
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index b27159832e..a57f3c7db3 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -22,6 +22,7 @@ import {
   Project,
   TutorialStreamService,
   UnitRoleService,
+  FeedbackTemplate,
 } from './doubtfire-model';
 import {LearningOutcome} from './learning-outcome';
 import {AlertService} from 'src/app/common/services/alert.service';
@@ -73,6 +74,8 @@ export class Unit extends Entity {
     new EntityCache<TaskDefinition>();
   public readonly taskOutcomeAlignmentsCache: EntityCache<TaskOutcomeAlignment> =
     new EntityCache<TaskOutcomeAlignment>();
+  public readonly feedbackTemplateCache: EntityCache<FeedbackTemplate> =
+    new EntityCache<FeedbackTemplate>();
 
   readonly staffCache: EntityCache<UnitRole> = new EntityCache<UnitRole>();
 
@@ -388,6 +391,10 @@ export class Unit extends Entity {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.id}/outcomes/csv`;
   }
 
+  public getFeedbackTemplateBatchUploadUrl(): string {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.id}/feedback_templates/csv`;
+  }
+
   public hasStreams(): boolean {
     return this.tutorialStreamsCache.size > 1;
   }
diff --git a/src/app/api/services/feedback-template.service.ts b/src/app/api/services/feedback-template.service.ts
index 4d0bef50de..0c10e6debc 100644
--- a/src/app/api/services/feedback-template.service.ts
+++ b/src/app/api/services/feedback-template.service.ts
@@ -3,7 +3,7 @@ import {CachedEntityService} from 'ngx-entity-service';
 import {FeedbackTemplate} from '../models/feedback-template';
 import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiURL';
-import {TaskDefinition} from '../models/task-definition';
+import {TaskDefinition, Unit} from '../models/doubtfire-model';
 
 @Injectable()
 export class FeedbackTemplateService extends CachedEntityService<FeedbackTemplate> {
@@ -22,7 +22,10 @@ export class FeedbackTemplateService extends CachedEntityService<FeedbackTemplat
     );
   }
 
-  public override createInstanceFrom(json: object, other?: any): FeedbackTemplate {
-    return new FeedbackTemplate(other as TaskDefinition);
+  public override createInstanceFrom(
+    json: object,
+    other?: TaskDefinition | Unit,
+  ): FeedbackTemplate {
+    return new FeedbackTemplate(other);
   }
 }
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 0914929fbe..e32e9cfcca 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -1,17 +1,22 @@
 import { CachedEntityService } from 'ngx-entity-service';
-import { TaskDefinition, Unit } from 'src/app/api/models/doubtfire-model';
+import { LearningOutcomeService, TaskDefinition, Unit } from 'src/app/api/models/doubtfire-model';
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiURL';
 import { MappingFunctions } from './mapping-fn';
 import { AppInjector } from 'src/app/app-injector';
 import { Observable } from 'rxjs';
+import { FeedbackTemplateService } from './feedback-template.service';
 
 @Injectable()
 export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
   protected readonly endpointFormat = 'units/:unitId:/task_definitions/:id:';
 
-  constructor(httpClient: HttpClient) {
+  constructor(
+    httpClient: HttpClient,
+    private learningOutcomeService: LearningOutcomeService,
+    private feedbackTemplateService: FeedbackTemplateService,
+  ) {
     super(httpClient, API_URL);
 
     this.mapping.addKeys(
@@ -108,7 +113,31 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'isGraded',
       'maxQualityPts',
       'overseerImageId',
-      'assessmentEnabled'
+      'assessmentEnabled',
+      {
+        keys: 'tlos',
+        toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
+          data[key]?.forEach((tlo) => {
+            taskDefinition.learningOutcomesCache.getOrCreate(
+              tlo['id'],
+              this.learningOutcomeService,
+              tlo,
+            );
+          });
+        },
+      },
+      {
+        keys: 'feedbackTemplates',
+        toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
+          data[key]?.forEach((template) => {
+            taskDefinition.feedbackTemplateCache.getOrCreate(
+              template['id'],
+              this.feedbackTemplateService,
+              template,
+            );
+          });
+        },
+      },
     );
 
     this.mapping.mapAllKeysToJsonExcept(
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index c3c38c7406..cd4eee6abb 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -9,6 +9,7 @@ import { TaskDefinitionService } from './task-definition.service';
 import { GroupService } from './group.service';
 import { Observable } from 'rxjs';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import { FeedbackTemplateService } from './feedback-template.service';
 
 export type IloStats = {
   median: number;
@@ -32,7 +33,8 @@ export class UnitService extends CachedEntityService<Unit> {
     private taskDefinitionService: TaskDefinitionService,
     private taskOutcomeAlignmentService: TaskOutcomeAlignmentService,
     private groupSetService: GroupSetService,
-    private groupService: GroupService
+    private groupService: GroupService,
+    private feedbackTemplateService: FeedbackTemplateService,
   ) {
     super(httpClient, API_URL);
 
@@ -210,6 +212,18 @@ export class UnitService extends CachedEntityService<Unit> {
           });
         }
       },
+      {
+        keys: 'feedbackTemplates',
+        toEntityOp: (data: object, key: string, unit: Unit) => {
+          data[key]?.forEach((template) => {
+            unit.feedbackTemplateCache.getOrCreate(
+              template['id'],
+              this.feedbackTemplateService,
+              template,
+            );
+          });
+        },
+      },
       // 'groupMemberships', - map to group memberships
     );
 
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 51af89539a..fd4cccc16c 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -91,202 +91,246 @@
       <mat-form-field appearance="outline">
         <input
           matInput
-          (keyup)="applyOutcomeFilter($event.target.value)"
+          (keyup)="applyFilter($event.target.value, 'outcome')"
           placeholder="Filter"
-          [(ngModel)]="outcomeFilter"
         />
       </mat-form-field>
     </div>
     <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
     <span class="flex-grow"></span>
     <label>Task Learning Outcomes CSV</label>
-    <button mat-icon-button>
+    <button mat-icon-button (click)="downloadCsv('learning-outcomes')">
       <mat-icon>download</mat-icon>
     </button>
-    <button mat-icon-button (click)="uploadLearningOutcomesCsv()">
+    <button mat-icon-button (click)="uploadCsv('Learning Outcomes')">
       <mat-icon>upload_file</mat-icon>
     </button>
     <span class="flex-grow"></span>
     <button mat-raised-button color="primary" (click)="createLearningOutcome()">Add Outcome</button>
   </span>
   @if (selectedOutcome) {
-    <div class="flex flex-row gap-4">
-      <mat-form-field appearance="outline" class="basis-1/3">
-        <mat-label>Outcome Number</mat-label>
-        <input matInput required [(ngModel)]="selectedOutcome.iloNumber" />
-      </mat-form-field>
+    <div class="border border-solid rounded-lg p-5">
+      <div>
+        <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
+        <mat-divider></mat-divider>
 
-      <mat-form-field appearance="outline" class="basis-1/3">
-        <mat-label>Abbreviation</mat-label>
-        <input matInput required [(ngModel)]="selectedOutcome.abbreviation" />
-      </mat-form-field>
+        <div class="flex flex-row gap-4">
+          <mat-form-field appearance="outline" class="basis-1/3">
+            <mat-label>Tag</mat-label>
+            <input matInput required [(ngModel)]="selectedOutcome.abbreviation" />
+          </mat-form-field>
 
-      <mat-form-field appearance="outline" class="flex-grow">
-        <mat-label>Name</mat-label>
-        <input matInput required [(ngModel)]="selectedOutcome.name" />
-      </mat-form-field>
-    </div>
+          <mat-form-field appearance="outline" class="flex-grow">
+            <mat-label>Name</mat-label>
+            <input matInput required [(ngModel)]="selectedOutcome.name" />
+          </mat-form-field>
+        </div>
 
-    <mat-form-field appearance="outline" class="flex flex-grow">
-      <mat-label>Description</mat-label>
-      <textarea matInput required [(ngModel)]="selectedOutcome.description"> </textarea>
-    </mat-form-field>
+        <mat-form-field appearance="outline" class="flex flex-grow">
+          <mat-label>Description</mat-label>
+          <textarea matInput required [(ngModel)]="selectedOutcome.description"> </textarea>
+        </mat-form-field>
 
-    <mat-form-field appearance="outline" class="flex flex-grow">
-      <mat-label>Connected Learning Outcomes</mat-label>
-      <mat-chip-grid #chipGrid aria-label="Outcome selection">
-        @for (outcome of connectedOutcomes(); track $index) {
-          <mat-chip-row (removed)="remove(outcome)">
-            {{ outcome }}
-            <button matChipRemove [attr.aria-label]="'remove ' + outcome">
-              <mat-icon>cancel</mat-icon>
-            </button>
-          </mat-chip-row>
-        }
-      </mat-chip-grid>
-      <input
-        name="currentConnectedOutcome"
-        placeholder="Connect an outcome..."
-        #connectedOutcomeInput
-        [(ngModel)]="currentConnectedOutcome"
-        [matChipInputFor]="chipGrid"
-        [matAutocomplete]="auto"
-        [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-        (matChipInputTokenEnd)="add($event)"
-      />
-      <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)">
-        @for (outcome of filteredOutcomes(); track outcome) {
-          <mat-option [value]="outcome">{{ outcome }}</mat-option>
-        }
-      </mat-autocomplete>
-    </mat-form-field>
+        <mat-form-field appearance="outline" class="flex flex-grow">
+          <mat-label>Connected Learning Outcomes</mat-label>
+          <mat-chip-grid #chipGrid aria-label="Outcome selection">
+            @for (outcome of connectedOutcomes(); track $index) {
+              <mat-chip-row (removed)="remove(outcome)">
+                {{ outcome }}
+                <button matChipRemove [attr.aria-label]="'remove ' + outcome">
+                  <mat-icon>cancel</mat-icon>
+                </button>
+              </mat-chip-row>
+            }
+          </mat-chip-grid>
+          <input
+            name="currentConnectedOutcome"
+            placeholder="Connect an outcome..."
+            #connectedOutcomeInput
+            [(ngModel)]="currentConnectedOutcome"
+            [matChipInputFor]="chipGrid"
+            [matAutocomplete]="auto"
+            [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+            (matChipInputTokenEnd)="add($event)"
+          />
+          <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)">
+            @for (outcome of filteredOutcomes(); track outcome) {
+              <mat-option [value]="outcome">{{ outcome }}</mat-option>
+            }
+          </mat-autocomplete>
+        </mat-form-field>
 
-    <div class="flex flex-col gap-8">
-      <table
-        class="flex-grow f-table selectable"
-        mat-table
-        [dataSource]="templateSource"
-        matSort
-        (matSortChange)="sortTemplateData($event)"
-      >
-        <ng-container matColumnDef="number" sticky>
-          <th mat-header-cell *matHeaderCellDef mat-sort-header>Number</th>
-          <td
-            mat-cell
-            *matCellDef="let feedbackTemplate"
-            (click)="selectFeedbackTemplate(feedbackTemplate)"
-          >
-            {{ feedbackTemplate.id }}
-          </td>
-        </ng-container>
-        <ng-container matColumnDef="chipText" sticky>
-          <th mat-header-cell *matHeaderCellDef mat-sort-header>Chip Text</th>
-          <td
-            mat-cell
-            *matCellDef="let feedbackTemplate"
-            (click)="selectFeedbackTemplate(feedbackTemplate)"
-          >
-            {{ feedbackTemplate.chipText }}
-          </td>
-        </ng-container>
-        <ng-container matColumnDef="description" sticky>
-          <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
-          <td
-            mat-cell
-            *matCellDef="let feedbackTemplate"
-            (click)="selectFeedbackTemplate(feedbackTemplate)"
-          >
-            {{ feedbackTemplate.description }}
-          </td>
-        </ng-container>
-        <ng-container matColumnDef="commentText" sticky>
-          <th mat-header-cell *matHeaderCellDef mat-sort-header>Comment Text</th>
-          <td
-            mat-cell
-            *matCellDef="let feedbackTemplate"
-            (click)="selectFeedbackTemplate(feedbackTemplate)"
-          >
-            {{ feedbackTemplate.commentText }}
-          </td>
-        </ng-container>
-        <ng-container matColumnDef="summaryText" sticky>
-          <th mat-header-cell *matHeaderCellDef mat-sort-header>Summary Text</th>
-          <td
-            mat-cell
-            *matCellDef="let feedbackTemplate"
-            (click)="selectFeedbackTemplate(feedbackTemplate)"
-          >
-            {{ feedbackTemplate.summaryText }}
-          </td>
-        </ng-container>
-        <ng-container matColumnDef="feedbackTemplateAction" sticky>
-          <th mat-header-cell *matHeaderCellDef></th>
-          <td
-            mat-cell
-            *matCellDef="let feedbackTemplate"
-            (click)="selectFeedbackTemplate(feedbackTemplate)"
+        <div class="flex">
+          <span class="flex-grow"></span>
+          <button mat-raised-button color="primary">Save Outcome</button>
+        </div>
+      </div>
+
+      <div class="mb-1">
+        <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates</h4>
+        <mat-divider></mat-divider>
+
+        <div class="flex flex-col gap-8">
+          <table
+            class="flex-grow f-table selectable"
+            mat-table
+            [dataSource]="templateSource"
+            matSort
+            (matSortChange)="sortTemplateData($event)"
           >
-            @if (feedbackTemplateHasChanges(feedbackTemplate)) {
-              <button
-                mat-icon-button
-                aria-label="save feedback template"
-                color="primary"
-                (click)="saveFeedbackTemplate(feedbackTemplate)"
+            <ng-container matColumnDef="number" sticky>
+              <th mat-header-cell *matHeaderCellDef mat-sort-header>Number</th>
+              <td
+                mat-cell
+                *matCellDef="let feedbackTemplate"
+                (click)="selectFeedbackTemplate(feedbackTemplate)"
               >
-                <mat-icon>save</mat-icon>
-              </button>
-            }
-            <button
-              mat-icon-button
-              aria-label="delete feedback template"
-              color="warn"
-              (click)="deleteFeedbackTemplate(feedbackTemplate)"
-            >
-              <mat-icon>delete</mat-icon>
+                {{ feedbackTemplate.id }}
+              </td>
+            </ng-container>
+            <ng-container matColumnDef="chipText" sticky>
+              <th mat-header-cell *matHeaderCellDef mat-sort-header>Chip Text</th>
+              <td
+                mat-cell
+                *matCellDef="let feedbackTemplate"
+                (click)="selectFeedbackTemplate(feedbackTemplate)"
+              >
+                {{ feedbackTemplate.chipText }}
+              </td>
+            </ng-container>
+            <ng-container matColumnDef="description" sticky>
+              <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
+              <td
+                mat-cell
+                *matCellDef="let feedbackTemplate"
+                (click)="selectFeedbackTemplate(feedbackTemplate)"
+              >
+                {{ feedbackTemplate.description }}
+              </td>
+            </ng-container>
+            <ng-container matColumnDef="commentText" sticky>
+              <th mat-header-cell *matHeaderCellDef mat-sort-header>Comment Text</th>
+              <td
+                mat-cell
+                *matCellDef="let feedbackTemplate"
+                (click)="selectFeedbackTemplate(feedbackTemplate)"
+              >
+                {{ feedbackTemplate.commentText }}
+              </td>
+            </ng-container>
+            <ng-container matColumnDef="summaryText" sticky>
+              <th mat-header-cell *matHeaderCellDef mat-sort-header>Summary Text</th>
+              <td
+                mat-cell
+                *matCellDef="let feedbackTemplate"
+                (click)="selectFeedbackTemplate(feedbackTemplate)"
+              >
+                {{ feedbackTemplate.summaryText }}
+              </td>
+            </ng-container>
+            <ng-container matColumnDef="feedbackTemplateAction" sticky>
+              <th mat-header-cell *matHeaderCellDef></th>
+              <td
+                mat-cell
+                *matCellDef="let feedbackTemplate"
+                (click)="selectFeedbackTemplate(feedbackTemplate)"
+              >
+                @if (feedbackTemplateHasChanges(feedbackTemplate)) {
+                  <button
+                    mat-icon-button
+                    aria-label="save feedback template"
+                    color="primary"
+                    (click)="saveFeedbackTemplate(feedbackTemplate)"
+                  >
+                    <mat-icon>save</mat-icon>
+                  </button>
+                }
+                <button
+                  mat-icon-button
+                  aria-label="delete feedback template"
+                  color="warn"
+                  (click)="deleteFeedbackTemplate(feedbackTemplate)"
+                >
+                  <mat-icon>delete</mat-icon>
+                </button>
+              </td>
+            </ng-container>
+
+            <!-- Action footer row -->
+            <ng-container matColumnDef="actions">
+              <td mat-footer-cell *matFooterCellDef [colSpan]="templateColumns.length"></td>
+            </ng-container>
+
+            <tr mat-header-row *matHeaderRowDef="templateColumns"></tr>
+            <tr
+              mat-row
+              *matRowDef="let row; columns: templateColumns"
+              [style.background]="selectedTemplate === row ? 'lightblue' : ''"
+            ></tr>
+          </table>
+          <span class="flex items-center">
+            <div class="h-20">
+              <mat-form-field appearance="outline">
+                <input
+                  matInput
+                  (keyup)="applyFilter($event.target.value, 'template')"
+                  placeholder="Filter"
+                />
+              </mat-form-field>
+            </div>
+            <mat-paginator
+              class="mat-elevation-z0"
+              [pageSizeOptions]="[5, 10, 25, 100]"
+            ></mat-paginator>
+            <span class="flex-grow"></span>
+            <label>Feedback Templates CSV</label>
+            <button mat-icon-button (click)="downloadCsv('feedback-templates')">
+              <mat-icon>download</mat-icon>
+            </button>
+            <button mat-icon-button (click)="uploadCsv('Feedback Templates')">
+              <mat-icon>upload_file</mat-icon>
             </button>
-          </td>
-        </ng-container>
+            <span class="flex-grow"></span>
+            <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">
+              Add Template
+            </button>
+          </span>
 
-        <!-- Action footer row -->
-        <ng-container matColumnDef="actions">
-          <td mat-footer-cell *matFooterCellDef [colSpan]="templateColumns.length"></td>
-        </ng-container>
+          @if (selectedTemplate) {
+            <div>
+              <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
+              <mat-divider></mat-divider>
 
-        <tr mat-header-row *matHeaderRowDef="templateColumns"></tr>
-        <tr
-          mat-row
-          *matRowDef="let row; columns: templateColumns"
-          [style.background]="selectedTemplate === row ? 'lightblue' : ''"
-        ></tr>
-      </table>
-      <span class="flex items-center">
-        <div class="h-20">
-          <mat-form-field appearance="outline">
-            <input
-              matInput
-              (keyup)="applyTemplateFilter($event.target.value)"
-              placeholder="Filter"
-              [(ngModel)]="templateFilter"
-            />
-          </mat-form-field>
+              <div class="flex flex-row gap-4">
+                <mat-form-field appearance="outline" class="basis-1/3">
+                  <mat-label>Chip Text</mat-label>
+                  <input matInput required [(ngModel)]="selectedTemplate.chipText" />
+                </mat-form-field>
+
+                <mat-form-field appearance="outline" class="flex-grow">
+                  <mat-label>Summary Text</mat-label>
+                  <input matInput required [(ngModel)]="selectedTemplate.summaryText" />
+                </mat-form-field>
+              </div>
+
+              <mat-form-field appearance="outline" class="flex flex-grow">
+                <mat-label>Comment Text</mat-label>
+                <textarea matInput required [(ngModel)]="selectedTemplate.commentText"> </textarea>
+              </mat-form-field>
+
+              <mat-form-field appearance="outline" class="flex flex-grow">
+                <mat-label>Description</mat-label>
+                <textarea matInput required [(ngModel)]="selectedTemplate.description"> </textarea>
+              </mat-form-field>
+
+              <div class="flex">
+                <span class="flex-grow"></span>
+                <button mat-raised-button color="primary">Save Template</button>
+              </div>
+            </div>
+          }
         </div>
-        <mat-paginator
-          class="mat-elevation-z0"
-          [pageSizeOptions]="[5, 10, 25, 100]"
-        ></mat-paginator>
-        <span class="flex-grow"></span>
-        <label>Feedback Templates CSV</label>
-        <button mat-icon-button>
-          <mat-icon>download</mat-icon>
-        </button>
-        <button mat-icon-button (click)="uploadFeedbackTemplatesCsv()">
-          <mat-icon>upload_file</mat-icon>
-        </button>
-        <span class="flex-grow"></span>
-        <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">
-          Add Template
-        </button>
-      </span>
+      </div>
     </div>
   }
 </div>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index fa8a82df27..ddf0334e54 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -32,13 +32,14 @@ import {COMMA, ENTER} from '@angular/cdk/keycodes';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
 import {MatChipInputEvent} from '@angular/material/chips';
 import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
+import {FileDownloaderService} from '../file-downloader/file-downloader.service';
 
 @Component({
   selector: 'f-feedback-template-editor',
   templateUrl: 'feedback-template-editor.component.html',
 })
 export class FeedbackTemplateEditorComponent implements AfterViewInit {
-  @Input() taskDefinition: TaskDefinition;
+  @Input() context: TaskDefinition | Unit;
 
   @ViewChild(MatTable, {static: false}) outcomeTable: MatTable<LearningOutcome>;
   @ViewChild(MatSort, {static: false}) outcomeSort: MatSort;
@@ -52,7 +53,6 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     'description',
     'learningOutcomeAction',
   ];
-  public outcomeFilter: string;
   public selectedOutcome: LearningOutcome;
 
   @ViewChild(MatTable, {static: false}) templateTable: MatTable<FeedbackTemplate>;
@@ -68,7 +68,6 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     'summaryText',
     'feedbackTemplateAction',
   ];
-  public templateFilter: string;
   public selectedTemplate: FeedbackTemplate;
 
   constructor(
@@ -76,28 +75,42 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     private taskDefinitionService: TaskDefinitionService,
     private learningOutcomeService: LearningOutcomeService,
     private feedbackTemplateService: FeedbackTemplateService,
+    private fileDownloaderService: FileDownloaderService,
     @Inject(csvResultModalService) private csvResultModalService: any,
     @Inject(csvUploadModalService) private csvUploadModal: any,
     @Inject(confirmationModal) private confirmationModal: any,
   ) {}
 
-  public get unit(): Unit {
-    return this.taskDefinition?.unit;
-  }
-
   ngAfterViewInit(): void {
     this.subscriptions.push(
-      this.unit.learningOutcomesCache.values.subscribe((learningOutcomes) => {
+      this.context.learningOutcomesCache.values.subscribe((learningOutcomes) => {
         this.outcomeSource = new MatTableDataSource<LearningOutcome>(learningOutcomes);
         this.outcomeSource.paginator = this.outcomePaginator;
         this.outcomeSource.sort = this.outcomeSort;
-        this.outcomeSource.filterPredicate = (data: any, filter: string) => data.matches(filter);
+        this.outcomeSource.filterPredicate = (data: LearningOutcome, filter: string) => {
+          const filterValue = filter.trim().toLowerCase();
+          return (
+            data.iloNumber.toString().includes(filterValue) ||
+            data.abbreviation.toLowerCase().includes(filterValue) ||
+            data.name.toLowerCase().includes(filterValue) ||
+            data.description.toLowerCase().includes(filterValue)
+          );
+        };
       }),
-      this.taskDefinition.feedbackTemplateCache.values.subscribe((feedbackTemplates) => {
+      this.context.feedbackTemplateCache.values.subscribe((feedbackTemplates) => {
         this.templateSource = new MatTableDataSource<FeedbackTemplate>(feedbackTemplates);
         this.templateSource.paginator = this.templatePaginator;
         this.templateSource.sort = this.templateSort;
-        this.templateSource.filterPredicate = (data: any, filter: string) => data.matches(filter);
+        this.templateSource.filterPredicate = (data: FeedbackTemplate, filter: string) => {
+          const filterValue = filter.trim().toLowerCase();
+          return (
+            data.id.toString().includes(filterValue) ||
+            data.chipText.toLowerCase().includes(filterValue) ||
+            data.commentText.toLowerCase().includes(filterValue) ||
+            data.summaryText.toLowerCase().includes(filterValue) ||
+            data.description.toLowerCase().includes(filterValue)
+          );
+        };
       }),
     );
   }
@@ -201,19 +214,17 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
   }
 
-  applyOutcomeFilter(filterValue: string) {
-    this.outcomeSource.filter = filterValue.trim().toLowerCase();
-
-    if (this.outcomeSource.paginator) {
-      this.outcomeSource.paginator.firstPage();
-    }
-  }
-
-  applyTemplateFilter(filterValue: string) {
-    this.templateSource.filter = filterValue.trim().toLowerCase();
-
-    if (this.templateSource.paginator) {
-      this.templateSource.paginator.firstPage();
+  applyFilter(filterValue: string, table: string) {
+    if (table === 'outcome') {
+      this.outcomeSource.filter = filterValue;
+      if (this.outcomeSource.paginator) {
+        this.outcomeSource.paginator.firstPage();
+      }
+    } else if (table === 'template') {
+      this.templateSource.filter = filterValue;
+      if (this.templateSource.paginator) {
+        this.templateSource.paginator.firstPage();
+      }
     }
   }
 
@@ -230,6 +241,15 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
       'Delete learning outcome',
       'Are you sure you want to delete this outcome? This action is final.',
       () => {
+        this.learningOutcomeService
+          .delete(
+            {id: learningOutcome.id, unitId: this.context.id},
+            {entity: learningOutcome, cache: this.context.learningOutcomesCache},
+          )
+          .subscribe({
+            next: () => this.alerts.success('Learning outcome deleted'),
+            error: () => this.alerts.error('Failed to delete learning outcome. Please try again.'),
+          });
         this.alerts.success('Outcome deleted');
       },
     );
@@ -245,45 +265,58 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     );
   }
 
-  public uploadLearningOutcomesCsv() {
+  public uploadCsv(type: 'Learning Outcomes' | 'Feedback Templates') {
+    const url =
+      type === 'Learning Outcomes'
+        ? this.context.getOutcomeBatchUploadUrl()
+        : this.context.getFeedbackTemplateBatchUploadUrl();
+
     this.csvUploadModal.show(
-      'Upload Learning Outcomes as CSV',
+      `Upload ${type} as CSV`,
       'Test message',
-      {file: {name: 'Learning Outcome CSV Data', type: 'csv'}},
-      this.unit.getTaskDefinitionBatchUploadUrl(),
-      (response: any) => {},
+      {file: {name: `${type} CSV Data`, type: 'csv'}},
+      url,
+      (response: any) => {
+        this.csvResultModalService.show(`${type} CSV Upload Results`, response);
+        if (response.success.length > 0) {
+          this.context.refresh();
+        }
+      },
     );
   }
 
-  public uploadFeedbackTemplatesCsv() {
-    this.csvUploadModal.show(
-      'Upload Feedback Templates as CSV',
-      'Test message',
-      {file: {name: 'Feedback Template CSV Data', type: 'csv'}},
-      this.unit.getTaskDefinitionBatchUploadUrl(),
-      (response: any) => {},
-    );
+  public downloadCsv(type: 'learning-outcomes' | 'feedback-templates') {
+    let name: string = '';
+    if (this.context instanceof TaskDefinition) name = this.context.abbreviation;
+    else if (this.context instanceof Unit) name = this.context.code;
+
+    const url =
+      type === 'learning-outcomes'
+        ? this.context.getOutcomeBatchUploadUrl()
+        : this.context.getFeedbackTemplateBatchUploadUrl();
+
+    this.fileDownloaderService.downloadFile(url, `${name}-${type}.csv`);
   }
 
   public createLearningOutcome() {
     const learningOutcome = new LearningOutcome();
 
     learningOutcome.iloNumber = 1;
-    learningOutcome.abbreviation = 'lm';
-    learningOutcome.name = 'lorem';
-    learningOutcome.description = 'Lorem ipsum dolor';
+    learningOutcome.abbreviation = '';
+    learningOutcome.name = '';
+    learningOutcome.description = '';
 
     this.selectedOutcome = learningOutcome;
   }
 
   public createFeedbackTemplate() {
-    const feedbackTemplate = new FeedbackTemplate(this.taskDefinition);
+    const feedbackTemplate = new FeedbackTemplate(this.context);
 
     feedbackTemplate.id = 0;
-    feedbackTemplate.chipText = 'lorem';
-    feedbackTemplate.description = 'Lorem ipsum dolor';
-    feedbackTemplate.commentText = 'Lorem dolor';
-    feedbackTemplate.summaryText = 'Lorem ipsum';
+    feedbackTemplate.chipText = '';
+    feedbackTemplate.description = '';
+    feedbackTemplate.commentText = '';
+    feedbackTemplate.summaryText = '';
 
     this.selectedTemplate = feedbackTemplate;
   }
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index e14fdbb545..c227a43c05 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -225,6 +225,7 @@ import {MarkedPipe} from './common/pipes/marked.pipe';
 import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
 import {TaskScormCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component';
+import {FeedbackTemplateEditorComponent} from './common/feedback-template/feedback-template-editor.component';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -463,6 +464,10 @@ DoubtfireAngularJSModule.directive(
   'statusIcon',
   downgradeComponent({component: StatusIconComponent}),
 );
+DoubtfireAngularJSModule.directive(
+  'fFeedbackTemplateEditor',
+  downgradeComponent({component: FeedbackTemplateEditorComponent}),
+);
 DoubtfireAngularJSModule.directive('newFUnits', downgradeComponent({component: FUnitsComponent}));
 
 // Global configuration
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index c56b29c055..59adc0f043 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -34,7 +34,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task details</h
         <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task Learning Outcomes</h3>
         <p class="font-normal text-gray-700">Add learning outcomes for this task</p>
         <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-feedback-template-editor [taskDefinition]="taskDefinition"></f-feedback-template-editor>
+          <f-feedback-template-editor [context]="taskDefinition"></f-feedback-template-editor>
         </div>
       </div>
     </div>
diff --git a/src/app/units/states/edit/edit.tpl.html b/src/app/units/states/edit/edit.tpl.html
index 3ba73129a5..c2db43e07f 100644
--- a/src/app/units/states/edit/edit.tpl.html
+++ b/src/app/units/states/edit/edit.tpl.html
@@ -5,7 +5,7 @@
     </tab>
   </tabset><!--/tabs-->
   <unit-details-editor unit="unit" ng-if="activeTab === tabs.unitTab"></unit-details-editor>
-  <unit-ilo-editor ng-if="activeTab === tabs.learningOutcomesTab"></unit-ilo-editor>
+  <f-feedback-template-editor [context]="unit" ng-if="activeTab === tabs.learningOutcomesTab"></f-feedback-template-editor>
   <unit-staff-editor ng-if="activeTab === tabs.staffTab"></unit-staff-editor>
   <unit-tutorials-manager ng-if="activeTab === tabs.tutorialsTab" [unit]="unit"></unit-tutorials-manager>
   <unit-students-editor [unit]="unit" ng-if="activeTab === tabs.studentsTab"></unit-students-editor>

From 5494384f1a4becf462dd031e89fae2734ed46e55 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 26 Nov 2024 15:29:16 +1100
Subject: [PATCH 167/776] fix: remove selected outcomes from dropdown

---
 .../feedback-template-editor.component.ts                | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index ddf0334e54..38358b0eab 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -327,9 +327,12 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
   readonly allOutcomes: string[] = ['TLO1', 'TLO2', 'TLO3', 'ULO1', 'ULO2'];
   readonly filteredOutcomes = computed(() => {
     const currentOutcome = this.currentConnectedOutcome().toLowerCase();
-    return currentOutcome
-      ? this.allOutcomes.filter((outcome) => outcome.toLowerCase().includes(currentOutcome))
-      : this.allOutcomes.slice();
+    return this.allOutcomes.filter((outcome) => {
+      return (
+        !this.connectedOutcomes().includes(outcome) &&
+        (!currentOutcome || outcome.toLowerCase().includes(currentOutcome))
+      );
+    });
   });
 
   readonly announcer = inject(LiveAnnouncer);

From 9d017fbfaa1d5bae7f43da37ec7ae43e1dfafa8f Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 6 Dec 2024 10:25:51 +1100
Subject: [PATCH 168/776] feat: switch to html5 mode

---
 src/app/doubtfire-angularjs.module.ts | 4 +++-
 src/index.html                        | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index e14fdbb545..2f12cc2b57 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -236,7 +236,9 @@ export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.projects',
   'doubtfire.groups',
   'doubtfire.visualisations',
-]);
+]).config(['$locationProvider', ($locationProvider) => {
+  $locationProvider.html5Mode(true);
+}]);
 
 // Downgrade angular modules that we need...
 // factory -> service
diff --git a/src/index.html b/src/index.html
index 54fed2d067..2e715e206f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html lang="en">
   <head>
+    <base href="/">
     <!-- Google tag (gtag.js) -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-VJWZRWYE2C"></script>
     <script>

From 65ffc4f8d61a9d0b2cc7c5f8d13db932436fc4f5 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:35:33 +1100
Subject: [PATCH 169/776] feat: modify fields and operate on learning outcomes

---
 src/app/api/models/feedback-template.ts       |   5 +-
 src/app/api/models/learning-outcome.ts        |  70 ++++++-
 .../api/services/feedback-template.service.ts |   5 +-
 .../api/services/learning-outcome.service.ts  |  28 ++-
 .../api/services/task-definition.service.ts   |   8 +-
 .../feedback-template-editor.component.html   | 171 ++++++++++++------
 .../feedback-template-editor.component.ts     | 170 +++++++++--------
 7 files changed, 313 insertions(+), 144 deletions(-)

diff --git a/src/app/api/models/feedback-template.ts b/src/app/api/models/feedback-template.ts
index f0679a611f..19e1a0089c 100644
--- a/src/app/api/models/feedback-template.ts
+++ b/src/app/api/models/feedback-template.ts
@@ -6,11 +6,14 @@ import {FeedbackTemplateService} from '../services/feedback-template.service';
 
 export class FeedbackTemplate extends Entity {
   id: number;
-  learningOutcome: string;
+  type: 'Group' | 'Feedback';
   chipText: string;
   description: string;
   commentText: string;
   summaryText: string;
+  taskStatus: 'fix_and_resubmit' | 'discuss' | 'redo' | 'complete' | 'feedback_exceeded';
+  parent: number;
+  learningOutcome: number;
 
   readonly context: TaskDefinition | Unit;
 
diff --git a/src/app/api/models/learning-outcome.ts b/src/app/api/models/learning-outcome.ts
index 40a19d893a..f4eef0a8af 100644
--- a/src/app/api/models/learning-outcome.ts
+++ b/src/app/api/models/learning-outcome.ts
@@ -1,12 +1,72 @@
-import { Entity } from 'ngx-entity-service';
-
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {Observable} from 'rxjs';
+import {AppInjector} from 'src/app/app-injector';
+import {LearningOutcomeService} from './doubtfire-model';
 
 export class LearningOutcome extends Entity {
-
   id: number;
+  contextType: string;
+  contextId: number;
   iloNumber: number;
   abbreviation: string;
-  name: string;
-  description: string;
+  shortDescription: string;
+  fullOutcomeDescription: string;
+
+  contextTypePaths = {
+    'Unit': 'units',
+    'TaskDefinition': 'task_definitions',
+    'Course': 'courses',
+  };
+
+  public save(): Observable<LearningOutcome> {
+    const svc = AppInjector.get(LearningOutcomeService);
+
+    if (this.isNew) {
+      return svc.create(
+        {
+          contextType: this.contextTypePaths[this.contextType],
+          contextId: this.contextId,
+        },
+        {entity: this},
+      );
+    } else {
+      return svc.update(
+        {
+          contextType: this.contextTypePaths[this.contextType],
+          contextId: this.contextId,
+          id: this.id,
+        },
+        {entity: this, endpointFormat: LearningOutcomeService.updateEndpoint},
+      );
+    }
+  }
+
+  private originalSaveData: string;
+
+  public get hasOriginalSaveData(): boolean {
+    return this.originalSaveData !== undefined && this.originalSaveData !== null;
+  }
+
+  /**
+   * To check if things have changed, we need to get the initial save data... as it
+   * isn't empty by default. We can then use
+   * this to check if there are changes.
+   *
+   * @param mapping the mapping to get changes
+   */
+  public setOriginalSaveData(mapping: EntityMapping<LearningOutcome>) {
+    this.originalSaveData = JSON.stringify(this.toJson(mapping));
+  }
+
+  public hasChanges<T extends Entity>(mapping: EntityMapping<T>): boolean {
+    if (!this.originalSaveData) {
+      return false;
+    }
+
+    return this.originalSaveData != JSON.stringify(this.toJson(mapping));
+  }
 
+  public get isNew(): boolean {
+    return !this.id;
+  }
 }
diff --git a/src/app/api/services/feedback-template.service.ts b/src/app/api/services/feedback-template.service.ts
index 0c10e6debc..42163b5348 100644
--- a/src/app/api/services/feedback-template.service.ts
+++ b/src/app/api/services/feedback-template.service.ts
@@ -14,11 +14,14 @@ export class FeedbackTemplateService extends CachedEntityService<FeedbackTemplat
 
     this.mapping.addKeys(
       'id',
-      'learningOutcome',
+      'type',
       'chipText',
       'description',
       'commentText',
       'summaryText',
+      'task_status_id',
+      'parent_chip_id',
+      'learning_outcome_id',
     );
   }
 
diff --git a/src/app/api/services/learning-outcome.service.ts b/src/app/api/services/learning-outcome.service.ts
index c69ebc7224..78c592dea9 100644
--- a/src/app/api/services/learning-outcome.service.ts
+++ b/src/app/api/services/learning-outcome.service.ts
@@ -1,22 +1,27 @@
-import { CachedEntityService } from 'ngx-entity-service';
-import { LearningOutcome } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import {CachedEntityService} from 'ngx-entity-service';
+import {LearningOutcome} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiURL';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {Observable} from 'rxjs';
 
 @Injectable()
 export class LearningOutcomeService extends CachedEntityService<LearningOutcome> {
-  protected readonly endpointFormat = 'units/:unitId:/outcomes/:id:';
+  protected readonly endpointFormat = ':contextType:/:contextId:/outcomes';
+  public static updateEndpoint = ':contextType:/:contextId:/outcomes/:id:';
 
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
 
     this.mapping.addKeys(
       'id',
-      'name',
-      'description',
+      'contextId',
+      'contextType',
       'abbreviation',
-      'iloNumber'
+      'shortDescription',
+      'fullOutcomeDescription',
     );
 
     this.mapping.mapAllKeysToJsonExcept('id');
@@ -25,4 +30,11 @@ export class LearningOutcomeService extends CachedEntityService<LearningOutcome>
   public createInstanceFrom(json: object, other?: any): LearningOutcome {
     return new LearningOutcome();
   }
+
+  public globalOutcomes(): Observable<any> {
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/global/outcomes`;
+    const httpClient = AppInjector.get(HttpClient);
+
+    return httpClient.get<any>(url);
+  }
 }
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index e32e9cfcca..9749e78466 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -115,13 +115,13 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'overseerImageId',
       'assessmentEnabled',
       {
-        keys: 'tlos',
+        keys: 'ilos',
         toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
-          data[key]?.forEach((tlo) => {
+          data[key]?.forEach(ilo => {
             taskDefinition.learningOutcomesCache.getOrCreate(
-              tlo['id'],
+              ilo['id'],
               this.learningOutcomeService,
-              tlo,
+              ilo,
             );
           });
         },
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index fd4cccc16c..4c6647f954 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -1,49 +1,50 @@
 <div class="flex flex-col gap-8">
   <table
+    #outcomeTable
     class="flex-grow f-table selectable"
     mat-table
     [dataSource]="outcomeSource"
     matSort
     (matSortChange)="sortOutcomeData($event)"
   >
-    <ng-container matColumnDef="number" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Number</th>
+    <ng-container matColumnDef="abbreviation" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Abbreviation</th>
       <td
         mat-cell
         *matCellDef="let learningOutcome"
         (click)="selectLearningOutcome(learningOutcome)"
       >
-        {{ learningOutcome.iloNumber }}
+        {{ learningOutcome.abbreviation }}
       </td>
     </ng-container>
-    <ng-container matColumnDef="tag" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Tag</th>
+    <ng-container matColumnDef="shortDescription" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Short Description</th>
       <td
         mat-cell
         *matCellDef="let learningOutcome"
         (click)="selectLearningOutcome(learningOutcome)"
       >
-        {{ learningOutcome.abbreviation }}
+        {{ learningOutcome.shortDescription }}
       </td>
     </ng-container>
-    <ng-container matColumnDef="name" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Name</th>
+    <ng-container matColumnDef="fullOutcomeDescription" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Full Outcome Description</th>
       <td
         mat-cell
         *matCellDef="let learningOutcome"
         (click)="selectLearningOutcome(learningOutcome)"
       >
-        {{ learningOutcome.name }}
+        {{ learningOutcome.fullOutcomeDescription }}
       </td>
     </ng-container>
-    <ng-container matColumnDef="description" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
+    <ng-container matColumnDef="connectedOutcomes" sticky>
+      <th mat-header-cell *matHeaderCellDef>Connected Learning Outcomes</th>
       <td
         mat-cell
         *matCellDef="let learningOutcome"
         (click)="selectLearningOutcome(learningOutcome)"
       >
-        {{ learningOutcome.description }}
+
       </td>
     </ng-container>
     <ng-container matColumnDef="learningOutcomeAction" sticky>
@@ -96,9 +97,13 @@
         />
       </mat-form-field>
     </div>
-    <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+    <mat-paginator
+      #outcomePaginator
+      class="mat-elevation-z0"
+      [pageSizeOptions]="[5, 10, 25, 100]"
+    ></mat-paginator>
     <span class="flex-grow"></span>
-    <label>Task Learning Outcomes CSV</label>
+    <label>Learning Outcomes CSV</label>
     <button mat-icon-button (click)="downloadCsv('learning-outcomes')">
       <mat-icon>download</mat-icon>
     </button>
@@ -109,45 +114,44 @@
     <button mat-raised-button color="primary" (click)="createLearningOutcome()">Add Outcome</button>
   </span>
   @if (selectedOutcome) {
-    <div class="border border-solid rounded-lg p-5">
+    <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
       <div>
         <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
-        <mat-divider></mat-divider>
 
         <div class="flex flex-row gap-4">
           <mat-form-field appearance="outline" class="basis-1/3">
-            <mat-label>Tag</mat-label>
-            <input matInput required [(ngModel)]="selectedOutcome.abbreviation" />
+            <mat-label>Abbreviation</mat-label>
+            <input matInput required [(ngModel)]="selectedOutcome.abbreviation" maxlength="5" />
           </mat-form-field>
 
           <mat-form-field appearance="outline" class="flex-grow">
-            <mat-label>Name</mat-label>
-            <input matInput required [(ngModel)]="selectedOutcome.name" />
+            <mat-label>Short Description</mat-label>
+            <input matInput required [(ngModel)]="selectedOutcome.shortDescription" />
           </mat-form-field>
         </div>
 
         <mat-form-field appearance="outline" class="flex flex-grow">
-          <mat-label>Description</mat-label>
-          <textarea matInput required [(ngModel)]="selectedOutcome.description"> </textarea>
+          <mat-label>Full Outcome Description</mat-label>
+          <textarea matInput required [(ngModel)]="selectedOutcome.fullOutcomeDescription"> </textarea>
         </mat-form-field>
 
         <mat-form-field appearance="outline" class="flex flex-grow">
           <mat-label>Connected Learning Outcomes</mat-label>
           <mat-chip-grid #chipGrid aria-label="Outcome selection">
-            @for (outcome of connectedOutcomes(); track $index) {
+            @for (outcome of selectedConnectedOutcomes(); track outcome.abbreviation) {
               <mat-chip-row (removed)="remove(outcome)">
-                {{ outcome }}
-                <button matChipRemove [attr.aria-label]="'remove ' + outcome">
+                {{ outcome.abbreviation }}
+                <button matChipRemove [attr.aria-label]="'remove ' + outcome.abbreviation">
                   <mat-icon>cancel</mat-icon>
                 </button>
               </mat-chip-row>
             }
           </mat-chip-grid>
           <input
-            name="currentConnectedOutcome"
+            name="typedConnectedOutcome"
             placeholder="Connect an outcome..."
             #connectedOutcomeInput
-            [(ngModel)]="currentConnectedOutcome"
+            [(ngModel)]="typedConnectedOutcome"
             [matChipInputFor]="chipGrid"
             [matAutocomplete]="auto"
             [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
@@ -155,41 +159,42 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
           />
           <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)">
             @for (outcome of filteredOutcomes(); track outcome) {
-              <mat-option [value]="outcome">{{ outcome }}</mat-option>
+              <mat-option [value]="outcome.abbreviation">{{ outcome.abbreviation }}</mat-option>
             }
           </mat-autocomplete>
         </mat-form-field>
 
         <div class="flex">
           <span class="flex-grow"></span>
-          <button mat-raised-button color="primary">Save Outcome</button>
+          <button mat-raised-button color="primary" (click)="saveLearningOutcome(selectedOutcome)">Save Outcome</button>
         </div>
       </div>
-
+    </div>
+    <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
       <div class="mb-1">
-        <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates</h4>
-        <mat-divider></mat-divider>
+        <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome</h4>
 
         <div class="flex flex-col gap-8">
           <table
+            #templateTable
             class="flex-grow f-table selectable"
             mat-table
             [dataSource]="templateSource"
             matSort
             (matSortChange)="sortTemplateData($event)"
           >
-            <ng-container matColumnDef="number" sticky>
-              <th mat-header-cell *matHeaderCellDef mat-sort-header>Number</th>
+            <ng-container matColumnDef="parent" sticky>
+              <th mat-header-cell *matHeaderCellDef>Parent</th>
               <td
                 mat-cell
                 *matCellDef="let feedbackTemplate"
                 (click)="selectFeedbackTemplate(feedbackTemplate)"
               >
-                {{ feedbackTemplate.id }}
+                {{ feedbackTemplate.parent }}
               </td>
             </ng-container>
             <ng-container matColumnDef="chipText" sticky>
-              <th mat-header-cell *matHeaderCellDef mat-sort-header>Chip Text</th>
+              <th mat-header-cell *matHeaderCellDef>Chip Text</th>
               <td
                 mat-cell
                 *matCellDef="let feedbackTemplate"
@@ -199,7 +204,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates</h4>
               </td>
             </ng-container>
             <ng-container matColumnDef="description" sticky>
-              <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
+              <th mat-header-cell *matHeaderCellDef>Description</th>
               <td
                 mat-cell
                 *matCellDef="let feedbackTemplate"
@@ -209,7 +214,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates</h4>
               </td>
             </ng-container>
             <ng-container matColumnDef="commentText" sticky>
-              <th mat-header-cell *matHeaderCellDef mat-sort-header>Comment Text</th>
+              <th mat-header-cell *matHeaderCellDef>Comment Text</th>
               <td
                 mat-cell
                 *matCellDef="let feedbackTemplate"
@@ -219,7 +224,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates</h4>
               </td>
             </ng-container>
             <ng-container matColumnDef="summaryText" sticky>
-              <th mat-header-cell *matHeaderCellDef mat-sort-header>Summary Text</th>
+              <th mat-header-cell *matHeaderCellDef>Summary Text</th>
               <td
                 mat-cell
                 *matCellDef="let feedbackTemplate"
@@ -228,6 +233,16 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates</h4>
                 {{ feedbackTemplate.summaryText }}
               </td>
             </ng-container>
+            <ng-container matColumnDef="taskStatus" sticky>
+              <th mat-header-cell *matHeaderCellDef>Task Status</th>
+              <td
+                mat-cell
+                *matCellDef="let feedbackTemplate"
+                (click)="selectFeedbackTemplate(feedbackTemplate)"
+              >
+                {{ feedbackTemplate.taskStatus }}
+              </td>
+            </ng-container>
             <ng-container matColumnDef="feedbackTemplateAction" sticky>
               <th mat-header-cell *matHeaderCellDef></th>
               <td
@@ -279,6 +294,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates</h4>
               </mat-form-field>
             </div>
             <mat-paginator
+              #templatePaginator
               class="mat-elevation-z0"
               [pageSizeOptions]="[5, 10, 25, 100]"
             ></mat-paginator>
@@ -299,30 +315,79 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates</h4>
           @if (selectedTemplate) {
             <div>
               <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
-              <mat-divider></mat-divider>
 
               <div class="flex flex-row gap-4">
-                <mat-form-field appearance="outline" class="basis-1/3">
+                <mat-form-field appearance="outline" class="basis-1/5">
+                  <mat-label>Type</mat-label>
+                  <mat-select required [(ngModel)]="selectedTemplate.type">
+                    <mat-option [value]="'Group'">Group</mat-option>
+                    <mat-option [value]="'Feedback'">Feedback</mat-option>
+                  </mat-select>
+                </mat-form-field>
+
+                <mat-form-field appearance="outline" class="basis-1/5">
+                  <mat-label>Parent</mat-label>
+                  <mat-select required [(ngModel)]="selectedTemplate.parent">
+                  </mat-select>
+                </mat-form-field>
+
+                <mat-form-field appearance="outline" class="basis-1/5">
                   <mat-label>Chip Text</mat-label>
-                  <input matInput required [(ngModel)]="selectedTemplate.chipText" />
+                  <input
+                    matInput
+                    required
+                    [(ngModel)]="selectedTemplate.chipText"
+                    maxlength="20"
+                    placeholder="Short text shown on the chip"
+                  />
                 </mat-form-field>
 
                 <mat-form-field appearance="outline" class="flex-grow">
-                  <mat-label>Summary Text</mat-label>
-                  <input matInput required [(ngModel)]="selectedTemplate.summaryText" />
+                  <mat-label>Description</mat-label>
+                  <input
+                    matInput
+                    required
+                    [(ngModel)]="selectedTemplate.description"
+                    maxlength="116"
+                    placeholder="Description of the feedback template"
+                  />
                 </mat-form-field>
               </div>
+              @if (selectedTemplate.type === 'Feedback') {
+                <mat-form-field appearance="outline" class="flex flex-grow">
+                  <mat-label>Comment Text</mat-label>
+                  <textarea
+                    matInput
+                    required
+                    [(ngModel)]="selectedTemplate.commentText"
+                    placeholder="Feedback text that is added to the comment area"
+                  >
+                  </textarea>
+                </mat-form-field>
 
-              <mat-form-field appearance="outline" class="flex flex-grow">
-                <mat-label>Comment Text</mat-label>
-                <textarea matInput required [(ngModel)]="selectedTemplate.commentText"> </textarea>
-              </mat-form-field>
-
-              <mat-form-field appearance="outline" class="flex flex-grow">
-                <mat-label>Description</mat-label>
-                <textarea matInput required [(ngModel)]="selectedTemplate.description"> </textarea>
-              </mat-form-field>
+                <div class="flex flex-row gap-4">
+                  <mat-form-field appearance="outline" class="flex-grow">
+                    <mat-label>Summary Text</mat-label>
+                    <input
+                      matInput
+                      required
+                      [(ngModel)]="selectedTemplate.summaryText"
+                      placeholder="Summary of the feedback"
+                    />
+                  </mat-form-field>
 
+                  <mat-form-field appearance="outline" class="basis-1/3">
+                    <mat-label>Task Status</mat-label>
+                    <mat-select required [(ngModel)]="selectedTemplate.taskStatus">
+                      <mat-option [value]="'fix_and_resubmit'">Fix and Resubmit</mat-option>
+                      <mat-option [value]="'discuss'">Discuss</mat-option>
+                      <mat-option [value]="'redo'">Redo</mat-option>
+                      <mat-option [value]="'complete'">Complete</mat-option>
+                      <mat-option [value]="'feedback_exceeded'">Feedback Exceeded</mat-option>
+                    </mat-select>
+                  </mat-form-field>
+                </div>
+              }
               <div class="flex">
                 <span class="flex-grow"></span>
                 <button mat-raised-button color="primary">Save Template</button>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 38358b0eab..42f3c94fdb 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -6,6 +6,8 @@ import {
   Inject,
   Input,
   model,
+  OnDestroy,
+  OnInit,
   signal,
   ViewChild,
 } from '@angular/core';
@@ -38,38 +40,43 @@ import {FileDownloaderService} from '../file-downloader/file-downloader.service'
   selector: 'f-feedback-template-editor',
   templateUrl: 'feedback-template-editor.component.html',
 })
-export class FeedbackTemplateEditorComponent implements AfterViewInit {
+export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, OnDestroy {
   @Input() context: TaskDefinition | Unit;
 
-  @ViewChild(MatTable, {static: false}) outcomeTable: MatTable<LearningOutcome>;
+  @ViewChild('outcomeTable', {static: false}) outcomeTable: MatTable<LearningOutcome>;
   @ViewChild(MatSort, {static: false}) outcomeSort: MatSort;
-  @ViewChild(MatPaginator, {static: false}) outcomePaginator: MatPaginator;
+  @ViewChild('outcomePaginator', {static: false}) outcomePaginator: MatPaginator;
 
   public outcomeSource: MatTableDataSource<LearningOutcome>;
   public outcomeColumns: string[] = [
-    'number',
-    'tag',
-    'name',
-    'description',
+    'abbreviation',
+    'shortDescription',
+    'fullOutcomeDescription',
+    'connectedOutcomes',
     'learningOutcomeAction',
   ];
   public selectedOutcome: LearningOutcome;
+  public abbreviationPrefix: 'TLO' | 'ULO' | 'GLO';
 
-  @ViewChild(MatTable, {static: false}) templateTable: MatTable<FeedbackTemplate>;
+  @ViewChild('templateTable', {static: false}) templateTable: MatTable<FeedbackTemplate>;
   @ViewChild(MatSort, {static: false}) templateSort: MatSort;
-  @ViewChild(MatPaginator, {static: false}) templatePaginator: MatPaginator;
+  @ViewChild('templatePaginator', {static: false}) templatePaginator: MatPaginator;
 
   public templateSource: MatTableDataSource<FeedbackTemplate>;
   public templateColumns: string[] = [
-    'number',
+    'parent',
     'chipText',
     'description',
     'commentText',
     'summaryText',
+    'taskStatus',
     'feedbackTemplateAction',
   ];
   public selectedTemplate: FeedbackTemplate;
 
+  private subscriptions: Subscription[] = [];
+  public allOutcomes: LearningOutcome[] = [];
+
   constructor(
     private alerts: AlertService,
     private taskDefinitionService: TaskDefinitionService,
@@ -81,6 +88,11 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     @Inject(confirmationModal) private confirmationModal: any,
   ) {}
 
+  ngOnInit(): void {
+    if (this.context instanceof TaskDefinition) this.abbreviationPrefix = 'TLO';
+    else if (this.context instanceof Unit) this.abbreviationPrefix = 'ULO';
+  }
+
   ngAfterViewInit(): void {
     this.subscriptions.push(
       this.context.learningOutcomesCache.values.subscribe((learningOutcomes) => {
@@ -90,10 +102,9 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
         this.outcomeSource.filterPredicate = (data: LearningOutcome, filter: string) => {
           const filterValue = filter.trim().toLowerCase();
           return (
-            data.iloNumber.toString().includes(filterValue) ||
             data.abbreviation.toLowerCase().includes(filterValue) ||
-            data.name.toLowerCase().includes(filterValue) ||
-            data.description.toLowerCase().includes(filterValue)
+            data.shortDescription.toLowerCase().includes(filterValue) ||
+            data.fullOutcomeDescription.toLowerCase().includes(filterValue)
           );
         };
       }),
@@ -112,14 +123,29 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
           );
         };
       }),
+      this.learningOutcomeService.globalOutcomes().subscribe((glos) => {
+        this.allOutcomes = [...this.allOutcomes, ...glos];
+      }),
     );
+
+    if (this.context instanceof TaskDefinition) {
+      this.subscriptions.push(
+        this.context.unit.learningOutcomesCache.values.subscribe((learningOutcomes) => {
+          this.allOutcomes = [...this.allOutcomes, ...learningOutcomes];
+        }),
+      );
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((s) => s.unsubscribe());
   }
 
   public saveLearningOutcome(learningOutcome: LearningOutcome) {
-    // learningOutcome.save().subscribe(() => {
-    //   this.alerts.success('Outcome saved');
-    //   learningOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
-    // });
+    learningOutcome.save().subscribe(() => {
+      this.alerts.success('Outcome saved');
+      learningOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
+    });
   }
 
   public saveFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
@@ -129,20 +155,11 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     });
   }
 
-  private subscriptions: Subscription[] = [];
-  ngOnDestroy(): void {
-    this.subscriptions.forEach((s) => s.unsubscribe());
-  }
-
   public selectLearningOutcome(learningOutcome: LearningOutcome) {
     if (this.selectedOutcome === learningOutcome) {
       this.selectedOutcome = null;
     } else {
       this.selectedOutcome = learningOutcome;
-
-      // if (!this.selectedFeedbackTemplate.hasOriginalSaveData) {
-      //   this.selectedFeedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
-      // }
     }
   }
 
@@ -169,14 +186,12 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     this.outcomeSource.data = data.sort((a, b) => {
       const isAsc = sort.direction === 'asc';
       switch (sort.active) {
-        case 'number':
-          return this.compare(a.iloNumber, b.iloNumber, isAsc);
-        case 'tag':
+        case 'abbreviation':
           return this.compare(a.abbreviation, b.abbreviation, isAsc);
-        case 'name':
-          return this.compare(a.name, b.name, isAsc);
-        case 'description':
-          return this.compare(a.description, b.description, isAsc);
+        case 'shortDescription':
+          return this.compare(a.shortDescription, b.shortDescription, isAsc);
+        case 'fullOutcomeDescription':
+          return this.compare(a.fullOutcomeDescription, b.fullOutcomeDescription, isAsc);
         default:
           return 0;
       }
@@ -194,16 +209,8 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     this.templateSource.data = data.sort((a, b) => {
       const isAsc = sort.direction === 'asc';
       switch (sort.active) {
-        case 'number':
-          return this.compare(a.id, b.id, isAsc);
         case 'chipText':
           return this.compare(a.chipText, b.chipText, isAsc);
-        case 'description':
-          return this.compare(a.description, b.description, isAsc);
-        case 'commentText':
-          return this.compare(a.commentText, b.commentText, isAsc);
-        case 'summaryText':
-          return this.compare(a.summaryText, b.summaryText, isAsc);
         default:
           return 0;
       }
@@ -243,14 +250,21 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
       () => {
         this.learningOutcomeService
           .delete(
-            {id: learningOutcome.id, unitId: this.context.id},
-            {entity: learningOutcome, cache: this.context.learningOutcomesCache},
+            {
+              contextType: learningOutcome.contextTypePaths[learningOutcome.contextType],
+              contextId: learningOutcome.contextId,
+              id: learningOutcome.id,
+            },
+            {
+              entity: learningOutcome,
+              cache: this.context.learningOutcomesCache,
+              endpointFormat: LearningOutcomeService.updateEndpoint,
+            },
           )
           .subscribe({
             next: () => this.alerts.success('Learning outcome deleted'),
             error: () => this.alerts.error('Failed to delete learning outcome. Please try again.'),
           });
-        this.alerts.success('Outcome deleted');
       },
     );
   }
@@ -301,10 +315,12 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
   public createLearningOutcome() {
     const learningOutcome = new LearningOutcome();
 
-    learningOutcome.iloNumber = 1;
-    learningOutcome.abbreviation = '';
-    learningOutcome.name = '';
-    learningOutcome.description = '';
+    if (this.context instanceof TaskDefinition) learningOutcome.contextType = 'TaskDefinition';
+    else if (this.context instanceof Unit) learningOutcome.contextType = 'Unit';
+    learningOutcome.contextId = this.context.id;
+    learningOutcome.abbreviation = this.abbreviationPrefix;
+    learningOutcome.shortDescription = '';
+    learningOutcome.fullOutcomeDescription = '';
 
     this.selectedOutcome = learningOutcome;
   }
@@ -312,7 +328,7 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
   public createFeedbackTemplate() {
     const feedbackTemplate = new FeedbackTemplate(this.context);
 
-    feedbackTemplate.id = 0;
+    feedbackTemplate.type = 'Feedback';
     feedbackTemplate.chipText = '';
     feedbackTemplate.description = '';
     feedbackTemplate.commentText = '';
@@ -322,15 +338,15 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
   }
 
   readonly separatorKeysCodes: number[] = [ENTER, COMMA];
-  readonly currentConnectedOutcome = model('');
-  readonly connectedOutcomes = signal([]);
-  readonly allOutcomes: string[] = ['TLO1', 'TLO2', 'TLO3', 'ULO1', 'ULO2'];
+  readonly typedConnectedOutcome = model('');
+  readonly selectedConnectedOutcomes = signal([]);
   readonly filteredOutcomes = computed(() => {
-    const currentOutcome = this.currentConnectedOutcome().toLowerCase();
+    const currentOutcome = this.typedConnectedOutcome().toLowerCase();
     return this.allOutcomes.filter((outcome) => {
+      const abbreviation = outcome.abbreviation?.toLowerCase();
       return (
-        !this.connectedOutcomes().includes(outcome) &&
-        (!currentOutcome || outcome.toLowerCase().includes(currentOutcome))
+        !this.selectedConnectedOutcomes().includes(outcome) &&
+        (!currentOutcome || abbreviation?.includes(currentOutcome))
       );
     });
   });
@@ -341,31 +357,41 @@ export class FeedbackTemplateEditorComponent implements AfterViewInit {
     const value = (event.value || '').trim();
 
     if (value) {
-      this.connectedOutcomes.update((connectedOutcomes) => [...connectedOutcomes, value]);
+      const outcome = this.allOutcomes.find(
+        (o) => o.abbreviation?.toLowerCase() === value.toLowerCase(),
+      );
+      if (outcome && !this.selectedConnectedOutcomes().includes(outcome)) {
+        this.selectedConnectedOutcomes.update((selectedConnectedOutcomes) => [
+          ...selectedConnectedOutcomes,
+          outcome,
+        ]);
+      }
     }
 
-    this.currentConnectedOutcome.set('');
+    this.typedConnectedOutcome.set('');
   }
 
-  remove(outcome: string): void {
-    this.connectedOutcomes.update((connectedOutcomes) => {
-      const index = connectedOutcomes.indexOf(outcome);
-      if (index < 0) {
-        return connectedOutcomes;
-      }
-
-      connectedOutcomes.splice(index, 1);
-      this.announcer.announce(`Removed ${outcome}`);
-      return [...connectedOutcomes];
+  remove(outcome: LearningOutcome): void {
+    this.selectedConnectedOutcomes.update((selectedConnectedOutcomes) => {
+      const updatedOutcomes = selectedConnectedOutcomes.filter(
+        (o) => o.abbreviation !== outcome.abbreviation,
+      );
+      this.announcer.announce(`Removed ${outcome.abbreviation}`);
+      return updatedOutcomes;
     });
   }
 
   selected(event: MatAutocompleteSelectedEvent): void {
-    this.connectedOutcomes.update((connectedOutcomes) => [
-      ...connectedOutcomes,
-      event.option.viewValue,
-    ]);
-    this.currentConnectedOutcome.set('');
+    const outcome = this.allOutcomes.find((o) => o.abbreviation === event.option.viewValue);
+
+    if (outcome && !this.selectedConnectedOutcomes().includes(outcome)) {
+      this.selectedConnectedOutcomes.update((selectedConnectedOutcomes) => [
+        ...selectedConnectedOutcomes,
+        outcome,
+      ]);
+    }
+
+    this.typedConnectedOutcome.set('');
     event.option.deselect();
   }
 }

From d27dff6daa530c913eb4f0a912f21d6a91a7d560 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:17:10 +1100
Subject: [PATCH 170/776] refactor: remove old outcome components from view

---
 src/app/api/models/learning-outcome.ts        |  1 -
 src/app/api/models/unit.ts                    |  2 +-
 .../task-dropdown.component.html              |  8 ---
 .../task-dropdown/task-dropdown.component.ts  |  1 -
 .../common/services/outcome-service.coffee    |  2 +
 .../project-outcome-alignment.coffee          |  2 +
 .../projects/states/outcomes/outcomes.coffee  |  2 +
 .../portfolio-tasks-step.coffee               |  2 +
 .../states/portfolio/portfolio.coffee         | 22 ++-----
 .../states/portfolio/portfolio.tpl.html       |  1 -
 .../upload-submission-modal.coffee            | 53 +----------------
 .../upload-submission-modal.tpl.html          | 58 -------------------
 .../task-ilo-alignment-modal.coffee           |  2 +
 .../task-ilo-alignment-editor.coffee          |  2 +
 .../task-ilo-alignment-rater.coffee           |  2 +
 .../task-ilo-alignment-viewer.coffee          |  2 +
 .../unit-ilo-edit-modal.coffee                |  2 +
 .../unit-ilo-editor/unit-ilo-editor.coffee    |  2 +
 src/app/units/states/edit/edit.coffee         |  3 -
 src/app/units/states/edit/edit.tpl.html       |  1 -
 20 files changed, 29 insertions(+), 141 deletions(-)

diff --git a/src/app/api/models/learning-outcome.ts b/src/app/api/models/learning-outcome.ts
index f4eef0a8af..ade1f7a0d5 100644
--- a/src/app/api/models/learning-outcome.ts
+++ b/src/app/api/models/learning-outcome.ts
@@ -7,7 +7,6 @@ export class LearningOutcome extends Entity {
   id: number;
   contextType: string;
   contextId: number;
-  iloNumber: number;
   abbreviation: string;
   shortDescription: string;
   fullOutcomeDescription: string;
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index a57f3c7db3..8cdf6df2da 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -373,7 +373,7 @@ export class Unit extends Entity {
         return alignment.taskDefinition.id === td.id;
       })
       .sort((a: TaskOutcomeAlignment, b: TaskOutcomeAlignment) => {
-        return a.learningOutcome.iloNumber - b.learningOutcome.iloNumber;
+        return a.learningOutcome.id - b.learningOutcome.id;
       });
   }
 
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index 9e848d0c5b..c7bee65bf6 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -64,14 +64,6 @@
           <mat-icon aria-label="Dashboard icon" fontIcon="dashboard"></mat-icon> Dashboard
         </button>
         <mat-divider></mat-divider>
-        <button
-          uiSref="projects/outcomes"
-          [uiParams]="{projectId: currentProject.id, taskAbbr: ''}"
-          mat-menu-item
-        >
-          <mat-icon aria-label="learning outcomes icon" fontIcon="flag"></mat-icon> Learning
-          Outcomes
-        </button>
         <button
           uiSref="projects/portfolio"
           [uiParams]="{projectId: currentProject.id, taskAbbr: ''}"
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.ts b/src/app/common/header/task-dropdown/task-dropdown.component.ts
index f905c7b822..b67f220b03 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.ts
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.ts
@@ -18,7 +18,6 @@ export class TaskDropdownComponent {
   @Input() unitRole: UnitRole;
 
   taskToShortName: { [key: string]: string } = {
-    'Learning Outcomes': 'Outcomes',
     'Portfolio Creation': 'Portfolio',
     'Staff Tasks': 'Staff Tasks',
     'Student Groups': 'Groups',
diff --git a/src/app/common/services/outcome-service.coffee b/src/app/common/services/outcome-service.coffee
index e8c19ca445..e87fce2613 100644
--- a/src/app/common/services/outcome-service.coffee
+++ b/src/app/common/services/outcome-service.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module("doubtfire.common.services.outcome-service", [])
 
 #
diff --git a/src/app/projects/project-outcome-alignment/project-outcome-alignment.coffee b/src/app/projects/project-outcome-alignment/project-outcome-alignment.coffee
index 896a2eb2c7..3b45694da3 100644
--- a/src/app/projects/project-outcome-alignment/project-outcome-alignment.coffee
+++ b/src/app/projects/project-outcome-alignment/project-outcome-alignment.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module("doubtfire.projects.project-outcome-alignment", [])
 
 .directive("projectOutcomeAlignment", ->
diff --git a/src/app/projects/states/outcomes/outcomes.coffee b/src/app/projects/states/outcomes/outcomes.coffee
index 5c5d610928..d92214d086 100644
--- a/src/app/projects/states/outcomes/outcomes.coffee
+++ b/src/app/projects/states/outcomes/outcomes.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module('doubtfire.projects.states.outcomes', [])
 
 #
diff --git a/src/app/projects/states/portfolio/directives/portfolio-tasks-step/portfolio-tasks-step.coffee b/src/app/projects/states/portfolio/directives/portfolio-tasks-step/portfolio-tasks-step.coffee
index a3fd83fed1..bae7d0abd7 100644
--- a/src/app/projects/states/portfolio/directives/portfolio-tasks-step/portfolio-tasks-step.coffee
+++ b/src/app/projects/states/portfolio/directives/portfolio-tasks-step/portfolio-tasks-step.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module('doubtfire.projects.states.portfolio.directives.portfolio-tasks-step', [])
 
 #
diff --git a/src/app/projects/states/portfolio/portfolio.coffee b/src/app/projects/states/portfolio/portfolio.coffee
index 4257ab1757..63e93ea961 100644
--- a/src/app/projects/states/portfolio/portfolio.coffee
+++ b/src/app/projects/states/portfolio/portfolio.coffee
@@ -32,15 +32,12 @@ angular.module('doubtfire.projects.states.portfolio', [
     summaryStep:
       title: "Learning Summary Report"
       seq: 3
-    taskStep:
-      title: "Select Tasks"
-      seq: 4
     otherFilesStep:
       title: "Upload Other Files"
-      seq: 5
+      seq: 4
     reviewStep:
       title: "Review Portfolio"
-      seq: 6
+      seq: 5
   $scope.setActiveTab = (tab) ->
     $scope.activeTab = tab
     $scope.activeTab.active = true
@@ -82,19 +79,10 @@ angular.module('doubtfire.projects.states.portfolio', [
       # when f.idx is 0 it's the LSR
       f.idx isnt 0
 
-  # Gets whether the unit has ilos
-  $scope.unitHasILOs = $scope.unit.ilos.length > 0
-
   # Gets selected tasks in the task selector
   $scope.selectedTasks = ->
-    if $scope.unitHasILOs
-      # Filter by aligned tasks that are included
-      tasks = _.filter $scope.project.tasks, (t) ->
-        hasAlignmentsForTask = _.find($scope.project.taskOutcomeAlignments, (ta) -> ta.task.id ==  t.id )?
-        t.includeInPortfolio and hasAlignmentsForTask
-    else
-      # Filter by included in portfolio
-      tasks = _.filter $scope.project.tasks, (t) -> t.includeInPortfolio
+    # Filter by included in portfolio
+    tasks = _.filter $scope.project.tasks, (t) -> t.includeInPortfolio
     tasks = _.filter tasks, (t) -> !_.includes(newTaskService.toBeWorkedOn, t.status)
     _.sortBy tasks, (t) -> t.definition.seq
 
@@ -104,7 +92,7 @@ angular.module('doubtfire.projects.states.portfolio', [
   else if $scope.projectHasDraftLearningSummaryReport
     $scope.setActiveTab $scope.tabs.summaryStep
   else if $scope.projectHasLearningSummaryReport()
-    $scope.setActiveTab $scope.tabs.taskStep
+    $scope.setActiveTab $scope.tabs.otherFilesStep
   else
     $scope.setActiveTab $scope.tabs.welcomeStep
 
diff --git a/src/app/projects/states/portfolio/portfolio.tpl.html b/src/app/projects/states/portfolio/portfolio.tpl.html
index 1c009b47ab..be61edec29 100644
--- a/src/app/projects/states/portfolio/portfolio.tpl.html
+++ b/src/app/projects/states/portfolio/portfolio.tpl.html
@@ -9,7 +9,6 @@
   <portfolio-welcome-step ng-if="activeTab == tabs.welcomeStep"></portfolio-welcome-step>
   <portfolio-grade-select-step ng-if="activeTab == tabs.gradeStep"></portfolio-grade-select-step>
   <portfolio-learning-summary-report-step ng-if="activeTab == tabs.summaryStep"></portfolio-learning-summary-report-step>
-  <portfolio-tasks-step ng-if="activeTab == tabs.taskStep"></portfolio-tasks-step>
   <portfolio-add-extra-files-step ng-if="activeTab == tabs.otherFilesStep"></portfolio-add-extra-files-step>
   <portfolio-review-step ng-if="activeTab == tabs.reviewStep"></portfolio-review-step>
 </div>
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index b9c9ebd2b9..8279c595b9 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -32,7 +32,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
 
   UploadSubmissionModal
 )
-.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, newTaskService, newProjectService, task, reuploadEvidence, outcomeService, PrivacyPolicy) ->
+.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, newTaskService, newProjectService, task, reuploadEvidence, PrivacyPolicy) ->
   $scope.privacyPolicy = PrivacyPolicy
   # Expose task to scope
   $scope.task = task
@@ -68,7 +68,6 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
     start: null # initialised by uploader
     onBeforeUpload: ->
       $scope.uploader.payload.contributions = mapTeamToPayload() if _.includes(states.shown, 'group')
-      $scope.uploader.payload.alignment_data = mapAlignmentDataToPayload() if _.includes(states.shown, 'alignment')
       $scope.uploader.payload.trigger = 'need_help' if $scope.submissionType == 'need_help'
     onSuccess: (response) ->
       $scope.uploader.response = response
@@ -100,7 +99,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
   # States functionality
   states = {
     # All possible states
-    all: ['group', 'files', 'alignment', 'comments', 'uploading']
+    all: ['group', 'files', 'comments', 'uploading']
     # Only states which are shown (populated in initialise)
     shown: []
     # The currently active state (set in initialise)
@@ -124,9 +123,8 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       isRFF = $scope.submissionType == 'ready_for_feedback'
       isTestSubmission = $scope.submissionType == 'test_submission'
       removed = []
-      # Remove group and alignment states
+      # Remove group states
       removed.push('group') if !isRFF || !task.isGroupTask()
-      removed.push('alignment') if !isRFF || !task.unit.ilos.length > 0
       removed.push('comments') if isTestSubmission
       removed
     # Initialises the states
@@ -161,11 +159,6 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
         # Disable group if group members not allocated anything
         group: ->
           _.chain($scope.team.memberContributions).map('confRating').compact().value().length == 0
-        # Disable alignment if no alignments made (need at least 1) and
-        # if description is blank
-        alignment: ->
-          _.chain($scope.alignments).map('rating').compact().value().length == 0 ||
-          $scope.alignmentsRationale.trim().length == 0
         # Disable files if no files made
         files: ->
           !$scope.uploader.isReady
@@ -223,44 +216,4 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
 
   # Comment on the task
   $scope.comment = ""
-
-  # Maps the alignment data to payload data
-  mapAlignmentDataToPayload = ->
-    _.chain($scope.alignments)
-    .map((alignment, key) ->
-      alignment.rationale = $scope.alignmentsRationale
-      alignment.ilo_id = +key
-      alignment
-    )
-    .filter((alignment) ->
-      alignment.rating > 0
-    )
-    .value()
-
-  unless $scope.task.isTestSubmission
-    # Get initial alignment data...
-    initialAlignments = task.project.taskOutcomeAlignments.filter( (a) -> a.taskDefinition.id == task.definition.id )
-    # ILO alignment defaults
-    $scope.alignmentsRationale = if initialAlignments.length > 0 then initialAlignments[0].description else ""
-    staffAlignments = $scope.task.staffAlignments()
-    $scope.ilos = _.map(task.unit.ilos, (ilo) ->
-      staffAlignment = _.find(staffAlignments, (sa) -> sa.learningOutcome.id ==  ilo.id)
-      staffAlignment ?= {}
-      staffAlignment.rating ?= 0
-      staffAlignment.label = outcomeService.alignmentLabels[staffAlignment.rating]
-      ilo.staffAlignment = staffAlignment
-      ilo
-    )
-    $scope.alignments = _.chain(task.unit.ilos)
-      .map((ilo) ->
-        value = initialAlignments.filter((a) -> a.learningOutcome.id == ilo.id)?[0]?.rating
-        value ?= 0
-        [ilo.id, {rating: value }]
-      )
-      .fromPairs()
-      .value()
-  else
-    $scope.ilos = []
-    $scope.alignments = []
-    $scope.alignmentsRationale = ""
 )
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 9caab7897e..89067b9b11 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -78,64 +78,6 @@ <h4>
       </div>
     </div>
     <!--/state-files-->
-    <div
-      class="state state-alignment"
-      ng-class="{'state-hidden-left': isHidden('alignment').left,
-                 'state-hidden-right': isHidden('alignment').right}">
-      <div class="card card-default">
-        <div class="card-heading">
-          <h4>
-            Learning Outcome Alignment <b class="text-red-500">*</b>
-          </h4>
-          <p>
-            Please rate the relevancy of this task to the specific learning outcome.
-            You must relate this task to at least one outcome and provide a rationale to proceed.
-          </p>
-          <p class="text-muted">
-            If you think the task is not related to a specific outcome, click the highest filled circle to remove its relevancy.
-          </p>
-        </div>
-        <!--/card-heading-->
-        <div class="list-group">
-          <div class="list-group-item clearfix" ng-repeat="ilo in ilos | orderBy: 'iloNumber'">
-            <div class="col-sm-12 col-md-7 pointer" ng-click="ilo.collapsed = !ilo.collapsed">
-              <h4>
-                <strong>{{ilo.abbreviation}}</strong>
-                <small>{{ilo.name}}</small>
-              </h4>
-              <div>Staff believe that {{ilo.staffAlignment.label | lcfirst}}. Click to expand.</div>
-              <div class="panel panel-default" collapse="!ilo.collapsed">
-                <div class="panel-body">
-                  <p>
-                    <h5>Outcome Description</h5>
-                    <div class="markdown-to-html" ng-bind-html="ilo.description | marked | to_trusted"></div>
-                  </p>
-                  <p ng-show="ilo.staffAlignment.rating > 0">
-                    <h5>Rationale</h5>
-                    <div class="markdown-to-html" ng-bind-html="ilo.staffAlignment.rationale | marked | to_trusted"></div>
-                  </p>
-                </div>
-              </div>
-            </div><!--/ilo-description-->
-            <div class="col-sm-12 col-md-5">
-              <task-ilo-alignment-rater
-                readonly="false"
-                unit="task.unit"
-                show-zero-rating="true"
-                ng-model="alignments[ilo.id]">
-              </task-ilo-alignment-rater>
-            </div><!--/alignment-rater-->
-          </div>
-        </div><!--/alignment-list-group-->
-        <div class="card-footer">
-          <p>
-            Justify your relevancy alignments with a comment to explain your choices. <b class="text-red-500">*</b>
-          </p>
-          <textarea ng-model="alignmentsRationale" class="form-control input-lg" rows="3" placeholder="My rationale is...">
-          </textarea>
-        </div><!--/comments-for-alignment-->
-      </div><!--/card-alignment-->
-    </div><!--/state-alignment-->
     <div
       class="state state-comments"
       ng-class="{'state-hidden-left': isHidden('comments').left,
diff --git a/src/app/tasks/task-ilo-alignment/modals/task-ilo-alignment-modal/task-ilo-alignment-modal.coffee b/src/app/tasks/task-ilo-alignment/modals/task-ilo-alignment-modal/task-ilo-alignment-modal.coffee
index 51633d4fb6..b40980c706 100644
--- a/src/app/tasks/task-ilo-alignment/modals/task-ilo-alignment-modal/task-ilo-alignment-modal.coffee
+++ b/src/app/tasks/task-ilo-alignment/modals/task-ilo-alignment-modal/task-ilo-alignment-modal.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module('doubtfire.tasks.task-ilo-alignment.modals.task-ilo-alignment-modal', [])
 
 #
diff --git a/src/app/tasks/task-ilo-alignment/task-ilo-alignment-editor/task-ilo-alignment-editor.coffee b/src/app/tasks/task-ilo-alignment/task-ilo-alignment-editor/task-ilo-alignment-editor.coffee
index b8aad86bb6..8381daf763 100644
--- a/src/app/tasks/task-ilo-alignment/task-ilo-alignment-editor/task-ilo-alignment-editor.coffee
+++ b/src/app/tasks/task-ilo-alignment/task-ilo-alignment-editor/task-ilo-alignment-editor.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module('doubtfire.tasks.task-ilo-alignment.task-ilo-alignment-editor',[])
 
 .directive('taskIloAlignmentEditor', ->
diff --git a/src/app/tasks/task-ilo-alignment/task-ilo-alignment-rater/task-ilo-alignment-rater.coffee b/src/app/tasks/task-ilo-alignment/task-ilo-alignment-rater/task-ilo-alignment-rater.coffee
index 0dfeb7598c..9179c4c6bd 100644
--- a/src/app/tasks/task-ilo-alignment/task-ilo-alignment-rater/task-ilo-alignment-rater.coffee
+++ b/src/app/tasks/task-ilo-alignment/task-ilo-alignment-rater/task-ilo-alignment-rater.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module('doubtfire.tasks.task-ilo-alignment.task-ilo-alignment-rater',[])
 
 #
diff --git a/src/app/tasks/task-ilo-alignment/task-ilo-alignment-viewer/task-ilo-alignment-viewer.coffee b/src/app/tasks/task-ilo-alignment/task-ilo-alignment-viewer/task-ilo-alignment-viewer.coffee
index 2980696c1c..e95cbfdc5d 100644
--- a/src/app/tasks/task-ilo-alignment/task-ilo-alignment-viewer/task-ilo-alignment-viewer.coffee
+++ b/src/app/tasks/task-ilo-alignment/task-ilo-alignment-viewer/task-ilo-alignment-viewer.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module('doubtfire.tasks.task-ilo-alignment.task-ilo-alignment-viewer', [])
 
 #
diff --git a/src/app/units/modals/unit-ilo-edit-modal/unit-ilo-edit-modal.coffee b/src/app/units/modals/unit-ilo-edit-modal/unit-ilo-edit-modal.coffee
index 084f2cc69e..1aef6ca1b3 100644
--- a/src/app/units/modals/unit-ilo-edit-modal/unit-ilo-edit-modal.coffee
+++ b/src/app/units/modals/unit-ilo-edit-modal/unit-ilo-edit-modal.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module('doubtfire.units.modals.unit-ilo-edit-modal', [])
 #
 # Modal to edit or create a new ILO
diff --git a/src/app/units/states/edit/directives/unit-ilo-editor/unit-ilo-editor.coffee b/src/app/units/states/edit/directives/unit-ilo-editor/unit-ilo-editor.coffee
index 54209881ac..151d331a77 100644
--- a/src/app/units/states/edit/directives/unit-ilo-editor/unit-ilo-editor.coffee
+++ b/src/app/units/states/edit/directives/unit-ilo-editor/unit-ilo-editor.coffee
@@ -1,3 +1,5 @@
+# Component not used
+
 angular.module('doubtfire.units.states.edit.directives.unit-ilo-editor',[])
 
 #
diff --git a/src/app/units/states/edit/edit.coffee b/src/app/units/states/edit/edit.coffee
index 7951553c54..2a47b2c8b1 100644
--- a/src/app/units/states/edit/edit.coffee
+++ b/src/app/units/states/edit/edit.coffee
@@ -47,9 +47,6 @@ angular.module('doubtfire.units.states.edit', [
     tasksTab:
       title: "Tasks"
       seq:   5
-    taskAlignmentTab:
-      title: "Task Alignment"
-      seq:   5
     groupsTab:
       title: "Groups"
       seq:   6
diff --git a/src/app/units/states/edit/edit.tpl.html b/src/app/units/states/edit/edit.tpl.html
index c2db43e07f..9871e5efe2 100644
--- a/src/app/units/states/edit/edit.tpl.html
+++ b/src/app/units/states/edit/edit.tpl.html
@@ -10,6 +10,5 @@
   <unit-tutorials-manager ng-if="activeTab === tabs.tutorialsTab" [unit]="unit"></unit-tutorials-manager>
   <unit-students-editor [unit]="unit" ng-if="activeTab === tabs.studentsTab"></unit-students-editor>
   <f-unit-task-editor ng-if="activeTab === tabs.tasksTab" [unit]="unit"></f-unit-task-editor>
-  <task-ilo-alignment-editor show-csv="true" unit="unit" ng-if="activeTab === tabs.taskAlignmentTab"></task-ilo-alignment-editor>
   <unit-group-set-editor ng-if="activeTab === tabs.groupsTab"></unit-group-set-editor>
 </div>

From 93fd6144c798fd302204728a6c2dd43f74d7bf91 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 20 Dec 2024 16:34:19 +1100
Subject: [PATCH 171/776] feat: add ability to collect d2l org and grade object
 ids

---
 .../d2l/d2l_assessment_mapping.service.ts     |  23 ++++
 .../api/models/d2l/d2l_assessment_mapping.ts  |  15 +++
 src/app/api/models/doubtfire-model.ts         |   1 +
 .../config/constants/doubtfire-constants.ts   |  11 +-
 src/app/doubtfire-angular.module.ts           |   5 +
 src/app/doubtfire-angularjs.module.ts         |   2 +
 .../d2l-unit-details-form.component.html      |  37 ++++++
 .../d2l-unit-details-form.component.scss      |   3 +
 .../d2l-unit-details-form.component.ts        | 122 ++++++++++++++++++
 .../unit-details-editor.coffee                |   5 +-
 .../unit-details-editor.tpl.html              |  28 ++--
 11 files changed, 238 insertions(+), 14 deletions(-)
 create mode 100644 src/app/api/models/d2l/d2l_assessment_mapping.service.ts
 create mode 100644 src/app/api/models/d2l/d2l_assessment_mapping.ts
 create mode 100644 src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.html
 create mode 100644 src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.scss
 create mode 100644 src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.ts

diff --git a/src/app/api/models/d2l/d2l_assessment_mapping.service.ts b/src/app/api/models/d2l/d2l_assessment_mapping.service.ts
new file mode 100644
index 0000000000..cef683fb23
--- /dev/null
+++ b/src/app/api/models/d2l/d2l_assessment_mapping.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { EntityService } from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiURL';
+import { HttpClient } from '@angular/common/http';
+import { D2lAssessmentMapping } from './d2l_assessment_mapping';
+import { Unit } from '../doubtfire-model';
+
+@Injectable()
+export class D2lAssessmentMappingService extends EntityService<D2lAssessmentMapping> {
+  protected readonly endpointFormat = 'units/:unitId:/d2l/:id:';
+
+  constructor(httpClient: HttpClient) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys('id', 'orgUnitId', 'gradeObjectId');
+
+    this.mapping.mapAllKeysToJsonExcept('id');
+  }
+
+  public createInstanceFrom(_json: object, other: Unit): D2lAssessmentMapping {
+    return new D2lAssessmentMapping(other);
+  }
+}
diff --git a/src/app/api/models/d2l/d2l_assessment_mapping.ts b/src/app/api/models/d2l/d2l_assessment_mapping.ts
new file mode 100644
index 0000000000..ac228bdbb6
--- /dev/null
+++ b/src/app/api/models/d2l/d2l_assessment_mapping.ts
@@ -0,0 +1,15 @@
+import {Entity} from 'ngx-entity-service';
+import {Unit} from '../unit';
+
+export class D2lAssessmentMapping extends Entity {
+  id: number;
+  unit: Unit;
+
+  orgUnitId: string;
+  gradeObjectId: string;
+
+  constructor(unit: Unit) {
+    super();
+    this.unit = unit;
+  }
+}
diff --git a/src/app/api/models/doubtfire-model.ts b/src/app/api/models/doubtfire-model.ts
index fffc361a4e..4f3da308e8 100644
--- a/src/app/api/models/doubtfire-model.ts
+++ b/src/app/api/models/doubtfire-model.ts
@@ -62,3 +62,4 @@ export * from '../services/learning-outcome.service';
 export * from '../services/group-set.service';
 export * from '../services/task-similarity.service';
 export * from '../services/test-attempt.service';
+export * from '../models/d2l/d2l_assessment_mapping.service';
diff --git a/src/app/config/constants/doubtfire-constants.ts b/src/app/config/constants/doubtfire-constants.ts
index 93b97d7885..32f05ac739 100644
--- a/src/app/config/constants/doubtfire-constants.ts
+++ b/src/app/config/constants/doubtfire-constants.ts
@@ -8,6 +8,7 @@ interface SettingsResponseFormat {
   externalName: string;
   overseerEnabled: boolean;
   tiiEnabled: boolean;
+  d2lEnabled: boolean;
 }
 
 interface SignOutUrlResponseFormat {
@@ -37,6 +38,11 @@ export class DoubtfireConstants {
    */
   public IsOverseerEnabled: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  /**
+   * Whether or not the D2L integration is enabled.
+   */
+  public IsD2LEnabled: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
   /**
    * Whether or not the TurnItIn integration is enabled.
    */
@@ -47,7 +53,7 @@ export class DoubtfireConstants {
   constructor(handler: HttpBackend) {
     // Don't use interceptors for Doubtfire Constants
     this.http = new HttpClient(handler);
-    this.loadExternalName();
+    this.loadSettings();
     this.loadSignoutUrl();
   }
 
@@ -61,11 +67,12 @@ export class DoubtfireConstants {
   }
 
   // publish update to ExternalName when get request finishes.
-  private loadExternalName() {
+  private loadSettings() {
     this.http.get<SettingsResponseFormat>(this.settingsUrl).subscribe((result) => {
       this.ExternalName.next(result.externalName);
       this.IsOverseerEnabled.next(result.overseerEnabled);
       this.IsTiiEnabled.next(result.tiiEnabled);
+      this.IsD2LEnabled.next(result.d2lEnabled);
     });
   }
 }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 991ac397b4..7b719cf551 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -47,6 +47,7 @@ import {AlertComponent} from 'src/app/common/services/alert.service';
 import {setTheme} from 'ngx-bootstrap/utils';
 
 import {AboutDoubtfireModalService} from 'src/app/common/modals/about-doubtfire-modal/about-doubtfire-modal.service';
+import { D2lUnitDetailsFormComponent, D2lUnitDetailsModal } from './units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component';
 import {
   AboutDoubtfireModal,
   AboutDoubtfireModalContent,
@@ -159,6 +160,7 @@ import {
   WebcalService,
   LearningOutcomeService,
   TaskSimilarityService,
+  D2lAssessmentMappingService,
 } from './api/models/doubtfire-model';
 import {FileDownloaderService} from './common/file-downloader/file-downloader.service';
 import {PdfImageCommentComponent} from './tasks/task-comments-viewer/pdf-image-comment/pdf-image-comment.component';
@@ -256,6 +258,7 @@ const MY_DATE_FORMAT = {
   declarations: [
     AlertComponent,
     AboutDoubtfireModalContent,
+    D2lUnitDetailsFormComponent,
     TeachingPeriodUnitImportDialogComponent,
     TaskCommentComposerComponent,
     AudioCommentRecorderComponent,
@@ -367,6 +370,7 @@ const MY_DATE_FORMAT = {
     GroupSetService,
     GroupService,
     UnitService,
+    D2lAssessmentMappingService,
     ProjectService,
     UnitRoleService,
     LearningOutcomeService,
@@ -429,6 +433,7 @@ const MY_DATE_FORMAT = {
     TasksInTutorialsPipe,
     TasksForInboxSearchPipe,
     IsActiveUnitRole,
+    D2lUnitDetailsModal,
     CreateNewUnitModal,
     ScormAdapterService,
     TestAttemptService,
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 2f12cc2b57..6be3341a68 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -225,6 +225,7 @@ import {MarkedPipe} from './common/pipes/marked.pipe';
 import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
 import {TaskScormCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component';
+import { D2lUnitDetailsModal } from './units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -243,6 +244,7 @@ export const DoubtfireAngularJSModule = angular.module('doubtfire', [
 // Downgrade angular modules that we need...
 // factory -> service
 DoubtfireAngularJSModule.factory('AboutDoubtfireModal', downgradeInjectable(AboutDoubtfireModal));
+DoubtfireAngularJSModule.factory('D2lUnitDetailsModal', downgradeInjectable(D2lUnitDetailsModal));
 DoubtfireAngularJSModule.factory('DoubtfireConstants', downgradeInjectable(DoubtfireConstants));
 DoubtfireAngularJSModule.factory('ExtensionModal', downgradeInjectable(ExtensionModalService));
 DoubtfireAngularJSModule.factory('Marked', downgradeInjectable(MarkedPipe));
diff --git a/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.html b/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.html
new file mode 100644
index 0000000000..10618f6bc8
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.html
@@ -0,0 +1,37 @@
+<mat-dialog-content class="mat-typography">
+  <div class="modal-header">
+    <h1>D2L Unit Details</h1>
+  </div>
+  <div class="modal-body">
+    <p>Enter the D2L identifier to allow grades to be transfered once entered.</p>
+    <mat-form-field appearance="outline">
+      <input
+        matInput
+        type="text"
+        placeholder="Org Unit Id"
+        [(ngModel)]="d2lDataMapping.orgUnitId"
+        name="orgUnitId"
+        required
+      />
+    </mat-form-field>
+    <mat-form-field appearance="outline">
+      <input
+        matInput
+        type="text"
+        placeholder="Grade Object Id"
+        [(ngModel)]="d2lDataMapping.gradeObjectId"
+        name="orgUnitId"
+      />
+      <mat-hint align="start">Created during grades transfer if not set</mat-hint>
+    </mat-form-field>
+  </div>
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-stroked-button color="warn" (click)="delete()" *ngIf="d2lDataMapping.id">
+    Delete
+  </button>
+  <button mat-stroked-button (click)="saveAndClose()" class="pull-right">
+    <span *ngIf="d2lDataMapping.hasChanges(d2lAssessmentMappingService.mapping)">Save and </span
+    >Close
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.scss b/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.scss
new file mode 100644
index 0000000000..a4e1d77cc6
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.scss
@@ -0,0 +1,3 @@
+mat-form-field {
+  padding: 1rem;
+}
diff --git a/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.ts b/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.ts
new file mode 100644
index 0000000000..a26454cbd7
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.ts
@@ -0,0 +1,122 @@
+//
+// Modal to show Doubtfire version info
+//
+import {Injectable, Component, Inject, AfterViewInit, OnInit} from '@angular/core';
+
+import {MatDialog, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {Observable} from 'rxjs';
+import {D2lAssessmentMapping} from 'src/app/api/models/d2l/d2l_assessment_mapping';
+import {D2lAssessmentMappingService} from 'src/app/api/models/doubtfire-model';
+import {Unit} from 'src/app/api/models/unit';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-d2l-unit-details-form',
+  templateUrl: 'd2l-unit-details-form.component.html',
+  styleUrl: 'd2l-unit-details-form.component.scss',
+})
+export class D2lUnitDetailsFormComponent implements OnInit {
+  public d2lDataMapping: D2lAssessmentMapping = new D2lAssessmentMapping(this.data);
+
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public data: Unit,
+    @Inject(MatDialogRef<D2lUnitDetailsFormComponent>)
+    public dialogRef: MatDialogRef<D2lUnitDetailsFormComponent>,
+    private alertService: AlertService,
+    public d2lAssessmentMappingService: D2lAssessmentMappingService,
+  ) {}
+
+  ngOnInit(): void {
+    this.d2lAssessmentMappingService.get({unitId: this.data.id}).subscribe({
+      next: (d2lDataMapping) => {
+        this.d2lDataMapping = d2lDataMapping;
+      },
+      error: (_err) => {
+        // No mapping found, create a new one
+        this.d2lDataMapping = new D2lAssessmentMapping(this.data);
+      },
+    });
+  }
+
+  private saveAction(): Observable<D2lAssessmentMapping> {
+    if (!this.d2lDataMapping.id) {
+      if (!this.d2lDataMapping.orgUnitId && !this.d2lDataMapping.gradeObjectId) {
+        return null;
+      }
+      return this.d2lAssessmentMappingService.post(
+        {
+          unitId: this.data.id,
+          id: undefined,
+        },
+        {
+          entity: this.d2lDataMapping,
+          constructorParams: this.data,
+        },
+      );
+    } else if (this.d2lDataMapping.hasChanges(this.d2lAssessmentMappingService.mapping)) {
+      return this.d2lAssessmentMappingService.update(
+        {
+          unitId: this.data.id,
+          id: this.d2lDataMapping.id,
+        },
+        {
+          entity: this.d2lDataMapping,
+        },
+      );
+    } else {
+      return null;
+    }
+  }
+
+  public saveAndClose(): void {
+    const action = this.saveAction();
+
+    if (action) {
+      action.subscribe({
+        next: () => {
+          this.alertService.success('D2l details saved successfully');
+          // Close the dialog
+          this.dialogRef.close();
+        },
+        error: (err) => {
+          this.alertService.error(`Failed to save unit ${err}`);
+          console.error(err);
+        },
+      });
+    } else {
+      this.dialogRef.close();
+    }
+  }
+
+  public delete(): void {
+    this.d2lAssessmentMappingService
+      .delete({unitId: this.data.id, id: this.d2lDataMapping.id})
+      .subscribe({
+        next: () => {
+          this.alertService.success('D2l details deleted successfully');
+          this.dialogRef.close();
+        },
+        error: (err) => {
+          this.alertService.error(`Failed to delete D2L details: ${err}`);
+          console.error(err);
+        },
+      });
+  }
+}
+
+/**
+ * The about doubtfire modal service - used to create and show the modal
+ */
+// eslint-disable-next-line max-classes-per-file
+@Injectable()
+export class D2lUnitDetailsModal {
+  constructor(public dialog: MatDialog) {}
+
+  public open(unit: Unit): void {
+    // Show dialog while the data above is being fetched
+    this.dialog.open(D2lUnitDetailsFormComponent, {
+      width: '600px',
+      data: unit,
+    });
+  }
+}
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
index c1fe9e38fa..bbb7950f27 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
@@ -8,7 +8,7 @@ angular.module('doubtfire.units.states.edit.directives.unit-details-editor', [])
   replace: true
   restrict: 'E'
   templateUrl: 'units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html'
-  controller: ($scope, $state, $rootScope, DoubtfireConstants, newUnitService, alertService, newTeachingPeriodService, TaskSubmission) ->
+  controller: ($scope, $state, $rootScope, DoubtfireConstants, newUnitService, alertService, newTeachingPeriodService, TaskSubmission, D2lUnitDetailsModal) ->
     $scope.overseerEnabled = DoubtfireConstants.IsOverseerEnabled
 
     $scope.calOptions = {
@@ -77,6 +77,9 @@ angular.module('doubtfire.units.states.edit.directives.unit-details-editor', [])
           alertService.error( "Failed to update unit. #{response}", 6000)
     })
 
+    $scope.addD2lData = ->
+      D2lUnitDetailsModal.open($scope.unit)
+
 )
 
 
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
index 3cd81f09c4..1f13dc8870 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
@@ -13,7 +13,7 @@ <h3 class="panel-title">Update Unit</h3>
         <div class="form-group">
           <label class="col-sm-2 control-label" for="code">Code</label>
           <div class="col-sm-9">
-            <input class="form-control" id="code" type="text" placeholder="COS1234567" ng-model="unit.code" />
+            <input class="form-control" id="code" type="text" placeholder="Enter unit code" ng-model="unit.code" />
           </div>
         </div>
         <!--/code-date-->
@@ -26,7 +26,7 @@ <h3 class="panel-title">Update Unit</h3>
               type="text"
               class="form-control"
               ng-model="unit.name"
-              placeholder="Introduction to {{externalName.value}}"
+              placeholder="Enter unit name"
             />
           </div>
         </div>
@@ -417,15 +417,21 @@ <h3 class="panel-title">Update Unit</h3>
         </div>
         <!--/active-->
       </div>
-      <div class="panel-footer text-right">
-        <a class="btn btn-success" ui-sref="units/rollover">
-          <header>Rollover</header>
-        </a>
-        <input
-          type="submit"
-          value="{{ unit.id == -1 ? 'Create' : 'Update' }}"
-          class="btn btn-success"
-        />
+
+      <div class="panel-footer">
+          <a class="btn btn-info" ng-click="addD2lData()" ng-enabled="unit.id != -1">
+            <header>Add D2L Details</header>
+          </a>
+          <div class="pull-right">
+            <a class="btn btn-success" ui-sref="units/rollover">
+              <header>Rollover</header>
+            </a>
+            <input
+              type="submit"
+              value="{{ unit.id == -1 ? 'Create' : 'Update' }}"
+              class="btn btn-success"
+            />
+          </div>
       </div>
     </form>
   </div>

From fd056db47631087d5ef29223bd3dc9037c4b10dd Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 20 Dec 2024 16:34:53 +1100
Subject: [PATCH 172/776] fix: ensure standard error propagate to the ui

---
 src/app/common/services/http-error.interceptor.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/common/services/http-error.interceptor.ts b/src/app/common/services/http-error.interceptor.ts
index 76f5a9a4b0..1d589fdc94 100644
--- a/src/app/common/services/http-error.interceptor.ts
+++ b/src/app/common/services/http-error.interceptor.ts
@@ -35,7 +35,11 @@ export class HttpErrorInterceptor implements HttpInterceptor {
           errorMessage = error.statusText;
         } else {
           // server-side error
-          errorMessage = error.error.error;
+          if (error.error.error) {
+            errorMessage = error.error.error;
+          } else {
+            errorMessage = error.error;
+          }
           logMessage = `Error Code: ${error.status}`;
         }
 

From fa8835540673ac7743fb861a09ff1c0c9da3fd45 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 20 Dec 2024 16:35:13 +1100
Subject: [PATCH 173/776] chore: add ability for unit to detect changes

---
 src/app/api/models/unit.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index b27159832e..05ce5147b8 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -93,6 +93,12 @@ export class Unit extends Entity {
     };
   }
 
+  public hasChanges(): boolean {
+    const unitService = AppInjector.get(UnitService);
+    const changes = this.toJson(unitService.mapping);
+    return JSON.stringify(changes) !== '{"unit":{}}';
+  }
+
   public get nameAndPeriod(): string {
     return `${this.name} (${
       this.teachingPeriod ? this.teachingPeriod.name : this.startDate.toLocaleDateString()

From fd0cc0737682e9aa02af14f858c8a5f5f27f22e7 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 20 Dec 2024 17:57:52 +1100
Subject: [PATCH 174/776] feat: add ability to trigger d2l grade transfer

---
 src/app/api/models/unit.ts                    | 18 +++++
 src/app/doubtfire-angular.module.ts           |  3 +
 src/app/doubtfire-angularjs.module.ts         |  2 +
 .../d2l-unit-details-form.component.ts        |  3 +-
 .../unit-details-editor.tpl.html              |  2 +-
 .../d2l-transfer.component.html               | 36 +++++++++
 .../d2l-transfer.component.scss               |  3 +
 .../d2l-transfer.component.ts                 | 78 +++++++++++++++++++
 .../units/states/portfolios/portfolios.coffee | 10 ++-
 .../states/portfolios/portfolios.tpl.html     |  3 +-
 10 files changed, 154 insertions(+), 4 deletions(-)
 create mode 100644 src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html
 create mode 100644 src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss
 create mode 100644 src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 05ce5147b8..d118ae2196 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -22,9 +22,11 @@ import {
   Project,
   TutorialStreamService,
   UnitRoleService,
+  D2lAssessmentMappingService,
 } from './doubtfire-model';
 import {LearningOutcome} from './learning-outcome';
 import {AlertService} from 'src/app/common/services/alert.service';
+import { D2lAssessmentMapping } from './d2l/d2l_assessment_mapping';
 
 export class Unit extends Entity {
   id: number;
@@ -63,6 +65,8 @@ export class Unit extends Entity {
   extensionWeeksOnResubmitRequest: number;
   allowStudentChangeTutorial: boolean;
 
+  d2lMapping: D2lAssessmentMapping;
+
   public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
     new EntityCache<LearningOutcome>();
   public readonly tutorialStreamsCache: EntityCache<TutorialStream> =
@@ -553,4 +557,18 @@ export class Unit extends Entity {
       `${this.name}-tutor-assessments.csv`,
     );
   }
+
+  public hasD2lMapping(): boolean {
+    return this.d2lMapping !== undefined && this.d2lMapping.orgUnitId.length > 0;
+  }
+
+  public loadD2lMapping(): Observable<D2lAssessmentMapping> {
+    const d2lMappingSvc = AppInjector.get(D2lAssessmentMappingService);
+
+    return d2lMappingSvc.get({unitId: this.id}).pipe(
+      tap((mappings) => {
+        this.d2lMapping = mappings;
+      }),
+    );
+  }
 }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 7b719cf551..967644eb7e 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -239,6 +239,7 @@ import {TaskScormCardComponent} from './projects/states/dashboard/directives/tas
 import {TestAttemptService} from './api/services/test-attempt.service';
 import {ScormExtensionCommentComponent} from './tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component';
 import {ScormExtensionModalComponent} from './common/modals/scorm-extension-modal/scorm-extension-modal.component';
+import { D2lTransferComponent, D2lTransferModal } from './units/states/portfolios/d2l-transfer-modal/d2l-transfer.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -259,6 +260,7 @@ const MY_DATE_FORMAT = {
     AlertComponent,
     AboutDoubtfireModalContent,
     D2lUnitDetailsFormComponent,
+    D2lTransferComponent,
     TeachingPeriodUnitImportDialogComponent,
     TaskCommentComposerComponent,
     AudioCommentRecorderComponent,
@@ -434,6 +436,7 @@ const MY_DATE_FORMAT = {
     TasksForInboxSearchPipe,
     IsActiveUnitRole,
     D2lUnitDetailsModal,
+    D2lTransferModal,
     CreateNewUnitModal,
     ScormAdapterService,
     TestAttemptService,
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 6be3341a68..c7b5c2502c 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -226,6 +226,7 @@ import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
 import {TaskScormCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component';
 import { D2lUnitDetailsModal } from './units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component';
+import { D2lTransferModal } from './units/states/portfolios/d2l-transfer-modal/d2l-transfer.component';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -245,6 +246,7 @@ export const DoubtfireAngularJSModule = angular.module('doubtfire', [
 // factory -> service
 DoubtfireAngularJSModule.factory('AboutDoubtfireModal', downgradeInjectable(AboutDoubtfireModal));
 DoubtfireAngularJSModule.factory('D2lUnitDetailsModal', downgradeInjectable(D2lUnitDetailsModal));
+DoubtfireAngularJSModule.factory('D2lTransferModal', downgradeInjectable(D2lTransferModal));
 DoubtfireAngularJSModule.factory('DoubtfireConstants', downgradeInjectable(DoubtfireConstants));
 DoubtfireAngularJSModule.factory('ExtensionModal', downgradeInjectable(ExtensionModalService));
 DoubtfireAngularJSModule.factory('Marked', downgradeInjectable(MarkedPipe));
diff --git a/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.ts b/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.ts
index a26454cbd7..f7524cce33 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.ts
+++ b/src/app/units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component.ts
@@ -27,7 +27,7 @@ export class D2lUnitDetailsFormComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.d2lAssessmentMappingService.get({unitId: this.data.id}).subscribe({
+    this.data.loadD2lMapping().subscribe({
       next: (d2lDataMapping) => {
         this.d2lDataMapping = d2lDataMapping;
       },
@@ -94,6 +94,7 @@ export class D2lUnitDetailsFormComponent implements OnInit {
       .subscribe({
         next: () => {
           this.alertService.success('D2l details deleted successfully');
+          this.data.d2lMapping = undefined;
           this.dialogRef.close();
         },
         error: (err) => {
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
index 1f13dc8870..8d70bfd493 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
@@ -420,7 +420,7 @@ <h3 class="panel-title">Update Unit</h3>
 
       <div class="panel-footer">
           <a class="btn btn-info" ng-click="addD2lData()" ng-enabled="unit.id != -1">
-            <header>Add D2L Details</header>
+            <header>D2L Details</header>
           </a>
           <div class="pull-right">
             <a class="btn btn-success" ui-sref="units/rollover">
diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html
new file mode 100644
index 0000000000..2035a0fb07
--- /dev/null
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html
@@ -0,0 +1,36 @@
+<mat-dialog-content class="mat-typography">
+  <div class="modal-header">
+    <h1>D2L Grade Transfer</h1>
+  </div>
+  <div class="modal-body">
+    <p>Make sure that all student grades are ready to be transferred. Then run the following actions in oder.</p>
+
+    <p><strong>1. Login to D2L</strong>. This will open a new window.</p>
+    <p>
+      <button mat-icon-button color="primary" (click)="openD2l()">
+        <mat-icon>open_in_new</mat-icon>
+      </button>
+    </p>
+    <p><strong>2. Begin Grade Transfer</strong></p>
+    <p>
+      <button mat-icon-button color="primary" (click)="startTransfer()">
+        <mat-icon>start</mat-icon>
+      </button>
+    </p>
+    <p><strong>3. Wait for Email</strong></p>
+    <p>Once the transfer is complete, you will receive an email with the results.</p>
+    <p><strong>4. Download record</strong></p>
+    <p>
+      Once the transfer is complete, you can download the record of the transfer. This will show you any errors that may have occurred.
+    </p>
+    <p>
+      <button mat-icon-button color="primary" (click)="downloadRecord()">
+        <mat-icon>download</mat-icon>
+      </button>
+  </div>
+</mat-dialog-content>
+<mat-dialog-actions align="end">
+  <button mat-stroked-button mat-dialog-close>
+    Close
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss
new file mode 100644
index 0000000000..a4e1d77cc6
--- /dev/null
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss
@@ -0,0 +1,3 @@
+mat-form-field {
+  padding: 1rem;
+}
diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
new file mode 100644
index 0000000000..acf6f17a7f
--- /dev/null
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
@@ -0,0 +1,78 @@
+//
+// Modal to show Doubtfire version info
+//
+import { HttpClient } from '@angular/common/http';
+import {Injectable, Component, Inject} from '@angular/core';
+import {MatDialog, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {D2lAssessmentMapping} from 'src/app/api/models/d2l/d2l_assessment_mapping';
+import {D2lAssessmentMappingService} from 'src/app/api/models/doubtfire-model';
+import {Unit} from 'src/app/api/models/unit';
+import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+
+@Component({
+  selector: 'f-d2l-transfer',
+  templateUrl: 'd2l-transfer.component.html',
+  styleUrl: 'd2l-transfer.component.scss',
+})
+export class D2lTransferComponent {
+  public d2lDataMapping: D2lAssessmentMapping = new D2lAssessmentMapping(this.data);
+
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public data: Unit,
+    @Inject(MatDialogRef<D2lTransferComponent>)
+    public dialogRef: MatDialogRef<D2lTransferComponent>,
+    private alertService: AlertService,
+    public d2lAssessmentMappingService: D2lAssessmentMappingService,
+    public httpClient: HttpClient,
+    public doubtfireConstants: DoubtfireConstants,
+    public fileDownloader: FileDownloaderService,
+  ) {}
+
+  public openD2l(): void {
+    const url = `${this.doubtfireConstants.API_URL}/d2l/login_url`;
+    this.httpClient.post<string>(url, {}).subscribe({
+      next: (response) => {
+        window.open(response, '_blank');
+      },
+      error: (err) => {
+        this.alertService.error(`Failed to get D2L login URL: ${err}`);
+      },
+    });
+  }
+
+  public startTransfer(): void {
+    const url = `${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades`;
+    this.httpClient.post(url, {}).subscribe({
+      next: () => {
+        this.alertService.success('Transfer started');
+      },
+      error: (err) => {
+        this.alertService.error(`Failed to start transfer: ${err}`);
+      },
+    });
+  }
+
+  public downloadRecord(): void {
+    const url = `${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades`;
+    this.fileDownloader.downloadFile(url, `${this.data.code}-d2l-grades.csv`);
+  }
+}
+
+/**
+ * The about doubtfire modal service - used to create and show the modal
+ */
+// eslint-disable-next-line max-classes-per-file
+@Injectable()
+export class D2lTransferModal {
+  constructor(public dialog: MatDialog) {}
+
+  public open(unit: Unit): void {
+    // Show dialog while the data above is being fetched
+    this.dialog.open(D2lTransferComponent, {
+      width: '600px',
+      data: unit,
+    });
+  }
+}
diff --git a/src/app/units/states/portfolios/portfolios.coffee b/src/app/units/states/portfolios/portfolios.coffee
index c0837ba517..42bebca567 100644
--- a/src/app/units/states/portfolios/portfolios.coffee
+++ b/src/app/units/states/portfolios/portfolios.coffee
@@ -14,9 +14,11 @@ angular.module('doubtfire.units.states.portfolios', [])
       roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor']
    }
 )
-.controller("UnitPortfoliosStateCtrl", ($scope, alertService, analyticsService, gradeService, newProjectService, Visualisation, newTaskService, fileDownloaderService, newUserService) ->
+.controller("UnitPortfoliosStateCtrl", ($scope, alertService, analyticsService, gradeService, newProjectService, Visualisation, newTaskService, fileDownloaderService, newUserService, D2lTransferModal) ->
   # TODO: (@alexcu) Break this down into smaller directives/substates
 
+  $scope.unit.loadD2lMapping().subscribe()
+
   $scope.downloadGrades = -> fileDownloaderService.downloadFile($scope.unit.gradesUrl, "#{$scope.unit.code}-grades.csv")
   $scope.downloadPortfolios = -> fileDownloaderService.downloadFile($scope.unit.portfoliosUrl, "#{$scope.unit.code}-portfolios.zip")
 
@@ -126,4 +128,10 @@ angular.module('doubtfire.units.states.portfolios', [])
         $scope.project.preloadedUrl = $scope.project.portfolioUrl()
       error: (message) -> alertService.error( message, 6000)
     })
+
+  $scope.hasD2lMapping = ->
+    $scope.unit.hasD2lMapping()
+
+  $scope.transferToD2L = ->
+    D2lTransferModal.open($scope.unit)
 )
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index 2b8a2277eb..e43941ec2c 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -237,7 +237,8 @@ <h4 class="panel-title">Mark Portfolios</h4>
         >
           <i class="fa fa-download"></i> Download All Portfolios
         </button> -->
-        <button ng-click="downloadGrades()"><i class="fa fa-download"></i> Download Grades</button>
+        <button ng-click="downloadGrades()" style="padding-right: 1rem"><i class="fa fa-download"></i> Download Grades</button>
+        <button ng-if="hasD2lMapping()" ng-click="transferToD2L()"><i class="fa fa-upload"></i> Transfer Grades to D2L</button>
       </div>
     </div>
   </div>

From cf87d68ea3a5433a073ae6db413f8c1f825ada80 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 20 Dec 2024 17:58:16 +1100
Subject: [PATCH 175/776] fix: report better errors during file downloads

---
 src/app/common/services/http-error.interceptor.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/common/services/http-error.interceptor.ts b/src/app/common/services/http-error.interceptor.ts
index 1d589fdc94..9fbf32f0f6 100644
--- a/src/app/common/services/http-error.interceptor.ts
+++ b/src/app/common/services/http-error.interceptor.ts
@@ -37,6 +37,8 @@ export class HttpErrorInterceptor implements HttpInterceptor {
           // server-side error
           if (error.error.error) {
             errorMessage = error.error.error;
+          } else if (error.error instanceof Blob) {
+            errorMessage = error.statusText;
           } else {
             errorMessage = error.error;
           }

From 9532d9ffe620d67d7bc83137d59e0a91ecf8a73a Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 8 Jan 2025 07:30:53 +1100
Subject: [PATCH 176/776] feat: add connected learning outcomes

---
 src/app/api/models/feedback-template.ts       |  4 +-
 src/app/api/models/learning-outcome.ts        |  1 +
 .../api/services/feedback-template.service.ts |  8 +--
 .../api/services/learning-outcome.service.ts  | 12 +---
 .../api/services/task-definition.service.ts   | 14 ----
 src/app/api/services/unit.service.ts          | 14 ----
 .../feedback-template-editor.component.html   | 20 +++---
 .../feedback-template-editor.component.ts     | 65 ++++++++++++-------
 .../states/index/global-state.service.ts      | 15 ++++-
 9 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/src/app/api/models/feedback-template.ts b/src/app/api/models/feedback-template.ts
index 19e1a0089c..f4920e58e5 100644
--- a/src/app/api/models/feedback-template.ts
+++ b/src/app/api/models/feedback-template.ts
@@ -12,8 +12,8 @@ export class FeedbackTemplate extends Entity {
   commentText: string;
   summaryText: string;
   taskStatus: 'fix_and_resubmit' | 'discuss' | 'redo' | 'complete' | 'feedback_exceeded';
-  parent: number;
-  learningOutcome: number;
+  parentChipId: number;
+  learningOutcomeId: number;
 
   readonly context: TaskDefinition | Unit;
 
diff --git a/src/app/api/models/learning-outcome.ts b/src/app/api/models/learning-outcome.ts
index ade1f7a0d5..ce89a31b19 100644
--- a/src/app/api/models/learning-outcome.ts
+++ b/src/app/api/models/learning-outcome.ts
@@ -10,6 +10,7 @@ export class LearningOutcome extends Entity {
   abbreviation: string;
   shortDescription: string;
   fullOutcomeDescription: string;
+  linkedOutcomeIds: number[] = [];
 
   contextTypePaths = {
     'Unit': 'units',
diff --git a/src/app/api/services/feedback-template.service.ts b/src/app/api/services/feedback-template.service.ts
index 42163b5348..ec5994f532 100644
--- a/src/app/api/services/feedback-template.service.ts
+++ b/src/app/api/services/feedback-template.service.ts
@@ -7,7 +7,7 @@ import {TaskDefinition, Unit} from '../models/doubtfire-model';
 
 @Injectable()
 export class FeedbackTemplateService extends CachedEntityService<FeedbackTemplate> {
-  protected readonly endpointFormat = 'feedback_templates/';
+  protected readonly endpointFormat = 'feedback_template_chips/context/:contextType:/:contextId:';
 
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
@@ -19,9 +19,9 @@ export class FeedbackTemplateService extends CachedEntityService<FeedbackTemplat
       'description',
       'commentText',
       'summaryText',
-      'task_status_id',
-      'parent_chip_id',
-      'learning_outcome_id',
+      'taskStatusId',
+      'parentChipId',
+      'learningOutcomeId',
     );
   }
 
diff --git a/src/app/api/services/learning-outcome.service.ts b/src/app/api/services/learning-outcome.service.ts
index 78c592dea9..c9fbe34547 100644
--- a/src/app/api/services/learning-outcome.service.ts
+++ b/src/app/api/services/learning-outcome.service.ts
@@ -3,14 +3,12 @@ import {LearningOutcome} from 'src/app/api/models/doubtfire-model';
 import {Injectable} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiURL';
-import {AppInjector} from 'src/app/app-injector';
-import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
-import {Observable} from 'rxjs';
 
 @Injectable()
 export class LearningOutcomeService extends CachedEntityService<LearningOutcome> {
   protected readonly endpointFormat = ':contextType:/:contextId:/outcomes';
   public static updateEndpoint = ':contextType:/:contextId:/outcomes/:id:';
+  public static globalEndpoint = 'global/outcomes';
 
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
@@ -22,6 +20,7 @@ export class LearningOutcomeService extends CachedEntityService<LearningOutcome>
       'abbreviation',
       'shortDescription',
       'fullOutcomeDescription',
+      'linkedOutcomeIds',
     );
 
     this.mapping.mapAllKeysToJsonExcept('id');
@@ -30,11 +29,4 @@ export class LearningOutcomeService extends CachedEntityService<LearningOutcome>
   public createInstanceFrom(json: object, other?: any): LearningOutcome {
     return new LearningOutcome();
   }
-
-  public globalOutcomes(): Observable<any> {
-    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/global/outcomes`;
-    const httpClient = AppInjector.get(HttpClient);
-
-    return httpClient.get<any>(url);
-  }
 }
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 9749e78466..8af16008e8 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -6,7 +6,6 @@ import API_URL from 'src/app/config/constants/apiURL';
 import { MappingFunctions } from './mapping-fn';
 import { AppInjector } from 'src/app/app-injector';
 import { Observable } from 'rxjs';
-import { FeedbackTemplateService } from './feedback-template.service';
 
 @Injectable()
 export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
@@ -15,7 +14,6 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
   constructor(
     httpClient: HttpClient,
     private learningOutcomeService: LearningOutcomeService,
-    private feedbackTemplateService: FeedbackTemplateService,
   ) {
     super(httpClient, API_URL);
 
@@ -126,18 +124,6 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
           });
         },
       },
-      {
-        keys: 'feedbackTemplates',
-        toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
-          data[key]?.forEach((template) => {
-            taskDefinition.feedbackTemplateCache.getOrCreate(
-              template['id'],
-              this.feedbackTemplateService,
-              template,
-            );
-          });
-        },
-      },
     );
 
     this.mapping.mapAllKeysToJsonExcept(
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index cd4eee6abb..2587180d2c 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -9,7 +9,6 @@ import { TaskDefinitionService } from './task-definition.service';
 import { GroupService } from './group.service';
 import { Observable } from 'rxjs';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { FeedbackTemplateService } from './feedback-template.service';
 
 export type IloStats = {
   median: number;
@@ -34,7 +33,6 @@ export class UnitService extends CachedEntityService<Unit> {
     private taskOutcomeAlignmentService: TaskOutcomeAlignmentService,
     private groupSetService: GroupSetService,
     private groupService: GroupService,
-    private feedbackTemplateService: FeedbackTemplateService,
   ) {
     super(httpClient, API_URL);
 
@@ -212,18 +210,6 @@ export class UnitService extends CachedEntityService<Unit> {
           });
         }
       },
-      {
-        keys: 'feedbackTemplates',
-        toEntityOp: (data: object, key: string, unit: Unit) => {
-          data[key]?.forEach((template) => {
-            unit.feedbackTemplateCache.getOrCreate(
-              template['id'],
-              this.feedbackTemplateService,
-              template,
-            );
-          });
-        },
-      },
       // 'groupMemberships', - map to group memberships
     );
 
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 4c6647f954..474c0d665b 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -44,7 +44,9 @@
         *matCellDef="let learningOutcome"
         (click)="selectLearningOutcome(learningOutcome)"
       >
-
+        @for (outcome of getLinkedOutcomes(learningOutcome); track outcome.abbreviation) {
+          <mat-chip-row>{{ outcome.abbreviation }}</mat-chip-row>
+        }
       </td>
     </ng-container>
     <ng-container matColumnDef="learningOutcomeAction" sticky>
@@ -59,7 +61,7 @@
             mat-icon-button
             aria-label="save learning outcome"
             color="primary"
-            (click)="saveLearningOutcome(learningOutcome)"
+            (click)="saveLearningOutcome()"
           >
             <mat-icon>save</mat-icon>
           </button>
@@ -132,7 +134,8 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
 
         <mat-form-field appearance="outline" class="flex flex-grow">
           <mat-label>Full Outcome Description</mat-label>
-          <textarea matInput required [(ngModel)]="selectedOutcome.fullOutcomeDescription"> </textarea>
+          <textarea matInput required [(ngModel)]="selectedOutcome.fullOutcomeDescription">
+          </textarea>
         </mat-form-field>
 
         <mat-form-field appearance="outline" class="flex flex-grow">
@@ -166,7 +169,9 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
 
         <div class="flex">
           <span class="flex-grow"></span>
-          <button mat-raised-button color="primary" (click)="saveLearningOutcome(selectedOutcome)">Save Outcome</button>
+          <button mat-raised-button color="primary" (click)="saveLearningOutcome(selectedOutcome)">
+            Save Outcome
+          </button>
         </div>
       </div>
     </div>
@@ -190,7 +195,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
                 *matCellDef="let feedbackTemplate"
                 (click)="selectFeedbackTemplate(feedbackTemplate)"
               >
-                {{ feedbackTemplate.parent }}
+                {{ feedbackTemplate.parentId }}
               </td>
             </ng-container>
             <ng-container matColumnDef="chipText" sticky>
@@ -255,7 +260,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
                     mat-icon-button
                     aria-label="save feedback template"
                     color="primary"
-                    (click)="saveFeedbackTemplate(feedbackTemplate)"
+                    (click)="saveFeedbackTemplate()"
                   >
                     <mat-icon>save</mat-icon>
                   </button>
@@ -327,8 +332,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
 
                 <mat-form-field appearance="outline" class="basis-1/5">
                   <mat-label>Parent</mat-label>
-                  <mat-select required [(ngModel)]="selectedTemplate.parent">
-                  </mat-select>
+                  <mat-select required [(ngModel)]="selectedTemplate.parent"> </mat-select>
                 </mat-form-field>
 
                 <mat-form-field appearance="outline" class="basis-1/5">
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 42f3c94fdb..785e6daeb6 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -58,6 +58,9 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   public selectedOutcome: LearningOutcome;
   public abbreviationPrefix: 'TLO' | 'ULO' | 'GLO';
 
+  public allOutcomes: LearningOutcome[] = [];
+  public selectedConnectedOutcomes = signal([]);
+
   @ViewChild('templateTable', {static: false}) templateTable: MatTable<FeedbackTemplate>;
   @ViewChild(MatSort, {static: false}) templateSort: MatSort;
   @ViewChild('templatePaginator', {static: false}) templatePaginator: MatPaginator;
@@ -75,7 +78,6 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   public selectedTemplate: FeedbackTemplate;
 
   private subscriptions: Subscription[] = [];
-  public allOutcomes: LearningOutcome[] = [];
 
   constructor(
     private alerts: AlertService,
@@ -108,22 +110,8 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
           );
         };
       }),
-      this.context.feedbackTemplateCache.values.subscribe((feedbackTemplates) => {
-        this.templateSource = new MatTableDataSource<FeedbackTemplate>(feedbackTemplates);
-        this.templateSource.paginator = this.templatePaginator;
-        this.templateSource.sort = this.templateSort;
-        this.templateSource.filterPredicate = (data: FeedbackTemplate, filter: string) => {
-          const filterValue = filter.trim().toLowerCase();
-          return (
-            data.id.toString().includes(filterValue) ||
-            data.chipText.toLowerCase().includes(filterValue) ||
-            data.commentText.toLowerCase().includes(filterValue) ||
-            data.summaryText.toLowerCase().includes(filterValue) ||
-            data.description.toLowerCase().includes(filterValue)
-          );
-        };
-      }),
-      this.learningOutcomeService.globalOutcomes().subscribe((glos) => {
+      this.learningOutcomeService.cache.values.subscribe((outcomes) => {
+        const glos = outcomes.filter((outcome) => outcome.contextType === null);
         this.allOutcomes = [...this.allOutcomes, ...glos];
       }),
     );
@@ -141,25 +129,49 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     this.subscriptions.forEach((s) => s.unsubscribe());
   }
 
-  public saveLearningOutcome(learningOutcome: LearningOutcome) {
-    learningOutcome.save().subscribe(() => {
+  public getFeedbackChips() {
+    this.context.feedbackTemplateCache.values.subscribe((feedbackTemplates) => {
+      this.templateSource = new MatTableDataSource<FeedbackTemplate>(feedbackTemplates);
+      this.templateSource.paginator = this.templatePaginator;
+      this.templateSource.sort = this.templateSort;
+      this.templateSource.filterPredicate = (data: FeedbackTemplate, filter: string) => {
+        const filterValue = filter.trim().toLowerCase();
+        return (
+          data.id.toString().includes(filterValue) ||
+          data.chipText.toLowerCase().includes(filterValue) ||
+          data.commentText.toLowerCase().includes(filterValue) ||
+          data.summaryText.toLowerCase().includes(filterValue) ||
+          data.description.toLowerCase().includes(filterValue)
+        );
+      };
+    });
+  }
+
+  public saveLearningOutcome() {
+    for (const outcome of this.selectedConnectedOutcomes()) {
+      this.selectedOutcome.linkedOutcomeIds.push(outcome.id);
+    }
+    this.selectedOutcome.save().subscribe(() => {
       this.alerts.success('Outcome saved');
-      learningOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
+      this.selectedOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
     });
   }
 
-  public saveFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
-    feedbackTemplate.save().subscribe(() => {
+  public saveFeedbackTemplate() {
+    this.selectedTemplate.save().subscribe(() => {
       this.alerts.success('Template saved');
-      feedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+      this.selectedTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
     });
   }
 
   public selectLearningOutcome(learningOutcome: LearningOutcome) {
     if (this.selectedOutcome === learningOutcome) {
       this.selectedOutcome = null;
+      this.selectedConnectedOutcomes.update((_selectedConnectedOutcomes) => []);
     } else {
       this.selectedOutcome = learningOutcome;
+      this.selectedConnectedOutcomes.update(() => this.getLinkedOutcomes(learningOutcome));
+      this.getFeedbackChips();
     }
   }
 
@@ -339,7 +351,6 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
 
   readonly separatorKeysCodes: number[] = [ENTER, COMMA];
   readonly typedConnectedOutcome = model('');
-  readonly selectedConnectedOutcomes = signal([]);
   readonly filteredOutcomes = computed(() => {
     const currentOutcome = this.typedConnectedOutcome().toLowerCase();
     return this.allOutcomes.filter((outcome) => {
@@ -394,4 +405,10 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     this.typedConnectedOutcome.set('');
     event.option.deselect();
   }
+
+  getLinkedOutcomes(learningOutcome: LearningOutcome): LearningOutcome[] {
+    return this.allOutcomes.filter((outcome) =>
+      learningOutcome.linkedOutcomeIds.includes(outcome.id),
+    );
+  }
 }
diff --git a/src/app/projects/states/index/global-state.service.ts b/src/app/projects/states/index/global-state.service.ts
index 18d77561ac..b5d567496b 100644
--- a/src/app/projects/states/index/global-state.service.ts
+++ b/src/app/projects/states/index/global-state.service.ts
@@ -5,6 +5,7 @@ import {EntityCache} from 'ngx-entity-service';
 import {BehaviorSubject, Observable, Subject, skip, take} from 'rxjs';
 import {
   CampusService,
+  LearningOutcomeService,
   Project,
   ProjectService,
   TeachingPeriodService,
@@ -106,6 +107,7 @@ export class GlobalStateService implements OnDestroy {
     private projectService: ProjectService,
     private campusService: CampusService,
     private teachingPeriodService: TeachingPeriodService,
+    private learningOutcomeService: LearningOutcomeService,
     @Inject(UIRouter) private router: UIRouter,
     private alerts: AlertService,
     private mediaObserver: MediaObserver,
@@ -219,7 +221,7 @@ export class GlobalStateService implements OnDestroy {
     const loadingObserver = new Observable((subscriber) => {
       // Loading campuses
       this.campusService.query().subscribe({
-        next: (_reponse) => {
+        next: (_response) => {
           subscriber.next(true);
         },
         error: (_response) => {
@@ -227,6 +229,17 @@ export class GlobalStateService implements OnDestroy {
         },
       });
 
+      this.learningOutcomeService
+        .query({}, {endpointFormat: LearningOutcomeService.globalEndpoint})
+        .subscribe({
+          next: (_response) => {
+            subscriber.next(true);
+          },
+          error: (_response) => {
+            this.alerts.error('Unable to access service. Failed loading GLOs.', 6000);
+          },
+        });
+
       // Loading teaching periods
       this.teachingPeriodService.query().subscribe({
         next: (_response) => {

From e457952f591b5c2355dca3d0ed048e8588d33464 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 11 Jan 2025 17:10:58 +1100
Subject: [PATCH 177/776] refactor: change type name to Template

---
 src/app/api/models/feedback-template.ts                       | 2 +-
 .../feedback-template/feedback-template-editor.component.html | 4 ++--
 .../feedback-template/feedback-template-editor.component.ts   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/api/models/feedback-template.ts b/src/app/api/models/feedback-template.ts
index f4920e58e5..e0b95f7597 100644
--- a/src/app/api/models/feedback-template.ts
+++ b/src/app/api/models/feedback-template.ts
@@ -6,7 +6,7 @@ import {FeedbackTemplateService} from '../services/feedback-template.service';
 
 export class FeedbackTemplate extends Entity {
   id: number;
-  type: 'Group' | 'Feedback';
+  type: 'Group' | 'Template';
   chipText: string;
   description: string;
   commentText: string;
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 474c0d665b..bba05b102a 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -326,7 +326,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
                   <mat-label>Type</mat-label>
                   <mat-select required [(ngModel)]="selectedTemplate.type">
                     <mat-option [value]="'Group'">Group</mat-option>
-                    <mat-option [value]="'Feedback'">Feedback</mat-option>
+                    <mat-option [value]="'Template'">Template</mat-option>
                   </mat-select>
                 </mat-form-field>
 
@@ -357,7 +357,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
                   />
                 </mat-form-field>
               </div>
-              @if (selectedTemplate.type === 'Feedback') {
+              @if (selectedTemplate.type === 'Template') {
                 <mat-form-field appearance="outline" class="flex flex-grow">
                   <mat-label>Comment Text</mat-label>
                   <textarea
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 785e6daeb6..f4865e035a 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -340,7 +340,7 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   public createFeedbackTemplate() {
     const feedbackTemplate = new FeedbackTemplate(this.context);
 
-    feedbackTemplate.type = 'Feedback';
+    feedbackTemplate.type = 'Template';
     feedbackTemplate.chipText = '';
     feedbackTemplate.description = '';
     feedbackTemplate.commentText = '';

From 80edff2ef04137b3d38ccdd252788cfb40f458f0 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:35:28 +1100
Subject: [PATCH 178/776] fix: save to proper cache and clean up

---
 src/app/api/models/learning-outcome.ts        | 97 +++++++++++++++----
 .../api/services/learning-outcome.service.ts  |  1 +
 .../feedback-template-editor.component.ts     | 63 ++++++------
 3 files changed, 112 insertions(+), 49 deletions(-)

diff --git a/src/app/api/models/learning-outcome.ts b/src/app/api/models/learning-outcome.ts
index ce89a31b19..9f7c5d2bd8 100644
--- a/src/app/api/models/learning-outcome.ts
+++ b/src/app/api/models/learning-outcome.ts
@@ -1,7 +1,7 @@
 import {Entity, EntityMapping} from 'ngx-entity-service';
 import {Observable} from 'rxjs';
 import {AppInjector} from 'src/app/app-injector';
-import {LearningOutcomeService} from './doubtfire-model';
+import {LearningOutcomeService, TaskDefinition, Unit} from './doubtfire-model';
 
 export class LearningOutcome extends Entity {
   id: number;
@@ -12,7 +12,9 @@ export class LearningOutcome extends Entity {
   fullOutcomeDescription: string;
   linkedOutcomeIds: number[] = [];
 
-  contextTypePaths = {
+  context?: TaskDefinition | Unit;
+
+  readonly contextTypePath = {
     'Unit': 'units',
     'TaskDefinition': 'task_definitions',
     'Course': 'courses',
@@ -21,23 +23,51 @@ export class LearningOutcome extends Entity {
   public save(): Observable<LearningOutcome> {
     const svc = AppInjector.get(LearningOutcomeService);
 
-    if (this.isNew) {
-      return svc.create(
-        {
-          contextType: this.contextTypePaths[this.contextType],
-          contextId: this.contextId,
-        },
-        {entity: this},
-      );
+    if (this.context) {
+      if (this.isNew) {
+        return svc.create(
+          {
+            contextType: this.contextTypePath[this.contextType],
+            contextId: this.contextId,
+          },
+          {
+            entity: this,
+            cache: this.context.learningOutcomesCache,
+          },
+        );
+      } else {
+        return svc.update(
+          {
+            contextType: this.contextTypePath[this.contextType],
+            contextId: this.contextId,
+            id: this.id,
+          },
+          {
+            entity: this,
+            cache: this.context.learningOutcomesCache,
+            endpointFormat: LearningOutcomeService.updateEndpoint,
+          },
+        );
+      }
     } else {
-      return svc.update(
-        {
-          contextType: this.contextTypePaths[this.contextType],
-          contextId: this.contextId,
-          id: this.id,
-        },
-        {entity: this, endpointFormat: LearningOutcomeService.updateEndpoint},
-      );
+      // GLO
+      if (this.isNew) {
+        return svc.create(
+          {},
+          {entity: this, cache: svc.cache, endpointFormat: LearningOutcomeService.globalEndpoint},
+        );
+      } else {
+        return svc.update(
+          {
+            id: this.id,
+          },
+          {
+            entity: this,
+            cache: svc.cache,
+            endpointFormat: LearningOutcomeService.updateGlobalEndpoint,
+          },
+        );
+      }
     }
   }
 
@@ -69,4 +99,35 @@ export class LearningOutcome extends Entity {
   public get isNew(): boolean {
     return !this.id;
   }
+
+  public delete(): Observable<unknown> {
+    const svc = AppInjector.get(LearningOutcomeService);
+
+    if (this.context) {
+      return svc.delete(
+        {
+          contextType: this.contextTypePath[this.contextType],
+          contextId: this.contextId,
+          id: this.id,
+        },
+        {
+          entity: this,
+          cache: this.context.learningOutcomesCache,
+          endpointFormat: LearningOutcomeService.updateEndpoint,
+        },
+      );
+    } else {
+      // GLO
+      return svc.delete(
+        {
+          id: this.id,
+        },
+        {
+          entity: this,
+          cache: svc.cache,
+          endpointFormat: LearningOutcomeService.updateGlobalEndpoint,
+        },
+      );
+    }
+  }
 }
diff --git a/src/app/api/services/learning-outcome.service.ts b/src/app/api/services/learning-outcome.service.ts
index c9fbe34547..f8b02fd236 100644
--- a/src/app/api/services/learning-outcome.service.ts
+++ b/src/app/api/services/learning-outcome.service.ts
@@ -9,6 +9,7 @@ export class LearningOutcomeService extends CachedEntityService<LearningOutcome>
   protected readonly endpointFormat = ':contextType:/:contextId:/outcomes';
   public static updateEndpoint = ':contextType:/:contextId:/outcomes/:id:';
   public static globalEndpoint = 'global/outcomes';
+  public static updateGlobalEndpoint = 'global/outcomes/:id:';
 
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index f4865e035a..8129c489bb 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -20,7 +20,6 @@ import {
   LearningOutcomeService,
   FeedbackTemplate,
 } from 'src/app/api/models/doubtfire-model';
-import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {MatSort, Sort} from '@angular/material/sort';
 import {
@@ -41,7 +40,7 @@ import {FileDownloaderService} from '../file-downloader/file-downloader.service'
   templateUrl: 'feedback-template-editor.component.html',
 })
 export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, OnDestroy {
-  @Input() context: TaskDefinition | Unit;
+  @Input() context?: TaskDefinition | Unit;
 
   @ViewChild('outcomeTable', {static: false}) outcomeTable: MatTable<LearningOutcome>;
   @ViewChild(MatSort, {static: false}) outcomeSort: MatSort;
@@ -81,7 +80,6 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
 
   constructor(
     private alerts: AlertService,
-    private taskDefinitionService: TaskDefinitionService,
     private learningOutcomeService: LearningOutcomeService,
     private feedbackTemplateService: FeedbackTemplateService,
     private fileDownloaderService: FileDownloaderService,
@@ -91,7 +89,8 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   ) {}
 
   ngOnInit(): void {
-    if (this.context instanceof TaskDefinition) this.abbreviationPrefix = 'TLO';
+    if (!this.context) this.abbreviationPrefix = 'GLO';
+    else if (this.context instanceof TaskDefinition) this.abbreviationPrefix = 'TLO';
     else if (this.context instanceof Unit) this.abbreviationPrefix = 'ULO';
   }
 
@@ -137,7 +136,6 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
       this.templateSource.filterPredicate = (data: FeedbackTemplate, filter: string) => {
         const filterValue = filter.trim().toLowerCase();
         return (
-          data.id.toString().includes(filterValue) ||
           data.chipText.toLowerCase().includes(filterValue) ||
           data.commentText.toLowerCase().includes(filterValue) ||
           data.summaryText.toLowerCase().includes(filterValue) ||
@@ -151,16 +149,22 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     for (const outcome of this.selectedConnectedOutcomes()) {
       this.selectedOutcome.linkedOutcomeIds.push(outcome.id);
     }
-    this.selectedOutcome.save().subscribe(() => {
-      this.alerts.success('Outcome saved');
-      this.selectedOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
+    this.selectedOutcome.save().subscribe({
+      next: () => {
+        this.alerts.success('Outcome saved');
+        this.selectedOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
+      },
+      error: () => this.alerts.error('Failed to save learning outcome. Please try again.'),
     });
   }
 
   public saveFeedbackTemplate() {
-    this.selectedTemplate.save().subscribe(() => {
-      this.alerts.success('Template saved');
-      this.selectedTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+    this.selectedTemplate.save().subscribe({
+      next: () => {
+        this.alerts.success('Template saved');
+        this.selectedTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+      },
+      error: () => this.alerts.error('Failed to save feedback template. Please try again.'),
     });
   }
 
@@ -171,6 +175,12 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     } else {
       this.selectedOutcome = learningOutcome;
       this.selectedConnectedOutcomes.update(() => this.getLinkedOutcomes(learningOutcome));
+      if (!this.selectedOutcome.context) this.selectedOutcome.context = this.context;
+
+      if (!this.selectedOutcome.hasOriginalSaveData) {
+        this.selectedOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
+      }
+
       this.getFeedbackChips();
     }
   }
@@ -260,23 +270,10 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
       'Delete learning outcome',
       'Are you sure you want to delete this outcome? This action is final.',
       () => {
-        this.learningOutcomeService
-          .delete(
-            {
-              contextType: learningOutcome.contextTypePaths[learningOutcome.contextType],
-              contextId: learningOutcome.contextId,
-              id: learningOutcome.id,
-            },
-            {
-              entity: learningOutcome,
-              cache: this.context.learningOutcomesCache,
-              endpointFormat: LearningOutcomeService.updateEndpoint,
-            },
-          )
-          .subscribe({
-            next: () => this.alerts.success('Learning outcome deleted'),
-            error: () => this.alerts.error('Failed to delete learning outcome. Please try again.'),
-          });
+        learningOutcome.delete().subscribe({
+          next: () => this.alerts.success('Learning outcome deleted'),
+          error: () => this.alerts.error('Failed to delete learning outcome. Please try again.'),
+        });
       },
     );
   }
@@ -327,9 +324,13 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   public createLearningOutcome() {
     const learningOutcome = new LearningOutcome();
 
-    if (this.context instanceof TaskDefinition) learningOutcome.contextType = 'TaskDefinition';
-    else if (this.context instanceof Unit) learningOutcome.contextType = 'Unit';
-    learningOutcome.contextId = this.context.id;
+    learningOutcome.context = this.context;
+
+    if (this.context) {
+      if (this.context instanceof TaskDefinition) learningOutcome.contextType = 'TaskDefinition';
+      else if (this.context instanceof Unit) learningOutcome.contextType = 'Unit';
+      learningOutcome.contextId = this.context.id;
+    }
     learningOutcome.abbreviation = this.abbreviationPrefix;
     learningOutcome.shortDescription = '';
     learningOutcome.fullOutcomeDescription = '';

From 4efe87694a426c4b6a55ef943576fe47498166e5 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 12 Jan 2025 17:21:02 +1100
Subject: [PATCH 179/776] feat: add glo editor

---
 .../institution-settings.component.html       | 11 ++++++++++
 .../institution-settings.component.scss       | 13 ++++++++++++
 .../feedback-template-editor.component.html   |  1 +
 .../feedback-template-editor.component.ts     | 20 +++++++++++++++++++
 4 files changed, 45 insertions(+)

diff --git a/src/app/admin/institution-settings/institution-settings.component.html b/src/app/admin/institution-settings/institution-settings.component.html
index fdaa85dddc..e714f813bb 100644
--- a/src/app/admin/institution-settings/institution-settings.component.html
+++ b/src/app/admin/institution-settings/institution-settings.component.html
@@ -9,6 +9,17 @@
     <mat-tab label="Teaching Periods">
       <f-teaching-period-list></f-teaching-period-list>
     </mat-tab>
+    <mat-tab label="Learning Outcomes">
+      <div class="learning-outcomes-container">
+        <div class="header">
+          <div class="mt-10">
+            <h1 class="mb-1">Learning Outcomes</h1>
+            <p>Manage global learning outcomes for the institution</p>
+          </div>
+        </div>
+        <f-feedback-template-editor></f-feedback-template-editor>
+      </div>
+    </mat-tab>
     @if (overseerEnabled) {
     <mat-tab label="Overseer Images">
       <overseer-image-list></overseer-image-list>
diff --git a/src/app/admin/institution-settings/institution-settings.component.scss b/src/app/admin/institution-settings/institution-settings.component.scss
index 8681f6dbfa..7017d84036 100644
--- a/src/app/admin/institution-settings/institution-settings.component.scss
+++ b/src/app/admin/institution-settings/institution-settings.component.scss
@@ -1,3 +1,16 @@
 .institution-settings-container {
   padding: 0 5rem 0 5rem;
 }
+.learning-outcomes-container {
+  padding: 0 1rem 1rem 1rem;
+}
+table {
+  width: 100%;
+}
+.header {
+  display: flex;
+  .interactions {
+    margin-left: auto;
+    margin-top: auto;
+  }
+}
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index bba05b102a..574cdfe1ed 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -159,6 +159,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
             [matAutocomplete]="auto"
             [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
             (matChipInputTokenEnd)="add($event)"
+            [disabled]="!this.context"
           />
           <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)">
             @for (outcome of filteredOutcomes(); track outcome) {
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 8129c489bb..efa9ce899c 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -95,6 +95,26 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   }
 
   ngAfterViewInit(): void {
+    if (!this.context) {
+      this.subscriptions.push(
+        this.learningOutcomeService.cache.values.subscribe((outcomes) => {
+          const glos = outcomes.filter((outcome) => outcome.contextType === null);
+          this.outcomeSource = new MatTableDataSource<LearningOutcome>(glos);
+          this.outcomeSource.paginator = this.outcomePaginator;
+          this.outcomeSource.sort = this.outcomeSort;
+          this.outcomeSource.filterPredicate = (data: LearningOutcome, filter: string) => {
+            const filterValue = filter.trim().toLowerCase();
+            return (
+              data.abbreviation.toLowerCase().includes(filterValue) ||
+              data.shortDescription.toLowerCase().includes(filterValue) ||
+              data.fullOutcomeDescription.toLowerCase().includes(filterValue)
+            );
+          };
+        }),
+      );
+      return;
+    }
+
     this.subscriptions.push(
       this.context.learningOutcomesCache.values.subscribe((learningOutcomes) => {
         this.outcomeSource = new MatTableDataSource<LearningOutcome>(learningOutcomes);

From eb3cf6daf99b893642336efb48ed58bc9c8b8207 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 12 Jan 2025 18:28:42 +1100
Subject: [PATCH 180/776] fix: save connected outcomes

---
 src/app/api/models/learning-outcome.ts                       | 2 +-
 src/app/api/services/learning-outcome.service.ts             | 2 +-
 .../feedback-template-editor.component.html                  | 4 +++-
 .../feedback-template/feedback-template-editor.component.ts  | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/api/models/learning-outcome.ts b/src/app/api/models/learning-outcome.ts
index 9f7c5d2bd8..a8f9d94310 100644
--- a/src/app/api/models/learning-outcome.ts
+++ b/src/app/api/models/learning-outcome.ts
@@ -14,7 +14,7 @@ export class LearningOutcome extends Entity {
 
   context?: TaskDefinition | Unit;
 
-  readonly contextTypePath = {
+  private readonly contextTypePath = {
     'Unit': 'units',
     'TaskDefinition': 'task_definitions',
     'Course': 'courses',
diff --git a/src/app/api/services/learning-outcome.service.ts b/src/app/api/services/learning-outcome.service.ts
index f8b02fd236..aceffbc91e 100644
--- a/src/app/api/services/learning-outcome.service.ts
+++ b/src/app/api/services/learning-outcome.service.ts
@@ -24,7 +24,7 @@ export class LearningOutcomeService extends CachedEntityService<LearningOutcome>
       'linkedOutcomeIds',
     );
 
-    this.mapping.mapAllKeysToJsonExcept('id');
+    this.mapping.mapAllKeysToJsonExcept('id', 'context');
   }
 
   public createInstanceFrom(json: object, other?: any): LearningOutcome {
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 574cdfe1ed..a6368a5840 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -45,7 +45,9 @@
         (click)="selectLearningOutcome(learningOutcome)"
       >
         @for (outcome of getLinkedOutcomes(learningOutcome); track outcome.abbreviation) {
-          <mat-chip-row>{{ outcome.abbreviation }}</mat-chip-row>
+          <mat-chip-row matTooltip="{{ outcome.shortDescription }}">{{
+            outcome.abbreviation
+          }}</mat-chip-row>
         }
       </td>
     </ng-container>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index efa9ce899c..008ac4aff4 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -166,8 +166,9 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   }
 
   public saveLearningOutcome() {
-    for (const outcome of this.selectedConnectedOutcomes()) {
-      this.selectedOutcome.linkedOutcomeIds.push(outcome.id);
+    const linkedOutcomes = this.selectedConnectedOutcomes();
+    if (linkedOutcomes.length > 0) {
+      this.selectedOutcome.linkedOutcomeIds = linkedOutcomes.map((outcome) => outcome.id);
     }
     this.selectedOutcome.save().subscribe({
       next: () => {

From e9ec270c9d172ac201c2b236f30eaf9592552d9f Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 12 Jan 2025 23:49:37 +1100
Subject: [PATCH 181/776] refactor: cleanup feedback editor html

---
 .../feedback-template-editor.component.html    | 18 +++++++-----------
 .../feedback-template-editor.component.ts      |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index a6368a5840..f99e3e76fd 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -79,11 +79,6 @@
       </td>
     </ng-container>
 
-    <!-- Action footer row -->
-    <ng-container matColumnDef="actions">
-      <td mat-footer-cell *matFooterCellDef [colSpan]="outcomeColumns.length"></td>
-    </ng-container>
-
     <tr mat-header-row *matHeaderRowDef="outcomeColumns"></tr>
     <tr
       mat-row
@@ -91,6 +86,7 @@
       [style.background]="selectedOutcome === row ? 'lightblue' : ''"
     ></tr>
   </table>
+
   <span class="flex items-center">
     <div class="h-20">
       <mat-form-field appearance="outline">
@@ -117,6 +113,7 @@
     <span class="flex-grow"></span>
     <button mat-raised-button color="primary" (click)="createLearningOutcome()">Add Outcome</button>
   </span>
+
   @if (selectedOutcome) {
     <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
       <div>
@@ -163,7 +160,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
             (matChipInputTokenEnd)="add($event)"
             [disabled]="!this.context"
           />
-          <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)">
+          <mat-autocomplete #auto="matAutocomplete" (optionSelected)="select($event)">
             @for (outcome of filteredOutcomes(); track outcome) {
               <mat-option [value]="outcome.abbreviation">{{ outcome.abbreviation }}</mat-option>
             }
@@ -178,6 +175,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
         </div>
       </div>
     </div>
+
     <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
       <div class="mb-1">
         <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome</h4>
@@ -279,11 +277,6 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
               </td>
             </ng-container>
 
-            <!-- Action footer row -->
-            <ng-container matColumnDef="actions">
-              <td mat-footer-cell *matFooterCellDef [colSpan]="templateColumns.length"></td>
-            </ng-container>
-
             <tr mat-header-row *matHeaderRowDef="templateColumns"></tr>
             <tr
               mat-row
@@ -291,6 +284,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
               [style.background]="selectedTemplate === row ? 'lightblue' : ''"
             ></tr>
           </table>
+
           <span class="flex items-center">
             <div class="h-20">
               <mat-form-field appearance="outline">
@@ -360,6 +354,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
                   />
                 </mat-form-field>
               </div>
+
               @if (selectedTemplate.type === 'Template') {
                 <mat-form-field appearance="outline" class="flex flex-grow">
                   <mat-label>Comment Text</mat-label>
@@ -395,6 +390,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
                   </mat-form-field>
                 </div>
               }
+
               <div class="flex">
                 <span class="flex-grow"></span>
                 <button mat-raised-button color="primary">Save Template</button>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 008ac4aff4..ac3d45d3c8 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -414,7 +414,7 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     });
   }
 
-  selected(event: MatAutocompleteSelectedEvent): void {
+  select(event: MatAutocompleteSelectedEvent): void {
     const outcome = this.allOutcomes.find((o) => o.abbreviation === event.option.viewValue);
 
     if (outcome && !this.selectedConnectedOutcomes().includes(outcome)) {

From 73588d886118861bbd3e5ae380cddc7baa532dbb Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 13 Jan 2025 00:50:20 +1100
Subject: [PATCH 182/776] fix: tlo csv url

---
 src/app/api/models/task-definition.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index a2e9b85e73..9ec5259145 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -185,7 +185,7 @@ export class TaskDefinition extends Entity {
 
   public getOutcomeBatchUploadUrl(): string {
     const constants = AppInjector.get(DoubtfireConstants);
-    return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/outcomes/csv`;
+    return `${constants.API_URL}/task_definitions/${this.id}/outcomes/csv`;
   }
 
   public getFeedbackTemplateBatchUploadUrl(): string {

From 566491033fb464467ad599f10a17c055a9c06e03 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 13 Jan 2025 14:09:17 +1100
Subject: [PATCH 183/776] chore: allow development via external tunnel without
 port

---
 src/app/config/constants/apiURL.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/config/constants/apiURL.ts b/src/app/config/constants/apiURL.ts
index a4d39f05f2..f2c362ac12 100644
--- a/src/app/config/constants/apiURL.ts
+++ b/src/app/config/constants/apiURL.ts
@@ -1,4 +1,2 @@
-let API_URL: string;
-
-API_URL = `${window.location.protocol}//${window.location.hostname}:4200/api`;
+const API_URL: string = `${window.location.protocol}//${window.location.hostname}${window.location.port ? ':' + window.location.port : ''}/api`;
 export default API_URL;

From 0a61df53c9fc187b7462e8564a19641ac1693cf0 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 13 Jan 2025 14:11:06 +1100
Subject: [PATCH 184/776] feat: d2l integration checks settings

- checks with weighted grading
- provides a link to open D2L unit edit for weight
---
 src/app/api/models/unit.ts                    |  7 +-
 .../unit-details-editor.coffee                |  3 +
 .../unit-details-editor.tpl.html              | 12 ++-
 .../d2l-transfer.component.html               | 95 ++++++++++++++-----
 .../d2l-transfer.component.scss               | 10 ++
 .../d2l-transfer.component.ts                 | 59 +++++++++++-
 6 files changed, 154 insertions(+), 32 deletions(-)

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index d118ae2196..8adfda2998 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -559,7 +559,12 @@ export class Unit extends Entity {
   }
 
   public hasD2lMapping(): boolean {
-    return this.d2lMapping !== undefined && this.d2lMapping.orgUnitId.length > 0;
+    const doubtfireConstants = AppInjector.get(DoubtfireConstants);
+    return (
+      doubtfireConstants.IsD2LEnabled.value &&
+      this.d2lMapping !== undefined &&
+      this.d2lMapping.orgUnitId.length > 0
+    );
   }
 
   public loadD2lMapping(): Observable<D2lAssessmentMapping> {
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
index bbb7950f27..a93c83b0ed 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
@@ -80,6 +80,9 @@ angular.module('doubtfire.units.states.edit.directives.unit-details-editor', [])
     $scope.addD2lData = ->
       D2lUnitDetailsModal.open($scope.unit)
 
+    $scope.d2lEnabled = ->
+      DoubtfireConstants.IsD2LEnabled.value
+
 )
 
 
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
index 8d70bfd493..66d289e0cc 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
@@ -418,11 +418,13 @@ <h3 class="panel-title">Update Unit</h3>
         <!--/active-->
       </div>
 
-      <div class="panel-footer">
-          <a class="btn btn-info" ng-click="addD2lData()" ng-enabled="unit.id != -1">
-            <header>D2L Details</header>
-          </a>
-          <div class="pull-right">
+      <div class="panel-footer text-right">
+          <div class="pull-left">
+            <a class="btn btn-info" ng-click="addD2lData()" ng-enabled="unit.id != -1" ng-hide="!d2lEnabled()">
+              <header>D2L Details</header>
+            </a>
+          </div>
+          <div>
             <a class="btn btn-success" ui-sref="units/rollover">
               <header>Rollover</header>
             </a>
diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html
index 2035a0fb07..ccf3c460a1 100644
--- a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.html
@@ -2,35 +2,82 @@
   <div class="modal-header">
     <h1>D2L Grade Transfer</h1>
   </div>
-  <div class="modal-body">
-    <p>Make sure that all student grades are ready to be transferred. Then run the following actions in oder.</p>
-
-    <p><strong>1. Login to D2L</strong>. This will open a new window.</p>
-    <p>
-      <button mat-icon-button color="primary" (click)="openD2l()">
-        <mat-icon>open_in_new</mat-icon>
-      </button>
-    </p>
-    <p><strong>2. Begin Grade Transfer</strong></p>
+  <div class="modal-body" [hidden]="hasD2lMapping()">
     <p>
-      <button mat-icon-button color="primary" (click)="startTransfer()">
-        <mat-icon>start</mat-icon>
-      </button>
+      There are no D2L mapping details for this unit. Please update in the Unit Administration page.
     </p>
-    <p><strong>3. Wait for Email</strong></p>
-    <p>Once the transfer is complete, you will receive an email with the results.</p>
-    <p><strong>4. Download record</strong></p>
+  </div>
+  <div class="modal-body" [hidden]="!hasD2lMapping()">
     <p>
-      Once the transfer is complete, you can download the record of the transfer. This will show you any errors that may have occurred.
+      Make sure that all student grades are ready to be transferred. Then run the following actions
+      in order.
     </p>
-    <p>
-      <button mat-icon-button color="primary" (click)="downloadRecord()">
-        <mat-icon>download</mat-icon>
-      </button>
+
+    <ol>
+      <li class="flex flex-row items-center">
+        <button mat-icon-button color="primary" (click)="openD2l()">
+          <mat-icon>open_in_new</mat-icon>
+        </button>
+        <div>
+          <strong>1. Login to D2L</strong>.
+          <p>
+            This will open a new window, where you need to login to D2L to authenticate for the
+            grade transfer process.
+          </p>
+        </div>
+      </li>
+      <li class="flex flex-row items-center">
+        <button mat-icon-button color="primary" (click)="startTransfer()">
+          <mat-icon>start</mat-icon>
+        </button>
+        <div>
+          <strong>2. Begin Grade Transfer</strong>
+          <p>This will start transferring grades to D2L. This may take a few minutes.</p>
+        </div>
+      </li>
+      <li class="flex flex-row items-center" [hidden]="!hasWeight()">
+        <button mat-icon-button color="primary" (click)="openWeightPage()">
+          <mat-icon>open_in_new</mat-icon>
+        </button>
+        <div>
+          <strong>3. Update the weight</strong>
+          <p>
+            Use the following button to open D2L. Update the weight based on the weight of the
+            portfolio in the unit. If this is the only assessment consider changing to a Points
+            grading scheme in D2L.
+          </p>
+        </div>
+      </li>
+      <li class="flex flex-row items-center">
+        <button mat-icon-button color="primary">
+          <mat-icon>hourglass_empty</mat-icon>
+        </button>
+        <div>
+          <strong
+            ><span [hidden]="hasWeight()">3</span><span [hidden]="!hasWeight()">4</span>. Wait for
+            Email</strong
+          >
+          <p>Once the transfer is complete, you will receive an email with the results.</p>
+        </div>
+      </li>
+      <li class="flex flex-row items-center">
+        <button mat-icon-button color="primary" (click)="downloadRecord()">
+          <mat-icon>download</mat-icon>
+        </button>
+        <div>
+          <strong
+            ><span [hidden]="hasWeight()">4</span><span [hidden]="!hasWeight()">5</span>. Download
+            record</strong
+          >
+          <p>
+            Once the transfer is complete, you can download the record of the transfer. This will
+            show you any errors that may have occurred.
+          </p>
+        </div>
+      </li>
+    </ol>
   </div>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button mat-stroked-button mat-dialog-close>
-    Close
-  </button>
+  <button mat-stroked-button mat-dialog-close>Close</button>
 </mat-dialog-actions>
diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss
index a4e1d77cc6..0e78119808 100644
--- a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.scss
@@ -1,3 +1,13 @@
 mat-form-field {
   padding: 1rem;
 }
+
+li {
+  width: 100%;
+  margin-top: 1rem;
+  margin-bottom: 1rem;
+}
+
+li button {
+  margin-right: 1rem;
+}
diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
index acf6f17a7f..f684a764a7 100644
--- a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
@@ -2,7 +2,7 @@
 // Modal to show Doubtfire version info
 //
 import { HttpClient } from '@angular/common/http';
-import {Injectable, Component, Inject} from '@angular/core';
+import {Injectable, Component, Inject, OnInit} from '@angular/core';
 import {MatDialog, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {D2lAssessmentMapping} from 'src/app/api/models/d2l/d2l_assessment_mapping';
 import {D2lAssessmentMappingService} from 'src/app/api/models/doubtfire-model';
@@ -16,8 +16,10 @@ import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants
   templateUrl: 'd2l-transfer.component.html',
   styleUrl: 'd2l-transfer.component.scss',
 })
-export class D2lTransferComponent {
+export class D2lTransferComponent implements OnInit {
   public d2lDataMapping: D2lAssessmentMapping = new D2lAssessmentMapping(this.data);
+  private apiEndpoint: string;
+  private weightedUnit: boolean = false;
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: Unit,
@@ -30,6 +32,45 @@ export class D2lTransferComponent {
     public fileDownloader: FileDownloaderService,
   ) {}
 
+  public ngOnInit(): void {
+    this.data.loadD2lMapping().subscribe({
+      next: (d2lDataMapping) => {
+        this.d2lDataMapping = d2lDataMapping;
+
+        // If we have the org unit it, then we can check the grading standard
+        if (this.d2lDataMapping.orgUnitId) {
+          this.checkUnitGradesWeighted();
+        }
+      },
+      error: (_err) => {
+        // No mapping found, create a new one
+        this.d2lDataMapping = new D2lAssessmentMapping(this.data);
+      },
+    });
+
+    this.httpClient.get<string>(`${this.doubtfireConstants.API_URL}/d2l/endpoint`).subscribe({
+      next: (response) => {
+        this.apiEndpoint = response;
+      },
+      error: (err) => {
+        this.alertService.error(`Failed to get locaiton of D2L instance: ${err}`);
+      },
+    });
+  }
+
+  public checkUnitGradesWeighted(): void {
+    this.httpClient
+      .get<boolean>(`${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades/weighted`)
+      .subscribe({
+        next: (response) => {
+          this.weightedUnit = response;
+        },
+        error: (err) => {
+          this.alertService.error(`Failed to get unit weighted status: ${err}`);
+        },
+      });
+  }
+
   public openD2l(): void {
     const url = `${this.doubtfireConstants.API_URL}/d2l/login_url`;
     this.httpClient.post<string>(url, {}).subscribe({
@@ -42,6 +83,20 @@ export class D2lTransferComponent {
     });
   }
 
+  public openWeightPage(): void {
+    const url = `${this.apiEndpoint}/d2l/lms/grades/admin/manage/item_props_newedit.d2l?objectId=${this.d2lDataMapping.gradeObjectId}&ou=${this.d2lDataMapping.orgUnitId}&scroll=weight`;
+    console.log(url);
+    window.open(url, '_blank');
+  }
+
+  public hasD2lMapping(): boolean {
+    return this.d2lDataMapping.id !== undefined;
+  }
+
+  public hasWeight(): boolean {
+    return this.weightedUnit;
+  }
+
   public startTransfer(): void {
     const url = `${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades`;
     this.httpClient.post(url, {}).subscribe({

From 4c3d05b84241d3b9c80ac51af4033c9fe75bc862 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 13 Jan 2025 14:27:48 +1100
Subject: [PATCH 185/776] refactor: cleanup feedback picker

---
 .../task-feedback-templates.component.html    | 56 ++++---------------
 .../task-feedback-templates.component.scss    |  3 +
 .../task-feedback-templates.component.ts      | 14 ++---
 3 files changed, 19 insertions(+), 54 deletions(-)
 create mode 100644 src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss

diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
index f92a30ec03..da88180732 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -1,24 +1,22 @@
 <mat-card
-  class="feedback-template-picker-card p-2 bg-white bg-opacity-90 rounded-lg border border-gray-300 shadow-none flex flex-col w-[338px] h-[423px]"
+  class="p-2 bg-white rounded-lg border border-gray-300 shadow-none flex flex-col w-[338px] h-[423px]"
 >
   <mat-tab-group (selectedTabChange)="scrollToSection($event)" class="category-tab-group">
     <mat-tab *ngFor="let category of categories" [label]="category.name"></mat-tab>
   </mat-tab-group>
 
-  <mat-form-field class="w-full">
+  <mat-form-field appearance="outline" class="template-search w-full pt-2">
     <input
       matInput
       placeholder="Search templates"
       [(ngModel)]="searchTerm"
       (input)="filterTemplates()"
     />
-    <button mat-icon-button matSuffix aria-label="Search">
-      <mat-icon>search</mat-icon>
-    </button>
+    <mat-icon matSuffix>search</mat-icon>
   </mat-form-field>
 
-  <div class="scrollable-content overflow-y-auto flex-grow">
-    <div #tloSection class="template-category mt-2">
+  <div class="overflow-y-auto flex-grow">
+    <div #tloSection class="mt-2">
       <h4 class="text-gray-700 font-semibold">TLO</h4>
       <div class="template-grid flex flex-wrap gap-1.5 mt-1">
         <mat-chip
@@ -26,7 +24,7 @@ <h4 class="text-gray-700 font-semibold">TLO</h4>
           (mouseenter)="onHoverTemplate(template)"
           (mouseleave)="onHoverTemplate('')"
           (click)="selectTemplate(template)"
-          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+          class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
         >
           {{ template }}
         </mat-chip>
@@ -41,22 +39,7 @@ <h4 class="text-gray-700 font-semibold">ULO</h4>
           (mouseenter)="onHoverTemplate(template)"
           (mouseleave)="onHoverTemplate('')"
           (click)="selectTemplate(template)"
-          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
-        >
-          {{ template }}
-        </mat-chip>
-      </div>
-    </div>
-
-    <div #cloSection class="template-category mt-2">
-      <h4 class="text-gray-700 font-semibold">CLO</h4>
-      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
-        <mat-chip
-          *ngFor="let template of filteredCategories[2].templates"
-          (mouseenter)="onHoverTemplate(template)"
-          (mouseleave)="onHoverTemplate('')"
-          (click)="selectTemplate(template)"
-          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+          class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
         >
           {{ template }}
         </mat-chip>
@@ -67,26 +50,11 @@ <h4 class="text-gray-700 font-semibold">CLO</h4>
       <h4 class="text-gray-700 font-semibold">GLO</h4>
       <div class="template-grid flex flex-wrap gap-1.5 mt-1">
         <mat-chip
-          *ngFor="let template of filteredCategories[3].templates"
-          (mouseenter)="onHoverTemplate(template)"
-          (mouseleave)="onHoverTemplate('')"
-          (click)="selectTemplate(template)"
-          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
-        >
-          {{ template }}
-        </mat-chip>
-      </div>
-    </div>
-
-    <div #sectionSection class="template-category mt-2">
-      <h4 class="text-gray-700 font-semibold">Section</h4>
-      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
-        <mat-chip
-          *ngFor="let template of filteredCategories[4].templates"
+          *ngFor="let template of filteredCategories[2].templates"
           (mouseenter)="onHoverTemplate(template)"
           (mouseleave)="onHoverTemplate('')"
           (click)="selectTemplate(template)"
-          class="template-chip px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+          class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
         >
           {{ template }}
         </mat-chip>
@@ -94,10 +62,10 @@ <h4 class="text-gray-700 font-semibold">Section</h4>
     </div>
   </div>
 
-  <div class="hovered-template-display text-gray-600">
-    <p class="pt-5 mb-0">{{ hoveredTemplate || 'Template A1' }}</p>
+  <div>
+    <p class="pt-5 mb-0">{{ hoveredTemplate || 'Select a feedback chip' }}</p>
     <p class="pt-1 pb-2 mb-0">
-      This template will populate {{ hoveredTemplate || 'Template A1' }} text.
+      {{ hoveredTemplate || 'This will populate the comment area with feedback.' }}
     </p>
   </div>
 </mat-card>
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss
new file mode 100644
index 0000000000..b8a05d722a
--- /dev/null
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss
@@ -0,0 +1,3 @@
+.category-tab-group .mat-mdc-tab-header {
+  --mdc-secondary-navigation-tab-container-height: 35px !important;
+}
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index 6a2ea98608..bfedc7b882 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -1,8 +1,10 @@
-import {Component, ElementRef, ViewChild} from '@angular/core';
+import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
 
 @Component({
   selector: 'f-task-feedback-templates',
+  styleUrl: './task-feedback-templates.component.scss',
   templateUrl: './task-feedback-templates.component.html',
+  encapsulation: ViewEncapsulation.None,
 })
 export class TaskFeedbackTemplatesComponent {
   searchTerm: string = '';
@@ -11,9 +13,7 @@ export class TaskFeedbackTemplatesComponent {
   categories = [
     {name: 'TLO', templates: ['Template A1', 'Template A2', 'Template A3', 'Template A4']},
     {name: 'ULO', templates: ['Template B1', 'Template B2', 'Template B3', 'Template B4']},
-    {name: 'CLO', templates: ['Template C1', 'Template C2', 'Template C3', 'Template C4']},
     {name: 'GLO', templates: ['Template D1', 'Template D2', 'Template D3', 'Template D4']},
-    {name: 'Section', templates: ['Template E1', 'Template E2', 'Template E3', 'Template E4']},
   ];
 
   filteredCategories = [...this.categories];
@@ -34,13 +34,7 @@ export class TaskFeedbackTemplatesComponent {
   @ViewChild('sectionSection') sectionSection!: ElementRef;
 
   scrollToSection(event: any) {
-    const sections = [
-      this.tloSection,
-      this.uloSection,
-      this.cloSection,
-      this.gloSection,
-      this.sectionSection,
-    ];
+    const sections = [this.tloSection, this.uloSection, this.gloSection];
     const selectedSection = sections[event.index];
 
     if (selectedSection) {

From 2460c88af08740f8626ed71d8851a75af095a03d Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 13 Jan 2025 15:22:21 +1100
Subject: [PATCH 186/776] feat: check if d2l results available

---
 .../d2l-transfer.component.ts                 | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
index f684a764a7..a5ea244d6b 100644
--- a/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
+++ b/src/app/units/states/portfolios/d2l-transfer-modal/d2l-transfer.component.ts
@@ -1,15 +1,15 @@
 //
 // Modal to show Doubtfire version info
 //
-import { HttpClient } from '@angular/common/http';
+import {HttpClient} from '@angular/common/http';
 import {Injectable, Component, Inject, OnInit} from '@angular/core';
 import {MatDialog, MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {D2lAssessmentMapping} from 'src/app/api/models/d2l/d2l_assessment_mapping';
 import {D2lAssessmentMappingService} from 'src/app/api/models/doubtfire-model';
 import {Unit} from 'src/app/api/models/unit';
-import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
 import {AlertService} from 'src/app/common/services/alert.service';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 
 @Component({
   selector: 'f-d2l-transfer',
@@ -110,8 +110,27 @@ export class D2lTransferComponent implements OnInit {
   }
 
   public downloadRecord(): void {
-    const url = `${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades`;
-    this.fileDownloader.downloadFile(url, `${this.data.code}-d2l-grades.csv`);
+    this.httpClient
+      .get<GradesAvailableResponse>(
+        `${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades/available`,
+      )
+      .subscribe({
+        next: (response) => {
+          if (response.running) {
+            this.alertService.error('Transfer in progress, please wait');
+          } else if (response.available) {
+            const url = `${this.doubtfireConstants.API_URL}/units/${this.data.id}/d2l/grades`;
+            this.fileDownloader.downloadFile(url, `${this.data.code}-d2l-grades.csv`);
+          } else {
+            this.alertService.error(
+              'No grade transfer results are available, and grade transfer does not appear to be in progress',
+            );
+          }
+        },
+        error: (err) => {
+          this.alertService.error(`Failed to download record: ${err}`);
+        },
+      });
   }
 }
 
@@ -131,3 +150,8 @@ export class D2lTransferModal {
     });
   }
 }
+
+interface GradesAvailableResponse {
+  available: boolean;
+  running: boolean;
+}

From 921406ed595c7a74cb750bc87d49fac0337bdb8a Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 13 Jan 2025 16:52:34 +1100
Subject: [PATCH 187/776] feat: add success page for oauth callback

---
 src/app/api/models/unit.ts                      |  1 +
 .../success-close/success-close.component.html  |  2 ++
 .../success-close/success-close.component.scss  |  0
 .../success-close/success-close.component.ts    | 14 ++++++++++++++
 src/app/doubtfire-angular.module.ts             |  2 ++
 src/app/doubtfire.states.ts                     | 17 +++++++++++++++++
 src/app/sessions/transition-hooks.service.ts    |  1 +
 7 files changed, 37 insertions(+)
 create mode 100644 src/app/common/success-close/success-close.component.html
 create mode 100644 src/app/common/success-close/success-close.component.scss
 create mode 100644 src/app/common/success-close/success-close.component.ts

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 8adfda2998..f157355da0 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -563,6 +563,7 @@ export class Unit extends Entity {
     return (
       doubtfireConstants.IsD2LEnabled.value &&
       this.d2lMapping !== undefined &&
+      this.d2lMapping.orgUnitId !== undefined &&
       this.d2lMapping.orgUnitId.length > 0
     );
   }
diff --git a/src/app/common/success-close/success-close.component.html b/src/app/common/success-close/success-close.component.html
new file mode 100644
index 0000000000..604e15a0d3
--- /dev/null
+++ b/src/app/common/success-close/success-close.component.html
@@ -0,0 +1,2 @@
+<h1>Success</h1>
+<p>Your action was successfully completed. This window will now close.</p>
diff --git a/src/app/common/success-close/success-close.component.scss b/src/app/common/success-close/success-close.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/common/success-close/success-close.component.ts b/src/app/common/success-close/success-close.component.ts
new file mode 100644
index 0000000000..ca298ac680
--- /dev/null
+++ b/src/app/common/success-close/success-close.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'f-success-close',
+  templateUrl: 'success-close.component.html',
+  styleUrls: ['success-close.component.scss']
+})
+export class SuccessCloseComponent implements OnInit {
+  ngOnInit(): void {
+    setTimeout(() => {
+      window.close();
+    }, 3000);
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 967644eb7e..a49f5f0bd9 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -240,6 +240,7 @@ import {TestAttemptService} from './api/services/test-attempt.service';
 import {ScormExtensionCommentComponent} from './tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component';
 import {ScormExtensionModalComponent} from './common/modals/scorm-extension-modal/scorm-extension-modal.component';
 import { D2lTransferComponent, D2lTransferModal } from './units/states/portfolios/d2l-transfer-modal/d2l-transfer.component';
+import { SuccessCloseComponent } from './common/success-close/success-close.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -278,6 +279,7 @@ const MY_DATE_FORMAT = {
     ExtensionModalComponent,
     CalendarModalComponent,
     InstitutionSettingsComponent,
+    SuccessCloseComponent,
     HomeComponent,
     CommentBubbleActionComponent,
     UnitTutorialsListComponent,
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 86b9f2b4d8..07ded93064 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -9,6 +9,7 @@ import {AcceptEulaComponent} from './eula/accept-eula/accept-eula.component';
 import {FUsersComponent} from './admin/states/f-users/f-users.component';
 import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
+import { SuccessCloseComponent } from './common/success-close/success-close.component';
 
 /*
  * Use this file to store any states that are sourced by angular components.
@@ -390,6 +391,21 @@ const ScormPlayerReviewState: NgHybridStateDeclaration = {
   },
 };
 
+const SuccessCloseState: NgHybridStateDeclaration = {
+  name: 'success-close',
+  url: '/success-close',
+  views: {
+    main: {
+      component: SuccessCloseComponent,
+    },
+  },
+  data: {
+    pageTitle: 'Home Page',
+    roleWhitelist: ['Student', 'Tutor', 'Convenor', 'Admin', 'Auditor'],
+  },
+};
+
+
 /**
  * Export the list of states we have created in angular
  */
@@ -408,4 +424,5 @@ export const doubtfireStates = [
   ScormPlayerNormalState,
   ScormPlayerReviewState,
   ScormPlayerStudentReviewState,
+  SuccessCloseState
 ];
diff --git a/src/app/sessions/transition-hooks.service.ts b/src/app/sessions/transition-hooks.service.ts
index 218e0c5397..7720d96fe0 100644
--- a/src/app/sessions/transition-hooks.service.ts
+++ b/src/app/sessions/transition-hooks.service.ts
@@ -43,6 +43,7 @@ export class TransitionHooksService {
       // Adjust settings such as headers
       switch (toState) {
         case 'timeout':
+        case 'success-close':
           return true;
         case 'sign_in':
           this.globalState.hideHeader();

From 07f103de46defa2a78f5d7c43030e67255c0d5fe Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 13 Jan 2025 16:58:28 +1100
Subject: [PATCH 188/776] fix: save linked outcomes upon selection

---
 .../feedback-template-editor.component.html    |  2 +-
 .../feedback-template-editor.component.ts      | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index f99e3e76fd..77c7785a35 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -63,7 +63,7 @@
             mat-icon-button
             aria-label="save learning outcome"
             color="primary"
-            (click)="saveLearningOutcome()"
+            (click)="saveLearningOutcome(learningOutcome)"
           >
             <mat-icon>save</mat-icon>
           </button>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index ac3d45d3c8..c4f308b7a9 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -9,6 +9,7 @@ import {
   OnDestroy,
   OnInit,
   signal,
+  effect,
   ViewChild,
 } from '@angular/core';
 import {MatTable, MatTableDataSource} from '@angular/material/table';
@@ -86,7 +87,12 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     @Inject(csvResultModalService) private csvResultModalService: any,
     @Inject(csvUploadModalService) private csvUploadModal: any,
     @Inject(confirmationModal) private confirmationModal: any,
-  ) {}
+  ) {
+    effect(() => {
+      const linkedOutcomes = this.selectedConnectedOutcomes();
+      this.selectedOutcome.linkedOutcomeIds = linkedOutcomes.map((outcome) => outcome.id);
+    });
+  }
 
   ngOnInit(): void {
     if (!this.context) this.abbreviationPrefix = 'GLO';
@@ -165,15 +171,11 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     });
   }
 
-  public saveLearningOutcome() {
-    const linkedOutcomes = this.selectedConnectedOutcomes();
-    if (linkedOutcomes.length > 0) {
-      this.selectedOutcome.linkedOutcomeIds = linkedOutcomes.map((outcome) => outcome.id);
-    }
-    this.selectedOutcome.save().subscribe({
+  public saveLearningOutcome(learningOutcome: LearningOutcome) {
+    learningOutcome.save().subscribe({
       next: () => {
         this.alerts.success('Outcome saved');
-        this.selectedOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
+        learningOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
       },
       error: () => this.alerts.error('Failed to save learning outcome. Please try again.'),
     });

From aa0bc76d32656dc14d28ebca520e4f90d6d9434e Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 13 Jan 2025 17:22:15 +1100
Subject: [PATCH 189/776] fix: check difference before updating linked outcomes

---
 .../feedback-template-editor.component.ts                | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index c4f308b7a9..85ad591ab7 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -35,6 +35,7 @@ import {LiveAnnouncer} from '@angular/cdk/a11y';
 import {MatChipInputEvent} from '@angular/material/chips';
 import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
+import {isEqual} from 'lodash';
 
 @Component({
   selector: 'f-feedback-template-editor',
@@ -89,8 +90,12 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     @Inject(confirmationModal) private confirmationModal: any,
   ) {
     effect(() => {
-      const linkedOutcomes = this.selectedConnectedOutcomes();
-      this.selectedOutcome.linkedOutcomeIds = linkedOutcomes.map((outcome) => outcome.id);
+      const linkedOutcomes = this.selectedConnectedOutcomes().map((outcome) => outcome.id);
+      if (
+        this.selectedOutcome &&
+        !isEqual(linkedOutcomes.sort(), this.selectedOutcome.linkedOutcomeIds.sort())
+      )
+        this.selectedOutcome.linkedOutcomeIds = linkedOutcomes;
     });
   }
 

From 04f8dce30f79d86637abd6db2aa9fa3aa14d1de2 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 14 Jan 2025 00:53:03 +1100
Subject: [PATCH 190/776] feat: edit feedback chips

---
 src/app/api/models/feedback-template.ts       | 43 +++++------------
 src/app/api/models/learning-outcome.ts        | 10 ++--
 src/app/api/models/task-definition.ts         |  9 +---
 src/app/api/models/unit.ts                    |  7 ---
 .../api/services/feedback-template.service.ts | 17 +++----
 .../feedback-template-editor.component.html   | 32 +++++++++----
 .../feedback-template-editor.component.ts     | 48 +++++++++++++++----
 src/app/doubtfire-angularjs.module.ts         |  6 +++
 .../states/index/global-state.service.ts      | 18 ++++++-
 .../task-comments-viewer.component.ts         |  7 +++
 src/app/units/states/index/index.coffee       |  6 ++-
 11 files changed, 124 insertions(+), 79 deletions(-)

diff --git a/src/app/api/models/feedback-template.ts b/src/app/api/models/feedback-template.ts
index e0b95f7597..305a639c33 100644
--- a/src/app/api/models/feedback-template.ts
+++ b/src/app/api/models/feedback-template.ts
@@ -1,12 +1,11 @@
 import {Entity, EntityMapping} from 'ngx-entity-service';
 import {Observable} from 'rxjs';
 import {AppInjector} from 'src/app/app-injector';
-import {TaskDefinition, Unit} from './doubtfire-model';
 import {FeedbackTemplateService} from '../services/feedback-template.service';
 
 export class FeedbackTemplate extends Entity {
   id: number;
-  type: 'Group' | 'Template';
+  type: 'group' | 'template';
   chipText: string;
   description: string;
   commentText: string;
@@ -15,40 +14,15 @@ export class FeedbackTemplate extends Entity {
   parentChipId: number;
   learningOutcomeId: number;
 
-  readonly context: TaskDefinition | Unit;
-
-  constructor(context: TaskDefinition | Unit) {
-    super();
-    this.context = context;
-  }
-
-  public toJson<T extends Entity>(mappingData: EntityMapping<T>, ignoreKeys?: string[]): object {
-    return {
-      feedback_template: super.toJson(mappingData, ignoreKeys),
-    };
-  }
-
   public save(): Observable<FeedbackTemplate> {
     const svc = AppInjector.get(FeedbackTemplateService);
 
     if (this.isNew) {
-      return svc.create(
-        {
-          contextId: this.context.id,
-        },
-        {
-          entity: this,
-          cache: this.context.feedbackTemplateCache,
-          constructorParams: this.context,
-        },
-      );
+      return svc.create({}, {entity: this, endpointFormat: FeedbackTemplateService.addEndpoint});
     } else {
       return svc.update(
-        {
-          contextId: this.context.id,
-          id: this.id,
-        },
-        {entity: this},
+        {id: this.id},
+        {entity: this, endpointFormat: FeedbackTemplateService.updateEndpoint},
       );
     }
   }
@@ -75,7 +49,12 @@ export class FeedbackTemplate extends Entity {
     return !this.id;
   }
 
-  public getContextId(): number {
-    return this.context.id;
+  public delete(): Observable<unknown> {
+    const svc = AppInjector.get(FeedbackTemplateService);
+
+    return svc.delete(
+      {id: this.id},
+      {entity: this, endpointFormat: FeedbackTemplateService.updateEndpoint},
+    );
   }
 }
diff --git a/src/app/api/models/learning-outcome.ts b/src/app/api/models/learning-outcome.ts
index a8f9d94310..5ffb0a4cd2 100644
--- a/src/app/api/models/learning-outcome.ts
+++ b/src/app/api/models/learning-outcome.ts
@@ -2,6 +2,7 @@ import {Entity, EntityMapping} from 'ngx-entity-service';
 import {Observable} from 'rxjs';
 import {AppInjector} from 'src/app/app-injector';
 import {LearningOutcomeService, TaskDefinition, Unit} from './doubtfire-model';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 
 export class LearningOutcome extends Entity {
   id: number;
@@ -54,7 +55,7 @@ export class LearningOutcome extends Entity {
       if (this.isNew) {
         return svc.create(
           {},
-          {entity: this, cache: svc.cache, endpointFormat: LearningOutcomeService.globalEndpoint},
+          {entity: this, endpointFormat: LearningOutcomeService.globalEndpoint},
         );
       } else {
         return svc.update(
@@ -63,7 +64,6 @@ export class LearningOutcome extends Entity {
           },
           {
             entity: this,
-            cache: svc.cache,
             endpointFormat: LearningOutcomeService.updateGlobalEndpoint,
           },
         );
@@ -124,10 +124,14 @@ export class LearningOutcome extends Entity {
         },
         {
           entity: this,
-          cache: svc.cache,
           endpointFormat: LearningOutcomeService.updateGlobalEndpoint,
         },
       );
     }
   }
+
+  public getFeedbackTemplateBatchUploadUrl(): string {
+    const constants = AppInjector.get(DoubtfireConstants);
+    return `${constants.API_URL}/${this.contextTypePath[this.contextType]}/${this.contextId}/outcomes/${this.id}/feedback_chips/csv`;
+  }
 }
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 9ec5259145..1b554ff761 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -3,7 +3,7 @@ import { Entity, EntityCache, EntityMapping } from 'ngx-entity-service';
 import { Observable, tap } from 'rxjs';
 import { AppInjector } from 'src/app/app-injector';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { FeedbackTemplate, Grade, GroupSet, LearningOutcome, TutorialStream, Unit } from './doubtfire-model';
+import { Grade, GroupSet, LearningOutcome, TutorialStream, Unit } from './doubtfire-model';
 import { TaskDefinitionService } from '../services/task-definition.service';
 import { AlertService } from 'src/app/common/services/alert.service';
 
@@ -47,8 +47,6 @@ export class TaskDefinition extends Entity {
 
   public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
     new EntityCache<LearningOutcome>();
-  public readonly feedbackTemplateCache: EntityCache<FeedbackTemplate> =
-    new EntityCache<FeedbackTemplate>();
 
   readonly unit: Unit;
 
@@ -188,11 +186,6 @@ export class TaskDefinition extends Entity {
     return `${constants.API_URL}/task_definitions/${this.id}/outcomes/csv`;
   }
 
-  public getFeedbackTemplateBatchUploadUrl(): string {
-    const constants = AppInjector.get(DoubtfireConstants);
-    return `${constants.API_URL}/units/${this.unit.id}/task_definitions/${this.id}/feedback_templates/csv`;
-  }
-
   /**
    * Open the SCORM test in a new tab - using preview mode.
    */
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 8cdf6df2da..c444ab9ad4 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -22,7 +22,6 @@ import {
   Project,
   TutorialStreamService,
   UnitRoleService,
-  FeedbackTemplate,
 } from './doubtfire-model';
 import {LearningOutcome} from './learning-outcome';
 import {AlertService} from 'src/app/common/services/alert.service';
@@ -74,8 +73,6 @@ export class Unit extends Entity {
     new EntityCache<TaskDefinition>();
   public readonly taskOutcomeAlignmentsCache: EntityCache<TaskOutcomeAlignment> =
     new EntityCache<TaskOutcomeAlignment>();
-  public readonly feedbackTemplateCache: EntityCache<FeedbackTemplate> =
-    new EntityCache<FeedbackTemplate>();
 
   readonly staffCache: EntityCache<UnitRole> = new EntityCache<UnitRole>();
 
@@ -391,10 +388,6 @@ export class Unit extends Entity {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.id}/outcomes/csv`;
   }
 
-  public getFeedbackTemplateBatchUploadUrl(): string {
-    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.id}/feedback_templates/csv`;
-  }
-
   public hasStreams(): boolean {
     return this.tutorialStreamsCache.size > 1;
   }
diff --git a/src/app/api/services/feedback-template.service.ts b/src/app/api/services/feedback-template.service.ts
index ec5994f532..aaf91400cf 100644
--- a/src/app/api/services/feedback-template.service.ts
+++ b/src/app/api/services/feedback-template.service.ts
@@ -3,11 +3,13 @@ import {CachedEntityService} from 'ngx-entity-service';
 import {FeedbackTemplate} from '../models/feedback-template';
 import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiURL';
-import {TaskDefinition, Unit} from '../models/doubtfire-model';
 
 @Injectable()
 export class FeedbackTemplateService extends CachedEntityService<FeedbackTemplate> {
-  protected readonly endpointFormat = 'feedback_template_chips/context/:contextType:/:contextId:';
+  protected readonly endpointFormat = ':contextType:/:contextId:/feedback_chips';
+  public static addEndpoint = 'feedback_chips';
+  public static updateEndpoint = 'feedback_chips/:id:';
+  public static globalEndpoint = 'global/feedback_chips';
 
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
@@ -19,16 +21,15 @@ export class FeedbackTemplateService extends CachedEntityService<FeedbackTemplat
       'description',
       'commentText',
       'summaryText',
-      'taskStatusId',
+      'taskStatus',
       'parentChipId',
       'learningOutcomeId',
     );
+
+    this.mapping.mapAllKeysToJsonExcept('id');
   }
 
-  public override createInstanceFrom(
-    json: object,
-    other?: TaskDefinition | Unit,
-  ): FeedbackTemplate {
-    return new FeedbackTemplate(other);
+  public override createInstanceFrom(json: object, other?: any): FeedbackTemplate {
+    return new FeedbackTemplate();
   }
 }
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 77c7785a35..c283fe99f9 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -196,7 +196,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
                 *matCellDef="let feedbackTemplate"
                 (click)="selectFeedbackTemplate(feedbackTemplate)"
               >
-                {{ feedbackTemplate.parentId }}
+                {{ getParentChipText(feedbackTemplate.parentChipId) }}
               </td>
             </ng-container>
             <ng-container matColumnDef="chipText" sticky>
@@ -261,7 +261,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
                     mat-icon-button
                     aria-label="save feedback template"
                     color="primary"
-                    (click)="saveFeedbackTemplate()"
+                    (click)="saveFeedbackTemplate(feedbackTemplate)"
                   >
                     <mat-icon>save</mat-icon>
                   </button>
@@ -321,15 +321,23 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
               <div class="flex flex-row gap-4">
                 <mat-form-field appearance="outline" class="basis-1/5">
                   <mat-label>Type</mat-label>
-                  <mat-select required [(ngModel)]="selectedTemplate.type">
-                    <mat-option [value]="'Group'">Group</mat-option>
-                    <mat-option [value]="'Template'">Template</mat-option>
+                  <mat-select
+                    required
+                    [value]="selectedTemplate.type"
+                    (selectionChange)="onTemplateTypeChange($event)"
+                  >
+                    <mat-option [value]="'group'">Group</mat-option>
+                    <mat-option [value]="'template'">Template</mat-option>
                   </mat-select>
                 </mat-form-field>
 
                 <mat-form-field appearance="outline" class="basis-1/5">
                   <mat-label>Parent</mat-label>
-                  <mat-select required [(ngModel)]="selectedTemplate.parent"> </mat-select>
+                  <mat-select [(ngModel)]="selectedTemplate.parentChipId">
+                    <mat-option *ngFor="let parent of getPossibleParents()" [value]="parent.id">
+                      {{ parent.chipText }}
+                    </mat-option>
+                  </mat-select>
                 </mat-form-field>
 
                 <mat-form-field appearance="outline" class="basis-1/5">
@@ -355,7 +363,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
                 </mat-form-field>
               </div>
 
-              @if (selectedTemplate.type === 'Template') {
+              @if (selectedTemplate.type === 'template') {
                 <mat-form-field appearance="outline" class="flex flex-grow">
                   <mat-label>Comment Text</mat-label>
                   <textarea
@@ -380,7 +388,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
 
                   <mat-form-field appearance="outline" class="basis-1/3">
                     <mat-label>Task Status</mat-label>
-                    <mat-select required [(ngModel)]="selectedTemplate.taskStatus">
+                    <mat-select [(ngModel)]="selectedTemplate.taskStatus">
                       <mat-option [value]="'fix_and_resubmit'">Fix and Resubmit</mat-option>
                       <mat-option [value]="'discuss'">Discuss</mat-option>
                       <mat-option [value]="'redo'">Redo</mat-option>
@@ -393,7 +401,13 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
 
               <div class="flex">
                 <span class="flex-grow"></span>
-                <button mat-raised-button color="primary">Save Template</button>
+                <button
+                  mat-raised-button
+                  color="primary"
+                  (click)="saveFeedbackTemplate(selectedTemplate)"
+                >
+                  Save Template
+                </button>
               </div>
             </div>
           }
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 85ad591ab7..4626190ac9 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -14,6 +14,7 @@ import {
 } from '@angular/core';
 import {MatTable, MatTableDataSource} from '@angular/material/table';
 import {MatPaginator} from '@angular/material/paginator';
+import {MatSelectChange} from '@angular/material/select';
 import {
   TaskDefinition,
   Unit,
@@ -77,6 +78,7 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     'feedbackTemplateAction',
   ];
   public selectedTemplate: FeedbackTemplate;
+  public possibleParents: FeedbackTemplate[];
 
   private subscriptions: Subscription[] = [];
 
@@ -160,8 +162,12 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   }
 
   public getFeedbackChips() {
-    this.context.feedbackTemplateCache.values.subscribe((feedbackTemplates) => {
-      this.templateSource = new MatTableDataSource<FeedbackTemplate>(feedbackTemplates);
+    this.feedbackTemplateService.cache.values.subscribe((templates) => {
+      const outcomeTemplates = templates.filter(
+        (temp) => temp.learningOutcomeId === this.selectedOutcome.id,
+      );
+      this.possibleParents = outcomeTemplates.filter((temp) => temp.type === 'group');
+      this.templateSource = new MatTableDataSource<FeedbackTemplate>(outcomeTemplates);
       this.templateSource.paginator = this.templatePaginator;
       this.templateSource.sort = this.templateSort;
       this.templateSource.filterPredicate = (data: FeedbackTemplate, filter: string) => {
@@ -186,11 +192,11 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     });
   }
 
-  public saveFeedbackTemplate() {
-    this.selectedTemplate.save().subscribe({
+  public saveFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    feedbackTemplate.save().subscribe({
       next: () => {
         this.alerts.success('Template saved');
-        this.selectedTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+        feedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
       },
       error: () => this.alerts.error('Failed to save feedback template. Please try again.'),
     });
@@ -311,7 +317,10 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
       'Delete feedback template',
       'Are you sure you want to delete this template? This action is final.',
       () => {
-        this.alerts.success('Template deleted');
+        feedbackTemplate.delete().subscribe({
+          next: () => this.alerts.success('Feedback template deleted'),
+          error: () => this.alerts.error('Failed to delete feedback template. Please try again.'),
+        });
       },
     );
   }
@@ -320,7 +329,7 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     const url =
       type === 'Learning Outcomes'
         ? this.context.getOutcomeBatchUploadUrl()
-        : this.context.getFeedbackTemplateBatchUploadUrl();
+        : this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
 
     this.csvUploadModal.show(
       `Upload ${type} as CSV`,
@@ -344,7 +353,7 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     const url =
       type === 'learning-outcomes'
         ? this.context.getOutcomeBatchUploadUrl()
-        : this.context.getFeedbackTemplateBatchUploadUrl();
+        : this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
 
     this.fileDownloaderService.downloadFile(url, `${name}-${type}.csv`);
   }
@@ -367,13 +376,14 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   }
 
   public createFeedbackTemplate() {
-    const feedbackTemplate = new FeedbackTemplate(this.context);
+    const feedbackTemplate = new FeedbackTemplate();
 
-    feedbackTemplate.type = 'Template';
+    feedbackTemplate.type = 'template';
     feedbackTemplate.chipText = '';
     feedbackTemplate.description = '';
     feedbackTemplate.commentText = '';
     feedbackTemplate.summaryText = '';
+    feedbackTemplate.learningOutcomeId = this.selectedOutcome.id;
 
     this.selectedTemplate = feedbackTemplate;
   }
@@ -440,4 +450,22 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
       learningOutcome.linkedOutcomeIds.includes(outcome.id),
     );
   }
+
+  onTemplateTypeChange(event: MatSelectChange): void {
+    if (!this.selectedTemplate.isNew) {
+      this.alerts.error('Template type change forbidden.');
+      event.source.writeValue(this.selectedTemplate.type);
+    } else {
+      this.selectedTemplate.type = event.value;
+    }
+  }
+
+  getPossibleParents(): FeedbackTemplate[] {
+    return this.possibleParents.filter((p) => p.id != this.selectedTemplate.id);
+  }
+
+  getParentChipText(parentId: number): string {
+    const parent = this.possibleParents.find((p) => p.id === parentId);
+    return parent ? parent.chipText : '';
+  }
 }
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index c227a43c05..14e93b2e65 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -226,6 +226,7 @@ import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
 import {TaskScormCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component';
 import {FeedbackTemplateEditorComponent} from './common/feedback-template/feedback-template-editor.component';
+import {FeedbackTemplateService} from './api/services/feedback-template.service';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -305,6 +306,11 @@ DoubtfireAngularJSModule.factory(
 );
 DoubtfireAngularJSModule.factory('CreateNewUnitModal', downgradeInjectable(CreateNewUnitModal));
 
+DoubtfireAngularJSModule.factory(
+  'FeedbackTemplateService',
+  downgradeInjectable(FeedbackTemplateService),
+);
+
 // directive -> component
 DoubtfireAngularJSModule.directive(
   'taskCommentComposer',
diff --git a/src/app/projects/states/index/global-state.service.ts b/src/app/projects/states/index/global-state.service.ts
index b5d567496b..4378502957 100644
--- a/src/app/projects/states/index/global-state.service.ts
+++ b/src/app/projects/states/index/global-state.service.ts
@@ -17,6 +17,7 @@ import {
 } from 'src/app/api/models/doubtfire-model';
 import {AuthenticationService} from 'src/app/api/services/authentication.service';
 import {AlertService} from 'src/app/common/services/alert.service';
+import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
 
 /**
  * The different types of views that can be shown. Used by the header to determine details to show.
@@ -108,6 +109,7 @@ export class GlobalStateService implements OnDestroy {
     private campusService: CampusService,
     private teachingPeriodService: TeachingPeriodService,
     private learningOutcomeService: LearningOutcomeService,
+    private feedbackTemplateService: FeedbackTemplateService,
     @Inject(UIRouter) private router: UIRouter,
     private alerts: AlertService,
     private mediaObserver: MediaObserver,
@@ -240,6 +242,20 @@ export class GlobalStateService implements OnDestroy {
           },
         });
 
+      this.feedbackTemplateService
+        .query({}, {endpointFormat: FeedbackTemplateService.globalEndpoint})
+        .subscribe({
+          next: (_response) => {
+            subscriber.next(true);
+          },
+          error: (_response) => {
+            this.alerts.error(
+              'Unable to access service. Failed loading GLO feedback templates.',
+              6000,
+            );
+          },
+        });
+
       // Loading teaching periods
       this.teachingPeriodService.query().subscribe({
         next: (_response) => {
@@ -283,7 +299,7 @@ export class GlobalStateService implements OnDestroy {
       },
       error: (_response) => {
         this.alerts.error('Unable to access your units.', 6000);
-      }
+      },
     });
   }
 
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 857f4581f2..71bd324005 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -4,6 +4,7 @@ import { Task, Project, TaskComment, TaskCommentService } from 'src/app/api/mode
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
 import { TaskCommentComposerData } from '../task-comment-composer/task-comment-composer.component';
 import { AlertService } from 'src/app/common/services/alert.service';
+import { FeedbackTemplateService } from 'src/app/api/services/feedback-template.service';
 
 @Component({
   selector: 'task-comments-viewer',
@@ -28,6 +29,7 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
 
   constructor(
     private taskCommentService: TaskCommentService,
+    private feedbackTemplateService: FeedbackTemplateService,
     private constants: DoubtfireConstants,
     @Inject(commentsModal) private commentsModalRef: any,
     private alerts: AlertService,
@@ -77,6 +79,11 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
             lastReadComment.lastRead = true;
           }
         });
+      this.feedbackTemplateService
+        .query({contextType: 'task_definitions', contextId: this.task.definition.id}, {})
+        .subscribe({
+          error: () => this.alerts.error('Error loading task feedback templates.'),
+        });
     } else {
       this.loading = false;
     }
diff --git a/src/app/units/states/index/index.coffee b/src/app/units/states/index/index.coffee
index 7a7346a319..924196e301 100644
--- a/src/app/units/states/index/index.coffee
+++ b/src/app/units/states/index/index.coffee
@@ -17,7 +17,7 @@ angular.module('doubtfire.units.states.index', [])
   }
 )
 
-.controller("UnitsIndexStateCtrl", ($scope, $rootScope, $state, $stateParams, newUnitService, newProjectService, listenerService, GlobalStateService, newUserService, alertService) ->
+.controller("UnitsIndexStateCtrl", ($scope, $rootScope, $state, $stateParams, newUnitService, newProjectService, listenerService, GlobalStateService, newUserService, FeedbackTemplateService) ->
   # Error - required unitId is missing!
   unitId = +$stateParams.unitId
   return $state.go('home') unless unitId
@@ -39,6 +39,10 @@ angular.module('doubtfire.units.states.index', [])
         newProjectService.loadStudents(unit).subscribe({
           next: (students)->
             $scope.unit = unit
+            FeedbackTemplateService.query({contextType: 'units', contextId: unitId}).subscribe({
+              error: (err) ->
+                alertService.error( "Error loading unit feedback templates: " + err, 8000)
+            })
           error: (err)->
             alertService.error( "Error loading students: " + err, 8000)
             setTimeout((()-> $state.go('home')), 5000)

From 6cfe37999fa7f484e1b89f4dbe657b99907adae1 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 14 Jan 2025 00:59:29 +1100
Subject: [PATCH 191/776] fix: template editor not showing if new

---
 .../feedback-template/feedback-template-editor.component.ts   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 4626190ac9..c9315a9463 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -461,7 +461,9 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   }
 
   getPossibleParents(): FeedbackTemplate[] {
-    return this.possibleParents.filter((p) => p.id != this.selectedTemplate.id);
+    if (!this.selectedTemplate.isNew)
+      return this.possibleParents.filter((p) => p.id != this.selectedTemplate.id);
+    else return this.possibleParents;
   }
 
   getParentChipText(parentId: number): string {

From 7585c1c60ca8fe168084ec3d857aec4856bfb0db Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 14 Jan 2025 01:23:49 +1100
Subject: [PATCH 192/776] fix: reset template table for new outcome

---
 .../feedback-template-editor.component.ts                  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index c9315a9463..fbffa80f7a 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -347,7 +347,8 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
 
   public downloadCsv(type: 'learning-outcomes' | 'feedback-templates') {
     let name: string = '';
-    if (this.context instanceof TaskDefinition) name = this.context.abbreviation;
+    if (type === 'feedback-templates') name = this.selectedOutcome.abbreviation;
+    else if (this.context instanceof TaskDefinition) name = this.context.abbreviation;
     else if (this.context instanceof Unit) name = this.context.code;
 
     const url =
@@ -371,6 +372,10 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     learningOutcome.abbreviation = this.abbreviationPrefix;
     learningOutcome.shortDescription = '';
     learningOutcome.fullOutcomeDescription = '';
+    this.selectedConnectedOutcomes.update((_selectedConnectedOutcomes) => []);
+
+    this.templateSource = new MatTableDataSource<FeedbackTemplate>([]);
+    this.templateTable.renderRows();
 
     this.selectedOutcome = learningOutcome;
   }

From a3706e9394b78edf9ec15030246c98acca9d3852 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 14 Jan 2025 14:36:55 +1100
Subject: [PATCH 193/776] fix: hide template editor on outcome switch

---
 .../feedback-template-editor.component.ts        | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index fbffa80f7a..2dcaacff5e 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -215,6 +215,7 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
         this.selectedOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
       }
 
+      this.selectedTemplate = null;
       this.getFeedbackChips();
     }
   }
@@ -362,9 +363,8 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
   public createLearningOutcome() {
     const learningOutcome = new LearningOutcome();
 
-    learningOutcome.context = this.context;
-
     if (this.context) {
+      learningOutcome.context = this.context;
       if (this.context instanceof TaskDefinition) learningOutcome.contextType = 'TaskDefinition';
       else if (this.context instanceof Unit) learningOutcome.contextType = 'Unit';
       learningOutcome.contextId = this.context.id;
@@ -374,13 +374,21 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
     learningOutcome.fullOutcomeDescription = '';
     this.selectedConnectedOutcomes.update((_selectedConnectedOutcomes) => []);
 
-    this.templateSource = new MatTableDataSource<FeedbackTemplate>([]);
-    this.templateTable.renderRows();
+    if (this.selectedOutcome) {
+      this.templateSource = new MatTableDataSource<FeedbackTemplate>([]);
+      this.templateTable.renderRows();
+      this.selectedTemplate = null;
+    }
 
     this.selectedOutcome = learningOutcome;
   }
 
   public createFeedbackTemplate() {
+    if (this.selectedOutcome.isNew) {
+      this.alerts.error('Save the new outcome to proceed.');
+      return;
+    }
+
     const feedbackTemplate = new FeedbackTemplate();
 
     feedbackTemplate.type = 'template';

From a1287449b945295ced60e86a21bcaab67ed0f9bd Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 14 Jan 2025 14:51:49 +1100
Subject: [PATCH 194/776] fix: upon save update entity in frontend

---
 src/app/api/models/feedback-template.ts | 24 +++++--
 src/app/api/models/learning-outcome.ts  | 93 +++++++++++++++----------
 2 files changed, 75 insertions(+), 42 deletions(-)

diff --git a/src/app/api/models/feedback-template.ts b/src/app/api/models/feedback-template.ts
index 305a639c33..1634cb70d6 100644
--- a/src/app/api/models/feedback-template.ts
+++ b/src/app/api/models/feedback-template.ts
@@ -1,5 +1,5 @@
 import {Entity, EntityMapping} from 'ngx-entity-service';
-import {Observable} from 'rxjs';
+import {Observable, tap} from 'rxjs';
 import {AppInjector} from 'src/app/app-injector';
 import {FeedbackTemplateService} from '../services/feedback-template.service';
 
@@ -18,12 +18,24 @@ export class FeedbackTemplate extends Entity {
     const svc = AppInjector.get(FeedbackTemplateService);
 
     if (this.isNew) {
-      return svc.create({}, {entity: this, endpointFormat: FeedbackTemplateService.addEndpoint});
+      return svc
+        .create({}, {entity: this, endpointFormat: FeedbackTemplateService.addEndpoint})
+        .pipe(
+          tap((response: FeedbackTemplate) => {
+            Object.assign(this, response);
+          }),
+        );
     } else {
-      return svc.update(
-        {id: this.id},
-        {entity: this, endpointFormat: FeedbackTemplateService.updateEndpoint},
-      );
+      return svc
+        .update(
+          {id: this.id},
+          {entity: this, endpointFormat: FeedbackTemplateService.updateEndpoint},
+        )
+        .pipe(
+          tap((response: FeedbackTemplate) => {
+            Object.assign(this, response);
+          }),
+        );
     }
   }
 
diff --git a/src/app/api/models/learning-outcome.ts b/src/app/api/models/learning-outcome.ts
index 5ffb0a4cd2..dfdc55fa19 100644
--- a/src/app/api/models/learning-outcome.ts
+++ b/src/app/api/models/learning-outcome.ts
@@ -1,5 +1,5 @@
 import {Entity, EntityMapping} from 'ngx-entity-service';
-import {Observable} from 'rxjs';
+import {Observable, tap} from 'rxjs';
 import {AppInjector} from 'src/app/app-injector';
 import {LearningOutcomeService, TaskDefinition, Unit} from './doubtfire-model';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
@@ -26,47 +26,68 @@ export class LearningOutcome extends Entity {
 
     if (this.context) {
       if (this.isNew) {
-        return svc.create(
-          {
-            contextType: this.contextTypePath[this.contextType],
-            contextId: this.contextId,
-          },
-          {
-            entity: this,
-            cache: this.context.learningOutcomesCache,
-          },
-        );
+        return svc
+          .create(
+            {
+              contextType: this.contextTypePath[this.contextType],
+              contextId: this.contextId,
+            },
+            {
+              entity: this,
+              cache: this.context.learningOutcomesCache,
+            },
+          )
+          .pipe(
+            tap((response: LearningOutcome) => {
+              Object.assign(this, response);
+            }),
+          );
       } else {
-        return svc.update(
-          {
-            contextType: this.contextTypePath[this.contextType],
-            contextId: this.contextId,
-            id: this.id,
-          },
-          {
-            entity: this,
-            cache: this.context.learningOutcomesCache,
-            endpointFormat: LearningOutcomeService.updateEndpoint,
-          },
-        );
+        return svc
+          .update(
+            {
+              contextType: this.contextTypePath[this.contextType],
+              contextId: this.contextId,
+              id: this.id,
+            },
+            {
+              entity: this,
+              cache: this.context.learningOutcomesCache,
+              endpointFormat: LearningOutcomeService.updateEndpoint,
+            },
+          )
+          .pipe(
+            tap((response: LearningOutcome) => {
+              Object.assign(this, response);
+            }),
+          );
       }
     } else {
       // GLO
       if (this.isNew) {
-        return svc.create(
-          {},
-          {entity: this, endpointFormat: LearningOutcomeService.globalEndpoint},
-        );
+        return svc
+          .create({}, {entity: this, endpointFormat: LearningOutcomeService.globalEndpoint})
+          .pipe(
+            tap((response: LearningOutcome) => {
+              Object.assign(this, response);
+            }),
+          );
       } else {
-        return svc.update(
-          {
-            id: this.id,
-          },
-          {
-            entity: this,
-            endpointFormat: LearningOutcomeService.updateGlobalEndpoint,
-          },
-        );
+        return svc
+          .update(
+            {
+              id: this.id,
+            },
+            {
+              entity: this,
+              endpointFormat: LearningOutcomeService.updateGlobalEndpoint,
+            },
+          )
+          .pipe(
+            tap((response: LearningOutcome) => {
+              Object.assign(this, response);
+            }),
+          );
       }
     }
   }

From 7f4381e1179400642821068d1acdba346a2969a2 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:06:31 +1100
Subject: [PATCH 195/776] fix: only get feedback chips if staff

---
 .../states/index/global-state.service.ts      | 50 ++++++++++---------
 .../task-comment-composer.component.html      |  2 +-
 .../task-comments-viewer.component.ts         | 16 +++---
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/app/projects/states/index/global-state.service.ts b/src/app/projects/states/index/global-state.service.ts
index 4378502957..a05b7705de 100644
--- a/src/app/projects/states/index/global-state.service.ts
+++ b/src/app/projects/states/index/global-state.service.ts
@@ -231,30 +231,32 @@ export class GlobalStateService implements OnDestroy {
         },
       });
 
-      this.learningOutcomeService
-        .query({}, {endpointFormat: LearningOutcomeService.globalEndpoint})
-        .subscribe({
-          next: (_response) => {
-            subscriber.next(true);
-          },
-          error: (_response) => {
-            this.alerts.error('Unable to access service. Failed loading GLOs.', 6000);
-          },
-        });
-
-      this.feedbackTemplateService
-        .query({}, {endpointFormat: FeedbackTemplateService.globalEndpoint})
-        .subscribe({
-          next: (_response) => {
-            subscriber.next(true);
-          },
-          error: (_response) => {
-            this.alerts.error(
-              'Unable to access service. Failed loading GLO feedback templates.',
-              6000,
-            );
-          },
-        });
+      if (this.userService.currentUser.isStaff) {
+        this.learningOutcomeService
+          .query({}, {endpointFormat: LearningOutcomeService.globalEndpoint})
+          .subscribe({
+            next: (_response) => {
+              subscriber.next(true);
+            },
+            error: (_response) => {
+              this.alerts.error('Unable to access service. Failed loading GLOs.', 6000);
+            },
+          });
+
+        this.feedbackTemplateService
+          .query({}, {endpointFormat: FeedbackTemplateService.globalEndpoint})
+          .subscribe({
+            next: (_response) => {
+              subscriber.next(true);
+            },
+            error: (_response) => {
+              this.alerts.error(
+                'Unable to access service. Failed loading GLO feedback templates.',
+                6000,
+              );
+            },
+          });
+      }
 
       // Loading teaching periods
       this.teachingPeriodService.query().subscribe({
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.html b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
index db1cc099ee..a5508feb9a 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.html
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
@@ -178,7 +178,7 @@
           emoji_emotions</mat-icon
         >
       </div>
-      <div id="innerButtons" [hidden]="recording">
+      <div id="innerButtons" [hidden]="recording || !isStaff">
         <mat-icon
           matTooltip="Choose feedback templates"
           matTooltipShowDelay="400"
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 71bd324005..43c4e61e5e 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, Input, Inject, OnChanges, SimpleChanges, ViewChild, ElementRef } from '@angular/core';
 import { commentsModal } from 'src/app/ajs-upgraded-providers';
-import { Task, Project, TaskComment, TaskCommentService } from 'src/app/api/models/doubtfire-model';
+import { Task, Project, TaskComment, TaskCommentService, UserService } from 'src/app/api/models/doubtfire-model';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
 import { TaskCommentComposerData } from '../task-comment-composer/task-comment-composer.component';
 import { AlertService } from 'src/app/common/services/alert.service';
@@ -30,6 +30,7 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
   constructor(
     private taskCommentService: TaskCommentService,
     private feedbackTemplateService: FeedbackTemplateService,
+    private userService: UserService,
     private constants: DoubtfireConstants,
     @Inject(commentsModal) private commentsModalRef: any,
     private alerts: AlertService,
@@ -79,11 +80,14 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
             lastReadComment.lastRead = true;
           }
         });
-      this.feedbackTemplateService
-        .query({contextType: 'task_definitions', contextId: this.task.definition.id}, {})
-        .subscribe({
-          error: () => this.alerts.error('Error loading task feedback templates.'),
-        });
+
+      if (this.userService.currentUser.isStaff) {
+        this.feedbackTemplateService
+          .query({contextType: 'task_definitions', contextId: this.task.definition.id}, {})
+          .subscribe({
+            error: () => this.alerts.error('Error loading task feedback templates.'),
+          });
+      }
     } else {
       this.loading = false;
     }

From c078bcf40198c5495d4c94354fab411d3e0ee934 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 20 Jan 2025 23:55:57 +1100
Subject: [PATCH 196/776] fix: refresh context when changing task defs

---
 .../feedback-template-editor.component.ts     | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 2dcaacff5e..12969e0f08 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -11,6 +11,8 @@ import {
   signal,
   effect,
   ViewChild,
+  OnChanges,
+  SimpleChanges,
 } from '@angular/core';
 import {MatTable, MatTableDataSource} from '@angular/material/table';
 import {MatPaginator} from '@angular/material/paginator';
@@ -42,7 +44,9 @@ import {isEqual} from 'lodash';
   selector: 'f-feedback-template-editor',
   templateUrl: 'feedback-template-editor.component.html',
 })
-export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, OnDestroy {
+export class FeedbackTemplateEditorComponent
+  implements OnInit, OnChanges, AfterViewInit, OnDestroy
+{
   @Input() context?: TaskDefinition | Unit;
 
   @ViewChild('outcomeTable', {static: false}) outcomeTable: MatTable<LearningOutcome>;
@@ -128,6 +132,23 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
       return;
     }
 
+    this.subscriptions.push(
+      this.learningOutcomeService.cache.values.subscribe((outcomes) => {
+        const glos = outcomes.filter((outcome) => outcome.contextType === null);
+        this.allOutcomes = [...this.allOutcomes, ...glos];
+      }),
+    );
+
+    if (this.context instanceof TaskDefinition) {
+      this.subscriptions.push(
+        this.context.unit.learningOutcomesCache.values.subscribe((learningOutcomes) => {
+          this.allOutcomes = [...this.allOutcomes, ...learningOutcomes];
+        }),
+      );
+    }
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
     this.subscriptions.push(
       this.context.learningOutcomesCache.values.subscribe((learningOutcomes) => {
         this.outcomeSource = new MatTableDataSource<LearningOutcome>(learningOutcomes);
@@ -142,19 +163,7 @@ export class FeedbackTemplateEditorComponent implements OnInit, AfterViewInit, O
           );
         };
       }),
-      this.learningOutcomeService.cache.values.subscribe((outcomes) => {
-        const glos = outcomes.filter((outcome) => outcome.contextType === null);
-        this.allOutcomes = [...this.allOutcomes, ...glos];
-      }),
     );
-
-    if (this.context instanceof TaskDefinition) {
-      this.subscriptions.push(
-        this.context.unit.learningOutcomesCache.values.subscribe((learningOutcomes) => {
-          this.allOutcomes = [...this.allOutcomes, ...learningOutcomes];
-        }),
-      );
-    }
   }
 
   ngOnDestroy(): void {

From f410cfe47b0c242f1a164c6345bc4d29f5659f6a Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 21 Jan 2025 01:19:56 +1100
Subject: [PATCH 197/776] fix: refine feedback editor

---
 .../feedback-template-editor.component.html   | 100 +++++++++++-------
 .../feedback-template-editor.component.ts     |  14 ++-
 2 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index c283fe99f9..a2ee467297 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -137,35 +137,37 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
           </textarea>
         </mat-form-field>
 
-        <mat-form-field appearance="outline" class="flex flex-grow">
-          <mat-label>Connected Learning Outcomes</mat-label>
-          <mat-chip-grid #chipGrid aria-label="Outcome selection">
-            @for (outcome of selectedConnectedOutcomes(); track outcome.abbreviation) {
-              <mat-chip-row (removed)="remove(outcome)">
-                {{ outcome.abbreviation }}
-                <button matChipRemove [attr.aria-label]="'remove ' + outcome.abbreviation">
-                  <mat-icon>cancel</mat-icon>
-                </button>
-              </mat-chip-row>
-            }
-          </mat-chip-grid>
-          <input
-            name="typedConnectedOutcome"
-            placeholder="Connect an outcome..."
-            #connectedOutcomeInput
-            [(ngModel)]="typedConnectedOutcome"
-            [matChipInputFor]="chipGrid"
-            [matAutocomplete]="auto"
-            [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-            (matChipInputTokenEnd)="add($event)"
-            [disabled]="!this.context"
-          />
-          <mat-autocomplete #auto="matAutocomplete" (optionSelected)="select($event)">
-            @for (outcome of filteredOutcomes(); track outcome) {
-              <mat-option [value]="outcome.abbreviation">{{ outcome.abbreviation }}</mat-option>
-            }
-          </mat-autocomplete>
-        </mat-form-field>
+        @if (abbreviationPrefix !== 'GLO') {
+          <mat-form-field appearance="outline" class="flex flex-grow">
+            <mat-label>Connected Learning Outcomes</mat-label>
+            <mat-chip-grid #chipGrid aria-label="Outcome selection">
+              @for (outcome of selectedConnectedOutcomes(); track outcome.abbreviation) {
+                <mat-chip-row (removed)="remove(outcome)">
+                  {{ outcome.abbreviation }}
+                  <button matChipRemove [attr.aria-label]="'remove ' + outcome.abbreviation">
+                    <mat-icon>cancel</mat-icon>
+                  </button>
+                </mat-chip-row>
+              }
+            </mat-chip-grid>
+            <input
+              name="typedConnectedOutcome"
+              placeholder="Connect an outcome..."
+              #connectedOutcomeInput
+              [(ngModel)]="typedConnectedOutcome"
+              [matChipInputFor]="chipGrid"
+              [matAutocomplete]="auto"
+              [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+              (matChipInputTokenEnd)="add($event)"
+              [disabled]="!this.context"
+            />
+            <mat-autocomplete #auto="matAutocomplete" (optionSelected)="select($event)">
+              @for (outcome of filteredOutcomes(); track outcome) {
+                <mat-option [value]="outcome.abbreviation">{{ outcome.abbreviation }}</mat-option>
+              }
+            </mat-autocomplete>
+          </mat-form-field>
+        }
 
         <div class="flex">
           <span class="flex-grow"></span>
@@ -189,6 +191,22 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
             matSort
             (matSortChange)="sortTemplateData($event)"
           >
+            <ng-container matColumnDef="icon" sticky>
+              <th mat-header-cell *matHeaderCellDef></th>
+              <td
+                mat-cell
+                *matCellDef="let feedbackTemplate"
+                (click)="selectFeedbackTemplate(feedbackTemplate)"
+                class="pr-0"
+              >
+                <ng-container *ngIf="feedbackTemplate.type === 'group'">
+                  <mat-icon>folder</mat-icon>
+                </ng-container>
+                <ng-container *ngIf="feedbackTemplate.type === 'template'">
+                  <mat-icon>description</mat-icon>
+                </ng-container>
+              </td>
+            </ng-container>
             <ng-container matColumnDef="parent" sticky>
               <th mat-header-cell *matHeaderCellDef>Parent</th>
               <td
@@ -319,17 +337,19 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
               <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
 
               <div class="flex flex-row gap-4">
-                <mat-form-field appearance="outline" class="basis-1/5">
-                  <mat-label>Type</mat-label>
-                  <mat-select
-                    required
-                    [value]="selectedTemplate.type"
-                    (selectionChange)="onTemplateTypeChange($event)"
-                  >
-                    <mat-option [value]="'group'">Group</mat-option>
-                    <mat-option [value]="'template'">Template</mat-option>
-                  </mat-select>
-                </mat-form-field>
+                @if (selectedTemplate.isNew) {
+                  <mat-form-field appearance="outline" class="basis-1/5">
+                    <mat-label>Type</mat-label>
+                    <mat-select
+                      required
+                      [value]="selectedTemplate.type"
+                      (selectionChange)="onTemplateTypeChange($event)"
+                    >
+                      <mat-option [value]="'group'">Group</mat-option>
+                      <mat-option [value]="'template'">Template</mat-option>
+                    </mat-select>
+                  </mat-form-field>
+                }
 
                 <mat-form-field appearance="outline" class="basis-1/5">
                   <mat-label>Parent</mat-label>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 12969e0f08..3ca3824689 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -73,6 +73,7 @@ export class FeedbackTemplateEditorComponent
 
   public templateSource: MatTableDataSource<FeedbackTemplate>;
   public templateColumns: string[] = [
+    'icon',
     'parent',
     'chipText',
     'description',
@@ -164,6 +165,8 @@ export class FeedbackTemplateEditorComponent
         };
       }),
     );
+
+    this.selectedOutcome = null;
   }
 
   ngOnDestroy(): void {
@@ -378,7 +381,7 @@ export class FeedbackTemplateEditorComponent
       else if (this.context instanceof Unit) learningOutcome.contextType = 'Unit';
       learningOutcome.contextId = this.context.id;
     }
-    learningOutcome.abbreviation = this.abbreviationPrefix;
+    learningOutcome.abbreviation = this.abbreviationPrefix + String(this.getNextOutcomeNumber());
     learningOutcome.shortDescription = '';
     learningOutcome.fullOutcomeDescription = '';
     this.selectedConnectedOutcomes.update((_selectedConnectedOutcomes) => []);
@@ -492,4 +495,13 @@ export class FeedbackTemplateEditorComponent
     const parent = this.possibleParents.find((p) => p.id === parentId);
     return parent ? parent.chipText : '';
   }
+
+  getNextOutcomeNumber(): number {
+    if (this.outcomeSource.data && this.outcomeSource.data.length > 0) {
+      let abbr = this.outcomeSource.data[this.outcomeSource.data.length - 1].abbreviation;
+      abbr = abbr.replace(this.abbreviationPrefix, '');
+      return Number(abbr) + 1;
+    }
+    return 1;
+  }
 }

From 24e9c04c9f1d93c87857e8cd2f08949becba602d Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 21 Jan 2025 03:04:11 +1100
Subject: [PATCH 198/776] refactor: remove nested feedback csv and add outcome
 csv modal

---
 .../feedback-template-editor.component.html   | 24 ++++++++++---------
 .../feedback-template-editor.component.ts     |  8 ++++++-
 ...-outcome-csv-download-modal.component.html | 14 +++++++++++
 ...ng-outcome-csv-download-modal.component.ts | 24 +++++++++++++++++++
 ...ning-outcome-csv-download-modal.service.ts | 16 +++++++++++++
 src/app/doubtfire-angular.module.ts           |  4 ++++
 6 files changed, 78 insertions(+), 12 deletions(-)
 create mode 100644 src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.html
 create mode 100644 src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.ts
 create mode 100644 src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service.ts

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index a2ee467297..35efa0df38 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -103,11 +103,21 @@
       [pageSizeOptions]="[5, 10, 25, 100]"
     ></mat-paginator>
     <span class="flex-grow"></span>
-    <label>Learning Outcomes CSV</label>
-    <button mat-icon-button (click)="downloadCsv('learning-outcomes')">
+    @if (abbreviationPrefix !== 'GLO') {
+      <label>Learning Outcomes CSV</label>
+      <button mat-icon-button (click)="downloadCsv('learning-outcomes')">
+        <mat-icon>download</mat-icon>
+      </button>
+      <button mat-icon-button (click)="uploadCsv('Learning Outcomes')">
+        <mat-icon>upload_file</mat-icon>
+      </button>
+      <span class="flex-grow"></span>
+    }
+    <label>Feedback Templates CSV</label>
+    <button mat-icon-button (click)="downloadCsv('feedback-templates')">
       <mat-icon>download</mat-icon>
     </button>
-    <button mat-icon-button (click)="uploadCsv('Learning Outcomes')">
+    <button mat-icon-button (click)="uploadCsv('Feedback Templates')">
       <mat-icon>upload_file</mat-icon>
     </button>
     <span class="flex-grow"></span>
@@ -319,14 +329,6 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
               [pageSizeOptions]="[5, 10, 25, 100]"
             ></mat-paginator>
             <span class="flex-grow"></span>
-            <label>Feedback Templates CSV</label>
-            <button mat-icon-button (click)="downloadCsv('feedback-templates')">
-              <mat-icon>download</mat-icon>
-            </button>
-            <button mat-icon-button (click)="uploadCsv('Feedback Templates')">
-              <mat-icon>upload_file</mat-icon>
-            </button>
-            <span class="flex-grow"></span>
             <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">
               Add Template
             </button>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 3ca3824689..dc0d8b6f5f 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -39,6 +39,7 @@ import {MatChipInputEvent} from '@angular/material/chips';
 import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
 import {isEqual} from 'lodash';
+import {LearningOutcomeCsvDownloadModalService} from './learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service';
 
 @Component({
   selector: 'f-feedback-template-editor',
@@ -92,6 +93,7 @@ export class FeedbackTemplateEditorComponent
     private learningOutcomeService: LearningOutcomeService,
     private feedbackTemplateService: FeedbackTemplateService,
     private fileDownloaderService: FileDownloaderService,
+    private learningOutcomeCsvDownloadModalService: LearningOutcomeCsvDownloadModalService,
     @Inject(csvResultModalService) private csvResultModalService: any,
     @Inject(csvUploadModalService) private csvUploadModal: any,
     @Inject(confirmationModal) private confirmationModal: any,
@@ -359,10 +361,14 @@ export class FeedbackTemplateEditorComponent
   }
 
   public downloadCsv(type: 'learning-outcomes' | 'feedback-templates') {
+    if (this.context instanceof Unit) {
+      this.learningOutcomeCsvDownloadModalService.show(this.context);
+      return;
+    }
+
     let name: string = '';
     if (type === 'feedback-templates') name = this.selectedOutcome.abbreviation;
     else if (this.context instanceof TaskDefinition) name = this.context.abbreviation;
-    else if (this.context instanceof Unit) name = this.context.code;
 
     const url =
       type === 'learning-outcomes'
diff --git a/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.html b/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.html
new file mode 100644
index 0000000000..91fe893afb
--- /dev/null
+++ b/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.html
@@ -0,0 +1,14 @@
+<div mat-dialog-content>
+  <h4 mat-dialog-title>Download the Learning Outcome CSV</h4>
+  <div class="px-10">
+    <p>This action will download all learning outcomes associated with this unit.</p>
+    <mat-checkbox [(ngModel)]="includeTaskOutcomes"
+      >Include the unit's task learning outcomes</mat-checkbox
+    >
+  </div>
+</div>
+
+<div mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close>Cancel</button>
+  <button mat-raised-button color="primary" (click)="downloadCsv()">Download</button>
+</div>
diff --git a/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.ts b/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.ts
new file mode 100644
index 0000000000..7c2b684912
--- /dev/null
+++ b/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.ts
@@ -0,0 +1,24 @@
+import {Component, Inject} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {Unit} from 'src/app/api/models/unit';
+import {FileDownloaderService} from '../../file-downloader/file-downloader.service';
+
+@Component({
+  selector: 'f-learning-outcome-csv-download-modal',
+  templateUrl: './learning-outcome-csv-download-modal.component.html',
+})
+export class LearningOutcomeCsvDownloadModalComponent {
+  public includeTaskOutcomes = false;
+
+  constructor(
+    private fileDownloaderService: FileDownloaderService,
+    public dialogRef: MatDialogRef<LearningOutcomeCsvDownloadModalComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: {unit: Unit},
+  ) {}
+
+  downloadCsv() {
+    const name = this.data.unit.code;
+    const url = this.data.unit.getOutcomeBatchUploadUrl();
+    this.fileDownloaderService.downloadFile(url, `${name}-learning-outcomes.csv`);
+  }
+}
diff --git a/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service.ts b/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service.ts
new file mode 100644
index 0000000000..f51f5040a5
--- /dev/null
+++ b/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service.ts
@@ -0,0 +1,16 @@
+import {Injectable} from '@angular/core';
+import {MatDialogRef, MatDialog} from '@angular/material/dialog';
+import {LearningOutcomeCsvDownloadModalComponent} from './learning-outcome-csv-download-modal.component';
+import {Unit} from 'src/app/api/models/unit';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class LearningOutcomeCsvDownloadModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(unit: Unit) {
+    let dialogRef: MatDialogRef<LearningOutcomeCsvDownloadModalComponent, any>;
+    dialogRef = this.dialog.open(LearningOutcomeCsvDownloadModalComponent, {data: {unit}});
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 21b56cc9e8..27e48ad52e 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -240,6 +240,8 @@ import {ScormExtensionModalComponent} from './common/modals/scorm-extension-moda
 import {FeedbackTemplateService} from './api/services/feedback-template.service';
 import {FeedbackTemplateEditorComponent} from './common/feedback-template/feedback-template-editor.component';
 import {TaskFeedbackTemplatesComponent} from './tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component';
+import {LearningOutcomeCsvDownloadModalComponent} from './common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component';
+import {LearningOutcomeCsvDownloadModalService} from './common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -362,6 +364,7 @@ const MY_DATE_FORMAT = {
     ScormExtensionModalComponent,
     FeedbackTemplateEditorComponent,
     TaskFeedbackTemplatesComponent,
+    LearningOutcomeCsvDownloadModalComponent,
   ],
   // Services we provide
   providers: [
@@ -441,6 +444,7 @@ const MY_DATE_FORMAT = {
       player: () => player,
     }),
     FeedbackTemplateService,
+    LearningOutcomeCsvDownloadModalService,
   ],
   imports: [
     FlexLayoutModule,

From fa1ea357ba732ded68ccb259c6870c0550720552 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 21 Jan 2025 11:24:36 +1100
Subject: [PATCH 199/776] refactor: remove unused feedback picker sections

---
 .../task-feedback-templates.component.ts                        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index bfedc7b882..fce8727a41 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -29,9 +29,7 @@ export class TaskFeedbackTemplatesComponent {
 
   @ViewChild('tloSection') tloSection!: ElementRef;
   @ViewChild('uloSection') uloSection!: ElementRef;
-  @ViewChild('cloSection') cloSection!: ElementRef;
   @ViewChild('gloSection') gloSection!: ElementRef;
-  @ViewChild('sectionSection') sectionSection!: ElementRef;
 
   scrollToSection(event: any) {
     const sections = [this.tloSection, this.uloSection, this.gloSection];

From e54216f8472b67cf9f2ff69c9bcb3355efa90081 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 21 Jan 2025 15:32:58 +1100
Subject: [PATCH 200/776] feat: show chips on picker

---
 .../task-comment-composer.component.html      | 11 ++-
 .../task-feedback-templates.component.html    | 84 +++++++++--------
 .../task-feedback-templates.component.ts      | 91 ++++++++++++++-----
 3 files changed, 121 insertions(+), 65 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.html b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
index a5508feb9a..f75bd7e160 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.html
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
@@ -1,7 +1,10 @@
-<f-task-feedback-templates
-  [hidden]="!this.showFeedbackTemplatePicker"
-  class="feedback-template-picker"
-></f-task-feedback-templates>
+@if (task) {
+  <f-task-feedback-templates
+    [task]="task"
+    [hidden]="!this.showFeedbackTemplatePicker"
+    class="feedback-template-picker"
+  ></f-task-feedback-templates>
+}
 
 <emoji-mart
   [darkMode]="false"
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
index da88180732..8f471e43c1 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -2,70 +2,74 @@
   class="p-2 bg-white rounded-lg border border-gray-300 shadow-none flex flex-col w-[338px] h-[423px]"
 >
   <mat-tab-group (selectedTabChange)="scrollToSection($event)" class="category-tab-group">
-    <mat-tab *ngFor="let category of categories" [label]="category.name"></mat-tab>
+    <mat-tab *ngFor="let category of categories" [label]="category"></mat-tab>
   </mat-tab-group>
 
   <mat-form-field appearance="outline" class="template-search w-full pt-2">
-    <input
-      matInput
-      placeholder="Search templates"
-      [(ngModel)]="searchTerm"
-      (input)="filterTemplates()"
-    />
+    <input matInput placeholder="Search templates" [(ngModel)]="searchTerm" />
     <mat-icon matSuffix>search</mat-icon>
   </mat-form-field>
 
   <div class="overflow-y-auto flex-grow">
-    <div #tloSection class="mt-2">
+    <div #tloSection class="template-category mt-2">
       <h4 class="text-gray-700 font-semibold">TLO</h4>
-      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
-        <mat-chip
-          *ngFor="let template of filteredCategories[0].templates"
-          (mouseenter)="onHoverTemplate(template)"
-          (mouseleave)="onHoverTemplate('')"
-          (click)="selectTemplate(template)"
-          class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
-        >
-          {{ template }}
-        </mat-chip>
+      <div *ngFor="let item of tlos$ | async" class="outcome-section mt-4">
+        <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
+        <div class="template-grid flex flex-wrap gap-1.5 mt-1">
+          <mat-chip
+            *ngFor="let template of item.templates"
+            (mouseenter)="onHoverTemplate(template)"
+            (mouseleave)="onHoverTemplate(null)"
+            (click)="selectTemplate(template)"
+            class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+          >
+            {{ template.chipText }}
+          </mat-chip>
+        </div>
       </div>
     </div>
 
     <div #uloSection class="template-category mt-2">
       <h4 class="text-gray-700 font-semibold">ULO</h4>
-      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
-        <mat-chip
-          *ngFor="let template of filteredCategories[1].templates"
-          (mouseenter)="onHoverTemplate(template)"
-          (mouseleave)="onHoverTemplate('')"
-          (click)="selectTemplate(template)"
-          class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
-        >
-          {{ template }}
-        </mat-chip>
+      <div *ngFor="let item of ulos$ | async" class="outcome-section mt-4">
+        <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
+        <div class="template-grid flex flex-wrap gap-1.5 mt-1">
+          <mat-chip
+            *ngFor="let template of item.templates"
+            (mouseenter)="onHoverTemplate(template)"
+            (mouseleave)="onHoverTemplate(null)"
+            (click)="selectTemplate(template)"
+            class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+          >
+            {{ template.chipText }}
+          </mat-chip>
+        </div>
       </div>
     </div>
 
     <div #gloSection class="template-category mt-2">
       <h4 class="text-gray-700 font-semibold">GLO</h4>
-      <div class="template-grid flex flex-wrap gap-1.5 mt-1">
-        <mat-chip
-          *ngFor="let template of filteredCategories[2].templates"
-          (mouseenter)="onHoverTemplate(template)"
-          (mouseleave)="onHoverTemplate('')"
-          (click)="selectTemplate(template)"
-          class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
-        >
-          {{ template }}
-        </mat-chip>
+      <div *ngFor="let item of glos$ | async" class="outcome-section mt-4">
+        <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
+        <div class="template-grid flex flex-wrap gap-1.5 mt-1">
+          <mat-chip
+            *ngFor="let template of item.templates"
+            (mouseenter)="onHoverTemplate(template)"
+            (mouseleave)="onHoverTemplate(null)"
+            (click)="selectTemplate(template)"
+            class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+          >
+            {{ template.chipText }}
+          </mat-chip>
+        </div>
       </div>
     </div>
   </div>
 
   <div>
-    <p class="pt-5 mb-0">{{ hoveredTemplate || 'Select a feedback chip' }}</p>
+    <p class="pt-5 mb-0">{{ hoveredTemplate?.chipText || 'Select a feedback chip' }}</p>
     <p class="pt-1 pb-2 mb-0">
-      {{ hoveredTemplate || 'This will populate the comment area with feedback.' }}
+      {{ hoveredTemplate?.description || 'This will populate the comment area with feedback.' }}
     </p>
   </div>
 </mat-card>
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index fce8727a41..21940e29e2 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -1,4 +1,16 @@
-import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
+import {
+  Component,
+  ElementRef,
+  Input,
+  OnChanges,
+  SimpleChanges,
+  ViewChild,
+  ViewEncapsulation,
+} from '@angular/core';
+import {combineLatest, map, Observable} from 'rxjs';
+import {LearningOutcome, FeedbackTemplate, Task} from 'src/app/api/models/doubtfire-model';
+import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
+import {LearningOutcomeService} from 'src/app/api/services/learning-outcome.service';
 
 @Component({
   selector: 'f-task-feedback-templates',
@@ -6,27 +18,64 @@ import {Component, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core
   templateUrl: './task-feedback-templates.component.html',
   encapsulation: ViewEncapsulation.None,
 })
-export class TaskFeedbackTemplatesComponent {
+export class TaskFeedbackTemplatesComponent implements OnChanges {
+  @Input() task: Task;
+  categories = ['TLO', 'ULO', 'GLO'];
   searchTerm: string = '';
-  hoveredTemplate: string = '';
-
-  categories = [
-    {name: 'TLO', templates: ['Template A1', 'Template A2', 'Template A3', 'Template A4']},
-    {name: 'ULO', templates: ['Template B1', 'Template B2', 'Template B3', 'Template B4']},
-    {name: 'GLO', templates: ['Template D1', 'Template D2', 'Template D3', 'Template D4']},
-  ];
-
-  filteredCategories = [...this.categories];
-
-  filterTemplates() {
-    this.filteredCategories = this.categories.map((category) => ({
-      ...category,
-      templates: category.templates.filter((template) =>
-        template.toLowerCase().includes(this.searchTerm.toLowerCase()),
-      ),
-    }));
+  hoveredTemplate: FeedbackTemplate;
+
+  public tlos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
+  public ulos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
+
+  constructor(
+    private learningOutcomeService: LearningOutcomeService,
+    private feedbackTemplateService: FeedbackTemplateService,
+  ) {}
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (this.task && this.task.definition) {
+      this.tlos$ = combineLatest([
+        this.task.definition.learningOutcomesCache.values,
+        this.feedbackTemplateService.cache.values,
+      ]).pipe(
+        map(([outcomes, templates]) =>
+          outcomes.map((outcome) => ({
+            outcome: outcome,
+            templates: templates.filter((template) => template.learningOutcomeId === outcome.id),
+          })),
+        ),
+      );
+    }
+
+    if (this.task.unit) {
+      this.ulos$ = combineLatest([
+        this.task.unit.learningOutcomesCache.values,
+        this.feedbackTemplateService.cache.values,
+      ]).pipe(
+        map(([outcomes, templates]) =>
+          outcomes.map((outcome) => ({
+            outcome: outcome,
+            templates: templates.filter((template) => template.learningOutcomeId === outcome.id),
+          })),
+        ),
+      );
+    }
   }
 
+  public glos$ = combineLatest([
+    this.learningOutcomeService.cache.values,
+    this.feedbackTemplateService.cache.values,
+  ]).pipe(
+    map(([outcomes, templates]) =>
+      outcomes
+        .filter((outcome) => outcome.contextType === null)
+        .map((outcome) => ({
+          outcome: outcome,
+          templates: templates.filter((template) => template.learningOutcomeId === outcome.id),
+        })),
+    ),
+  );
+
   @ViewChild('tloSection') tloSection!: ElementRef;
   @ViewChild('uloSection') uloSection!: ElementRef;
   @ViewChild('gloSection') gloSection!: ElementRef;
@@ -40,11 +89,11 @@ export class TaskFeedbackTemplatesComponent {
     }
   }
 
-  selectTemplate(template: string) {
+  selectTemplate(template: FeedbackTemplate) {
     console.log('Selected template:', template);
   }
 
-  onHoverTemplate(template: string) {
+  onHoverTemplate(template: FeedbackTemplate) {
     this.hoveredTemplate = template;
   }
 }

From 5c45415eafb38e221963781e4575480294d74e09 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 21 Jan 2025 15:54:05 +1100
Subject: [PATCH 201/776] feat: add comment text to comment area

---
 .../task-comment-composer.component.html       |  1 +
 .../task-comment-composer.component.ts         | 18 +++++++++++++++++-
 .../task-feedback-templates.component.ts       |  5 ++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.html b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
index f75bd7e160..5445d40944 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.html
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
@@ -1,6 +1,7 @@
 @if (task) {
   <f-task-feedback-templates
     [task]="task"
+    (templateSelected)="addFeedback($event)"
     [hidden]="!this.showFeedbackTemplatePicker"
     class="feedback-template-picker"
   ></f-task-feedback-templates>
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index ca4319969d..f08e54b21a 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -17,7 +17,12 @@ import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog
 import {EmojiSearch} from '@ctrl/ngx-emoji-mart';
 import {EmojiData} from '@ctrl/ngx-emoji-mart/ngx-emoji/';
 import {EmojiService} from 'src/app/common/services/emoji.service';
-import {Task, TaskComment, TaskCommentService} from 'src/app/api/models/doubtfire-model';
+import {
+  Task,
+  TaskComment,
+  TaskCommentService,
+  FeedbackTemplate,
+} from 'src/app/api/models/doubtfire-model';
 import {TaskCommentsViewerComponent} from '../task-comments-viewer/task-comments-viewer.component';
 import {BehaviorSubject} from 'rxjs';
 import {AlertService} from 'src/app/common/services/alert.service';
@@ -244,6 +249,17 @@ export class TaskCommentComposerComponent implements DoCheck {
     ].join('');
   }
 
+  addFeedback(template: FeedbackTemplate): void {
+    const char = template.commentText;
+    const text = this.input.first.nativeElement.innerText;
+    const position = this.caretOffset();
+    this.input.first.nativeElement.innerText = [
+      text.slice(0, position),
+      char,
+      text.slice(position),
+    ].join('');
+  }
+
   openDiscussionComposer() {
     this.dialog.open(DiscussionComposerDialog, {
       data: {
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index 21940e29e2..8582065901 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -3,9 +3,11 @@ import {
   ElementRef,
   Input,
   OnChanges,
+  Output,
   SimpleChanges,
   ViewChild,
   ViewEncapsulation,
+  EventEmitter,
 } from '@angular/core';
 import {combineLatest, map, Observable} from 'rxjs';
 import {LearningOutcome, FeedbackTemplate, Task} from 'src/app/api/models/doubtfire-model';
@@ -20,6 +22,7 @@ import {LearningOutcomeService} from 'src/app/api/services/learning-outcome.serv
 })
 export class TaskFeedbackTemplatesComponent implements OnChanges {
   @Input() task: Task;
+  @Output() templateSelected = new EventEmitter<FeedbackTemplate>();
   categories = ['TLO', 'ULO', 'GLO'];
   searchTerm: string = '';
   hoveredTemplate: FeedbackTemplate;
@@ -90,7 +93,7 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
   }
 
   selectTemplate(template: FeedbackTemplate) {
-    console.log('Selected template:', template);
+    this.templateSelected.emit(template);
   }
 
   onHoverTemplate(template: FeedbackTemplate) {

From 198b7f9d0ccad631059ed5e1ad5487604582074b Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 21 Jan 2025 19:08:13 +1100
Subject: [PATCH 202/776] fix: hide picker on task change

---
 .../task-comment-composer.component.ts                    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index f08e54b21a..cfec9e8e95 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -10,6 +10,8 @@ import {
   ElementRef,
   ViewChild,
   DoCheck,
+  OnChanges,
+  SimpleChanges,
 } from '@angular/core';
 import {trigger, style, animate, transition} from '@angular/animations';
 import {analyticsService} from 'src/app/ajs-upgraded-providers';
@@ -66,10 +68,14 @@ const ACCEPTED_FILE_TYPES = [
     ]),
   ],
 })
-export class TaskCommentComposerComponent implements DoCheck {
+export class TaskCommentComposerComponent implements DoCheck, OnChanges {
   @Input() task: Task;
   @Input() sharedData: TaskCommentComposerData;
 
+  ngOnChanges(changes: SimpleChanges): void {
+    this.showFeedbackTemplatePicker = false;
+  }
+
   public $userIsTyping = new BehaviorSubject<boolean>(false);
 
   comment = {

From 9caeda4e71946ddb7907027ebf7a54397f11606f Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 21 Jan 2025 23:34:32 +1100
Subject: [PATCH 203/776] feat: fetch feedback chips when selecting task in
 unit editor

---
 .../unit-tasks-editor/unit-task-editor.component.ts       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
index 72c309371d..158d6cae44 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
@@ -9,6 +9,7 @@ import { Unit } from 'src/app/api/models/unit';
 import { TaskDefinitionService } from 'src/app/api/services/task-definition.service';
 import { AlertService } from 'src/app/common/services/alert.service';
 import { addWeeks } from 'date-fns';
+import { FeedbackTemplateService } from 'src/app/api/services/feedback-template.service';
 
 @Component({
   selector: 'f-unit-task-editor',
@@ -29,6 +30,7 @@ export class UnitTaskEditorComponent implements AfterViewInit {
 
   constructor(
     private taskDefinitionService: TaskDefinitionService,
+    private feedbackTemplateService: FeedbackTemplateService,
     private alerts: AlertService,
     @Inject(csvResultModalService) private csvResultModalService: any,
     @Inject(csvUploadModalService) private csvUploadModal: any,
@@ -68,6 +70,12 @@ export class UnitTaskEditorComponent implements AfterViewInit {
       if (!this.selectedTaskDefinition.hasOriginalSaveData) {
         this.selectedTaskDefinition.setOriginalSaveData(this.taskDefinitionService.mapping);
       }
+
+      this.feedbackTemplateService
+        .query({contextType: 'task_definitions', contextId: this.selectedTaskDefinition.id}, {})
+        .subscribe({
+          error: () => this.alerts.error('Error loading task feedback templates.'),
+        });
     }
   }
 

From 0ac3881e7f6d0f5b7ddeb85e5e8f9e6835c5dba6 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Tue, 21 Jan 2025 23:34:58 +1100
Subject: [PATCH 204/776] fix: show proper selected outcome or template

---
 .../feedback-template-editor.component.ts     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index dc0d8b6f5f..f072f99e63 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -201,6 +201,7 @@ export class FeedbackTemplateEditorComponent
       next: () => {
         this.alerts.success('Outcome saved');
         learningOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
+        this.selectLearningOutcome(this.selectedOutcome);
       },
       error: () => this.alerts.error('Failed to save learning outcome. Please try again.'),
     });
@@ -211,6 +212,7 @@ export class FeedbackTemplateEditorComponent
       next: () => {
         this.alerts.success('Template saved');
         feedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+        this.selectFeedbackTemplate(this.selectedTemplate);
       },
       error: () => this.alerts.error('Failed to save feedback template. Please try again.'),
     });
@@ -320,7 +322,11 @@ export class FeedbackTemplateEditorComponent
       'Are you sure you want to delete this outcome? This action is final.',
       () => {
         learningOutcome.delete().subscribe({
-          next: () => this.alerts.success('Learning outcome deleted'),
+          next: () => {
+            this.alerts.success('Learning outcome deleted');
+            if (this.selectedOutcome === learningOutcome)
+              this.selectLearningOutcome(this.selectedOutcome);
+          },
           error: () => this.alerts.error('Failed to delete learning outcome. Please try again.'),
         });
       },
@@ -333,7 +339,11 @@ export class FeedbackTemplateEditorComponent
       'Are you sure you want to delete this template? This action is final.',
       () => {
         feedbackTemplate.delete().subscribe({
-          next: () => this.alerts.success('Feedback template deleted'),
+          next: () => {
+            this.alerts.success('Feedback template deleted');
+            if (this.selectedTemplate === feedbackTemplate)
+              this.selectFeedbackTemplate(this.selectedTemplate);
+          },
           error: () => this.alerts.error('Failed to delete feedback template. Please try again.'),
         });
       },
@@ -392,11 +402,8 @@ export class FeedbackTemplateEditorComponent
     learningOutcome.fullOutcomeDescription = '';
     this.selectedConnectedOutcomes.update((_selectedConnectedOutcomes) => []);
 
-    if (this.selectedOutcome) {
-      this.templateSource = new MatTableDataSource<FeedbackTemplate>([]);
-      this.templateTable.renderRows();
-      this.selectedTemplate = null;
-    }
+    this.templateSource = new MatTableDataSource<FeedbackTemplate>([]);
+    this.selectedTemplate = null;
 
     this.selectedOutcome = learningOutcome;
   }

From 973292168a4d0e70202892a61e5b4e3406052834 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 22 Jan 2025 11:02:54 +1100
Subject: [PATCH 205/776] chore: update run all and remove watch for angularjs
 changes

---
 package-lock.json | 164 +++++++++++++++++++---------------------------
 package.json      |   4 +-
 2 files changed, 68 insertions(+), 100 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7ff345e6cb..afb0f067ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -134,7 +134,7 @@
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.5.0",
         "load-grunt-tasks": "^5.0.0",
-        "npm-run-all": "^4.1.5",
+        "npm-run-all2": "^7.0",
         "postcss": "^8.4.27",
         "postcss-scss": "^0.1.7",
         "prettier": "^3.1.0",
@@ -8497,8 +8497,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "license": "MIT",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -15848,11 +15849,6 @@
         "node-gyp-build": "^4.2.2"
       }
     },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/no-case": {
       "version": "2.3.2",
       "dev": true,
@@ -16123,109 +16119,109 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/npm-run-all": {
-      "version": "4.1.5",
+    "node_modules/npm-run-all2": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-all2/-/npm-run-all2-7.0.2.tgz",
+      "integrity": "sha512-7tXR+r9hzRNOPNTvXegM+QzCuMjzUIIq66VDunL6j60O4RrExx32XUhlrS7UK4VcdGw5/Wxzb3kfNcFix9JKDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
+        "ansi-styles": "^6.2.1",
+        "cross-spawn": "^7.0.6",
         "memorystream": "^0.3.1",
-        "minimatch": "^3.0.4",
-        "pidtree": "^0.3.0",
-        "read-pkg": "^3.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
+        "minimatch": "^9.0.0",
+        "pidtree": "^0.6.0",
+        "read-package-json-fast": "^4.0.0",
+        "shell-quote": "^1.7.3",
+        "which": "^5.0.0"
       },
       "bin": {
         "npm-run-all": "bin/npm-run-all/index.js",
+        "npm-run-all2": "bin/npm-run-all/index.js",
         "run-p": "bin/run-p/index.js",
         "run-s": "bin/run-s/index.js"
       },
       "engines": {
-        "node": ">= 4"
+        "node": "^18.17.0 || >=20.5.0",
+        "npm": ">= 9"
       }
     },
-    "node_modules/npm-run-all/node_modules/brace-expansion": {
-      "version": "1.1.11",
+    "node_modules/npm-run-all2/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/npm-run-all/node_modules/cross-spawn": {
-      "version": "6.0.5",
+    "node_modules/npm-run-all2/node_modules/isexe": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
       "engines": {
-        "node": ">=4.8"
+        "node": ">=16"
       }
     },
-    "node_modules/npm-run-all/node_modules/minimatch": {
-      "version": "3.1.2",
+    "node_modules/npm-run-all2/node_modules/json-parse-even-better-errors": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz",
+      "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
       "engines": {
-        "node": "*"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/npm-run-all/node_modules/path-key": {
-      "version": "2.0.1",
+    "node_modules/npm-run-all2/node_modules/npm-normalize-package-bin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz",
+      "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/npm-run-all/node_modules/semver": {
-      "version": "5.7.2",
+    "node_modules/npm-run-all2/node_modules/pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
       "dev": true,
-      "license": "ISC",
       "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/npm-run-all/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
+        "pidtree": "bin/pidtree.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.10"
       }
     },
-    "node_modules/npm-run-all/node_modules/shebang-regex": {
-      "version": "1.0.0",
+    "node_modules/npm-run-all2/node_modules/read-package-json-fast": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz",
+      "integrity": "sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "json-parse-even-better-errors": "^4.0.0",
+        "npm-normalize-package-bin": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/npm-run-all/node_modules/which": {
-      "version": "1.3.1",
+    "node_modules/npm-run-all2/node_modules/which": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
+      "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "isexe": "^3.1.1"
       },
       "bin": {
-        "which": "bin/which"
+        "node-which": "bin/which.js"
+      },
+      "engines": {
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/npm-run-path": {
@@ -17263,17 +17259,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/pidtree": {
-      "version": "0.3.1",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "pidtree": "bin/pidtree.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/pify": {
       "version": "3.0.0",
       "dev": true,
@@ -20593,23 +20578,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/string.prototype.padend": {
-      "version": "3.1.6",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.9",
       "dev": true,
diff --git a/package.json b/package.json
index db93e90aad..55108c6d51 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "lint:fix": "ng lint --fix",
     "lint": "ng lint",
     "serve:angular17": "export NODE_OPTIONS=--max_old_space_size=4096 && ng serve --configuration $NODE_ENV --proxy-config proxy.conf.json",
-    "start": "npm-run-all -l -s build:angular1 -p watch:angular1 serve:angular17",
+    "start": "npm-run-all -l -s build:angular1 serve:angular17",
     "watch:angular1": "grunt delta",
     "deploy:build2api": "ng build --delete-output-path=true --optimization=true --configuration production --output-path dist",
     "deploy": "run-s -l build:angular1 deploy:build2api",
@@ -151,7 +151,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "load-grunt-tasks": "^5.0.0",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all2": "^7.0",
     "postcss": "^8.4.27",
     "postcss-scss": "^0.1.7",
     "prettier": "^3.1.0",

From dac5ea89e06baeb9efd03f3d2ff49b8e4339242d Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 22 Jan 2025 11:11:55 +1100
Subject: [PATCH 206/776] chore(release): 8.0.30

---
 CHANGELOG.md      | 18 ++++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28577a1a4d..78308a34a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 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.
 
+### [8.0.30](https://github.com/doubtfire-lms/doubtfire-deploy/compare/v8.0.29...v8.0.30) (2025-01-22)
+
+
+### Features
+
+* add ability to collect d2l org and grade object ids ([93fd614](https://github.com/doubtfire-lms/doubtfire-deploy/commit/93fd6144c798fd302204728a6c2dd43f74d7bf91))
+* add ability to trigger d2l grade transfer ([fd0cc07](https://github.com/doubtfire-lms/doubtfire-deploy/commit/fd0cc0737682e9aa02af14f858c8a5f5f27f22e7))
+* add success page for oauth callback ([921406e](https://github.com/doubtfire-lms/doubtfire-deploy/commit/921406ed595c7a74cb750bc87d49fac0337bdb8a))
+* check if d2l results available ([2460c88](https://github.com/doubtfire-lms/doubtfire-deploy/commit/2460c88af08740f8626ed71d8851a75af095a03d))
+* d2l integration checks settings ([0a61df5](https://github.com/doubtfire-lms/doubtfire-deploy/commit/0a61df53c9fc187b7462e8564a19641ac1693cf0))
+* switch to html5 mode ([9d017fb](https://github.com/doubtfire-lms/doubtfire-deploy/commit/9d017fbfaa1d5bae7f43da37ec7ae43e1dfafa8f))
+
+
+### Bug Fixes
+
+* ensure standard error propagate to the ui ([fd056db](https://github.com/doubtfire-lms/doubtfire-deploy/commit/fd056db47631087d5ef29223bd3dc9037c4b10dd))
+* report better errors during file downloads ([cf87d68](https://github.com/doubtfire-lms/doubtfire-deploy/commit/cf87d68ea3a5433a073ae6db413f8c1f825ada80))
+
 ### [8.0.29](https://github.com/macite/doubtfire-deploy/compare/v8.0.28...v8.0.29) (2024-10-25)
 
 
diff --git a/package-lock.json b/package-lock.json
index afb0f067ee..9f6efa5e33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.29",
+  "version": "8.0.30",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.29",
+      "version": "8.0.30",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 55108c6d51..5e3736b348 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.29",
+  "version": "8.0.30",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 06bfa714d0b54938231004a29ae11e68fe515d80 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 23 Jan 2025 21:19:32 +1100
Subject: [PATCH 207/776] fix: ensure test attempt work for staff students

Where the staff member is the student.
Also ensures the current user is in the cache when they login from cookie.
---
 src/app/api/services/authentication.service.ts               | 5 +++--
 .../task-scorm-card/task-scorm-card.component.html           | 2 +-
 .../directives/task-scorm-card/task-scorm-card.component.ts  | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index a83637b236..82fa8a8830 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -24,8 +24,9 @@ export class AuthenticationService {
 
   public checkUserCookie(): void {
     const userData = JSON.parse(localStorage.getItem(this.USERNAME_KEY));
-    const user = new User();
-    Object.assign(user, userData);
+
+    // Get current user from the user service
+    const user = this.userService.cache.getOrCreate(userData.id, this.userService, userData);
 
     if (userData && this.tryChangeUser(user)) {
       // Ensure current user is in cache
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
index ac1221f87f..d63cfbbd5c 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.html
@@ -63,7 +63,7 @@
         mat-stroked-button
         (click)="launchScormPlayer()"
         [hidden]="attemptsLeft === 0"
-        [disabled]="user.isStaff"
+        [disabled]="isNotStudent()"
       >
         <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="Launch icon">
           launch
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
index 377b89c2f4..53d0618d28 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component.ts
@@ -43,6 +43,10 @@ export class TaskScormCardComponent implements OnChanges {
     }
   }
 
+  isNotStudent(): boolean {
+    return this.user !== this.task.project.student;
+  }
+
   launchScormPlayer(): void {
     this.task.launchScormPlayer();
   }

From 641f1d9f75177d48b3911c300e23c901e0a603e1 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sun, 26 Jan 2025 23:59:32 +1100
Subject: [PATCH 208/776] fix: organise outcome and feedback csv functionality

---
 src/app/api/models/task-definition.ts         |  5 ++
 src/app/api/models/unit.ts                    |  4 ++
 .../feedback-template-editor.component.html   | 20 +++++---
 .../feedback-template-editor.component.ts     | 48 +++++++++++--------
 ...-outcome-csv-download-modal.component.html | 14 ------
 ...ng-outcome-csv-download-modal.component.ts | 24 ----------
 ...ning-outcome-csv-download-modal.service.ts | 16 -------
 .../nested-csv-download-modal.component.html  | 14 ++++++
 .../nested-csv-download-modal.component.ts    | 24 ++++++++++
 .../nested-csv-download-modal.service.ts      | 15 ++++++
 src/app/doubtfire-angular.module.ts           |  8 ++--
 11 files changed, 109 insertions(+), 83 deletions(-)
 delete mode 100644 src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.html
 delete mode 100644 src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.ts
 delete mode 100644 src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service.ts
 create mode 100644 src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html
 create mode 100644 src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.ts
 create mode 100644 src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 1b554ff761..27aec0edae 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -186,6 +186,11 @@ export class TaskDefinition extends Entity {
     return `${constants.API_URL}/task_definitions/${this.id}/outcomes/csv`;
   }
 
+  public getFeedbackTemplateBatchUploadUrl(): string {
+    const constants = AppInjector.get(DoubtfireConstants);
+    return `${constants.API_URL}/task_definitions/${this.id}/feedback_chips/csv`;
+  }
+
   /**
    * Open the SCORM test in a new tab - using preview mode.
    */
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index c444ab9ad4..85ebd73388 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -388,6 +388,10 @@ export class Unit extends Entity {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.id}/outcomes/csv`;
   }
 
+  public getFeedbackTemplateBatchUploadUrl(): string {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.id}/feedback_chips/csv`;
+  }
+
   public hasStreams(): boolean {
     return this.tutorialStreamsCache.size > 1;
   }
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 35efa0df38..637bb0f7ae 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -104,20 +104,20 @@
     ></mat-paginator>
     <span class="flex-grow"></span>
     @if (abbreviationPrefix !== 'GLO') {
-      <label>Learning Outcomes CSV</label>
-      <button mat-icon-button (click)="downloadCsv('learning-outcomes')">
+      <label>Outcomes CSV</label>
+      <button mat-icon-button (click)="downloadCsv('Learning Outcomes', false)">
         <mat-icon>download</mat-icon>
       </button>
-      <button mat-icon-button (click)="uploadCsv('Learning Outcomes')">
+      <button mat-icon-button (click)="uploadCsv('Learning Outcomes', false)">
         <mat-icon>upload_file</mat-icon>
       </button>
       <span class="flex-grow"></span>
     }
-    <label>Feedback Templates CSV</label>
-    <button mat-icon-button (click)="downloadCsv('feedback-templates')">
+    <label>Feedback CSV</label>
+    <button mat-icon-button (click)="downloadCsv('Feedback Templates', false)">
       <mat-icon>download</mat-icon>
     </button>
-    <button mat-icon-button (click)="uploadCsv('Feedback Templates')">
+    <button mat-icon-button (click)="uploadCsv('Feedback Templates', false)">
       <mat-icon>upload_file</mat-icon>
     </button>
     <span class="flex-grow"></span>
@@ -329,6 +329,14 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
               [pageSizeOptions]="[5, 10, 25, 100]"
             ></mat-paginator>
             <span class="flex-grow"></span>
+            <label>Feedback CSV</label>
+            <button mat-icon-button (click)="downloadCsv('Feedback Templates', true)">
+              <mat-icon>download</mat-icon>
+            </button>
+            <button mat-icon-button (click)="uploadCsv('Feedback Templates', true)">
+              <mat-icon>upload_file</mat-icon>
+            </button>
+            <span class="flex-grow"></span>
             <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">
               Add Template
             </button>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index f072f99e63..e9c21b5bc8 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -39,7 +39,8 @@ import {MatChipInputEvent} from '@angular/material/chips';
 import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
 import {isEqual} from 'lodash';
-import {LearningOutcomeCsvDownloadModalService} from './learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service';
+import {NestedCsvDownloadModalService} from './nested-csv-download-modal/nested-csv-download-modal.service';
+import API_URL from 'src/app/config/constants/apiURL';
 
 @Component({
   selector: 'f-feedback-template-editor',
@@ -93,7 +94,7 @@ export class FeedbackTemplateEditorComponent
     private learningOutcomeService: LearningOutcomeService,
     private feedbackTemplateService: FeedbackTemplateService,
     private fileDownloaderService: FileDownloaderService,
-    private learningOutcomeCsvDownloadModalService: LearningOutcomeCsvDownloadModalService,
+    private nestedCsvDownloadModalService: NestedCsvDownloadModalService,
     @Inject(csvResultModalService) private csvResultModalService: any,
     @Inject(csvUploadModalService) private csvUploadModal: any,
     @Inject(confirmationModal) private confirmationModal: any,
@@ -350,11 +351,15 @@ export class FeedbackTemplateEditorComponent
     );
   }
 
-  public uploadCsv(type: 'Learning Outcomes' | 'Feedback Templates') {
-    const url =
-      type === 'Learning Outcomes'
-        ? this.context.getOutcomeBatchUploadUrl()
-        : this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
+  public uploadCsv(type: 'Learning Outcomes' | 'Feedback Templates', byOutcome: boolean) {
+    let url: string;
+
+    if (type === 'Learning Outcomes') url = this.context.getOutcomeBatchUploadUrl();
+    else {
+      if (byOutcome) url = this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
+      else if (this.context) url = this.context.getFeedbackTemplateBatchUploadUrl();
+      else url = `${API_URL}/global/feedback_chips/csv`;
+    }
 
     this.csvUploadModal.show(
       `Upload ${type} as CSV`,
@@ -370,22 +375,27 @@ export class FeedbackTemplateEditorComponent
     );
   }
 
-  public downloadCsv(type: 'learning-outcomes' | 'feedback-templates') {
-    if (this.context instanceof Unit) {
-      this.learningOutcomeCsvDownloadModalService.show(this.context);
-      return;
+  public downloadCsv(type: 'Learning Outcomes' | 'Feedback Templates', byOutcome: boolean) {
+    let url: string;
+
+    if (type === 'Learning Outcomes') url = this.context.getOutcomeBatchUploadUrl();
+    else {
+      if (byOutcome) url = this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
+      else if (this.context) url = this.context.getFeedbackTemplateBatchUploadUrl();
+      else url = `${API_URL}/global/feedback_chips/csv`;
     }
 
-    let name: string = '';
-    if (type === 'feedback-templates') name = this.selectedOutcome.abbreviation;
-    else if (this.context instanceof TaskDefinition) name = this.context.abbreviation;
+    let name = `${type}.csv`;
 
-    const url =
-      type === 'learning-outcomes'
-        ? this.context.getOutcomeBatchUploadUrl()
-        : this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
+    if (type === 'Feedback Templates' && byOutcome)
+      name = `${this.selectedOutcome.abbreviation}-${name}`;
+    if (this.context instanceof TaskDefinition)
+      name = `${this.context.unit.code}-${this.context.abbreviation}-${name}`;
+    else name = `${this.context.code}-${name}`;
 
-    this.fileDownloaderService.downloadFile(url, `${name}-${type}.csv`);
+    if (this.context instanceof Unit && !byOutcome)
+      this.nestedCsvDownloadModalService.show(url, name, type);
+    else this.fileDownloaderService.downloadFile(url, name);
   }
 
   public createLearningOutcome() {
diff --git a/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.html b/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.html
deleted file mode 100644
index 91fe893afb..0000000000
--- a/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div mat-dialog-content>
-  <h4 mat-dialog-title>Download the Learning Outcome CSV</h4>
-  <div class="px-10">
-    <p>This action will download all learning outcomes associated with this unit.</p>
-    <mat-checkbox [(ngModel)]="includeTaskOutcomes"
-      >Include the unit's task learning outcomes</mat-checkbox
-    >
-  </div>
-</div>
-
-<div mat-dialog-actions align="end">
-  <button mat-button mat-dialog-close>Cancel</button>
-  <button mat-raised-button color="primary" (click)="downloadCsv()">Download</button>
-</div>
diff --git a/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.ts b/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.ts
deleted file mode 100644
index 7c2b684912..0000000000
--- a/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {Component, Inject} from '@angular/core';
-import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
-import {Unit} from 'src/app/api/models/unit';
-import {FileDownloaderService} from '../../file-downloader/file-downloader.service';
-
-@Component({
-  selector: 'f-learning-outcome-csv-download-modal',
-  templateUrl: './learning-outcome-csv-download-modal.component.html',
-})
-export class LearningOutcomeCsvDownloadModalComponent {
-  public includeTaskOutcomes = false;
-
-  constructor(
-    private fileDownloaderService: FileDownloaderService,
-    public dialogRef: MatDialogRef<LearningOutcomeCsvDownloadModalComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: {unit: Unit},
-  ) {}
-
-  downloadCsv() {
-    const name = this.data.unit.code;
-    const url = this.data.unit.getOutcomeBatchUploadUrl();
-    this.fileDownloaderService.downloadFile(url, `${name}-learning-outcomes.csv`);
-  }
-}
diff --git a/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service.ts b/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service.ts
deleted file mode 100644
index f51f5040a5..0000000000
--- a/src/app/common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {Injectable} from '@angular/core';
-import {MatDialogRef, MatDialog} from '@angular/material/dialog';
-import {LearningOutcomeCsvDownloadModalComponent} from './learning-outcome-csv-download-modal.component';
-import {Unit} from 'src/app/api/models/unit';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class LearningOutcomeCsvDownloadModalService {
-  constructor(public dialog: MatDialog) {}
-
-  public show(unit: Unit) {
-    let dialogRef: MatDialogRef<LearningOutcomeCsvDownloadModalComponent, any>;
-    dialogRef = this.dialog.open(LearningOutcomeCsvDownloadModalComponent, {data: {unit}});
-  }
-}
diff --git a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html
new file mode 100644
index 0000000000..34525487cc
--- /dev/null
+++ b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html
@@ -0,0 +1,14 @@
+<div mat-dialog-content>
+  <h4 mat-dialog-title>Download the {{ data.type }} CSV</h4>
+  <div class="px-10">
+    <p>This action will download all {{ data.type.toLowerCase() }} associated with this unit.</p>
+    <mat-checkbox [(ngModel)]="includeNested"
+      >Include task {{ data.type.toLowerCase() }}</mat-checkbox
+    >
+  </div>
+</div>
+
+<div mat-dialog-actions align="end">
+  <button mat-button mat-dialog-close>Cancel</button>
+  <button mat-raised-button color="primary" (click)="downloadCsv()">Download</button>
+</div>
diff --git a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.ts b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.ts
new file mode 100644
index 0000000000..b18e6dc3b6
--- /dev/null
+++ b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.ts
@@ -0,0 +1,24 @@
+import {Component, Inject} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {FileDownloaderService} from '../../file-downloader/file-downloader.service';
+
+@Component({
+  selector: 'f-nested-csv-download-modal',
+  templateUrl: './nested-csv-download-modal.component.html',
+})
+export class NestedCsvDownloadModalComponent {
+  public includeNested = false;
+
+  constructor(
+    private fileDownloaderService: FileDownloaderService,
+    public dialogRef: MatDialogRef<NestedCsvDownloadModalComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: {url: string; name: string; type: string},
+  ) {}
+
+  downloadCsv() {
+    this.fileDownloaderService.downloadFile(
+      `${this.data.url}?includes_tlos=${this.includeNested}`,
+      this.data.name,
+    );
+  }
+}
diff --git a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts
new file mode 100644
index 0000000000..473bbacfd2
--- /dev/null
+++ b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts
@@ -0,0 +1,15 @@
+import {Injectable} from '@angular/core';
+import {MatDialogRef, MatDialog} from '@angular/material/dialog';
+import {NestedCsvDownloadModalComponent} from './nested-csv-download-modal.component';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class NestedCsvDownloadModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(url: string, name: string, type: string) {
+    let dialogRef: MatDialogRef<NestedCsvDownloadModalComponent, any>;
+    dialogRef = this.dialog.open(NestedCsvDownloadModalComponent, {data: {url, name, type}});
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 27e48ad52e..da1e727f4c 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -240,8 +240,8 @@ import {ScormExtensionModalComponent} from './common/modals/scorm-extension-moda
 import {FeedbackTemplateService} from './api/services/feedback-template.service';
 import {FeedbackTemplateEditorComponent} from './common/feedback-template/feedback-template-editor.component';
 import {TaskFeedbackTemplatesComponent} from './tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component';
-import {LearningOutcomeCsvDownloadModalComponent} from './common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.component';
-import {LearningOutcomeCsvDownloadModalService} from './common/feedback-template/learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service';
+import {NestedCsvDownloadModalComponent} from './common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component';
+import {NestedCsvDownloadModalService} from './common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -364,7 +364,7 @@ const MY_DATE_FORMAT = {
     ScormExtensionModalComponent,
     FeedbackTemplateEditorComponent,
     TaskFeedbackTemplatesComponent,
-    LearningOutcomeCsvDownloadModalComponent,
+    NestedCsvDownloadModalComponent,
   ],
   // Services we provide
   providers: [
@@ -444,7 +444,7 @@ const MY_DATE_FORMAT = {
       player: () => player,
     }),
     FeedbackTemplateService,
-    LearningOutcomeCsvDownloadModalService,
+    NestedCsvDownloadModalService,
   ],
   imports: [
     FlexLayoutModule,

From 579c49170808a6fcca1bfd67f0923f0339255463 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 27 Jan 2025 00:04:51 +1100
Subject: [PATCH 209/776] fix: remove glo outcome specific csv buttons

---
 .../feedback-template-editor.component.html    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 637bb0f7ae..0f13f53a18 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -329,14 +329,16 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
               [pageSizeOptions]="[5, 10, 25, 100]"
             ></mat-paginator>
             <span class="flex-grow"></span>
-            <label>Feedback CSV</label>
-            <button mat-icon-button (click)="downloadCsv('Feedback Templates', true)">
-              <mat-icon>download</mat-icon>
-            </button>
-            <button mat-icon-button (click)="uploadCsv('Feedback Templates', true)">
-              <mat-icon>upload_file</mat-icon>
-            </button>
-            <span class="flex-grow"></span>
+            @if (abbreviationPrefix !== 'GLO') {
+              <label>Feedback CSV</label>
+              <button mat-icon-button (click)="downloadCsv('Feedback Templates', true)">
+                <mat-icon>download</mat-icon>
+              </button>
+              <button mat-icon-button (click)="uploadCsv('Feedback Templates', true)">
+                <mat-icon>upload_file</mat-icon>
+              </button>
+              <span class="flex-grow"></span>
+            }
             <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">
               Add Template
             </button>

From 6ecec8483222304161f9cda87a8bdf3ecd774bcb Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 27 Jan 2025 00:07:11 +1100
Subject: [PATCH 210/776] fix: check for unit context for template csv name

---
 .../feedback-template/feedback-template-editor.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index e9c21b5bc8..b604442f41 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -391,7 +391,7 @@ export class FeedbackTemplateEditorComponent
       name = `${this.selectedOutcome.abbreviation}-${name}`;
     if (this.context instanceof TaskDefinition)
       name = `${this.context.unit.code}-${this.context.abbreviation}-${name}`;
-    else name = `${this.context.code}-${name}`;
+    else if (this.context instanceof Unit) name = `${this.context.code}-${name}`;
 
     if (this.context instanceof Unit && !byOutcome)
       this.nestedCsvDownloadModalService.show(url, name, type);

From d7fac6f0fb23f060373fd4c40f5e82b960098c77 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:05:56 +1100
Subject: [PATCH 211/776] fix: adjust ui for nested csv modal

---
 .../nested-csv-download-modal.component.html             | 6 +++---
 .../nested-csv-download-modal.service.ts                 | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html
index 34525487cc..db56ad8b3e 100644
--- a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html
+++ b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html
@@ -2,13 +2,13 @@
   <h4 mat-dialog-title>Download the {{ data.type }} CSV</h4>
   <div class="px-10">
     <p>This action will download all {{ data.type.toLowerCase() }} associated with this unit.</p>
-    <mat-checkbox [(ngModel)]="includeNested"
-      >Include task {{ data.type.toLowerCase() }}</mat-checkbox
+    <mat-slide-toggle [(ngModel)]="includeNested"
+      >Include task {{ data.type.toLowerCase() }}</mat-slide-toggle
     >
   </div>
 </div>
 
-<div mat-dialog-actions align="end">
+<div mat-dialog-actions align="end" class="pr-10 pb-7">
   <button mat-button mat-dialog-close>Cancel</button>
   <button mat-raised-button color="primary" (click)="downloadCsv()">Download</button>
 </div>
diff --git a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts
index 473bbacfd2..91e34ff400 100644
--- a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts
+++ b/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts
@@ -9,7 +9,12 @@ export class NestedCsvDownloadModalService {
   constructor(public dialog: MatDialog) {}
 
   public show(url: string, name: string, type: string) {
-    let dialogRef: MatDialogRef<NestedCsvDownloadModalComponent, any>;
-    dialogRef = this.dialog.open(NestedCsvDownloadModalComponent, {data: {url, name, type}});
+    const dialogRef: MatDialogRef<NestedCsvDownloadModalComponent, any> = this.dialog.open(
+      NestedCsvDownloadModalComponent,
+      {
+        data: {url, name, type},
+        width: '500px',
+      },
+    );
   }
 }

From 3a5e02e2f7864b9e1ea4f8d49ce69d23addbcc5a Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:37:09 +1100
Subject: [PATCH 212/776] fix: feedback picker search

---
 .../task-feedback-templates.component.html    | 12 ++-
 .../task-feedback-templates.component.ts      | 75 +++++++++++++++----
 2 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
index 8f471e43c1..aa49b2de72 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -6,14 +6,18 @@
   </mat-tab-group>
 
   <mat-form-field appearance="outline" class="template-search w-full pt-2">
-    <input matInput placeholder="Search templates" [(ngModel)]="searchTerm" />
+    <input
+      matInput
+      placeholder="Search templates"
+      (input)="onSearchTermChange($event.target.value)"
+    />
     <mat-icon matSuffix>search</mat-icon>
   </mat-form-field>
 
   <div class="overflow-y-auto flex-grow">
     <div #tloSection class="template-category mt-2">
       <h4 class="text-gray-700 font-semibold">TLO</h4>
-      <div *ngFor="let item of tlos$ | async" class="outcome-section mt-4">
+      <div *ngFor="let item of filteredTlos$ | async" class="outcome-section mt-4">
         <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
         <div class="template-grid flex flex-wrap gap-1.5 mt-1">
           <mat-chip
@@ -31,7 +35,7 @@ <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
 
     <div #uloSection class="template-category mt-2">
       <h4 class="text-gray-700 font-semibold">ULO</h4>
-      <div *ngFor="let item of ulos$ | async" class="outcome-section mt-4">
+      <div *ngFor="let item of filteredUlos$ | async" class="outcome-section mt-4">
         <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
         <div class="template-grid flex flex-wrap gap-1.5 mt-1">
           <mat-chip
@@ -49,7 +53,7 @@ <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
 
     <div #gloSection class="template-category mt-2">
       <h4 class="text-gray-700 font-semibold">GLO</h4>
-      <div *ngFor="let item of glos$ | async" class="outcome-section mt-4">
+      <div *ngFor="let item of filteredGlos$ | async" class="outcome-section mt-4">
         <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
         <div class="template-grid flex flex-wrap gap-1.5 mt-1">
           <mat-chip
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index 8582065901..55ec40205c 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -9,7 +9,7 @@ import {
   ViewEncapsulation,
   EventEmitter,
 } from '@angular/core';
-import {combineLatest, map, Observable} from 'rxjs';
+import {BehaviorSubject, combineLatest, map, Observable} from 'rxjs';
 import {LearningOutcome, FeedbackTemplate, Task} from 'src/app/api/models/doubtfire-model';
 import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
 import {LearningOutcomeService} from 'src/app/api/services/learning-outcome.service';
@@ -24,11 +24,40 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
   @Input() task: Task;
   @Output() templateSelected = new EventEmitter<FeedbackTemplate>();
   categories = ['TLO', 'ULO', 'GLO'];
-  searchTerm: string = '';
   hoveredTemplate: FeedbackTemplate;
 
   public tlos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
   public ulos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
+  public glos$ = combineLatest([
+    this.learningOutcomeService.cache.values,
+    this.feedbackTemplateService.cache.values,
+  ]).pipe(
+    map(([outcomes, templates]) =>
+      outcomes
+        .filter((outcome) => outcome.contextType === null)
+        .map((outcome) => ({
+          outcome: outcome,
+          templates: templates.filter((template) => template.learningOutcomeId === outcome.id),
+        })),
+    ),
+  );
+
+  private searchTermSubject = new BehaviorSubject<string>('');
+  searchTerm$ = this.searchTermSubject.asObservable();
+  public filteredTlos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
+  public filteredUlos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
+  public filteredGlos$ = combineLatest([this.glos$, this.searchTerm$]).pipe(
+    map(([glos, searchTerm]) =>
+      glos
+        .map((glo) => ({
+          ...glo,
+          templates: glo.templates.filter((template) =>
+            template.chipText.toLowerCase().includes(searchTerm.toLowerCase()),
+          ),
+        }))
+        .filter((glo) => glo.templates.length > 0),
+    ),
+  );
 
   constructor(
     private learningOutcomeService: LearningOutcomeService,
@@ -48,6 +77,19 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
           })),
         ),
       );
+
+      this.filteredTlos$ = combineLatest([this.tlos$, this.searchTerm$]).pipe(
+        map(([tlos, searchTerm]) =>
+          tlos
+            .map((tlo) => ({
+              ...tlo,
+              templates: tlo.templates.filter((template) =>
+                template.chipText.toLowerCase().includes(searchTerm.toLowerCase()),
+              ),
+            }))
+            .filter((tlo) => tlo.templates.length > 0),
+        ),
+      );
     }
 
     if (this.task.unit) {
@@ -62,22 +104,25 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
           })),
         ),
       );
+
+      this.filteredUlos$ = combineLatest([this.ulos$, this.searchTerm$]).pipe(
+        map(([ulos, searchTerm]) =>
+          ulos
+            .map((ulo) => ({
+              ...ulo,
+              templates: ulo.templates.filter((template) =>
+                template.chipText.toLowerCase().includes(searchTerm.toLowerCase()),
+              ),
+            }))
+            .filter((ulo) => ulo.templates.length > 0),
+        ),
+      );
     }
   }
 
-  public glos$ = combineLatest([
-    this.learningOutcomeService.cache.values,
-    this.feedbackTemplateService.cache.values,
-  ]).pipe(
-    map(([outcomes, templates]) =>
-      outcomes
-        .filter((outcome) => outcome.contextType === null)
-        .map((outcome) => ({
-          outcome: outcome,
-          templates: templates.filter((template) => template.learningOutcomeId === outcome.id),
-        })),
-    ),
-  );
+  onSearchTermChange(searchTerm: string): void {
+    this.searchTermSubject.next(searchTerm);
+  }
 
   @ViewChild('tloSection') tloSection!: ElementRef;
   @ViewChild('uloSection') uloSection!: ElementRef;

From 55a662584c4b8b6123335bcbc5149a9f0f0701d8 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:58:54 +1100
Subject: [PATCH 213/776] fix: hide feedback group comment text

---
 .../feedback-template/feedback-template-editor.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 0f13f53a18..70b153759e 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -254,7 +254,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
                 *matCellDef="let feedbackTemplate"
                 (click)="selectFeedbackTemplate(feedbackTemplate)"
               >
-                {{ feedbackTemplate.commentText }}
+                {{ feedbackTemplate.type === 'group' ? '' : feedbackTemplate.commentText }}
               </td>
             </ng-container>
             <ng-container matColumnDef="summaryText" sticky>

From 8db1844402d080902a9d3938ecc04dd7a2f0340f Mon Sep 17 00:00:00 2001
From: Coskun Kilinc <82747562+coskun-kilinc@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:41:32 +1100
Subject: [PATCH 214/776] feat(feedback-template): add hierarchical sorting for
 feedback templates

- Added `mat-sort-header` to `chipText` and `description` table headers
  to enable sorting.
- Implemented custom sorting logic in `sortTemplateData()` to preserve
  parent-child hierarchy.
- Standardised sorting logic for `chipText`, `description`, and
  `taskStatus` fields.
- Refactored `sortTemplateData()` to group and sort child templates
  within their respective parents.
- Applied consistent formatting to imports and component decorators.
---
 .../feedback-template-editor.component.html   |   4 +-
 .../feedback-template-editor.component.ts     | 102 +++++++++++++-----
 2 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 35efa0df38..25d2fa06b4 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -228,7 +228,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
               </td>
             </ng-container>
             <ng-container matColumnDef="chipText" sticky>
-              <th mat-header-cell *matHeaderCellDef>Chip Text</th>
+              <th mat-header-cell *matHeaderCellDef mat-sort-header>Chip Text</th>
               <td
                 mat-cell
                 *matCellDef="let feedbackTemplate"
@@ -238,7 +238,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
               </td>
             </ng-container>
             <ng-container matColumnDef="description" sticky>
-              <th mat-header-cell *matHeaderCellDef>Description</th>
+              <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
               <td
                 mat-cell
                 *matCellDef="let feedbackTemplate"
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index f072f99e63..fb9ca315f8 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -14,9 +14,9 @@ import {
   OnChanges,
   SimpleChanges,
 } from '@angular/core';
-import {MatTable, MatTableDataSource} from '@angular/material/table';
-import {MatPaginator} from '@angular/material/paginator';
-import {MatSelectChange} from '@angular/material/select';
+import { MatTable, MatTableDataSource } from '@angular/material/table';
+import { MatPaginator } from '@angular/material/paginator';
+import { MatSelectChange } from '@angular/material/select';
 import {
   TaskDefinition,
   Unit,
@@ -24,35 +24,34 @@ import {
   LearningOutcomeService,
   FeedbackTemplate,
 } from 'src/app/api/models/doubtfire-model';
-import {AlertService} from 'src/app/common/services/alert.service';
-import {MatSort, Sort} from '@angular/material/sort';
+import { AlertService } from 'src/app/common/services/alert.service';
+import { MatSort, Sort } from '@angular/material/sort';
 import {
   confirmationModal,
   csvResultModalService,
   csvUploadModalService,
 } from 'src/app/ajs-upgraded-providers';
-import {Subscription} from 'rxjs';
-import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
-import {COMMA, ENTER} from '@angular/cdk/keycodes';
-import {LiveAnnouncer} from '@angular/cdk/a11y';
-import {MatChipInputEvent} from '@angular/material/chips';
-import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
-import {FileDownloaderService} from '../file-downloader/file-downloader.service';
-import {isEqual} from 'lodash';
-import {LearningOutcomeCsvDownloadModalService} from './learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service';
+import { Subscription } from 'rxjs';
+import { FeedbackTemplateService } from 'src/app/api/services/feedback-template.service';
+import { COMMA, ENTER } from '@angular/cdk/keycodes';
+import { LiveAnnouncer } from '@angular/cdk/a11y';
+import { MatChipInputEvent } from '@angular/material/chips';
+import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { FileDownloaderService } from '../file-downloader/file-downloader.service';
+import { isEqual } from 'lodash';
+import { LearningOutcomeCsvDownloadModalService } from './learning-outcome-csv-download-modal/learning-outcome-csv-download-modal.service';
 
 @Component({
   selector: 'f-feedback-template-editor',
   templateUrl: 'feedback-template-editor.component.html',
 })
 export class FeedbackTemplateEditorComponent
-  implements OnInit, OnChanges, AfterViewInit, OnDestroy
-{
+  implements OnInit, OnChanges, AfterViewInit, OnDestroy {
   @Input() context?: TaskDefinition | Unit;
 
-  @ViewChild('outcomeTable', {static: false}) outcomeTable: MatTable<LearningOutcome>;
-  @ViewChild(MatSort, {static: false}) outcomeSort: MatSort;
-  @ViewChild('outcomePaginator', {static: false}) outcomePaginator: MatPaginator;
+  @ViewChild('outcomeTable', { static: false }) outcomeTable: MatTable<LearningOutcome>;
+  @ViewChild(MatSort, { static: false }) outcomeSort: MatSort;
+  @ViewChild('outcomePaginator', { static: false }) outcomePaginator: MatPaginator;
 
   public outcomeSource: MatTableDataSource<LearningOutcome>;
   public outcomeColumns: string[] = [
@@ -68,9 +67,9 @@ export class FeedbackTemplateEditorComponent
   public allOutcomes: LearningOutcome[] = [];
   public selectedConnectedOutcomes = signal([]);
 
-  @ViewChild('templateTable', {static: false}) templateTable: MatTable<FeedbackTemplate>;
-  @ViewChild(MatSort, {static: false}) templateSort: MatSort;
-  @ViewChild('templatePaginator', {static: false}) templatePaginator: MatPaginator;
+  @ViewChild('templateTable', { static: false }) templateTable: MatTable<FeedbackTemplate>;
+  @ViewChild(MatSort, { static: false }) templateSort: MatSort;
+  @ViewChild('templatePaginator', { static: false }) templatePaginator: MatPaginator;
 
   public templateSource: MatTableDataSource<FeedbackTemplate>;
   public templateColumns: string[] = [
@@ -181,6 +180,7 @@ export class FeedbackTemplateEditorComponent
         (temp) => temp.learningOutcomeId === this.selectedOutcome.id,
       );
       this.possibleParents = outcomeTemplates.filter((temp) => temp.type === 'group');
+
       this.templateSource = new MatTableDataSource<FeedbackTemplate>(outcomeTemplates);
       this.templateSource.paginator = this.templatePaginator;
       this.templateSource.sort = this.templateSort;
@@ -272,22 +272,66 @@ export class FeedbackTemplateEditorComponent
   }
 
   public sortTemplateData(sort: Sort) {
-    const data = this.templateSource.data;
-
     if (!sort.active || sort.direction === '') {
-      this.templateSource.data = data;
       return;
     }
 
-    this.templateSource.data = data.sort((a, b) => {
-      const isAsc = sort.direction === 'asc';
+    const isAsc = sort.direction === 'asc';
+
+    const parents = [...this.possibleParents];
+    const nonParents = this.templateSource.data.filter(
+      (template) => !this.possibleParents.includes(template)
+    );
+
+    // Sort parents first by the selected field
+    parents.sort((a, b) => {
       switch (sort.active) {
         case 'chipText':
-          return this.compare(a.chipText, b.chipText, isAsc);
+          return a.chipText.localeCompare(b.chipText) * (isAsc ? 1 : -1);
+        case 'description':
+          return a.description.localeCompare(b.description) * (isAsc ? 1 : -1);
+        case 'taskStatus':
+          return a.taskStatus.localeCompare(b.taskStatus) * (isAsc ? 1 : -1);
         default:
           return 0;
       }
     });
+
+    const groupedTemplates = new Map<number, FeedbackTemplate[]>();
+    nonParents.forEach((template) => {
+      const parentId = template.parentChipId;
+      if (!groupedTemplates.has(parentId)) {
+        groupedTemplates.set(parentId, []);
+      }
+      groupedTemplates.get(parentId)!.push(template);
+    });
+
+    // Sort children within their parent groups
+    const finalSortedTemplates: FeedbackTemplate[] = [];
+
+    parents.forEach((parent) => {
+      finalSortedTemplates.push(parent); // Add parent first
+
+      // Get and sort children for this parent
+      const children = groupedTemplates.get(parent.id) ?? [];
+      children.sort((a, b) => {
+        switch (sort.active) {
+          case 'chipText':
+            return a.chipText.localeCompare(b.chipText) * (isAsc ? 1 : -1);
+          case 'description':
+            return a.description.localeCompare(b.description) * (isAsc ? 1 : -1);
+          case 'taskStatus':
+            return a.taskStatus.localeCompare(b.taskStatus) * (isAsc ? 1 : -1);
+          default:
+            return 0;
+        }
+      });
+
+      finalSortedTemplates.push(...children);
+    });
+
+    // Replace the data source
+    this.templateSource.data = [...finalSortedTemplates];
   }
 
   public compare(a: number | string, b: number | string, isAsc: boolean): number {
@@ -359,7 +403,7 @@ export class FeedbackTemplateEditorComponent
     this.csvUploadModal.show(
       `Upload ${type} as CSV`,
       'Test message',
-      {file: {name: `${type} CSV Data`, type: 'csv'}},
+      { file: { name: `${type} CSV Data`, type: 'csv' } },
       url,
       (response: any) => {
         this.csvResultModalService.show(`${type} CSV Upload Results`, response);

From 96f7555f9dfcf4c62ee3dd54b9e9e74087bec47a Mon Sep 17 00:00:00 2001
From: Coskun Kilinc <82747562+coskun-kilinc@users.noreply.github.com>
Date: Tue, 28 Jan 2025 12:11:40 +1100
Subject: [PATCH 215/776] fix(feedback-template): ensure sorting defaults are
 applied

- Applied default sorting for feedback templates when when fetched.
- Ensured `sortTemplateData` uses 'chipText' as the default column and
  'asc' as the default direction.
---
 .../feedback-template-editor.component.ts     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 6731e0413b..27ef20cb28 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -31,15 +31,15 @@ import {
   csvResultModalService,
   csvUploadModalService,
 } from 'src/app/ajs-upgraded-providers';
-import {Subscription} from 'rxjs';
-import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
-import {COMMA, ENTER} from '@angular/cdk/keycodes';
-import {LiveAnnouncer} from '@angular/cdk/a11y';
-import {MatChipInputEvent} from '@angular/material/chips';
-import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
-import {FileDownloaderService} from '../file-downloader/file-downloader.service';
-import {isEqual} from 'lodash';
-import {NestedCsvDownloadModalService} from './nested-csv-download-modal/nested-csv-download-modal.service';
+import { Subscription } from 'rxjs';
+import { FeedbackTemplateService } from 'src/app/api/services/feedback-template.service';
+import { COMMA, ENTER } from '@angular/cdk/keycodes';
+import { LiveAnnouncer } from '@angular/cdk/a11y';
+import { MatChipInputEvent } from '@angular/material/chips';
+import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { FileDownloaderService } from '../file-downloader/file-downloader.service';
+import { isEqual } from 'lodash';
+import { NestedCsvDownloadModalService } from './nested-csv-download-modal/nested-csv-download-modal.service';
 import API_URL from 'src/app/config/constants/apiURL';
 
 @Component({
@@ -194,6 +194,7 @@ export class FeedbackTemplateEditorComponent
           data.description.toLowerCase().includes(filterValue)
         );
       };
+      this.sortTemplateData({ active: 'chipText', direction: 'asc' });
     });
   }
 
@@ -273,9 +274,9 @@ export class FeedbackTemplateEditorComponent
   }
 
   public sortTemplateData(sort: Sort) {
-    if (!sort.active || sort.direction === '') {
-      return;
-    }
+
+    sort.active = sort.active || 'chipText';
+    sort.direction = sort.direction || 'asc';
 
     const isAsc = sort.direction === 'asc';
 

From d3f156a640e6a3da99c147c4c2303a1af3050f8f Mon Sep 17 00:00:00 2001
From: Coskun Kilinc <82747562+coskun-kilinc@users.noreply.github.com>
Date: Tue, 28 Jan 2025 17:06:34 +1100
Subject: [PATCH 216/776] feat(feedback-template): improve sorting logic for
 feedback templates

- Refactored `sortTemplateData` to implement a dynamic sorting function
  based on a selected property.
- Introduced a depth-based hierarchical sorting mechanism to better
  handle grouped feedback templates.
- Added step-by-step logging to debug sorting logic and ensure correct
  parent-child relationships.
- Assigned sequential order numbers and adjusted them based on hierarchy
  depth.
- Improved the final sorting step to maintain a consistent and logical
  structure.
- Replaced hard-coded sorting conditions with a generic property-based
  comparator.
---
 .../feedback-template-editor.component.ts     | 117 +++++++++++-------
 1 file changed, 72 insertions(+), 45 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 27ef20cb28..4d97d29473 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -274,66 +274,93 @@ export class FeedbackTemplateEditorComponent
   }
 
   public sortTemplateData(sort: Sort) {
-
     sort.active = sort.active || 'chipText';
     sort.direction = sort.direction || 'asc';
 
     const isAsc = sort.direction === 'asc';
 
-    const parents = [...this.possibleParents];
-    const nonParents = this.templateSource.data.filter(
-      (template) => !this.possibleParents.includes(template)
-    );
+    // Generic sorting function for dynamic property access
+    const compare = (a: FeedbackTemplate, b: FeedbackTemplate) => {
+      const key = sort.active as keyof FeedbackTemplate;
+      const aValue = a[key];
+      const bValue = b[key];
 
-    // Sort parents first by the selected field
-    parents.sort((a, b) => {
-      switch (sort.active) {
-        case 'chipText':
-          return a.chipText.localeCompare(b.chipText) * (isAsc ? 1 : -1);
-        case 'description':
-          return a.description.localeCompare(b.description) * (isAsc ? 1 : -1);
-        case 'taskStatus':
-          return a.taskStatus.localeCompare(b.taskStatus) * (isAsc ? 1 : -1);
-        default:
-          return 0;
+      if (typeof aValue === 'string' && typeof bValue === 'string') {
+        return aValue.localeCompare(bValue) * (isAsc ? 1 : -1);
+      }
+      return 0;
+    };
+
+    console.log("Step 1: Initial sorting based on:", sort.active);
+
+    // Step 1: Initial sorting by the chosen method
+    const sortedTemplates = [...this.templateSource.data].sort(compare);
+    console.log("After Initial Sort:", sortedTemplates.map(t => `${t.type}: ${t.chipText} (ID: ${t.id}, Parent: ${t.parentChipId})`));
+
+    // Step 2: Determine maximum depth of the hierarchy (only groups contribute to depth)
+    const depthMap = new Map<number, number>();
+    let maxDepth = 0;
+
+    sortedTemplates.forEach((template) => {
+      if (template.type === 'group') {
+        let depth = 0;
+        let parentId = template.parentChipId;
+
+        while (parentId) {
+          depth++;
+          parentId = sortedTemplates.find(t => t.id === parentId)?.parentChipId ?? null;
+        }
+
+        depthMap.set(template.id, depth);
+        maxDepth = Math.max(maxDepth, depth);
       }
     });
 
-    const groupedTemplates = new Map<number, FeedbackTemplate[]>();
-    nonParents.forEach((template) => {
-      const parentId = template.parentChipId;
-      if (!groupedTemplates.has(parentId)) {
-        groupedTemplates.set(parentId, []);
+    console.log("Maximum Depth:", maxDepth);
+    console.log("Group Depth Mapping:", Array.from(depthMap.entries()));
+
+    // Step 3: Assign sequential order numbers
+    const orderMap = new Map<number, number>();
+    let orderIndex = 1;
+
+    sortedTemplates.forEach((template) => {
+      orderMap.set(template.id, orderIndex++);
+    });
+
+    console.log("Initial Sequential Order Numbers:", Array.from(orderMap.entries()));
+
+    // Step 4: Assign hierarchical order to groups **using depth-based multiplier**
+    sortedTemplates.forEach((template) => {
+      if (template.type === 'group') {
+        const parentOrder = template.parentChipId ? orderMap.get(template.parentChipId)! : 0;
+        const depth = depthMap.get(template.id) ?? 0;
+        const multiplier = 10 ** (maxDepth - depth + 1); // Proper scaling based on depth
+
+        orderMap.set(template.id, parentOrder + orderMap.get(template.id)! * multiplier);
+        console.log(`Group "${template.chipText}" (ID: ${template.id}) -> Computed Order: ${orderMap.get(template.id)}`);
       }
-      groupedTemplates.get(parentId)!.push(template);
     });
 
-    // Sort children within their parent groups
-    const finalSortedTemplates: FeedbackTemplate[] = [];
-
-    parents.forEach((parent) => {
-      finalSortedTemplates.push(parent); // Add parent first
-
-      // Get and sort children for this parent
-      const children = groupedTemplates.get(parent.id) ?? [];
-      children.sort((a, b) => {
-        switch (sort.active) {
-          case 'chipText':
-            return a.chipText.localeCompare(b.chipText) * (isAsc ? 1 : -1);
-          case 'description':
-            return a.description.localeCompare(b.description) * (isAsc ? 1 : -1);
-          case 'taskStatus':
-            return a.taskStatus.localeCompare(b.taskStatus) * (isAsc ? 1 : -1);
-          default:
-            return 0;
-        }
-      });
+    console.log("Assigned Order for Groups:", Array.from(orderMap.entries()));
 
-      finalSortedTemplates.push(...children);
+    // Step 5: Assign order values to templates **by directly adding their parent's order**
+    sortedTemplates.forEach((template) => {
+      if (template.type !== 'group') {
+        const parentOrder = orderMap.get(template.parentChipId) ?? 0;
+        orderMap.set(template.id, parentOrder + orderMap.get(template.id)!);
+        console.log(`Template "${template.chipText}" (ID: ${template.id}) -> Computed Order: ${orderMap.get(template.id)}`);
+      }
     });
 
-    // Replace the data source
-    this.templateSource.data = [...finalSortedTemplates];
+    console.log("Final Order Assignments:", Array.from(orderMap.entries()));
+
+    // Step 6: Sort again by computed hierarchical order
+    sortedTemplates.sort((a, b) => (orderMap.get(a.id)! - orderMap.get(b.id)!));
+
+    console.log("Final Sorted Order:", sortedTemplates.map(t => `${t.chipText} (Final Order: ${orderMap.get(t.id)})`));
+
+    // Step 7: Update the data source
+    this.templateSource.data = [...sortedTemplates];
   }
 
   public compare(a: number | string, b: number | string, isAsc: boolean): number {

From d07ad26bd7e7bd8ba7c7877a1208a8f82958c72b Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 29 Jan 2025 09:45:45 +1100
Subject: [PATCH 217/776] fix: serve index.html for unknown paths

This should ensure that the new html5 urls work correctly.
---
 nginx.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nginx.conf b/nginx.conf
index 3d38fa6fd5..b5a1d0fade 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -14,6 +14,10 @@ http {
         add_header Content-Security-Policy "default-src https: 'unsafe-inline' 'unsafe-eval' blob: data: ws:" always;
         # add_header Feature-Policy "microphone=(self),speaker=(self),fullscreen=(self),payment=(none);" always;
         add_header Permissions-Policy "microphone=(self),speaker=(self),fullscreen=(self),payment=(none)" always;
+
+        location / {
+          try_files $uri index.html;
+        }
     }
 
     gzip on;

From 12c675f61e3eac38c0f307f78ed98988c9b775c6 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 29 Jan 2025 09:45:54 +1100
Subject: [PATCH 218/776] chore(release): 8.0.31

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78308a34a3..8dbc1e6091 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+### [8.0.31](https://github.com/macite/doubtfire-deploy/compare/v8.0.30...v8.0.31) (2025-01-28)
+
+
+### Bug Fixes
+
+* ensure test attempt work for staff students ([06bfa71](https://github.com/macite/doubtfire-deploy/commit/06bfa714d0b54938231004a29ae11e68fe515d80))
+* serve index.html for unknown paths ([d07ad26](https://github.com/macite/doubtfire-deploy/commit/d07ad26bd7e7bd8ba7c7877a1208a8f82958c72b))
+
 ### [8.0.30](https://github.com/doubtfire-lms/doubtfire-deploy/compare/v8.0.29...v8.0.30) (2025-01-22)
 
 
diff --git a/package-lock.json b/package-lock.json
index 9f6efa5e33..4f58c5d3a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.30",
+  "version": "8.0.31",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.30",
+      "version": "8.0.31",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 5e3736b348..409adabb5c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.30",
+  "version": "8.0.31",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 0d63775339dcbb648d7c8702b1c3428b8622a704 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 29 Jan 2025 15:09:56 +1100
Subject: [PATCH 219/776] fix: correct issue fetching user from cookie

---
 .../api/services/authentication.service.ts    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index 82fa8a8830..0e84fa22e5 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -1,5 +1,5 @@
 import {User, UserService} from 'src/app/api/models/doubtfire-model';
-import {Inject, Injectable} from '@angular/core';
+import {Injectable} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {StateService, UIRouter, UIRouterGlobals} from '@uirouter/angular';
@@ -25,12 +25,20 @@ export class AuthenticationService {
   public checkUserCookie(): void {
     const userData = JSON.parse(localStorage.getItem(this.USERNAME_KEY));
 
-    // Get current user from the user service
-    const user = this.userService.cache.getOrCreate(userData.id, this.userService, userData);
+    // Exit if no user data
+    if (!userData || !userData.id) {
+      return;
+    }
+
+    // Get current user from the user service - ensure the object exists there
+    const user = this.userService.cache.getOrCreate(userData.id, this.userService, {
+      username: userData.username,
+    });
+
+    // Merge in the cached data
+    Object.assign(user, userData);
 
-    if (userData && this.tryChangeUser(user)) {
-      // Ensure current user is in cache
-      this.userService.cache.add(user);
+    if (this.tryChangeUser(user)) {
       this.userService.currentUser = user;
 
       const resetTime = new Date(

From 1935310735130e3c656cded885c3dee569e9a422 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 29 Jan 2025 15:10:07 +1100
Subject: [PATCH 220/776] chore(release): 8.0.32

---
 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 8dbc1e6091..fca7f265fa 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.
 
+### [8.0.32](https://github.com/macite/doubtfire-deploy/compare/v8.0.31...v8.0.32) (2025-01-29)
+
+
+### Bug Fixes
+
+* correct issue fetching user from cookie ([0d63775](https://github.com/macite/doubtfire-deploy/commit/0d63775339dcbb648d7c8702b1c3428b8622a704))
+
 ### [8.0.31](https://github.com/macite/doubtfire-deploy/compare/v8.0.30...v8.0.31) (2025-01-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index 4f58c5d3a9..0a5cf954a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.31",
+  "version": "8.0.32",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.31",
+      "version": "8.0.32",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 409adabb5c..3e285d69f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.31",
+  "version": "8.0.32",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 95c0ca9384e5a0fe7e522f61146b711b706712c1 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 29 Jan 2025 15:54:09 +1100
Subject: [PATCH 221/776] fix: nginx conf redirect for spa

- Add directory to direct to index.html
- Add root index.html otherwise
---
 nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index b5a1d0fade..2c812d87e0 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -16,7 +16,7 @@ http {
         add_header Permissions-Policy "microphone=(self),speaker=(self),fullscreen=(self),payment=(none)" always;
 
         location / {
-          try_files $uri index.html;
+          try_files $uri $uri/ /index.html;
         }
     }
 

From bb861d2de2f4438a044664246f824b7a3a893541 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 29 Jan 2025 15:54:28 +1100
Subject: [PATCH 222/776] chore(release): 8.0.33

---
 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 fca7f265fa..512760e10d 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.
 
+### [8.0.33](https://github.com/macite/doubtfire-deploy/compare/v8.0.32...v8.0.33) (2025-01-29)
+
+
+### Bug Fixes
+
+* nginx conf redirect for spa ([95c0ca9](https://github.com/macite/doubtfire-deploy/commit/95c0ca9384e5a0fe7e522f61146b711b706712c1))
+
 ### [8.0.32](https://github.com/macite/doubtfire-deploy/compare/v8.0.31...v8.0.32) (2025-01-29)
 
 
diff --git a/package-lock.json b/package-lock.json
index 0a5cf954a7..eb29449b23 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.32",
+  "version": "8.0.33",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.32",
+      "version": "8.0.33",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 3e285d69f0..4607430eb3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.32",
+  "version": "8.0.33",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 8e9b3bdc369cf03815c07c38c32a277087dc3c9f Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 30 Jan 2025 20:54:09 +1100
Subject: [PATCH 223/776] refactor: enhance feedback picker ui

---
 .../task-feedback-templates.component.html    | 38 ++++++++++---------
 .../task-feedback-templates.component.scss    | 26 ++++++++++++-
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
index aa49b2de72..cf61629c90 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -1,11 +1,11 @@
 <mat-card
-  class="p-2 bg-white rounded-lg border border-gray-300 shadow-none flex flex-col w-[338px] h-[423px]"
+  class="bg-white rounded-lg border border-gray-300 shadow-none flex flex-col w-[338px] h-[423px]"
 >
   <mat-tab-group (selectedTabChange)="scrollToSection($event)" class="category-tab-group">
     <mat-tab *ngFor="let category of categories" [label]="category"></mat-tab>
   </mat-tab-group>
 
-  <mat-form-field appearance="outline" class="template-search w-full pt-2">
+  <mat-form-field appearance="outline" class="template-search w-full pt-2 pr-2 pl-2">
     <input
       matInput
       placeholder="Search templates"
@@ -14,11 +14,10 @@
     <mat-icon matSuffix>search</mat-icon>
   </mat-form-field>
 
-  <div class="overflow-y-auto flex-grow">
-    <div #tloSection class="template-category mt-2">
-      <h4 class="text-gray-700 font-semibold">TLO</h4>
+  <div class="overflow-y-auto flex-grow pr-4 pl-4 pb-5 pt-0">
+    <div #tloSection class="template-category mt-2 mb-2">
       <div *ngFor="let item of filteredTlos$ | async" class="outcome-section mt-4">
-        <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
+        <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h5>
         <div class="template-grid flex flex-wrap gap-1.5 mt-1">
           <mat-chip
             *ngFor="let template of item.templates"
@@ -33,10 +32,9 @@ <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
       </div>
     </div>
 
-    <div #uloSection class="template-category mt-2">
-      <h4 class="text-gray-700 font-semibold">ULO</h4>
+    <div #uloSection class="template-category mt-2 mb-2">
       <div *ngFor="let item of filteredUlos$ | async" class="outcome-section mt-4">
-        <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
+        <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h5>
         <div class="template-grid flex flex-wrap gap-1.5 mt-1">
           <mat-chip
             *ngFor="let template of item.templates"
@@ -51,10 +49,9 @@ <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
       </div>
     </div>
 
-    <div #gloSection class="template-category mt-2">
-      <h4 class="text-gray-700 font-semibold">GLO</h4>
+    <div #gloSection class="template-category mt-2 mb-2">
       <div *ngFor="let item of filteredGlos$ | async" class="outcome-section mt-4">
-        <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
+        <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h5>
         <div class="template-grid flex flex-wrap gap-1.5 mt-1">
           <mat-chip
             *ngFor="let template of item.templates"
@@ -70,10 +67,17 @@ <h5 class="text-blue-600 font-bold">{{ item.outcome.abbreviation }}</h5>
     </div>
   </div>
 
-  <div>
-    <p class="pt-5 mb-0">{{ hoveredTemplate?.chipText || 'Select a feedback chip' }}</p>
-    <p class="pt-1 pb-2 mb-0">
-      {{ hoveredTemplate?.description || 'This will populate the comment area with feedback.' }}
-    </p>
+  <div class="border-t border-gray-300 p-5 flex items-center">
+    <mat-icon class="text-4xl mr-3 flex-shrink-0">{{
+      hoveredTemplate?.type === 'group' ? 'folder' : 'description'
+    }}</mat-icon>
+    <div class="flex flex-col">
+      <p class="font-semibold text-xl mb-0">
+        {{ hoveredTemplate?.chipText || 'Select a feedback chip' }}
+      </p>
+      <p class="text-gray-500 text-base mb-0">
+        {{ hoveredTemplate?.description || 'This will populate the comment area with feedback.' }}
+      </p>
+    </div>
   </div>
 </mat-card>
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss
index b8a05d722a..be7e1d12bd 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss
@@ -1,3 +1,27 @@
 .category-tab-group .mat-mdc-tab-header {
-  --mdc-secondary-navigation-tab-container-height: 35px !important;
+  --mdc-secondary-navigation-tab-container-height: 40px !important;
+}
+
+.template-search .mat-mdc-form-field-subscript-wrapper, .template-search .mat-mdc-form-field-bottom-align {
+  height: 0px !important;
+}
+
+.template-search .mat-mdc-text-field-wrapper, .template-search .mat-mdc-form-field {
+  height: 40px !important;
+}
+
+.template-search .mat-mdc-form-field-infix {
+  min-height: 40px !important;
+  padding-top: 5px !important;
+  padding-bottom: 5px !important;
+}
+
+.template-search .mat-mdc-input-element {
+  font-size: 14px !important;
+  padding-top: 3px !important;
+}
+
+.template-search .material-icons {
+  font-size: 19px !important;
+  padding-top: 5px !important;
 }

From ef524f1b048b3bfe1781307a34e1a5fe364943a4 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 30 Jan 2025 21:28:22 +1100
Subject: [PATCH 224/776] fix: show picker above composer and below comments

---
 .../task-comment-composer.component.html      | 21 +++++++++----------
 .../task-comment-composer.component.scss      |  7 -------
 .../task-comment-composer.component.ts        |  5 +++++
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.html b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
index 5445d40944..1c9c0fc5fd 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.html
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
@@ -1,12 +1,3 @@
-@if (task) {
-  <f-task-feedback-templates
-    [task]="task"
-    (templateSelected)="addFeedback($event)"
-    [hidden]="!this.showFeedbackTemplatePicker"
-    class="feedback-template-picker"
-  ></f-task-feedback-templates>
-}
-
 <emoji-mart
   [darkMode]="false"
   [isNative]="true"
@@ -59,10 +50,18 @@
 <form
   [hidden]="!this.task"
   style="display: flex; width: 100%"
-  class="input-group col-sm-12 comment-submitter"
+  class="input-group col-sm-12 comment-submitter flex-col"
   ng-submit="addComment()"
   role="form"
 >
+  @if (task) {
+    <f-task-feedback-templates
+      [task]="task"
+      (templateSelected)="addFeedback($event)"
+      [hidden]="!this.showFeedbackTemplatePicker"
+      class="feedback-template-picker"
+    ></f-task-feedback-templates>
+  }
   <div fxLayout="row" fxLayoutAlign="space-around center" class="composer-container">
     <div class="composer-action-group" [@shrinkgrow]="$userIsTyping | async">
       <!-- if active -->
@@ -187,7 +186,7 @@
           matTooltip="Choose feedback templates"
           matTooltipShowDelay="400"
           id="feedbackTemplateButton"
-          (click)="this.showFeedbackTemplatePicker = !this.showFeedbackTemplatePicker"
+          (click)="showFeedbackPicker()"
           aria-label="Feedback template button"
         >
           task</mat-icon
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.scss b/src/app/tasks/task-comment-composer/task-comment-composer.component.scss
index d17c924344..a79e6a5be4 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.scss
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.scss
@@ -95,13 +95,6 @@ $emoji-color: lighten(
   border-color: darken($color: white, $amount: 10);
 }
 
-.feedback-template-picker {
-  z-index: 1060;
-  position: absolute;
-  right: 26px;
-  bottom: 150px;
-}
-
 #replyContainer {
   margin: 0.4em 1em -0.2em 1em;
   font-size: 14px;
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index cfec9e8e95..e0f6d83160 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -340,6 +340,11 @@ export class TaskCommentComposerComponent implements DoCheck, OnChanges {
       },
     );
   }
+
+  showFeedbackPicker() {
+    this.showFeedbackTemplatePicker = !this.showFeedbackTemplatePicker;
+    this.commentsViewer.scrollDown();
+  }
 }
 
 // The discussion prompt composer dialog Component

From 95afdff12aac914bb8af8727f8b8d960bc3b072c Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 30 Jan 2025 22:04:16 +1100
Subject: [PATCH 225/776] fix: focus on composer input after selecting chip

---
 .../task-comment-composer/task-comment-composer.component.html  | 2 +-
 .../task-comment-composer/task-comment-composer.component.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.html b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
index 1c9c0fc5fd..23c3a3c0fa 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.html
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
@@ -59,7 +59,7 @@
       [task]="task"
       (templateSelected)="addFeedback($event)"
       [hidden]="!this.showFeedbackTemplatePicker"
-      class="feedback-template-picker"
+      class="feedback-template-picker pt-3"
     ></f-task-feedback-templates>
   }
   <div fxLayout="row" fxLayoutAlign="space-around center" class="composer-container">
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index e0f6d83160..db0593d14d 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -167,7 +167,6 @@ export class TaskCommentComposerComponent implements DoCheck, OnChanges {
     e.preventDefault();
     this.emojiSearchMode = false;
     this.showEmojiPicker = false;
-    this.showFeedbackTemplatePicker = false;
     if (this.input.first.nativeElement.innerText.trim() !== '') {
       this.addComment();
     }
@@ -264,6 +263,7 @@ export class TaskCommentComposerComponent implements DoCheck, OnChanges {
       char,
       text.slice(position),
     ].join('');
+    this.input.first.nativeElement.focus();
   }
 
   openDiscussionComposer() {

From 73986e89839603b19f643404e5a48964ac9a3c1b Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 30 Jan 2025 23:28:11 +1100
Subject: [PATCH 226/776] fix: display task status in coloured chip in feedback
 editor

---
 src/app/api/models/task-status.ts             |  8 +++++++
 src/app/api/services/task.service.ts          |  1 +
 .../feedback-template-editor.component.html   | 21 +++++++++++++------
 .../feedback-template-editor.component.ts     |  2 ++
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts
index 7470b9b143..8cd95b2404 100644
--- a/src/app/api/models/task-status.ts
+++ b/src/app/api/models/task-status.ts
@@ -101,6 +101,14 @@ export class TaskStatus {
     'complete',
   ];
 
+  public static readonly FEEDBACK_TEMPLATE_STATUSES: TaskStatusEnum[] = [
+    'complete',
+    'discuss',
+    'fix_and_resubmit',
+    'redo',
+    'feedback_exceeded',
+  ];
+
   public static readonly LEARNING_WEIGHT: Map<TaskStatusEnum, number> = new Map<TaskStatusEnum, number>([
     ['fail', 0.0],
     ['not_started', 0.0],
diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 737fe1ea4c..aa77cf1b3c 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -160,6 +160,7 @@ export class TaskService extends CachedEntityService<Task> {
   public readonly stateThatAllowsExtension = TaskStatus.STATE_THAT_ALLOWS_EXTENSION;
   public readonly pdfRegeneratableStatuses = TaskStatus.PDF_REGENERATABLE_STATES;
   public readonly submittableStatuses = TaskStatus.SUBMITTABLE_STATUSES;
+  public readonly feedbackTemplateStatuses = TaskStatus.FEEDBACK_TEMPLATE_STATUSES;
   public readonly completeStatus: TaskStatusEnum = 'complete';
   public readonly learningWeight: Map<TaskStatusEnum, number> = TaskStatus.LEARNING_WEIGHT;
   public readonly statusAcronym: Map<TaskStatusEnum, string> = TaskStatus.STATUS_ACRONYM;
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 70b153759e..d4fe446c0e 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -274,7 +274,15 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
                 *matCellDef="let feedbackTemplate"
                 (click)="selectFeedbackTemplate(feedbackTemplate)"
               >
-                {{ feedbackTemplate.taskStatus }}
+                @if (feedbackTemplate.taskStatus) {
+                  <mat-chip
+                    [ngStyle]="{
+                      'background-color': taskService.statusColors.get(feedbackTemplate.taskStatus)
+                    }"
+                  >
+                    {{ taskService.statusData(feedbackTemplate.taskStatus).label }}
+                  </mat-chip>
+                }
               </td>
             </ng-container>
             <ng-container matColumnDef="feedbackTemplateAction" sticky>
@@ -421,11 +429,12 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
                   <mat-form-field appearance="outline" class="basis-1/3">
                     <mat-label>Task Status</mat-label>
                     <mat-select [(ngModel)]="selectedTemplate.taskStatus">
-                      <mat-option [value]="'fix_and_resubmit'">Fix and Resubmit</mat-option>
-                      <mat-option [value]="'discuss'">Discuss</mat-option>
-                      <mat-option [value]="'redo'">Redo</mat-option>
-                      <mat-option [value]="'complete'">Complete</mat-option>
-                      <mat-option [value]="'feedback_exceeded'">Feedback Exceeded</mat-option>
+                      <mat-option
+                        *ngFor="let status of taskService.feedbackTemplateStatuses"
+                        [value]="status"
+                      >
+                        {{ taskService.statusData(status).label }}
+                      </mat-option>
                     </mat-select>
                   </mat-form-field>
                 </div>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index b604442f41..c33a3ee761 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -23,6 +23,7 @@ import {
   LearningOutcome,
   LearningOutcomeService,
   FeedbackTemplate,
+  TaskService,
 } from 'src/app/api/models/doubtfire-model';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {MatSort, Sort} from '@angular/material/sort';
@@ -95,6 +96,7 @@ export class FeedbackTemplateEditorComponent
     private feedbackTemplateService: FeedbackTemplateService,
     private fileDownloaderService: FileDownloaderService,
     private nestedCsvDownloadModalService: NestedCsvDownloadModalService,
+    private taskService: TaskService,
     @Inject(csvResultModalService) private csvResultModalService: any,
     @Inject(csvUploadModalService) private csvUploadModal: any,
     @Inject(confirmationModal) private confirmationModal: any,

From 6ae077149d16e5af538d432a9ce2db974298b549 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 31 Jan 2025 00:12:05 +1100
Subject: [PATCH 227/776] fix: display feedback picker chips in color

---
 src/app/api/models/doubtfire-model.ts             |  1 +
 .../feedback-template-editor.component.ts         |  2 +-
 .../task-feedback-templates.component.html        | 15 +++++++++++++++
 .../task-feedback-templates.component.ts          | 12 +++++++++---
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/app/api/models/doubtfire-model.ts b/src/app/api/models/doubtfire-model.ts
index 38b886a2ae..d40dc4a5a9 100644
--- a/src/app/api/models/doubtfire-model.ts
+++ b/src/app/api/models/doubtfire-model.ts
@@ -62,3 +62,4 @@ export * from '../services/learning-outcome.service';
 export * from '../services/group-set.service';
 export * from '../services/task-similarity.service';
 export * from '../services/test-attempt.service';
+export * from '../services/feedback-template.service';
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index c33a3ee761..ee0f9e3bd7 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -24,6 +24,7 @@ import {
   LearningOutcomeService,
   FeedbackTemplate,
   TaskService,
+  FeedbackTemplateService,
 } from 'src/app/api/models/doubtfire-model';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {MatSort, Sort} from '@angular/material/sort';
@@ -33,7 +34,6 @@ import {
   csvUploadModalService,
 } from 'src/app/ajs-upgraded-providers';
 import {Subscription} from 'rxjs';
-import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
 import {COMMA, ENTER} from '@angular/cdk/keycodes';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
 import {MatChipInputEvent} from '@angular/material/chips';
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
index cf61629c90..34734c933f 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -25,6 +25,11 @@ <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h
             (mouseleave)="onHoverTemplate(null)"
             (click)="selectTemplate(template)"
             class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+            [ngStyle]="
+              template.taskStatus
+                ? {'background-color': taskService.statusColors.get(template.taskStatus)}
+                : {}
+            "
           >
             {{ template.chipText }}
           </mat-chip>
@@ -42,6 +47,11 @@ <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h
             (mouseleave)="onHoverTemplate(null)"
             (click)="selectTemplate(template)"
             class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+            [ngStyle]="
+              template.taskStatus
+                ? {'background-color': taskService.statusColors.get(template.taskStatus)}
+                : {}
+            "
           >
             {{ template.chipText }}
           </mat-chip>
@@ -59,6 +69,11 @@ <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h
             (mouseleave)="onHoverTemplate(null)"
             (click)="selectTemplate(template)"
             class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+            [ngStyle]="
+              template.taskStatus
+                ? {'background-color': taskService.statusColors.get(template.taskStatus)}
+                : {}
+            "
           >
             {{ template.chipText }}
           </mat-chip>
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index 55ec40205c..1520ba578d 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -10,9 +10,14 @@ import {
   EventEmitter,
 } from '@angular/core';
 import {BehaviorSubject, combineLatest, map, Observable} from 'rxjs';
-import {LearningOutcome, FeedbackTemplate, Task} from 'src/app/api/models/doubtfire-model';
-import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
-import {LearningOutcomeService} from 'src/app/api/services/learning-outcome.service';
+import {
+  LearningOutcome,
+  FeedbackTemplate,
+  Task,
+  FeedbackTemplateService,
+  LearningOutcomeService,
+  TaskService,
+} from 'src/app/api/models/doubtfire-model';
 
 @Component({
   selector: 'f-task-feedback-templates',
@@ -62,6 +67,7 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
   constructor(
     private learningOutcomeService: LearningOutcomeService,
     private feedbackTemplateService: FeedbackTemplateService,
+    private taskService: TaskService,
   ) {}
 
   ngOnChanges(changes: SimpleChanges): void {

From bc349f3d9b3345aace6ae70bb9f41f0fe53f0768 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 31 Jan 2025 23:30:45 +1100
Subject: [PATCH 228/776] refactor: add feedback chip icons

---
 .../task-feedback-templates.component.html    | 39 ++++++++++++-------
 .../task-feedback-templates.component.scss    | 26 +++++++------
 .../task-feedback-templates.component.ts      | 14 ++++++-
 3 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
index 34734c933f..d27c874a44 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -25,12 +25,15 @@ <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h
             (mouseleave)="onHoverTemplate(null)"
             (click)="selectTemplate(template)"
             class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
-            [ngStyle]="
-              template.taskStatus
-                ? {'background-color': taskService.statusColors.get(template.taskStatus)}
-                : {}
-            "
+            [ngStyle]="isTemplateSelected(template) ? {'border': '1px solid'} : {}"
           >
+            <mat-icon *ngIf="isTemplateSelected(template)" matChipAvatar>check_circle</mat-icon>
+            <i
+              *ngIf="!isTemplateSelected(template) && template.taskStatus"
+              class="fa {{ taskService.statusData(template.taskStatus).icon }}"
+              matChipAvatar
+            ></i>
+            <mat-icon *ngIf="template.type === 'group'" matChipAvatar>folder</mat-icon>
             {{ template.chipText }}
           </mat-chip>
         </div>
@@ -47,12 +50,15 @@ <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h
             (mouseleave)="onHoverTemplate(null)"
             (click)="selectTemplate(template)"
             class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
-            [ngStyle]="
-              template.taskStatus
-                ? {'background-color': taskService.statusColors.get(template.taskStatus)}
-                : {}
-            "
+            [ngStyle]="isTemplateSelected(template) ? {'border': '1px solid'} : {}"
           >
+            <mat-icon *ngIf="isTemplateSelected(template)" matChipAvatar>check_circle</mat-icon>
+            <i
+              *ngIf="!isTemplateSelected(template) && template.taskStatus"
+              class="fa {{ taskService.statusData(template.taskStatus).icon }}"
+              matChipAvatar
+            ></i>
+            <mat-icon *ngIf="template.type === 'group'" matChipAvatar>folder</mat-icon>
             {{ template.chipText }}
           </mat-chip>
         </div>
@@ -69,12 +75,15 @@ <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h
             (mouseleave)="onHoverTemplate(null)"
             (click)="selectTemplate(template)"
             class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
-            [ngStyle]="
-              template.taskStatus
-                ? {'background-color': taskService.statusColors.get(template.taskStatus)}
-                : {}
-            "
+            [ngStyle]="isTemplateSelected(template) ? {'border': '1px solid'} : {}"
           >
+            <mat-icon *ngIf="isTemplateSelected(template)" matChipAvatar>check_circle</mat-icon>
+            <i
+              *ngIf="!isTemplateSelected(template) && template.taskStatus"
+              class="fa {{ taskService.statusData(template.taskStatus).icon }}"
+              matChipAvatar
+            ></i>
+            <mat-icon *ngIf="template.type === 'group'" matChipAvatar>folder</mat-icon>
             {{ template.chipText }}
           </mat-chip>
         </div>
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss
index be7e1d12bd..7158f04fb8 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.scss
@@ -1,27 +1,31 @@
 .category-tab-group .mat-mdc-tab-header {
-  --mdc-secondary-navigation-tab-container-height: 40px !important;
+  --mdc-secondary-navigation-tab-container-height: 40px;
 }
 
-.template-search .mat-mdc-form-field-subscript-wrapper, .template-search .mat-mdc-form-field-bottom-align {
-  height: 0px !important;
+.template-search .mat-mdc-form-field-subscript-wrapper.mat-mdc-form-field-bottom-align {
+  height: 0px;
 }
 
 .template-search .mat-mdc-text-field-wrapper, .template-search .mat-mdc-form-field {
-  height: 40px !important;
+  height: 40px;
 }
 
 .template-search .mat-mdc-form-field-infix {
-  min-height: 40px !important;
-  padding-top: 5px !important;
-  padding-bottom: 5px !important;
+  min-height: 40px;
+  padding-top: 5px;
+  padding-bottom: 5px;
 }
 
 .template-search .mat-mdc-input-element {
-  font-size: 14px !important;
-  padding-top: 3px !important;
+  font-size: 14px;
+  padding-top: 3px;
 }
 
 .template-search .material-icons {
-  font-size: 19px !important;
-  padding-top: 5px !important;
+  font-size: 19px;
+  padding-top: 5px;
+}
+
+.template-grid .mdc-evolution-chip__graphic.mat-mdc-chip-graphic.ng-star-inserted {
+  padding-right: 2px;
 }
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index 1520ba578d..362f1b852e 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -29,7 +29,6 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
   @Input() task: Task;
   @Output() templateSelected = new EventEmitter<FeedbackTemplate>();
   categories = ['TLO', 'ULO', 'GLO'];
-  hoveredTemplate: FeedbackTemplate;
 
   public tlos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
   public ulos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
@@ -143,10 +142,21 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
     }
   }
 
+  selectedTemplates: FeedbackTemplate[] = [];
+
   selectTemplate(template: FeedbackTemplate) {
-    this.templateSelected.emit(template);
+    if (template.type === 'template') {
+      this.selectedTemplates.push(template);
+      this.templateSelected.emit(template);
+    }
   }
 
+  isTemplateSelected(template: FeedbackTemplate): boolean {
+    return this.selectedTemplates.includes(template);
+  }
+
+  hoveredTemplate: FeedbackTemplate;
+
   onHoverTemplate(template: FeedbackTemplate) {
     this.hoveredTemplate = template;
   }

From 7644cba92f92f5c261501c1907f7f5418538e3a7 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 31 Jan 2025 23:32:18 +1100
Subject: [PATCH 229/776] fix: hide summary instead of comment text for groups

---
 .../feedback-template/feedback-template-editor.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index d4fe446c0e..3ddba527c3 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -254,7 +254,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
                 *matCellDef="let feedbackTemplate"
                 (click)="selectFeedbackTemplate(feedbackTemplate)"
               >
-                {{ feedbackTemplate.type === 'group' ? '' : feedbackTemplate.commentText }}
+                {{ feedbackTemplate.commentText }}
               </td>
             </ng-container>
             <ng-container matColumnDef="summaryText" sticky>
@@ -264,7 +264,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
                 *matCellDef="let feedbackTemplate"
                 (click)="selectFeedbackTemplate(feedbackTemplate)"
               >
-                {{ feedbackTemplate.summaryText }}
+                {{ feedbackTemplate.type === 'group' ? '' : feedbackTemplate.summaryText }}
               </td>
             </ng-container>
             <ng-container matColumnDef="taskStatus" sticky>

From 11a399324ee64af901f44f28de3526cbd7650bac Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Fri, 31 Jan 2025 23:34:54 +1100
Subject: [PATCH 230/776] fix: use icon instead of color for template task
 status

---
 .../feedback-template-editor.component.html              | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index 3ddba527c3..6dc1b783f9 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -275,11 +275,10 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
                 (click)="selectFeedbackTemplate(feedbackTemplate)"
               >
                 @if (feedbackTemplate.taskStatus) {
-                  <mat-chip
-                    [ngStyle]="{
-                      'background-color': taskService.statusColors.get(feedbackTemplate.taskStatus)
-                    }"
-                  >
+                  <mat-chip>
+                    <i
+                      class="fa {{ taskService.statusData(feedbackTemplate.taskStatus).icon }}"
+                    ></i>
                     {{ taskService.statusData(feedbackTemplate.taskStatus).label }}
                   </mat-chip>
                 }

From 30c59a1d39eddc35a9778c41f4689e85f3621754 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 3 Feb 2025 02:04:35 +1100
Subject: [PATCH 231/776] refactor: add outcome heading to picker

---
 .../task-feedback-templates.component.html           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
index d27c874a44..33347e8770 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -17,7 +17,9 @@
   <div class="overflow-y-auto flex-grow pr-4 pl-4 pb-5 pt-0">
     <div #tloSection class="template-category mt-2 mb-2">
       <div *ngFor="let item of filteredTlos$ | async" class="outcome-section mt-4">
-        <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h5>
+        <h5 class="text-formatif-blue font-extrabold">
+          {{ item.outcome.abbreviation }} - {{ item.outcome.shortDescription }}
+        </h5>
         <div class="template-grid flex flex-wrap gap-1.5 mt-1">
           <mat-chip
             *ngFor="let template of item.templates"
@@ -42,7 +44,9 @@ <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h
 
     <div #uloSection class="template-category mt-2 mb-2">
       <div *ngFor="let item of filteredUlos$ | async" class="outcome-section mt-4">
-        <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h5>
+        <h5 class="text-formatif-blue font-extrabold">
+          {{ item.outcome.abbreviation }} - {{ item.outcome.shortDescription }}
+        </h5>
         <div class="template-grid flex flex-wrap gap-1.5 mt-1">
           <mat-chip
             *ngFor="let template of item.templates"
@@ -67,7 +71,9 @@ <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h
 
     <div #gloSection class="template-category mt-2 mb-2">
       <div *ngFor="let item of filteredGlos$ | async" class="outcome-section mt-4">
-        <h5 class="text-formatif-blue font-extrabold">{{ item.outcome.abbreviation }}</h5>
+        <h5 class="text-formatif-blue font-extrabold">
+          {{ item.outcome.abbreviation }} - {{ item.outcome.shortDescription }}
+        </h5>
         <div class="template-grid flex flex-wrap gap-1.5 mt-1">
           <mat-chip
             *ngFor="let template of item.templates"

From db93b187cfe6e197a3b6243445809ec6d767d4bd Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 3 Feb 2025 06:26:03 +1100
Subject: [PATCH 232/776] fix: display nested feedback groups in picker

---
 .../task-feedback-templates.component.html    |  27 +++-
 .../task-feedback-templates.component.ts      | 131 +++++++++++-------
 2 files changed, 101 insertions(+), 57 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
index 33347e8770..326943de41 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -16,7 +16,7 @@
 
   <div class="overflow-y-auto flex-grow pr-4 pl-4 pb-5 pt-0">
     <div #tloSection class="template-category mt-2 mb-2">
-      <div *ngFor="let item of filteredTlos$ | async" class="outcome-section mt-4">
+      <div *ngFor="let item of tlos$ | async" class="outcome-section mt-4">
         <h5 class="text-formatif-blue font-extrabold">
           {{ item.outcome.abbreviation }} - {{ item.outcome.shortDescription }}
         </h5>
@@ -35,7 +35,12 @@ <h5 class="text-formatif-blue font-extrabold">
               class="fa {{ taskService.statusData(template.taskStatus).icon }}"
               matChipAvatar
             ></i>
-            <mat-icon *ngIf="template.type === 'group'" matChipAvatar>folder</mat-icon>
+            <mat-icon *ngIf="template.type === 'group' && !isGroupExpanded(template)" matChipAvatar
+              >folder</mat-icon
+            >
+            <mat-icon *ngIf="template.type === 'group' && isGroupExpanded(template)" matChipAvatar
+              >chevron_right</mat-icon
+            >
             {{ template.chipText }}
           </mat-chip>
         </div>
@@ -43,7 +48,7 @@ <h5 class="text-formatif-blue font-extrabold">
     </div>
 
     <div #uloSection class="template-category mt-2 mb-2">
-      <div *ngFor="let item of filteredUlos$ | async" class="outcome-section mt-4">
+      <div *ngFor="let item of ulos$ | async" class="outcome-section mt-4">
         <h5 class="text-formatif-blue font-extrabold">
           {{ item.outcome.abbreviation }} - {{ item.outcome.shortDescription }}
         </h5>
@@ -62,7 +67,12 @@ <h5 class="text-formatif-blue font-extrabold">
               class="fa {{ taskService.statusData(template.taskStatus).icon }}"
               matChipAvatar
             ></i>
-            <mat-icon *ngIf="template.type === 'group'" matChipAvatar>folder</mat-icon>
+            <mat-icon *ngIf="template.type === 'group' && !isGroupExpanded(template)" matChipAvatar
+              >folder</mat-icon
+            >
+            <mat-icon *ngIf="template.type === 'group' && isGroupExpanded(template)" matChipAvatar
+              >chevron_right</mat-icon
+            >
             {{ template.chipText }}
           </mat-chip>
         </div>
@@ -70,7 +80,7 @@ <h5 class="text-formatif-blue font-extrabold">
     </div>
 
     <div #gloSection class="template-category mt-2 mb-2">
-      <div *ngFor="let item of filteredGlos$ | async" class="outcome-section mt-4">
+      <div *ngFor="let item of glos$ | async" class="outcome-section mt-4">
         <h5 class="text-formatif-blue font-extrabold">
           {{ item.outcome.abbreviation }} - {{ item.outcome.shortDescription }}
         </h5>
@@ -89,7 +99,12 @@ <h5 class="text-formatif-blue font-extrabold">
               class="fa {{ taskService.statusData(template.taskStatus).icon }}"
               matChipAvatar
             ></i>
-            <mat-icon *ngIf="template.type === 'group'" matChipAvatar>folder</mat-icon>
+            <mat-icon *ngIf="template.type === 'group' && !isGroupExpanded(template)" matChipAvatar
+              >folder</mat-icon
+            >
+            <mat-icon *ngIf="template.type === 'group' && isGroupExpanded(template)" matChipAvatar
+              >chevron_right</mat-icon
+            >
             {{ template.chipText }}
           </mat-chip>
         </div>
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index 362f1b852e..d102f27213 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -28,36 +28,33 @@ import {
 export class TaskFeedbackTemplatesComponent implements OnChanges {
   @Input() task: Task;
   @Output() templateSelected = new EventEmitter<FeedbackTemplate>();
+
   categories = ['TLO', 'ULO', 'GLO'];
+  selectedTemplates: FeedbackTemplate[] = [];
+  hoveredTemplate: FeedbackTemplate;
+
+  private navigationStackSubject = new BehaviorSubject<Map<number, number[]>>(
+    new Map<number, number[]>(),
+  );
+  navigationStack$ = this.navigationStackSubject.asObservable();
+
+  private searchTermSubject = new BehaviorSubject<string>('');
+  searchTerm$ = this.searchTermSubject.asObservable();
 
   public tlos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
   public ulos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
   public glos$ = combineLatest([
     this.learningOutcomeService.cache.values,
     this.feedbackTemplateService.cache.values,
+    this.navigationStack$,
+    this.searchTerm$,
   ]).pipe(
-    map(([outcomes, templates]) =>
+    map(([outcomes, templates, navigationStack, searchTerm]) =>
       outcomes
         .filter((outcome) => outcome.contextType === null)
         .map((outcome) => ({
           outcome: outcome,
-          templates: templates.filter((template) => template.learningOutcomeId === outcome.id),
-        })),
-    ),
-  );
-
-  private searchTermSubject = new BehaviorSubject<string>('');
-  searchTerm$ = this.searchTermSubject.asObservable();
-  public filteredTlos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
-  public filteredUlos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
-  public filteredGlos$ = combineLatest([this.glos$, this.searchTerm$]).pipe(
-    map(([glos, searchTerm]) =>
-      glos
-        .map((glo) => ({
-          ...glo,
-          templates: glo.templates.filter((template) =>
-            template.chipText.toLowerCase().includes(searchTerm.toLowerCase()),
-          ),
+          templates: this.getTemplatesToDisplay(outcome.id, templates, navigationStack, searchTerm),
         }))
         .filter((glo) => glo.templates.length > 0),
     ),
@@ -74,22 +71,18 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
       this.tlos$ = combineLatest([
         this.task.definition.learningOutcomesCache.values,
         this.feedbackTemplateService.cache.values,
+        this.navigationStack$,
+        this.searchTerm$,
       ]).pipe(
-        map(([outcomes, templates]) =>
-          outcomes.map((outcome) => ({
-            outcome: outcome,
-            templates: templates.filter((template) => template.learningOutcomeId === outcome.id),
-          })),
-        ),
-      );
-
-      this.filteredTlos$ = combineLatest([this.tlos$, this.searchTerm$]).pipe(
-        map(([tlos, searchTerm]) =>
-          tlos
-            .map((tlo) => ({
-              ...tlo,
-              templates: tlo.templates.filter((template) =>
-                template.chipText.toLowerCase().includes(searchTerm.toLowerCase()),
+        map(([outcomes, templates, navigationStack, searchTerm]) =>
+          outcomes
+            .map((outcome) => ({
+              outcome: outcome,
+              templates: this.getTemplatesToDisplay(
+                outcome.id,
+                templates,
+                navigationStack,
+                searchTerm,
               ),
             }))
             .filter((tlo) => tlo.templates.length > 0),
@@ -101,22 +94,18 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
       this.ulos$ = combineLatest([
         this.task.unit.learningOutcomesCache.values,
         this.feedbackTemplateService.cache.values,
+        this.navigationStack$,
+        this.searchTerm$,
       ]).pipe(
-        map(([outcomes, templates]) =>
-          outcomes.map((outcome) => ({
-            outcome: outcome,
-            templates: templates.filter((template) => template.learningOutcomeId === outcome.id),
-          })),
-        ),
-      );
-
-      this.filteredUlos$ = combineLatest([this.ulos$, this.searchTerm$]).pipe(
-        map(([ulos, searchTerm]) =>
-          ulos
-            .map((ulo) => ({
-              ...ulo,
-              templates: ulo.templates.filter((template) =>
-                template.chipText.toLowerCase().includes(searchTerm.toLowerCase()),
+        map(([outcomes, templates, navigationStack, searchTerm]) =>
+          outcomes
+            .map((outcome) => ({
+              outcome: outcome,
+              templates: this.getTemplatesToDisplay(
+                outcome.id,
+                templates,
+                navigationStack,
+                searchTerm,
               ),
             }))
             .filter((ulo) => ulo.templates.length > 0),
@@ -125,6 +114,34 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
     }
   }
 
+  private getTemplatesToDisplay(
+    outcomeId: number,
+    templates: FeedbackTemplate[],
+    navigationStack: Map<number, number[]>,
+    searchTerm: string,
+  ): FeedbackTemplate[] {
+    const allTemplates = templates.filter((template) => template.learningOutcomeId === outcomeId);
+    let templatesToDisplay: FeedbackTemplate[] = [];
+
+    if (navigationStack.get(outcomeId) && navigationStack.get(outcomeId).length > 0) {
+      const outcomeStack = navigationStack.get(outcomeId);
+      const groupId = outcomeStack[outcomeStack.length - 1];
+
+      templatesToDisplay.push(allTemplates.find((template) => template.id === groupId));
+      allTemplates.forEach((template) => {
+        if (template.parentChipId === groupId) templatesToDisplay.push(template);
+      });
+    } else {
+      templatesToDisplay = allTemplates.filter((template) => !template.parentChipId);
+    }
+
+    templatesToDisplay = templatesToDisplay.filter((template) =>
+      template.chipText.toLowerCase().includes(searchTerm.toLowerCase()),
+    );
+
+    return templatesToDisplay;
+  }
+
   onSearchTermChange(searchTerm: string): void {
     this.searchTermSubject.next(searchTerm);
   }
@@ -142,12 +159,18 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
     }
   }
 
-  selectedTemplates: FeedbackTemplate[] = [];
-
   selectTemplate(template: FeedbackTemplate) {
     if (template.type === 'template') {
       this.selectedTemplates.push(template);
       this.templateSelected.emit(template);
+    } else {
+      const updatedStack = new Map(this.navigationStackSubject.getValue());
+      const outcomeStack = updatedStack.get(template.learningOutcomeId) || [];
+      const index = outcomeStack.indexOf(template.id);
+      if (index === -1) outcomeStack.push(template.id);
+      else outcomeStack.splice(index, 1);
+      updatedStack.set(template.learningOutcomeId, outcomeStack);
+      this.navigationStackSubject.next(updatedStack);
     }
   }
 
@@ -155,7 +178,13 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
     return this.selectedTemplates.includes(template);
   }
 
-  hoveredTemplate: FeedbackTemplate;
+  isGroupExpanded(template: FeedbackTemplate): boolean {
+    const stack = this.navigationStackSubject.getValue();
+    const outcomeStack = stack.get(template.learningOutcomeId) || [];
+    const index = outcomeStack.indexOf(template.id);
+    if (index === -1) return false;
+    else return true;
+  }
 
   onHoverTemplate(template: FeedbackTemplate) {
     this.hoveredTemplate = template;

From 95796da4e7855bcd76023754d95cec8d033668fc Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 3 Feb 2025 07:31:25 +1100
Subject: [PATCH 233/776] feat: suggest task status according to feedback

---
 src/app/api/models/task.ts                        |  2 ++
 src/app/common/footer/footer.component.html       | 15 +++++++++++++++
 src/app/common/footer/footer.component.scss       | 10 ++++++++++
 src/app/common/footer/footer.component.ts         |  4 ++--
 .../task-feedback-templates.component.ts          | 11 +++++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index f5019d4ac4..3181946447 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -59,6 +59,8 @@ export class Task extends Entity {
   public readonly similarityCache: EntityCache<TaskSimilarity> = new EntityCache<TaskSimilarity>();
   public readonly testAttemptCache: EntityCache<TestAttempt> = new EntityCache<TestAttempt>();
 
+  suggestedTaskStatus;
+
   private _unit: Unit;
 
   constructor(data?: Project | Unit) {
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 7e28c72b32..4dfac39449 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -45,6 +45,21 @@
         <mat-icon>construction</mat-icon>
       </button>
       <span class="w-3"></span>
+      @if (selectedTask && selectedTask.suggestedTaskStatus) {
+        <button
+          mat-icon-button
+          matTooltip="Recommended: Mark as {{
+            taskService.statusData(selectedTask.suggestedTaskStatus).label
+          }}"
+          matTooltipPosition="above"
+          aria-label=""
+          class="button extra-large-button"
+          (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
+        >
+          <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
+        </button>
+        <span class="w-3"></span>
+      }
       <button
         [disabled]="selectedTask === undefined"
         mat-icon-button
diff --git a/src/app/common/footer/footer.component.scss b/src/app/common/footer/footer.component.scss
index ca55371d54..771a544303 100644
--- a/src/app/common/footer/footer.component.scss
+++ b/src/app/common/footer/footer.component.scss
@@ -22,6 +22,16 @@
     .large-button:hover {
       background-color: #f5f5f5;
     }
+
+    .extra-large-button {
+      padding-top: 7px;
+      transform: scale(1.30);
+      background-color: #ffac2e;
+    }
+
+    .extra-large-button:hover {
+      background-color: #e2992c;
+    }
   }
 
   .small-icon {
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 2e4d3ff1ef..7e4aa4b216 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -2,7 +2,7 @@ import { Component, ElementRef, HostListener, OnInit, ViewChild } from '@angular
 import { Observable } from 'rxjs';
 import { Task } from 'src/app/api/models/task';
 import { SelectedTaskService } from 'src/app/projects/states/dashboard/selected-task.service';
-
+import { TaskService } from 'src/app/api/services/task.service';
 import { FileDownloaderService } from '../file-downloader/file-downloader.service';
 
 @Component({
@@ -11,7 +11,7 @@ import { FileDownloaderService } from '../file-downloader/file-downloader.servic
   styleUrls: ['./footer.component.scss'],
 })
 export class FooterComponent implements OnInit {
-  constructor(public selectedTaskService: SelectedTaskService, private fileDownloader: FileDownloaderService) {}
+  constructor(public selectedTaskService: SelectedTaskService, public taskService: TaskService, private fileDownloader: FileDownloaderService) {}
 
   selectedTask$: Observable<Task>;
   selectedTask: Task;
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index d102f27213..14c83e57a8 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -163,6 +163,7 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
     if (template.type === 'template') {
       this.selectedTemplates.push(template);
       this.templateSelected.emit(template);
+      this.suggestTaskStatus(template);
     } else {
       const updatedStack = new Map(this.navigationStackSubject.getValue());
       const outcomeStack = updatedStack.get(template.learningOutcomeId) || [];
@@ -189,4 +190,14 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
   onHoverTemplate(template: FeedbackTemplate) {
     this.hoveredTemplate = template;
   }
+
+  private suggestTaskStatus(template: FeedbackTemplate) {
+    if (this.task.suggestedTaskStatus) {
+      const currentSeq = this.taskService.statusSeq.get(this.task.suggestedTaskStatus);
+      const templateSeq = this.taskService.statusSeq.get(template.taskStatus);
+      if (templateSeq < currentSeq) this.task.suggestedTaskStatus = template.taskStatus;
+    } else {
+      this.task.suggestedTaskStatus = template.taskStatus;
+    }
+  }
 }

From e86162d1592d8418bab3c889b1d0bbfe3662b86d Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 3 Feb 2025 07:43:24 +1100
Subject: [PATCH 234/776] fix: comment console logs

---
 .../feedback-template-editor.component.ts     | 65 +++++++++++--------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 54a045b377..9bca4e95a6 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -14,9 +14,9 @@ import {
   OnChanges,
   SimpleChanges,
 } from '@angular/core';
-import { MatTable, MatTableDataSource } from '@angular/material/table';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSelectChange } from '@angular/material/select';
+import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {MatPaginator} from '@angular/material/paginator';
+import {MatSelectChange} from '@angular/material/select';
 import {
   TaskDefinition,
   Unit,
@@ -26,8 +26,8 @@ import {
   TaskService,
   FeedbackTemplateService,
 } from 'src/app/api/models/doubtfire-model';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { MatSort, Sort } from '@angular/material/sort';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {MatSort, Sort} from '@angular/material/sort';
 import {
   confirmationModal,
   csvResultModalService,
@@ -48,12 +48,13 @@ import API_URL from 'src/app/config/constants/apiURL';
   templateUrl: 'feedback-template-editor.component.html',
 })
 export class FeedbackTemplateEditorComponent
-  implements OnInit, OnChanges, AfterViewInit, OnDestroy {
+  implements OnInit, OnChanges, AfterViewInit, OnDestroy
+{
   @Input() context?: TaskDefinition | Unit;
 
-  @ViewChild('outcomeTable', { static: false }) outcomeTable: MatTable<LearningOutcome>;
-  @ViewChild(MatSort, { static: false }) outcomeSort: MatSort;
-  @ViewChild('outcomePaginator', { static: false }) outcomePaginator: MatPaginator;
+  @ViewChild('outcomeTable', {static: false}) outcomeTable: MatTable<LearningOutcome>;
+  @ViewChild(MatSort, {static: false}) outcomeSort: MatSort;
+  @ViewChild('outcomePaginator', {static: false}) outcomePaginator: MatPaginator;
 
   public outcomeSource: MatTableDataSource<LearningOutcome>;
   public outcomeColumns: string[] = [
@@ -69,9 +70,9 @@ export class FeedbackTemplateEditorComponent
   public allOutcomes: LearningOutcome[] = [];
   public selectedConnectedOutcomes = signal([]);
 
-  @ViewChild('templateTable', { static: false }) templateTable: MatTable<FeedbackTemplate>;
-  @ViewChild(MatSort, { static: false }) templateSort: MatSort;
-  @ViewChild('templatePaginator', { static: false }) templatePaginator: MatPaginator;
+  @ViewChild('templateTable', {static: false}) templateTable: MatTable<FeedbackTemplate>;
+  @ViewChild(MatSort, {static: false}) templateSort: MatSort;
+  @ViewChild('templatePaginator', {static: false}) templatePaginator: MatPaginator;
 
   public templateSource: MatTableDataSource<FeedbackTemplate>;
   public templateColumns: string[] = [
@@ -196,7 +197,7 @@ export class FeedbackTemplateEditorComponent
           data.description.toLowerCase().includes(filterValue)
         );
       };
-      this.sortTemplateData({ active: 'chipText', direction: 'asc' });
+      this.sortTemplateData({active: 'chipText', direction: 'asc'});
     });
   }
 
@@ -293,11 +294,16 @@ export class FeedbackTemplateEditorComponent
       return 0;
     };
 
-    console.log("Step 1: Initial sorting based on:", sort.active);
+    // console.log('Step 1: Initial sorting based on:', sort.active);
 
     // Step 1: Initial sorting by the chosen method
     const sortedTemplates = [...this.templateSource.data].sort(compare);
-    console.log("After Initial Sort:", sortedTemplates.map(t => `${t.type}: ${t.chipText} (ID: ${t.id}, Parent: ${t.parentChipId})`));
+    // console.log(
+    //   'After Initial Sort:',
+    //   sortedTemplates.map(
+    //     (t) => `${t.type}: ${t.chipText} (ID: ${t.id}, Parent: ${t.parentChipId})`,
+    //   ),
+    // );
 
     // Step 2: Determine maximum depth of the hierarchy (only groups contribute to depth)
     const depthMap = new Map<number, number>();
@@ -310,7 +316,7 @@ export class FeedbackTemplateEditorComponent
 
         while (parentId) {
           depth++;
-          parentId = sortedTemplates.find(t => t.id === parentId)?.parentChipId ?? null;
+          parentId = sortedTemplates.find((t) => t.id === parentId)?.parentChipId ?? null;
         }
 
         depthMap.set(template.id, depth);
@@ -318,8 +324,8 @@ export class FeedbackTemplateEditorComponent
       }
     });
 
-    console.log("Maximum Depth:", maxDepth);
-    console.log("Group Depth Mapping:", Array.from(depthMap.entries()));
+    // console.log('Maximum Depth:', maxDepth);
+    // console.log('Group Depth Mapping:', Array.from(depthMap.entries()));
 
     // Step 3: Assign sequential order numbers
     const orderMap = new Map<number, number>();
@@ -329,7 +335,7 @@ export class FeedbackTemplateEditorComponent
       orderMap.set(template.id, orderIndex++);
     });
 
-    console.log("Initial Sequential Order Numbers:", Array.from(orderMap.entries()));
+    // console.log('Initial Sequential Order Numbers:', Array.from(orderMap.entries()));
 
     // Step 4: Assign hierarchical order to groups **using depth-based multiplier**
     sortedTemplates.forEach((template) => {
@@ -339,27 +345,34 @@ export class FeedbackTemplateEditorComponent
         const multiplier = 10 ** (maxDepth - depth + 1); // Proper scaling based on depth
 
         orderMap.set(template.id, parentOrder + orderMap.get(template.id)! * multiplier);
-        console.log(`Group "${template.chipText}" (ID: ${template.id}) -> Computed Order: ${orderMap.get(template.id)}`);
+        // console.log(
+        //   `Group "${template.chipText}" (ID: ${template.id}) -> Computed Order: ${orderMap.get(template.id)}`,
+        // );
       }
     });
 
-    console.log("Assigned Order for Groups:", Array.from(orderMap.entries()));
+    // console.log('Assigned Order for Groups:', Array.from(orderMap.entries()));
 
     // Step 5: Assign order values to templates **by directly adding their parent's order**
     sortedTemplates.forEach((template) => {
       if (template.type !== 'group') {
         const parentOrder = orderMap.get(template.parentChipId) ?? 0;
         orderMap.set(template.id, parentOrder + orderMap.get(template.id)!);
-        console.log(`Template "${template.chipText}" (ID: ${template.id}) -> Computed Order: ${orderMap.get(template.id)}`);
+        // console.log(
+        //   `Template "${template.chipText}" (ID: ${template.id}) -> Computed Order: ${orderMap.get(template.id)}`,
+        // );
       }
     });
 
-    console.log("Final Order Assignments:", Array.from(orderMap.entries()));
+    // console.log('Final Order Assignments:', Array.from(orderMap.entries()));
 
     // Step 6: Sort again by computed hierarchical order
-    sortedTemplates.sort((a, b) => (orderMap.get(a.id)! - orderMap.get(b.id)!));
+    sortedTemplates.sort((a, b) => orderMap.get(a.id)! - orderMap.get(b.id)!);
 
-    console.log("Final Sorted Order:", sortedTemplates.map(t => `${t.chipText} (Final Order: ${orderMap.get(t.id)})`));
+    // console.log(
+    //   'Final Sorted Order:',
+    //   sortedTemplates.map((t) => `${t.chipText} (Final Order: ${orderMap.get(t.id)})`),
+    // );
 
     // Step 7: Update the data source
     this.templateSource.data = [...sortedTemplates];
@@ -438,7 +451,7 @@ export class FeedbackTemplateEditorComponent
     this.csvUploadModal.show(
       `Upload ${type} as CSV`,
       'Test message',
-      { file: { name: `${type} CSV Data`, type: 'csv' } },
+      {file: {name: `${type} CSV Data`, type: 'csv'}},
       url,
       (response: any) => {
         this.csvResultModalService.show(`${type} CSV Upload Results`, response);

From bd48c40c4c3b0a3d67d41373b624ed8b3b754f4a Mon Sep 17 00:00:00 2001
From: Coskun Kilinc <82747562+coskun-kilinc@users.noreply.github.com>
Date: Mon, 3 Feb 2025 11:26:20 +1100
Subject: [PATCH 235/776] fix(feedback-template-editor): improve feedback
 template sorting logic

- Separated feedback groups and non-group templates early for
  efficiency.
- Improved depth calculation by explicitly iterating over groups.
- Optimised hierarchical ordering by refining the depth-based
  multiplier.
- Removed redundant logging and consolidated essential debug
  information.
- Ensured computed hierarchical order is consistently applied across
  groups and templates.
---
 .../feedback-template-editor.component.ts     | 88 ++++++++-----------
 1 file changed, 39 insertions(+), 49 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 54a045b377..c6ebe0d160 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -33,14 +33,14 @@ import {
   csvResultModalService,
   csvUploadModalService,
 } from 'src/app/ajs-upgraded-providers';
-import {Subscription} from 'rxjs';
-import {COMMA, ENTER} from '@angular/cdk/keycodes';
-import {LiveAnnouncer} from '@angular/cdk/a11y';
-import {MatChipInputEvent} from '@angular/material/chips';
-import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
-import {FileDownloaderService} from '../file-downloader/file-downloader.service';
-import {isEqual} from 'lodash';
-import {NestedCsvDownloadModalService} from './nested-csv-download-modal/nested-csv-download-modal.service';
+import { Subscription } from 'rxjs';
+import { COMMA, ENTER } from '@angular/cdk/keycodes';
+import { LiveAnnouncer } from '@angular/cdk/a11y';
+import { MatChipInputEvent } from '@angular/material/chips';
+import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { FileDownloaderService } from '../file-downloader/file-downloader.service';
+import { isEqual } from 'lodash';
+import { NestedCsvDownloadModalService } from './nested-csv-download-modal/nested-csv-download-modal.service';
 import API_URL from 'src/app/config/constants/apiURL';
 
 @Component({
@@ -293,35 +293,34 @@ export class FeedbackTemplateEditorComponent
       return 0;
     };
 
-    console.log("Step 1: Initial sorting based on:", sort.active);
-
-    // Step 1: Initial sorting by the chosen method
+    // Initial sorting by the chosen method
     const sortedTemplates = [...this.templateSource.data].sort(compare);
-    console.log("After Initial Sort:", sortedTemplates.map(t => `${t.type}: ${t.chipText} (ID: ${t.id}, Parent: ${t.parentChipId})`));
+    console.log(`After Initial Sort based on: ${sort.active}`, sortedTemplates.map(t => `${t.type}: ${t.chipText}`));
 
-    // Step 2: Determine maximum depth of the hierarchy (only groups contribute to depth)
+    // Determine maximum depth of the hierarchy (only groups contribute to depth)
     const depthMap = new Map<number, number>();
     let maxDepth = 0;
 
-    sortedTemplates.forEach((template) => {
-      if (template.type === 'group') {
-        let depth = 0;
-        let parentId = template.parentChipId;
+    const feedbackGroups = sortedTemplates.filter(t => t.type === 'group');
+    const feedbackTemplates = sortedTemplates.filter(t => t.type !== 'group');
 
-        while (parentId) {
-          depth++;
-          parentId = sortedTemplates.find(t => t.id === parentId)?.parentChipId ?? null;
-        }
 
-        depthMap.set(template.id, depth);
-        maxDepth = Math.max(maxDepth, depth);
+
+    feedbackGroups.forEach((template) => {
+      let depth = 0;
+      let parentId = template.parentChipId;
+
+      while (parentId) {
+        depth++;
+        parentId = sortedTemplates.find(t => t.id === parentId)?.parentChipId ?? null;
       }
+
+      depthMap.set(template.id, depth);
+      maxDepth = Math.max(maxDepth, depth);
     });
 
-    console.log("Maximum Depth:", maxDepth);
-    console.log("Group Depth Mapping:", Array.from(depthMap.entries()));
 
-    // Step 3: Assign sequential order numbers
+    // Assign sequential order numbers
     const orderMap = new Map<number, number>();
     let orderIndex = 1;
 
@@ -329,39 +328,30 @@ export class FeedbackTemplateEditorComponent
       orderMap.set(template.id, orderIndex++);
     });
 
-    console.log("Initial Sequential Order Numbers:", Array.from(orderMap.entries()));
+    feedbackGroups.sort((a, b) => (depthMap.get(a.id)! - depthMap.get(b.id)!));
 
-    // Step 4: Assign hierarchical order to groups **using depth-based multiplier**
-    sortedTemplates.forEach((template) => {
-      if (template.type === 'group') {
-        const parentOrder = template.parentChipId ? orderMap.get(template.parentChipId)! : 0;
-        const depth = depthMap.get(template.id) ?? 0;
-        const multiplier = 10 ** (maxDepth - depth + 1); // Proper scaling based on depth
+    // Assign hierarchical order to groups using depth-based multiplier
+    feedbackGroups.forEach((template) => {
+      const parentOrder = template.parentChipId ? orderMap.get(template.parentChipId)! : 0;
+      const depth = depthMap.get(template.id) ?? 0;
+      const multiplier = 10(maxDepth + 5 - depth * 3); // Proper scaling based on depth
+      let oldOrder = orderMap.get(template.id)!;
 
-        orderMap.set(template.id, parentOrder + orderMap.get(template.id)! * multiplier);
-        console.log(`Group "${template.chipText}" (ID: ${template.id}) -> Computed Order: ${orderMap.get(template.id)}`);
-      }
+      orderMap.set(template.id, parentOrder + orderMap.get(template.id)! * multiplier);
     });
 
-    console.log("Assigned Order for Groups:", Array.from(orderMap.entries()));
+    // Assign order values to templates by directly adding their parent's order
+    feedbackTemplates.forEach((template) => {
+      const parentOrder = orderMap.get(template.parentChipId) ?? 0;
+      orderMap.set(template.id, parentOrder + orderMap.get(template.id)!);
 
-    // Step 5: Assign order values to templates **by directly adding their parent's order**
-    sortedTemplates.forEach((template) => {
-      if (template.type !== 'group') {
-        const parentOrder = orderMap.get(template.parentChipId) ?? 0;
-        orderMap.set(template.id, parentOrder + orderMap.get(template.id)!);
-        console.log(`Template "${template.chipText}" (ID: ${template.id}) -> Computed Order: ${orderMap.get(template.id)}`);
-      }
     });
 
-    console.log("Final Order Assignments:", Array.from(orderMap.entries()));
-
-    // Step 6: Sort again by computed hierarchical order
+    // Sort again by computed hierarchical order
     sortedTemplates.sort((a, b) => (orderMap.get(a.id)! - orderMap.get(b.id)!));
-
     console.log("Final Sorted Order:", sortedTemplates.map(t => `${t.chipText} (Final Order: ${orderMap.get(t.id)})`));
 
-    // Step 7: Update the data source
+    // Update the data source
     this.templateSource.data = [...sortedTemplates];
   }
 

From a1f220c9f5462a2b91035eb936f3ff25b7d4cd67 Mon Sep 17 00:00:00 2001
From: Coskun Kilinc <82747562+coskun-kilinc@users.noreply.github.com>
Date: Mon, 3 Feb 2025 17:06:04 +1100
Subject: [PATCH 236/776] fix(feedback-template-editor): add missing operator

Replaces a missing `**` operator in depth multiplier calculation.
---
 .../feedback-template/feedback-template-editor.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 429d77bb44..24524c97bb 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -332,7 +332,7 @@ export class FeedbackTemplateEditorComponent
     feedbackGroups.forEach((template) => {
       const parentOrder = template.parentChipId ? orderMap.get(template.parentChipId)! : 0;
       const depth = depthMap.get(template.id) ?? 0;
-      const multiplier = 10(maxDepth + 5 - depth * 3); // Proper scaling based on depth
+      const multiplier = 10 ** (maxDepth + 5 - depth * 3); // Proper scaling based on depth
       let oldOrder = orderMap.get(template.id)!;
 
       orderMap.set(template.id, parentOrder + orderMap.get(template.id)! * multiplier);

From 419d276a7c7f3077527b7a91d56af057187b3da1 Mon Sep 17 00:00:00 2001
From: Coskun Kilinc <82747562+coskun-kilinc@users.noreply.github.com>
Date: Mon, 3 Feb 2025 17:29:02 +1100
Subject: [PATCH 237/776] refactor(feedback-template-editor): remove console
 logs

- Removed unnecessary console logs used for debugging sorted templates.
- Minor cleanup of redundant variable assignments.
---
 .../feedback-template-editor.component.ts     | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index 24524c97bb..cf994b3a93 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -14,9 +14,9 @@ import {
   OnChanges,
   SimpleChanges,
 } from '@angular/core';
-import {MatTable, MatTableDataSource} from '@angular/material/table';
-import {MatPaginator} from '@angular/material/paginator';
-import {MatSelectChange} from '@angular/material/select';
+import { MatTable, MatTableDataSource } from '@angular/material/table';
+import { MatPaginator } from '@angular/material/paginator';
+import { MatSelectChange } from '@angular/material/select';
 import {
   TaskDefinition,
   Unit,
@@ -26,21 +26,21 @@ import {
   TaskService,
   FeedbackTemplateService,
 } from 'src/app/api/models/doubtfire-model';
-import {AlertService} from 'src/app/common/services/alert.service';
-import {MatSort, Sort} from '@angular/material/sort';
+import { AlertService } from 'src/app/common/services/alert.service';
+import { MatSort, Sort } from '@angular/material/sort';
 import {
   confirmationModal,
   csvResultModalService,
   csvUploadModalService,
 } from 'src/app/ajs-upgraded-providers';
-import {Subscription} from 'rxjs';
-import {COMMA, ENTER} from '@angular/cdk/keycodes';
-import {LiveAnnouncer} from '@angular/cdk/a11y';
-import {MatChipInputEvent} from '@angular/material/chips';
-import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
-import {FileDownloaderService} from '../file-downloader/file-downloader.service';
-import {isEqual} from 'lodash';
-import {NestedCsvDownloadModalService} from './nested-csv-download-modal/nested-csv-download-modal.service';
+import { Subscription } from 'rxjs';
+import { COMMA, ENTER } from '@angular/cdk/keycodes';
+import { LiveAnnouncer } from '@angular/cdk/a11y';
+import { MatChipInputEvent } from '@angular/material/chips';
+import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { FileDownloaderService } from '../file-downloader/file-downloader.service';
+import { isEqual } from 'lodash';
+import { NestedCsvDownloadModalService } from './nested-csv-download-modal/nested-csv-download-modal.service';
 import API_URL from 'src/app/config/constants/apiURL';
 
 @Component({
@@ -48,13 +48,12 @@ import API_URL from 'src/app/config/constants/apiURL';
   templateUrl: 'feedback-template-editor.component.html',
 })
 export class FeedbackTemplateEditorComponent
-  implements OnInit, OnChanges, AfterViewInit, OnDestroy
-{
+  implements OnInit, OnChanges, AfterViewInit, OnDestroy {
   @Input() context?: TaskDefinition | Unit;
 
-  @ViewChild('outcomeTable', {static: false}) outcomeTable: MatTable<LearningOutcome>;
-  @ViewChild(MatSort, {static: false}) outcomeSort: MatSort;
-  @ViewChild('outcomePaginator', {static: false}) outcomePaginator: MatPaginator;
+  @ViewChild('outcomeTable', { static: false }) outcomeTable: MatTable<LearningOutcome>;
+  @ViewChild(MatSort, { static: false }) outcomeSort: MatSort;
+  @ViewChild('outcomePaginator', { static: false }) outcomePaginator: MatPaginator;
 
   public outcomeSource: MatTableDataSource<LearningOutcome>;
   public outcomeColumns: string[] = [
@@ -70,9 +69,9 @@ export class FeedbackTemplateEditorComponent
   public allOutcomes: LearningOutcome[] = [];
   public selectedConnectedOutcomes = signal([]);
 
-  @ViewChild('templateTable', {static: false}) templateTable: MatTable<FeedbackTemplate>;
-  @ViewChild(MatSort, {static: false}) templateSort: MatSort;
-  @ViewChild('templatePaginator', {static: false}) templatePaginator: MatPaginator;
+  @ViewChild('templateTable', { static: false }) templateTable: MatTable<FeedbackTemplate>;
+  @ViewChild(MatSort, { static: false }) templateSort: MatSort;
+  @ViewChild('templatePaginator', { static: false }) templatePaginator: MatPaginator;
 
   public templateSource: MatTableDataSource<FeedbackTemplate>;
   public templateColumns: string[] = [
@@ -197,7 +196,7 @@ export class FeedbackTemplateEditorComponent
           data.description.toLowerCase().includes(filterValue)
         );
       };
-      this.sortTemplateData({active: 'chipText', direction: 'asc'});
+      this.sortTemplateData({ active: 'chipText', direction: 'asc' });
     });
   }
 
@@ -296,7 +295,7 @@ export class FeedbackTemplateEditorComponent
 
     // Initial sorting by the chosen method
     const sortedTemplates = [...this.templateSource.data].sort(compare);
-    console.log(`After Initial Sort based on: ${sort.active}`, sortedTemplates.map(t => `${t.type}: ${t.chipText}`));
+
 
     // Determine maximum depth of the hierarchy (only groups contribute to depth)
     const depthMap = new Map<number, number>();
@@ -305,6 +304,8 @@ export class FeedbackTemplateEditorComponent
     const feedbackGroups = sortedTemplates.filter(t => t.type === 'group');
     const feedbackTemplates = sortedTemplates.filter(t => t.type !== 'group');
 
+
+
     feedbackGroups.forEach((template) => {
       let depth = 0;
       let parentId = template.parentChipId;
@@ -318,6 +319,7 @@ export class FeedbackTemplateEditorComponent
       maxDepth = Math.max(maxDepth, depth);
     });
 
+
     // Assign sequential order numbers
     const orderMap = new Map<number, number>();
     let orderIndex = 1;
@@ -333,7 +335,6 @@ export class FeedbackTemplateEditorComponent
       const parentOrder = template.parentChipId ? orderMap.get(template.parentChipId)! : 0;
       const depth = depthMap.get(template.id) ?? 0;
       const multiplier = 10 ** (maxDepth + 5 - depth * 3); // Proper scaling based on depth
-      let oldOrder = orderMap.get(template.id)!;
 
       orderMap.set(template.id, parentOrder + orderMap.get(template.id)! * multiplier);
     });
@@ -342,11 +343,12 @@ export class FeedbackTemplateEditorComponent
     feedbackTemplates.forEach((template) => {
       const parentOrder = orderMap.get(template.parentChipId) ?? 0;
       orderMap.set(template.id, parentOrder + orderMap.get(template.id)!);
+
     });
 
     // Sort again by computed hierarchical order
     sortedTemplates.sort((a, b) => (orderMap.get(a.id)! - orderMap.get(b.id)!));
-    console.log("Final Sorted Order:", sortedTemplates.map(t => `${t.chipText} (Final Order: ${orderMap.get(t.id)})`));
+
 
     // Update the data source
     this.templateSource.data = [...sortedTemplates];
@@ -425,7 +427,7 @@ export class FeedbackTemplateEditorComponent
     this.csvUploadModal.show(
       `Upload ${type} as CSV`,
       'Test message',
-      {file: {name: `${type} CSV Data`, type: 'csv'}},
+      { file: { name: `${type} CSV Data`, type: 'csv' } },
       url,
       (response: any) => {
         this.csvResultModalService.show(`${type} CSV Upload Results`, response);

From 0f2c164579491298b81849cc110301229f2ca5af Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 3 Feb 2025 21:53:20 +1100
Subject: [PATCH 238/776] fix: show description for connected outcome selection

---
 .../feedback-template-editor.component.html   |  6 +-
 .../feedback-template-editor.component.ts     | 65 +++++++++----------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
index a2f614edd9..34fed78a4c 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template/feedback-template-editor.component.html
@@ -6,6 +6,7 @@
     [dataSource]="outcomeSource"
     matSort
     (matSortChange)="sortOutcomeData($event)"
+    #outcomeSort="matSort"
   >
     <ng-container matColumnDef="abbreviation" sticky>
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Abbreviation</th>
@@ -173,7 +174,9 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
             />
             <mat-autocomplete #auto="matAutocomplete" (optionSelected)="select($event)">
               @for (outcome of filteredOutcomes(); track outcome) {
-                <mat-option [value]="outcome.abbreviation">{{ outcome.abbreviation }}</mat-option>
+                <mat-option [value]="outcome.abbreviation"
+                  >{{ outcome.abbreviation }} - {{ outcome.shortDescription }}</mat-option
+                >
               }
             </mat-autocomplete>
           </mat-form-field>
@@ -200,6 +203,7 @@ <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome
             [dataSource]="templateSource"
             matSort
             (matSortChange)="sortTemplateData($event)"
+            #templateSort="matSort"
           >
             <ng-container matColumnDef="icon" sticky>
               <th mat-header-cell *matHeaderCellDef></th>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/feedback-template/feedback-template-editor.component.ts
index cf994b3a93..a7b3b733ea 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template/feedback-template-editor.component.ts
@@ -14,9 +14,9 @@ import {
   OnChanges,
   SimpleChanges,
 } from '@angular/core';
-import { MatTable, MatTableDataSource } from '@angular/material/table';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSelectChange } from '@angular/material/select';
+import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {MatPaginator} from '@angular/material/paginator';
+import {MatSelectChange} from '@angular/material/select';
 import {
   TaskDefinition,
   Unit,
@@ -26,21 +26,21 @@ import {
   TaskService,
   FeedbackTemplateService,
 } from 'src/app/api/models/doubtfire-model';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { MatSort, Sort } from '@angular/material/sort';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {MatSort, Sort} from '@angular/material/sort';
 import {
   confirmationModal,
   csvResultModalService,
   csvUploadModalService,
 } from 'src/app/ajs-upgraded-providers';
-import { Subscription } from 'rxjs';
-import { COMMA, ENTER } from '@angular/cdk/keycodes';
-import { LiveAnnouncer } from '@angular/cdk/a11y';
-import { MatChipInputEvent } from '@angular/material/chips';
-import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
-import { FileDownloaderService } from '../file-downloader/file-downloader.service';
-import { isEqual } from 'lodash';
-import { NestedCsvDownloadModalService } from './nested-csv-download-modal/nested-csv-download-modal.service';
+import {Subscription} from 'rxjs';
+import {COMMA, ENTER} from '@angular/cdk/keycodes';
+import {LiveAnnouncer} from '@angular/cdk/a11y';
+import {MatChipInputEvent} from '@angular/material/chips';
+import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
+import {FileDownloaderService} from '../file-downloader/file-downloader.service';
+import {isEqual} from 'lodash';
+import {NestedCsvDownloadModalService} from './nested-csv-download-modal/nested-csv-download-modal.service';
 import API_URL from 'src/app/config/constants/apiURL';
 
 @Component({
@@ -48,12 +48,13 @@ import API_URL from 'src/app/config/constants/apiURL';
   templateUrl: 'feedback-template-editor.component.html',
 })
 export class FeedbackTemplateEditorComponent
-  implements OnInit, OnChanges, AfterViewInit, OnDestroy {
+  implements OnInit, OnChanges, AfterViewInit, OnDestroy
+{
   @Input() context?: TaskDefinition | Unit;
 
-  @ViewChild('outcomeTable', { static: false }) outcomeTable: MatTable<LearningOutcome>;
-  @ViewChild(MatSort, { static: false }) outcomeSort: MatSort;
-  @ViewChild('outcomePaginator', { static: false }) outcomePaginator: MatPaginator;
+  @ViewChild('outcomeTable', {static: false}) outcomeTable: MatTable<LearningOutcome>;
+  @ViewChild('outcomeSort', {static: false}) outcomeSort: MatSort;
+  @ViewChild('outcomePaginator', {static: false}) outcomePaginator: MatPaginator;
 
   public outcomeSource: MatTableDataSource<LearningOutcome>;
   public outcomeColumns: string[] = [
@@ -69,9 +70,9 @@ export class FeedbackTemplateEditorComponent
   public allOutcomes: LearningOutcome[] = [];
   public selectedConnectedOutcomes = signal([]);
 
-  @ViewChild('templateTable', { static: false }) templateTable: MatTable<FeedbackTemplate>;
-  @ViewChild(MatSort, { static: false }) templateSort: MatSort;
-  @ViewChild('templatePaginator', { static: false }) templatePaginator: MatPaginator;
+  @ViewChild('templateTable', {static: false}) templateTable: MatTable<FeedbackTemplate>;
+  @ViewChild('templateSort', {static: false}) templateSort: MatSort;
+  @ViewChild('templatePaginator', {static: false}) templatePaginator: MatPaginator;
 
   public templateSource: MatTableDataSource<FeedbackTemplate>;
   public templateColumns: string[] = [
@@ -196,7 +197,7 @@ export class FeedbackTemplateEditorComponent
           data.description.toLowerCase().includes(filterValue)
         );
       };
-      this.sortTemplateData({ active: 'chipText', direction: 'asc' });
+      this.sortTemplateData({active: 'chipText', direction: 'asc'});
     });
   }
 
@@ -296,15 +297,12 @@ export class FeedbackTemplateEditorComponent
     // Initial sorting by the chosen method
     const sortedTemplates = [...this.templateSource.data].sort(compare);
 
-
     // Determine maximum depth of the hierarchy (only groups contribute to depth)
     const depthMap = new Map<number, number>();
     let maxDepth = 0;
 
-    const feedbackGroups = sortedTemplates.filter(t => t.type === 'group');
-    const feedbackTemplates = sortedTemplates.filter(t => t.type !== 'group');
-
-
+    const feedbackGroups = sortedTemplates.filter((t) => t.type === 'group');
+    const feedbackTemplates = sortedTemplates.filter((t) => t.type !== 'group');
 
     feedbackGroups.forEach((template) => {
       let depth = 0;
@@ -312,14 +310,13 @@ export class FeedbackTemplateEditorComponent
 
       while (parentId) {
         depth++;
-        parentId = sortedTemplates.find(t => t.id === parentId)?.parentChipId ?? null;
+        parentId = sortedTemplates.find((t) => t.id === parentId)?.parentChipId ?? null;
       }
 
       depthMap.set(template.id, depth);
       maxDepth = Math.max(maxDepth, depth);
     });
 
-
     // Assign sequential order numbers
     const orderMap = new Map<number, number>();
     let orderIndex = 1;
@@ -328,7 +325,7 @@ export class FeedbackTemplateEditorComponent
       orderMap.set(template.id, orderIndex++);
     });
 
-    feedbackGroups.sort((a, b) => (depthMap.get(a.id)! - depthMap.get(b.id)!));
+    feedbackGroups.sort((a, b) => depthMap.get(a.id)! - depthMap.get(b.id)!);
 
     // Assign hierarchical order to groups using depth-based multiplier
     feedbackGroups.forEach((template) => {
@@ -343,12 +340,10 @@ export class FeedbackTemplateEditorComponent
     feedbackTemplates.forEach((template) => {
       const parentOrder = orderMap.get(template.parentChipId) ?? 0;
       orderMap.set(template.id, parentOrder + orderMap.get(template.id)!);
-
     });
 
     // Sort again by computed hierarchical order
-    sortedTemplates.sort((a, b) => (orderMap.get(a.id)! - orderMap.get(b.id)!));
-
+    sortedTemplates.sort((a, b) => orderMap.get(a.id)! - orderMap.get(b.id)!);
 
     // Update the data source
     this.templateSource.data = [...sortedTemplates];
@@ -427,7 +422,7 @@ export class FeedbackTemplateEditorComponent
     this.csvUploadModal.show(
       `Upload ${type} as CSV`,
       'Test message',
-      { file: { name: `${type} CSV Data`, type: 'csv' } },
+      {file: {name: `${type} CSV Data`, type: 'csv'}},
       url,
       (response: any) => {
         this.csvResultModalService.show(`${type} CSV Upload Results`, response);
@@ -543,7 +538,9 @@ export class FeedbackTemplateEditorComponent
   }
 
   select(event: MatAutocompleteSelectedEvent): void {
-    const outcome = this.allOutcomes.find((o) => o.abbreviation === event.option.viewValue);
+    const outcome = this.allOutcomes.find(
+      (o) => o.abbreviation === event.option.viewValue.split(' - ')[0],
+    );
 
     if (outcome && !this.selectedConnectedOutcomes().includes(outcome)) {
       this.selectedConnectedOutcomes.update((selectedConnectedOutcomes) => [

From 174cde0022d0c728d2c6408d40129d6c343aa91d Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Mon, 3 Feb 2025 22:17:23 +1100
Subject: [PATCH 239/776] fix: use task status color for recommended button

---
 src/app/common/footer/footer.component.html |  3 ++-
 src/app/common/footer/footer.component.scss | 30 ++++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 4dfac39449..fdcafbbaa3 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -53,8 +53,9 @@
           }}"
           matTooltipPosition="above"
           aria-label=""
-          class="button extra-large-button"
+          class="button extra-large-button status-chip"
           (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
+          [ngClass]="taskService.statusData(selectedTask.suggestedTaskStatus).class"
         >
           <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
         </button>
diff --git a/src/app/common/footer/footer.component.scss b/src/app/common/footer/footer.component.scss
index 771a544303..59ea2367d3 100644
--- a/src/app/common/footer/footer.component.scss
+++ b/src/app/common/footer/footer.component.scss
@@ -25,12 +25,11 @@
 
     .extra-large-button {
       padding-top: 7px;
-      transform: scale(1.30);
-      background-color: #ffac2e;
+      transform: scale(1.25);
     }
 
     .extra-large-button:hover {
-      background-color: #e2992c;
+      filter: brightness(0.85);
     }
   }
 
@@ -49,3 +48,28 @@
     margin-right: 25px;
   }
 }
+
+@import '../../../styles/mixins/task-status-colors-generator.scss';
+
+@mixin status-icon($status) {
+  background-color: task-status-color($status);
+  color: task-status-color($status, fore);
+}
+
+.status-chip {
+  &.feedback-exceeded {
+    @include status-icon('feedback-exceeded');
+  }
+  &.redo {
+    @include status-icon('redo');
+  }
+  &.fix-and-resubmit {
+    @include status-icon('fix-and-resubmit');
+  }
+  &.discuss {
+    @include status-icon('discuss');
+  }
+  &.complete {
+    @include status-icon('complete');
+  }
+}

From ed683174ab7b330a48b2aeacdd65012396357479 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Wed, 5 Feb 2025 23:52:04 +1100
Subject: [PATCH 240/776] feat: add greeting and summary chip

---
 .../task-feedback-templates.component.html    | 17 ++++++++
 .../task-feedback-templates.component.ts      | 42 ++++++++++++++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
index 326943de41..323a2e0eed 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.html
@@ -15,6 +15,23 @@
   </mat-form-field>
 
   <div class="overflow-y-auto flex-grow pr-4 pl-4 pb-5 pt-0">
+    <div class="template-category mt-2 mb-2">
+      <div class="template-grid flex flex-wrap gap-1.5 mt-5">
+        <mat-chip
+          *ngFor="let template of genTemplates$ | async"
+          (mouseenter)="onHoverTemplate(template)"
+          (mouseleave)="onHoverTemplate(null)"
+          (click)="selectTemplate(template)"
+          class="px-2 py-1 rounded-full cursor-pointer hover:shadow-lg transition-shadow duration-200"
+          [ngStyle]="isTemplateSelected(template) ? {'border': '1px solid'} : {}"
+          [hidden]="template.chipText === 'Summarise feedback' && selectedTemplates.length < 1"
+        >
+          <mat-icon *ngIf="isTemplateSelected(template)" matChipAvatar>check_circle</mat-icon>
+          {{ template.chipText }}
+        </mat-chip>
+      </div>
+    </div>
+
     <div #tloSection class="template-category mt-2 mb-2">
       <div *ngFor="let item of tlos$ | async" class="outcome-section mt-4">
         <h5 class="text-formatif-blue font-extrabold">
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index 14c83e57a8..15a4de9450 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -8,6 +8,7 @@ import {
   ViewChild,
   ViewEncapsulation,
   EventEmitter,
+  OnInit,
 } from '@angular/core';
 import {BehaviorSubject, combineLatest, map, Observable} from 'rxjs';
 import {
@@ -25,7 +26,7 @@ import {
   templateUrl: './task-feedback-templates.component.html',
   encapsulation: ViewEncapsulation.None,
 })
-export class TaskFeedbackTemplatesComponent implements OnChanges {
+export class TaskFeedbackTemplatesComponent implements OnInit, OnChanges {
   @Input() task: Task;
   @Output() templateSelected = new EventEmitter<FeedbackTemplate>();
 
@@ -33,6 +34,9 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
   selectedTemplates: FeedbackTemplate[] = [];
   hoveredTemplate: FeedbackTemplate;
 
+  private generalTemplatesSubject = new BehaviorSubject<FeedbackTemplate[]>([]);
+  generalTemplates$ = this.generalTemplatesSubject.asObservable();
+
   private navigationStackSubject = new BehaviorSubject<Map<number, number[]>>(
     new Map<number, number[]>(),
   );
@@ -41,6 +45,13 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
   private searchTermSubject = new BehaviorSubject<string>('');
   searchTerm$ = this.searchTermSubject.asObservable();
 
+  public genTemplates$ = combineLatest([this.generalTemplates$, this.searchTerm$]).pipe(
+    map(([templates, searchTerm]) =>
+      templates.filter((template) =>
+        template.chipText.toLowerCase().includes(searchTerm.toLowerCase()),
+      ),
+    ),
+  );
   public tlos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
   public ulos$: Observable<{outcome: LearningOutcome; templates: FeedbackTemplate[]}[]>;
   public glos$ = combineLatest([
@@ -66,7 +77,25 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
     private taskService: TaskService,
   ) {}
 
+  ngOnInit(): void {
+    const greetingTemplate = new FeedbackTemplate();
+    greetingTemplate.type = 'template';
+    greetingTemplate.chipText = 'Greeting';
+    greetingTemplate.description = 'Insert a greeting with the student\'s name.';
+
+    const summaryTemplate = new FeedbackTemplate();
+    summaryTemplate.type = 'template';
+    summaryTemplate.chipText = 'Summarise feedback';
+    summaryTemplate.description = 'Summarise the given feedback.';
+
+    this.generalTemplatesSubject.next([greetingTemplate, summaryTemplate]);
+  }
+
   ngOnChanges(changes: SimpleChanges): void {
+    this.selectedTemplates = [];
+    this.navigationStackSubject.next(new Map<number, number[]>());
+    this.searchTermSubject.next('');
+
     if (this.task && this.task.definition) {
       this.tlos$ = combineLatest([
         this.task.definition.learningOutcomesCache.values,
@@ -161,6 +190,17 @@ export class TaskFeedbackTemplatesComponent implements OnChanges {
 
   selectTemplate(template: FeedbackTemplate) {
     if (template.type === 'template') {
+      if (template.chipText === 'Greeting') {
+        template.commentText = `Hi ${this.task.project.student.firstName}. `;
+      }
+      if (template.chipText === 'Summarise feedback') {
+        if (!this.selectedTemplates || this.selectedTemplates.length < 1) return;
+        template.commentText = 'Summary of the given feedback:';
+        this.selectedTemplates.forEach((t) => {
+          if (!t.summaryText) return;
+          template.commentText += '\n- ' + t.summaryText;
+        });
+      }
       this.selectedTemplates.push(template);
       this.templateSelected.emit(template);
       this.suggestTaskStatus(template);

From 1978e5410f6aa9314252ae3cf922917033f551f0 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Thu, 6 Feb 2025 00:19:42 +1100
Subject: [PATCH 241/776] fix: exclude greeting and summary from selected

---
 .../task-feedback-templates.component.ts                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index 15a4de9450..c0268ba5a0 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -192,18 +192,18 @@ export class TaskFeedbackTemplatesComponent implements OnInit, OnChanges {
     if (template.type === 'template') {
       if (template.chipText === 'Greeting') {
         template.commentText = `Hi ${this.task.project.student.firstName}. `;
-      }
-      if (template.chipText === 'Summarise feedback') {
+      } else if (template.chipText === 'Summarise feedback') {
         if (!this.selectedTemplates || this.selectedTemplates.length < 1) return;
         template.commentText = 'Summary of the given feedback:';
         this.selectedTemplates.forEach((t) => {
           if (!t.summaryText) return;
           template.commentText += '\n- ' + t.summaryText;
         });
+      } else {
+        this.selectedTemplates.push(template);
+        this.suggestTaskStatus(template);
       }
-      this.selectedTemplates.push(template);
       this.templateSelected.emit(template);
-      this.suggestTaskStatus(template);
     } else {
       const updatedStack = new Map(this.navigationStackSubject.getValue());
       const outcomeStack = updatedStack.get(template.learningOutcomeId) || [];

From a23321ca387a57458715935db3ca700c354e86b1 Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 8 Feb 2025 00:23:25 +1100
Subject: [PATCH 242/776] refactor: separate outcome and feedback template
 editor

---
 .../institution-settings.component.html       |   2 +-
 .../feedback-template-editor.component.html   | 260 ++++++++++
 .../feedback-template-editor.component.ts     | 303 ++++++++++++
 .../feedback-template-editor.component.html   | 462 ------------------
 .../learning-outcome-editor.component.html    | 190 +++++++
 .../learning-outcome-editor.component.ts}     | 303 ++----------
 .../nested-csv-download-modal.component.html  |   0
 .../nested-csv-download-modal.component.ts    |   0
 .../nested-csv-download-modal.service.ts      |   0
 src/app/doubtfire-angular.module.ts           |   8 +-
 src/app/doubtfire-angularjs.module.ts         |   6 +-
 .../task-feedback-templates.component.ts      |   2 +-
 .../task-definition-editor.component.html     |   2 +-
 src/app/units/states/edit/edit.tpl.html       |   2 +-
 14 files changed, 808 insertions(+), 732 deletions(-)
 create mode 100644 src/app/common/feedback-template-editor/feedback-template-editor.component.html
 create mode 100644 src/app/common/feedback-template-editor/feedback-template-editor.component.ts
 delete mode 100644 src/app/common/feedback-template/feedback-template-editor.component.html
 create mode 100644 src/app/common/learning-outcome-editor/learning-outcome-editor.component.html
 rename src/app/common/{feedback-template/feedback-template-editor.component.ts => learning-outcome-editor/learning-outcome-editor.component.ts} (52%)
 rename src/app/common/{feedback-template => learning-outcome-editor}/nested-csv-download-modal/nested-csv-download-modal.component.html (100%)
 rename src/app/common/{feedback-template => learning-outcome-editor}/nested-csv-download-modal/nested-csv-download-modal.component.ts (100%)
 rename src/app/common/{feedback-template => learning-outcome-editor}/nested-csv-download-modal/nested-csv-download-modal.service.ts (100%)

diff --git a/src/app/admin/institution-settings/institution-settings.component.html b/src/app/admin/institution-settings/institution-settings.component.html
index e714f813bb..590a56f54f 100644
--- a/src/app/admin/institution-settings/institution-settings.component.html
+++ b/src/app/admin/institution-settings/institution-settings.component.html
@@ -17,7 +17,7 @@ <h1 class="mb-1">Learning Outcomes</h1>
             <p>Manage global learning outcomes for the institution</p>
           </div>
         </div>
-        <f-feedback-template-editor></f-feedback-template-editor>
+        <f-learning-outcome-editor></f-learning-outcome-editor>
       </div>
     </mat-tab>
     @if (overseerEnabled) {
diff --git a/src/app/common/feedback-template-editor/feedback-template-editor.component.html b/src/app/common/feedback-template-editor/feedback-template-editor.component.html
new file mode 100644
index 0000000000..a173ec17e0
--- /dev/null
+++ b/src/app/common/feedback-template-editor/feedback-template-editor.component.html
@@ -0,0 +1,260 @@
+<div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+  <div class="mb-1">
+    <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome</h4>
+
+    <div class="flex flex-col gap-8">
+      <table
+        #templateTable
+        class="flex-grow f-table selectable"
+        mat-table
+        [dataSource]="templateSource"
+        matSort
+        (matSortChange)="sortTemplateData($event)"
+      >
+        <ng-container matColumnDef="icon" sticky>
+          <th mat-header-cell *matHeaderCellDef></th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+            class="pr-0"
+          >
+            <ng-container *ngIf="feedbackTemplate.type === 'group'">
+              <mat-icon>folder</mat-icon>
+            </ng-container>
+            <ng-container *ngIf="feedbackTemplate.type === 'template'">
+              <mat-icon>description</mat-icon>
+            </ng-container>
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="parent" sticky>
+          <th mat-header-cell *matHeaderCellDef>Parent</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ getParentChipText(feedbackTemplate.parentChipId) }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="chipText" sticky>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header>Chip Text</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ feedbackTemplate.chipText }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="description" sticky>
+          <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ feedbackTemplate.description }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="commentText" sticky>
+          <th mat-header-cell *matHeaderCellDef>Comment Text</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ feedbackTemplate.commentText }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="summaryText" sticky>
+          <th mat-header-cell *matHeaderCellDef>Summary Text</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            {{ feedbackTemplate.type === 'group' ? '' : feedbackTemplate.summaryText }}
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="taskStatus" sticky>
+          <th mat-header-cell *matHeaderCellDef>Task Status</th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            @if (feedbackTemplate.taskStatus) {
+              <mat-chip>
+                <i class="fa {{ taskService.statusData(feedbackTemplate.taskStatus).icon }}"></i>
+                {{ taskService.statusData(feedbackTemplate.taskStatus).label }}
+              </mat-chip>
+            }
+          </td>
+        </ng-container>
+        <ng-container matColumnDef="feedbackTemplateAction" sticky>
+          <th mat-header-cell *matHeaderCellDef></th>
+          <td
+            mat-cell
+            *matCellDef="let feedbackTemplate"
+            (click)="selectFeedbackTemplate(feedbackTemplate)"
+          >
+            @if (feedbackTemplateHasChanges(feedbackTemplate)) {
+              <button
+                mat-icon-button
+                aria-label="save feedback template"
+                color="primary"
+                (click)="saveFeedbackTemplate(feedbackTemplate)"
+              >
+                <mat-icon>save</mat-icon>
+              </button>
+            }
+            <button
+              mat-icon-button
+              aria-label="delete feedback template"
+              color="warn"
+              (click)="deleteFeedbackTemplate(feedbackTemplate)"
+            >
+              <mat-icon>delete</mat-icon>
+            </button>
+          </td>
+        </ng-container>
+
+        <tr mat-header-row *matHeaderRowDef="templateColumns"></tr>
+        <tr
+          mat-row
+          *matRowDef="let row; columns: templateColumns"
+          [style.background]="selectedTemplate === row ? 'lightblue' : ''"
+        ></tr>
+      </table>
+
+      <span class="flex items-center">
+        <div class="h-20">
+          <mat-form-field appearance="outline">
+            <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter" />
+          </mat-form-field>
+        </div>
+        <mat-paginator
+          class="mat-elevation-z0"
+          [pageSizeOptions]="[5, 10, 25, 100]"
+        ></mat-paginator>
+        <span class="flex-grow"></span>
+        @if (context) {
+          <label>Feedback CSV</label>
+          <button mat-icon-button (click)="downloadCsv()">
+            <mat-icon>download</mat-icon>
+          </button>
+          <button mat-icon-button (click)="uploadCsv()">
+            <mat-icon>upload_file</mat-icon>
+          </button>
+          <span class="flex-grow"></span>
+        }
+        <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">
+          Add Template
+        </button>
+      </span>
+
+      @if (selectedTemplate) {
+        <div>
+          <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
+
+          <div class="flex flex-row gap-4">
+            @if (selectedTemplate.isNew) {
+              <mat-form-field appearance="outline" class="basis-1/5">
+                <mat-label>Type</mat-label>
+                <mat-select
+                  required
+                  [value]="selectedTemplate.type"
+                  (selectionChange)="onTemplateTypeChange($event)"
+                >
+                  <mat-option [value]="'group'">Group</mat-option>
+                  <mat-option [value]="'template'">Template</mat-option>
+                </mat-select>
+              </mat-form-field>
+            }
+
+            <mat-form-field appearance="outline" class="basis-1/5">
+              <mat-label>Parent</mat-label>
+              <mat-select [(ngModel)]="selectedTemplate.parentChipId">
+                <mat-option *ngFor="let parent of getPossibleParents()" [value]="parent.id">
+                  {{ parent.chipText }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+
+            <mat-form-field appearance="outline" class="basis-1/5">
+              <mat-label>Chip Text</mat-label>
+              <input
+                matInput
+                required
+                [(ngModel)]="selectedTemplate.chipText"
+                maxlength="20"
+                placeholder="Short text shown on the chip"
+              />
+            </mat-form-field>
+
+            <mat-form-field appearance="outline" class="flex-grow">
+              <mat-label>Description</mat-label>
+              <input
+                matInput
+                required
+                [(ngModel)]="selectedTemplate.description"
+                maxlength="116"
+                placeholder="Description of the feedback template"
+              />
+            </mat-form-field>
+          </div>
+
+          @if (selectedTemplate.type === 'template') {
+            <mat-form-field appearance="outline" class="flex flex-grow">
+              <mat-label>Comment Text</mat-label>
+              <textarea
+                matInput
+                required
+                [(ngModel)]="selectedTemplate.commentText"
+                placeholder="Feedback text that is added to the comment area"
+              >
+              </textarea>
+            </mat-form-field>
+
+            <div class="flex flex-row gap-4">
+              <mat-form-field appearance="outline" class="flex-grow">
+                <mat-label>Summary Text</mat-label>
+                <input
+                  matInput
+                  required
+                  [(ngModel)]="selectedTemplate.summaryText"
+                  placeholder="Summary of the feedback"
+                />
+              </mat-form-field>
+
+              <mat-form-field appearance="outline" class="basis-1/3">
+                <mat-label>Task Status</mat-label>
+                <mat-select [(ngModel)]="selectedTemplate.taskStatus">
+                  <mat-option [value]="null"></mat-option>
+                  <mat-option
+                    *ngFor="let status of taskService.feedbackTemplateStatuses"
+                    [value]="status"
+                  >
+                    {{ taskService.statusData(status).label }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+            </div>
+          }
+
+          <div class="flex">
+            <span class="flex-grow"></span>
+            <button
+              mat-raised-button
+              color="primary"
+              (click)="saveFeedbackTemplate(selectedTemplate)"
+            >
+              Save Template
+            </button>
+          </div>
+        </div>
+      }
+    </div>
+  </div>
+</div>
diff --git a/src/app/common/feedback-template-editor/feedback-template-editor.component.ts b/src/app/common/feedback-template-editor/feedback-template-editor.component.ts
new file mode 100644
index 0000000000..6cc4930974
--- /dev/null
+++ b/src/app/common/feedback-template-editor/feedback-template-editor.component.ts
@@ -0,0 +1,303 @@
+import {
+  AfterViewInit,
+  Component,
+  Inject,
+  Input,
+  OnChanges,
+  SimpleChanges,
+  ViewChild,
+} from '@angular/core';
+import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {MatPaginator} from '@angular/material/paginator';
+import {MatSelectChange} from '@angular/material/select';
+import {
+  TaskDefinition,
+  Unit,
+  LearningOutcome,
+  FeedbackTemplate,
+  TaskService,
+  FeedbackTemplateService,
+} from 'src/app/api/models/doubtfire-model';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {MatSort, Sort} from '@angular/material/sort';
+import {
+  confirmationModal,
+  csvResultModalService,
+  csvUploadModalService,
+} from 'src/app/ajs-upgraded-providers';
+import {FileDownloaderService} from '../file-downloader/file-downloader.service';
+import { id } from 'date-fns/locale';
+
+@Component({
+  selector: 'f-feedback-template-editor',
+  templateUrl: 'feedback-template-editor.component.html',
+})
+export class FeedbackTemplateEditorComponent implements OnChanges, AfterViewInit {
+  @Input() context?: TaskDefinition | Unit;
+  @Input() selectedOutcome: LearningOutcome;
+
+  @ViewChild('templateTable', {static: false}) templateTable: MatTable<FeedbackTemplate>;
+  @ViewChild(MatSort, {static: false}) templateSort: MatSort;
+  @ViewChild(MatPaginator, {static: false}) templatePaginator: MatPaginator;
+
+  public templateSource: MatTableDataSource<FeedbackTemplate>;
+  public templateColumns: string[] = [
+    'icon',
+    'parent',
+    'chipText',
+    'description',
+    'commentText',
+    'summaryText',
+    'taskStatus',
+    'feedbackTemplateAction',
+  ];
+  public selectedTemplate: FeedbackTemplate;
+  public possibleParents: FeedbackTemplate[];
+
+  constructor(
+    private alerts: AlertService,
+    private feedbackTemplateService: FeedbackTemplateService,
+    private fileDownloaderService: FileDownloaderService,
+    private taskService: TaskService,
+    @Inject(csvResultModalService) private csvResultModalService: any,
+    @Inject(csvUploadModalService) private csvUploadModal: any,
+    @Inject(confirmationModal) private confirmationModal: any,
+  ) {}
+
+  ngAfterViewInit(): void {
+    this.getFeedbackChips();
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    this.selectedTemplate = null;
+    this.getFeedbackChips();
+  }
+
+  initialiseTable(feedbackTemplates: FeedbackTemplate[]) {
+    this.templateSource = new MatTableDataSource<FeedbackTemplate>(feedbackTemplates);
+    this.templateSource.paginator = this.templatePaginator;
+    this.templateSource.sort = this.templateSort;
+    this.templateSource.filterPredicate = (data: FeedbackTemplate, filter: string) => {
+      const filterValue = filter.trim().toLowerCase();
+      return (
+        this.getParentChipText(data.parentChipId).toLowerCase().includes(filterValue) ||
+        data.chipText.toLowerCase().includes(filterValue) ||
+        data.commentText?.toLowerCase().includes(filterValue) ||
+        data.summaryText?.toLowerCase().includes(filterValue) ||
+        data.description.toLowerCase().includes(filterValue)
+      );
+    };
+    this.sortTemplateData({active: 'chipText', direction: 'asc'});
+  }
+
+  public getFeedbackChips() {
+    this.feedbackTemplateService.cache.values.subscribe((templates) => {
+      const outcomeTemplates = templates.filter(
+        (temp) => temp.learningOutcomeId === this.selectedOutcome.id,
+      );
+      this.possibleParents = outcomeTemplates.filter((temp) => temp.type === 'group');
+      this.initialiseTable(outcomeTemplates);
+    });
+  }
+
+  public saveFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    feedbackTemplate.save().subscribe({
+      next: () => {
+        this.alerts.success('Template saved');
+        feedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+        this.selectFeedbackTemplate(this.selectedTemplate);
+      },
+      error: () => this.alerts.error('Failed to save feedback template. Please try again.'),
+    });
+  }
+
+  public selectFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    if (this.selectedTemplate === feedbackTemplate) {
+      this.selectedTemplate = null;
+    } else {
+      this.selectedTemplate = feedbackTemplate;
+
+      if (!this.selectedTemplate.hasOriginalSaveData) {
+        this.selectedTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
+      }
+    }
+  }
+
+  public sortTemplateData(sort: Sort) {
+    sort.active = sort.active || 'chipText';
+    sort.direction = sort.direction || 'asc';
+
+    const isAsc = sort.direction === 'asc';
+
+    // Generic sorting function for dynamic property access
+    const compare = (a: FeedbackTemplate, b: FeedbackTemplate) => {
+      const key = sort.active as keyof FeedbackTemplate;
+      const aValue = a[key];
+      const bValue = b[key];
+
+      if (typeof aValue === 'string' && typeof bValue === 'string') {
+        return aValue.localeCompare(bValue) * (isAsc ? 1 : -1);
+      }
+      return 0;
+    };
+
+    // Initial sorting by the chosen method
+    const sortedTemplates = [...this.templateSource.data].sort(compare);
+
+    // Determine maximum depth of the hierarchy (only groups contribute to depth)
+    const depthMap = new Map<number, number>();
+    let maxDepth = 0;
+
+    const feedbackGroups = sortedTemplates.filter((t) => t.type === 'group');
+    const feedbackTemplates = sortedTemplates.filter((t) => t.type !== 'group');
+
+    feedbackGroups.forEach((template) => {
+      let depth = 0;
+      let parentId = template.parentChipId;
+
+      while (parentId) {
+        depth++;
+        parentId = sortedTemplates.find((t) => t.id === parentId)?.parentChipId ?? null;
+      }
+
+      depthMap.set(template.id, depth);
+      maxDepth = Math.max(maxDepth, depth);
+    });
+
+    // Assign sequential order numbers
+    const orderMap = new Map<number, number>();
+    let orderIndex = 1;
+
+    sortedTemplates.forEach((template) => {
+      orderMap.set(template.id, orderIndex++);
+    });
+
+    feedbackGroups.sort((a, b) => depthMap.get(a.id)! - depthMap.get(b.id)!);
+
+    // Assign hierarchical order to groups using depth-based multiplier
+    feedbackGroups.forEach((template) => {
+      const parentOrder = template.parentChipId ? orderMap.get(template.parentChipId)! : 0;
+      const depth = depthMap.get(template.id) ?? 0;
+      const multiplier = 10 ** (maxDepth + 5 - depth * 3); // Proper scaling based on depth
+
+      orderMap.set(template.id, parentOrder + orderMap.get(template.id)! * multiplier);
+    });
+
+    // Assign order values to templates by directly adding their parent's order
+    feedbackTemplates.forEach((template) => {
+      const parentOrder = orderMap.get(template.parentChipId) ?? 0;
+      orderMap.set(template.id, parentOrder + orderMap.get(template.id)!);
+    });
+
+    // Sort again by computed hierarchical order
+    sortedTemplates.sort((a, b) => orderMap.get(a.id)! - orderMap.get(b.id)!);
+
+    // Update the data source
+    this.templateSource.data = [...sortedTemplates];
+  }
+
+  applyFilter(filterValue: string) {
+    this.templateSource.filter = filterValue;
+    if (this.templateSource.paginator) {
+      this.templateSource.paginator.firstPage();
+    }
+  }
+
+  public feedbackTemplateHasChanges(feedbackTemplate: FeedbackTemplate): boolean {
+    return feedbackTemplate.hasChanges(this.feedbackTemplateService.mapping);
+  }
+
+  public deleteFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    this.confirmationModal.show(
+      'Delete feedback template',
+      'Are you sure you want to delete this template? This action is final.',
+      () => {
+        feedbackTemplate.delete().subscribe({
+          next: () => {
+            this.alerts.success('Feedback template deleted');
+            if (this.selectedTemplate === feedbackTemplate)
+              this.selectFeedbackTemplate(this.selectedTemplate);
+          },
+          error: () => this.alerts.error('Failed to delete feedback template. Please try again.'),
+        });
+      },
+    );
+  }
+
+  public uploadCsv() {
+    const url = this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
+
+    this.csvUploadModal.show(
+      'Upload Feedback Templates as CSV',
+      'Test message',
+      {file: {name: 'Feedback Templates CSV Data', type: 'csv'}},
+      url,
+      (response: any) => {
+        this.csvResultModalService.show('Feedback Templates CSV Upload Results', response);
+        if (response.success.length > 0) {
+          this.context.refresh();
+        }
+      },
+    );
+  }
+
+  public downloadCsv() {
+    const url = this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
+    let name = `${this.selectedOutcome.abbreviation}-FeedbackTemplates.csv`;
+
+    if (this.context instanceof TaskDefinition)
+      name = `${this.context.unit.code}-${this.context.abbreviation}-${name}`;
+    else if (this.context instanceof Unit) name = `${this.context.code}-${name}`;
+
+    this.fileDownloaderService.downloadFile(url, name);
+  }
+
+  public createFeedbackTemplate() {
+    if (this.selectedOutcome.isNew) {
+      this.alerts.error('Save the new outcome to proceed.');
+      return;
+    }
+
+    const feedbackTemplate = new FeedbackTemplate();
+
+    feedbackTemplate.type = 'template';
+    feedbackTemplate.chipText = '';
+    feedbackTemplate.description = '';
+    feedbackTemplate.commentText = '';
+    feedbackTemplate.summaryText = '';
+    feedbackTemplate.learningOutcomeId = this.selectedOutcome.id;
+
+    this.selectedTemplate = feedbackTemplate;
+  }
+
+  onTemplateTypeChange(event: MatSelectChange): void {
+    if (!this.selectedTemplate.isNew) {
+      this.alerts.error('Template type change forbidden.');
+      event.source.writeValue(this.selectedTemplate.type);
+    } else {
+      this.selectedTemplate.type = event.value;
+    }
+  }
+
+  getPossibleParents(): FeedbackTemplate[] {
+    if (!this.selectedTemplate.isNew)
+      return this.possibleParents.filter(
+        (p) => p.id != this.selectedTemplate.id && !this.isAncestor(this.selectedTemplate.id, p),
+      );
+    else return this.possibleParents;
+  }
+
+  isAncestor(idToCheck: number, descendant: FeedbackTemplate): boolean {
+    if (descendant.parentChipId === idToCheck) return true;
+
+    const parent = this.possibleParents.find((p) => p.id === descendant.parentChipId);
+    if (!parent) return false;
+
+    return this.isAncestor(idToCheck, parent);
+  }
+
+  getParentChipText(parentId: number): string {
+    const parent = this.possibleParents.find((p) => p.id === parentId);
+    return parent ? parent.chipText : '';
+  }
+}
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.html b/src/app/common/feedback-template/feedback-template-editor.component.html
deleted file mode 100644
index 34fed78a4c..0000000000
--- a/src/app/common/feedback-template/feedback-template-editor.component.html
+++ /dev/null
@@ -1,462 +0,0 @@
-<div class="flex flex-col gap-8">
-  <table
-    #outcomeTable
-    class="flex-grow f-table selectable"
-    mat-table
-    [dataSource]="outcomeSource"
-    matSort
-    (matSortChange)="sortOutcomeData($event)"
-    #outcomeSort="matSort"
-  >
-    <ng-container matColumnDef="abbreviation" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Abbreviation</th>
-      <td
-        mat-cell
-        *matCellDef="let learningOutcome"
-        (click)="selectLearningOutcome(learningOutcome)"
-      >
-        {{ learningOutcome.abbreviation }}
-      </td>
-    </ng-container>
-    <ng-container matColumnDef="shortDescription" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Short Description</th>
-      <td
-        mat-cell
-        *matCellDef="let learningOutcome"
-        (click)="selectLearningOutcome(learningOutcome)"
-      >
-        {{ learningOutcome.shortDescription }}
-      </td>
-    </ng-container>
-    <ng-container matColumnDef="fullOutcomeDescription" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Full Outcome Description</th>
-      <td
-        mat-cell
-        *matCellDef="let learningOutcome"
-        (click)="selectLearningOutcome(learningOutcome)"
-      >
-        {{ learningOutcome.fullOutcomeDescription }}
-      </td>
-    </ng-container>
-    <ng-container matColumnDef="connectedOutcomes" sticky>
-      <th mat-header-cell *matHeaderCellDef>Connected Learning Outcomes</th>
-      <td
-        mat-cell
-        *matCellDef="let learningOutcome"
-        (click)="selectLearningOutcome(learningOutcome)"
-      >
-        @for (outcome of getLinkedOutcomes(learningOutcome); track outcome.abbreviation) {
-          <mat-chip-row matTooltip="{{ outcome.shortDescription }}">{{
-            outcome.abbreviation
-          }}</mat-chip-row>
-        }
-      </td>
-    </ng-container>
-    <ng-container matColumnDef="learningOutcomeAction" sticky>
-      <th mat-header-cell *matHeaderCellDef></th>
-      <td
-        mat-cell
-        *matCellDef="let learningOutcome"
-        (click)="selectLearningOutcome(learningOutcome)"
-      >
-        @if (learningOutcomeHasChanges(learningOutcome)) {
-          <button
-            mat-icon-button
-            aria-label="save learning outcome"
-            color="primary"
-            (click)="saveLearningOutcome(learningOutcome)"
-          >
-            <mat-icon>save</mat-icon>
-          </button>
-        }
-        <button
-          mat-icon-button
-          aria-label="delete learning outcome"
-          color="warn"
-          (click)="deleteLearningOutcome(learningOutcome)"
-        >
-          <mat-icon>delete</mat-icon>
-        </button>
-      </td>
-    </ng-container>
-
-    <tr mat-header-row *matHeaderRowDef="outcomeColumns"></tr>
-    <tr
-      mat-row
-      *matRowDef="let row; columns: outcomeColumns"
-      [style.background]="selectedOutcome === row ? 'lightblue' : ''"
-    ></tr>
-  </table>
-
-  <span class="flex items-center">
-    <div class="h-20">
-      <mat-form-field appearance="outline">
-        <input
-          matInput
-          (keyup)="applyFilter($event.target.value, 'outcome')"
-          placeholder="Filter"
-        />
-      </mat-form-field>
-    </div>
-    <mat-paginator
-      #outcomePaginator
-      class="mat-elevation-z0"
-      [pageSizeOptions]="[5, 10, 25, 100]"
-    ></mat-paginator>
-    <span class="flex-grow"></span>
-    @if (abbreviationPrefix !== 'GLO') {
-      <label>Outcomes CSV</label>
-      <button mat-icon-button (click)="downloadCsv('Learning Outcomes', false)">
-        <mat-icon>download</mat-icon>
-      </button>
-      <button mat-icon-button (click)="uploadCsv('Learning Outcomes', false)">
-        <mat-icon>upload_file</mat-icon>
-      </button>
-      <span class="flex-grow"></span>
-    }
-    <label>Feedback CSV</label>
-    <button mat-icon-button (click)="downloadCsv('Feedback Templates', false)">
-      <mat-icon>download</mat-icon>
-    </button>
-    <button mat-icon-button (click)="uploadCsv('Feedback Templates', false)">
-      <mat-icon>upload_file</mat-icon>
-    </button>
-    <span class="flex-grow"></span>
-    <button mat-raised-button color="primary" (click)="createLearningOutcome()">Add Outcome</button>
-  </span>
-
-  @if (selectedOutcome) {
-    <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-      <div>
-        <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
-
-        <div class="flex flex-row gap-4">
-          <mat-form-field appearance="outline" class="basis-1/3">
-            <mat-label>Abbreviation</mat-label>
-            <input matInput required [(ngModel)]="selectedOutcome.abbreviation" maxlength="5" />
-          </mat-form-field>
-
-          <mat-form-field appearance="outline" class="flex-grow">
-            <mat-label>Short Description</mat-label>
-            <input matInput required [(ngModel)]="selectedOutcome.shortDescription" />
-          </mat-form-field>
-        </div>
-
-        <mat-form-field appearance="outline" class="flex flex-grow">
-          <mat-label>Full Outcome Description</mat-label>
-          <textarea matInput required [(ngModel)]="selectedOutcome.fullOutcomeDescription">
-          </textarea>
-        </mat-form-field>
-
-        @if (abbreviationPrefix !== 'GLO') {
-          <mat-form-field appearance="outline" class="flex flex-grow">
-            <mat-label>Connected Learning Outcomes</mat-label>
-            <mat-chip-grid #chipGrid aria-label="Outcome selection">
-              @for (outcome of selectedConnectedOutcomes(); track outcome.abbreviation) {
-                <mat-chip-row (removed)="remove(outcome)">
-                  {{ outcome.abbreviation }}
-                  <button matChipRemove [attr.aria-label]="'remove ' + outcome.abbreviation">
-                    <mat-icon>cancel</mat-icon>
-                  </button>
-                </mat-chip-row>
-              }
-            </mat-chip-grid>
-            <input
-              name="typedConnectedOutcome"
-              placeholder="Connect an outcome..."
-              #connectedOutcomeInput
-              [(ngModel)]="typedConnectedOutcome"
-              [matChipInputFor]="chipGrid"
-              [matAutocomplete]="auto"
-              [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-              (matChipInputTokenEnd)="add($event)"
-              [disabled]="!this.context"
-            />
-            <mat-autocomplete #auto="matAutocomplete" (optionSelected)="select($event)">
-              @for (outcome of filteredOutcomes(); track outcome) {
-                <mat-option [value]="outcome.abbreviation"
-                  >{{ outcome.abbreviation }} - {{ outcome.shortDescription }}</mat-option
-                >
-              }
-            </mat-autocomplete>
-          </mat-form-field>
-        }
-
-        <div class="flex">
-          <span class="flex-grow"></span>
-          <button mat-raised-button color="primary" (click)="saveLearningOutcome(selectedOutcome)">
-            Save Outcome
-          </button>
-        </div>
-      </div>
-    </div>
-
-    <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-      <div class="mb-1">
-        <h4 class="font-bold text-2xl text-gray-900">Edit Feedback Templates for Outcome</h4>
-
-        <div class="flex flex-col gap-8">
-          <table
-            #templateTable
-            class="flex-grow f-table selectable"
-            mat-table
-            [dataSource]="templateSource"
-            matSort
-            (matSortChange)="sortTemplateData($event)"
-            #templateSort="matSort"
-          >
-            <ng-container matColumnDef="icon" sticky>
-              <th mat-header-cell *matHeaderCellDef></th>
-              <td
-                mat-cell
-                *matCellDef="let feedbackTemplate"
-                (click)="selectFeedbackTemplate(feedbackTemplate)"
-                class="pr-0"
-              >
-                <ng-container *ngIf="feedbackTemplate.type === 'group'">
-                  <mat-icon>folder</mat-icon>
-                </ng-container>
-                <ng-container *ngIf="feedbackTemplate.type === 'template'">
-                  <mat-icon>description</mat-icon>
-                </ng-container>
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="parent" sticky>
-              <th mat-header-cell *matHeaderCellDef>Parent</th>
-              <td
-                mat-cell
-                *matCellDef="let feedbackTemplate"
-                (click)="selectFeedbackTemplate(feedbackTemplate)"
-              >
-                {{ getParentChipText(feedbackTemplate.parentChipId) }}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="chipText" sticky>
-              <th mat-header-cell *matHeaderCellDef mat-sort-header>Chip Text</th>
-              <td
-                mat-cell
-                *matCellDef="let feedbackTemplate"
-                (click)="selectFeedbackTemplate(feedbackTemplate)"
-              >
-                {{ feedbackTemplate.chipText }}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="description" sticky>
-              <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
-              <td
-                mat-cell
-                *matCellDef="let feedbackTemplate"
-                (click)="selectFeedbackTemplate(feedbackTemplate)"
-              >
-                {{ feedbackTemplate.description }}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="commentText" sticky>
-              <th mat-header-cell *matHeaderCellDef>Comment Text</th>
-              <td
-                mat-cell
-                *matCellDef="let feedbackTemplate"
-                (click)="selectFeedbackTemplate(feedbackTemplate)"
-              >
-                {{ feedbackTemplate.commentText }}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="summaryText" sticky>
-              <th mat-header-cell *matHeaderCellDef>Summary Text</th>
-              <td
-                mat-cell
-                *matCellDef="let feedbackTemplate"
-                (click)="selectFeedbackTemplate(feedbackTemplate)"
-              >
-                {{ feedbackTemplate.type === 'group' ? '' : feedbackTemplate.summaryText }}
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="taskStatus" sticky>
-              <th mat-header-cell *matHeaderCellDef>Task Status</th>
-              <td
-                mat-cell
-                *matCellDef="let feedbackTemplate"
-                (click)="selectFeedbackTemplate(feedbackTemplate)"
-              >
-                @if (feedbackTemplate.taskStatus) {
-                  <mat-chip>
-                    <i
-                      class="fa {{ taskService.statusData(feedbackTemplate.taskStatus).icon }}"
-                    ></i>
-                    {{ taskService.statusData(feedbackTemplate.taskStatus).label }}
-                  </mat-chip>
-                }
-              </td>
-            </ng-container>
-            <ng-container matColumnDef="feedbackTemplateAction" sticky>
-              <th mat-header-cell *matHeaderCellDef></th>
-              <td
-                mat-cell
-                *matCellDef="let feedbackTemplate"
-                (click)="selectFeedbackTemplate(feedbackTemplate)"
-              >
-                @if (feedbackTemplateHasChanges(feedbackTemplate)) {
-                  <button
-                    mat-icon-button
-                    aria-label="save feedback template"
-                    color="primary"
-                    (click)="saveFeedbackTemplate(feedbackTemplate)"
-                  >
-                    <mat-icon>save</mat-icon>
-                  </button>
-                }
-                <button
-                  mat-icon-button
-                  aria-label="delete feedback template"
-                  color="warn"
-                  (click)="deleteFeedbackTemplate(feedbackTemplate)"
-                >
-                  <mat-icon>delete</mat-icon>
-                </button>
-              </td>
-            </ng-container>
-
-            <tr mat-header-row *matHeaderRowDef="templateColumns"></tr>
-            <tr
-              mat-row
-              *matRowDef="let row; columns: templateColumns"
-              [style.background]="selectedTemplate === row ? 'lightblue' : ''"
-            ></tr>
-          </table>
-
-          <span class="flex items-center">
-            <div class="h-20">
-              <mat-form-field appearance="outline">
-                <input
-                  matInput
-                  (keyup)="applyFilter($event.target.value, 'template')"
-                  placeholder="Filter"
-                />
-              </mat-form-field>
-            </div>
-            <mat-paginator
-              #templatePaginator
-              class="mat-elevation-z0"
-              [pageSizeOptions]="[5, 10, 25, 100]"
-            ></mat-paginator>
-            <span class="flex-grow"></span>
-            @if (abbreviationPrefix !== 'GLO') {
-              <label>Feedback CSV</label>
-              <button mat-icon-button (click)="downloadCsv('Feedback Templates', true)">
-                <mat-icon>download</mat-icon>
-              </button>
-              <button mat-icon-button (click)="uploadCsv('Feedback Templates', true)">
-                <mat-icon>upload_file</mat-icon>
-              </button>
-              <span class="flex-grow"></span>
-            }
-            <button mat-raised-button color="primary" (click)="createFeedbackTemplate()">
-              Add Template
-            </button>
-          </span>
-
-          @if (selectedTemplate) {
-            <div>
-              <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
-
-              <div class="flex flex-row gap-4">
-                @if (selectedTemplate.isNew) {
-                  <mat-form-field appearance="outline" class="basis-1/5">
-                    <mat-label>Type</mat-label>
-                    <mat-select
-                      required
-                      [value]="selectedTemplate.type"
-                      (selectionChange)="onTemplateTypeChange($event)"
-                    >
-                      <mat-option [value]="'group'">Group</mat-option>
-                      <mat-option [value]="'template'">Template</mat-option>
-                    </mat-select>
-                  </mat-form-field>
-                }
-
-                <mat-form-field appearance="outline" class="basis-1/5">
-                  <mat-label>Parent</mat-label>
-                  <mat-select [(ngModel)]="selectedTemplate.parentChipId">
-                    <mat-option *ngFor="let parent of getPossibleParents()" [value]="parent.id">
-                      {{ parent.chipText }}
-                    </mat-option>
-                  </mat-select>
-                </mat-form-field>
-
-                <mat-form-field appearance="outline" class="basis-1/5">
-                  <mat-label>Chip Text</mat-label>
-                  <input
-                    matInput
-                    required
-                    [(ngModel)]="selectedTemplate.chipText"
-                    maxlength="20"
-                    placeholder="Short text shown on the chip"
-                  />
-                </mat-form-field>
-
-                <mat-form-field appearance="outline" class="flex-grow">
-                  <mat-label>Description</mat-label>
-                  <input
-                    matInput
-                    required
-                    [(ngModel)]="selectedTemplate.description"
-                    maxlength="116"
-                    placeholder="Description of the feedback template"
-                  />
-                </mat-form-field>
-              </div>
-
-              @if (selectedTemplate.type === 'template') {
-                <mat-form-field appearance="outline" class="flex flex-grow">
-                  <mat-label>Comment Text</mat-label>
-                  <textarea
-                    matInput
-                    required
-                    [(ngModel)]="selectedTemplate.commentText"
-                    placeholder="Feedback text that is added to the comment area"
-                  >
-                  </textarea>
-                </mat-form-field>
-
-                <div class="flex flex-row gap-4">
-                  <mat-form-field appearance="outline" class="flex-grow">
-                    <mat-label>Summary Text</mat-label>
-                    <input
-                      matInput
-                      required
-                      [(ngModel)]="selectedTemplate.summaryText"
-                      placeholder="Summary of the feedback"
-                    />
-                  </mat-form-field>
-
-                  <mat-form-field appearance="outline" class="basis-1/3">
-                    <mat-label>Task Status</mat-label>
-                    <mat-select [(ngModel)]="selectedTemplate.taskStatus">
-                      <mat-option
-                        *ngFor="let status of taskService.feedbackTemplateStatuses"
-                        [value]="status"
-                      >
-                        {{ taskService.statusData(status).label }}
-                      </mat-option>
-                    </mat-select>
-                  </mat-form-field>
-                </div>
-              }
-
-              <div class="flex">
-                <span class="flex-grow"></span>
-                <button
-                  mat-raised-button
-                  color="primary"
-                  (click)="saveFeedbackTemplate(selectedTemplate)"
-                >
-                  Save Template
-                </button>
-              </div>
-            </div>
-          }
-        </div>
-      </div>
-    </div>
-  }
-</div>
diff --git a/src/app/common/learning-outcome-editor/learning-outcome-editor.component.html b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.html
new file mode 100644
index 0000000000..ffff5103d0
--- /dev/null
+++ b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.html
@@ -0,0 +1,190 @@
+<div class="flex flex-col gap-8">
+  <table
+    #outcomeTable
+    class="flex-grow f-table selectable"
+    mat-table
+    [dataSource]="outcomeSource"
+    matSort
+    (matSortChange)="sortOutcomeData($event)"
+  >
+    <ng-container matColumnDef="abbreviation" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Abbreviation</th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        {{ learningOutcome.abbreviation }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="shortDescription" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Short Description</th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        {{ learningOutcome.shortDescription }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="fullOutcomeDescription" sticky>
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Full Outcome Description</th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        {{ learningOutcome.fullOutcomeDescription }}
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="connectedOutcomes" sticky>
+      <th mat-header-cell *matHeaderCellDef>Connected Learning Outcomes</th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        @for (outcome of getLinkedOutcomes(learningOutcome); track outcome.abbreviation) {
+          <mat-chip-row matTooltip="{{ outcome.shortDescription }}">{{
+            outcome.abbreviation
+          }}</mat-chip-row>
+        }
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="learningOutcomeAction" sticky>
+      <th mat-header-cell *matHeaderCellDef></th>
+      <td
+        mat-cell
+        *matCellDef="let learningOutcome"
+        (click)="selectLearningOutcome(learningOutcome)"
+      >
+        @if (learningOutcomeHasChanges(learningOutcome)) {
+          <button
+            mat-icon-button
+            aria-label="save learning outcome"
+            color="primary"
+            (click)="saveLearningOutcome(learningOutcome)"
+          >
+            <mat-icon>save</mat-icon>
+          </button>
+        }
+        <button
+          mat-icon-button
+          aria-label="delete learning outcome"
+          color="warn"
+          (click)="deleteLearningOutcome(learningOutcome)"
+        >
+          <mat-icon>delete</mat-icon>
+        </button>
+      </td>
+    </ng-container>
+
+    <tr mat-header-row *matHeaderRowDef="outcomeColumns"></tr>
+    <tr
+      mat-row
+      *matRowDef="let row; columns: outcomeColumns"
+      [style.background]="selectedOutcome === row ? 'lightblue' : ''"
+    ></tr>
+  </table>
+
+  <span class="flex items-center">
+    <div class="h-20">
+      <mat-form-field appearance="outline">
+        <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter" />
+      </mat-form-field>
+    </div>
+    <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+    <span class="flex-grow"></span>
+    @if (abbreviationPrefix !== 'GLO') {
+      <label>Outcomes CSV</label>
+      <button mat-icon-button (click)="downloadCsv('Learning Outcomes')">
+        <mat-icon>download</mat-icon>
+      </button>
+      <button mat-icon-button (click)="uploadCsv('Learning Outcomes')">
+        <mat-icon>upload_file</mat-icon>
+      </button>
+      <span class="flex-grow"></span>
+    }
+    <label>Feedback CSV</label>
+    <button mat-icon-button (click)="downloadCsv('Feedback Templates')">
+      <mat-icon>download</mat-icon>
+    </button>
+    <button mat-icon-button (click)="uploadCsv('Feedback Templates')">
+      <mat-icon>upload_file</mat-icon>
+    </button>
+    <span class="flex-grow"></span>
+    <button mat-raised-button color="primary" (click)="createLearningOutcome()">Add Outcome</button>
+  </span>
+
+  @if (selectedOutcome) {
+    <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+      <div>
+        <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
+
+        <div class="flex flex-row gap-4">
+          <mat-form-field appearance="outline" class="basis-1/3">
+            <mat-label>Abbreviation</mat-label>
+            <input matInput required [(ngModel)]="selectedOutcome.abbreviation" maxlength="5" />
+          </mat-form-field>
+
+          <mat-form-field appearance="outline" class="flex-grow">
+            <mat-label>Short Description</mat-label>
+            <input matInput required [(ngModel)]="selectedOutcome.shortDescription" />
+          </mat-form-field>
+        </div>
+
+        <mat-form-field appearance="outline" class="flex flex-grow">
+          <mat-label>Full Outcome Description</mat-label>
+          <textarea matInput required [(ngModel)]="selectedOutcome.fullOutcomeDescription">
+          </textarea>
+        </mat-form-field>
+
+        @if (abbreviationPrefix !== 'GLO') {
+          <mat-form-field appearance="outline" class="flex flex-grow">
+            <mat-label>Connected Learning Outcomes</mat-label>
+            <mat-chip-grid #chipGrid aria-label="Outcome selection">
+              @for (outcome of selectedConnectedOutcomes(); track outcome.abbreviation) {
+                <mat-chip-row (removed)="remove(outcome)">
+                  {{ outcome.abbreviation }}
+                  <button matChipRemove [attr.aria-label]="'remove ' + outcome.abbreviation">
+                    <mat-icon>cancel</mat-icon>
+                  </button>
+                </mat-chip-row>
+              }
+            </mat-chip-grid>
+            <input
+              name="typedConnectedOutcome"
+              placeholder="Connect an outcome..."
+              #connectedOutcomeInput
+              [(ngModel)]="typedConnectedOutcome"
+              [matChipInputFor]="chipGrid"
+              [matAutocomplete]="auto"
+              [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+              (matChipInputTokenEnd)="add($event)"
+              [disabled]="!this.context"
+            />
+            <mat-autocomplete #auto="matAutocomplete" (optionSelected)="select($event)">
+              @for (outcome of filteredOutcomes(); track outcome) {
+                <mat-option [value]="outcome.abbreviation"
+                  >{{ outcome.abbreviation }} - {{ outcome.shortDescription }}</mat-option
+                >
+              }
+            </mat-autocomplete>
+          </mat-form-field>
+        }
+
+        <div class="flex">
+          <span class="flex-grow"></span>
+          <button mat-raised-button color="primary" (click)="saveLearningOutcome(selectedOutcome)">
+            Save Outcome
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <f-feedback-template-editor
+      [context]="context"
+      [selectedOutcome]="selectedOutcome"
+    ></f-feedback-template-editor>
+  }
+</div>
diff --git a/src/app/common/feedback-template/feedback-template-editor.component.ts b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
similarity index 52%
rename from src/app/common/feedback-template/feedback-template-editor.component.ts
rename to src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
index a7b3b733ea..465d4d6aa0 100644
--- a/src/app/common/feedback-template/feedback-template-editor.component.ts
+++ b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
@@ -7,7 +7,6 @@ import {
   Input,
   model,
   OnDestroy,
-  OnInit,
   signal,
   effect,
   ViewChild,
@@ -16,15 +15,12 @@ import {
 } from '@angular/core';
 import {MatTable, MatTableDataSource} from '@angular/material/table';
 import {MatPaginator} from '@angular/material/paginator';
-import {MatSelectChange} from '@angular/material/select';
 import {
   TaskDefinition,
   Unit,
   LearningOutcome,
   LearningOutcomeService,
-  FeedbackTemplate,
   TaskService,
-  FeedbackTemplateService,
 } from 'src/app/api/models/doubtfire-model';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {MatSort, Sort} from '@angular/material/sort';
@@ -44,17 +40,15 @@ import {NestedCsvDownloadModalService} from './nested-csv-download-modal/nested-
 import API_URL from 'src/app/config/constants/apiURL';
 
 @Component({
-  selector: 'f-feedback-template-editor',
-  templateUrl: 'feedback-template-editor.component.html',
+  selector: 'f-learning-outcome-editor',
+  templateUrl: 'learning-outcome-editor.component.html',
 })
-export class FeedbackTemplateEditorComponent
-  implements OnInit, OnChanges, AfterViewInit, OnDestroy
-{
+export class LearningOutcomeEditorComponent implements OnChanges, AfterViewInit, OnDestroy {
   @Input() context?: TaskDefinition | Unit;
 
   @ViewChild('outcomeTable', {static: false}) outcomeTable: MatTable<LearningOutcome>;
-  @ViewChild('outcomeSort', {static: false}) outcomeSort: MatSort;
-  @ViewChild('outcomePaginator', {static: false}) outcomePaginator: MatPaginator;
+  @ViewChild(MatSort, {static: false}) outcomeSort: MatSort;
+  @ViewChild(MatPaginator, {static: false}) outcomePaginator: MatPaginator;
 
   public outcomeSource: MatTableDataSource<LearningOutcome>;
   public outcomeColumns: string[] = [
@@ -70,30 +64,11 @@ export class FeedbackTemplateEditorComponent
   public allOutcomes: LearningOutcome[] = [];
   public selectedConnectedOutcomes = signal([]);
 
-  @ViewChild('templateTable', {static: false}) templateTable: MatTable<FeedbackTemplate>;
-  @ViewChild('templateSort', {static: false}) templateSort: MatSort;
-  @ViewChild('templatePaginator', {static: false}) templatePaginator: MatPaginator;
-
-  public templateSource: MatTableDataSource<FeedbackTemplate>;
-  public templateColumns: string[] = [
-    'icon',
-    'parent',
-    'chipText',
-    'description',
-    'commentText',
-    'summaryText',
-    'taskStatus',
-    'feedbackTemplateAction',
-  ];
-  public selectedTemplate: FeedbackTemplate;
-  public possibleParents: FeedbackTemplate[];
-
   private subscriptions: Subscription[] = [];
 
   constructor(
     private alerts: AlertService,
     private learningOutcomeService: LearningOutcomeService,
-    private feedbackTemplateService: FeedbackTemplateService,
     private fileDownloaderService: FileDownloaderService,
     private nestedCsvDownloadModalService: NestedCsvDownloadModalService,
     private taskService: TaskService,
@@ -111,33 +86,25 @@ export class FeedbackTemplateEditorComponent
     });
   }
 
-  ngOnInit(): void {
-    if (!this.context) this.abbreviationPrefix = 'GLO';
-    else if (this.context instanceof TaskDefinition) this.abbreviationPrefix = 'TLO';
-    else if (this.context instanceof Unit) this.abbreviationPrefix = 'ULO';
-  }
-
   ngAfterViewInit(): void {
+    this.setAbbreviationPrefix();
+
     if (!this.context) {
       this.subscriptions.push(
         this.learningOutcomeService.cache.values.subscribe((outcomes) => {
           const glos = outcomes.filter((outcome) => outcome.contextType === null);
-          this.outcomeSource = new MatTableDataSource<LearningOutcome>(glos);
-          this.outcomeSource.paginator = this.outcomePaginator;
-          this.outcomeSource.sort = this.outcomeSort;
-          this.outcomeSource.filterPredicate = (data: LearningOutcome, filter: string) => {
-            const filterValue = filter.trim().toLowerCase();
-            return (
-              data.abbreviation.toLowerCase().includes(filterValue) ||
-              data.shortDescription.toLowerCase().includes(filterValue) ||
-              data.fullOutcomeDescription.toLowerCase().includes(filterValue)
-            );
-          };
+          this.initialiseTable(glos);
         }),
       );
       return;
     }
 
+    this.subscriptions.push(
+      this.context.learningOutcomesCache.values.subscribe((learningOutcomes) => {
+        this.initialiseTable(learningOutcomes);
+      }),
+    );
+
     this.subscriptions.push(
       this.learningOutcomeService.cache.values.subscribe((outcomes) => {
         const glos = outcomes.filter((outcome) => outcome.contextType === null);
@@ -155,19 +122,11 @@ export class FeedbackTemplateEditorComponent
   }
 
   ngOnChanges(changes: SimpleChanges): void {
+    this.setAbbreviationPrefix();
+
     this.subscriptions.push(
       this.context.learningOutcomesCache.values.subscribe((learningOutcomes) => {
-        this.outcomeSource = new MatTableDataSource<LearningOutcome>(learningOutcomes);
-        this.outcomeSource.paginator = this.outcomePaginator;
-        this.outcomeSource.sort = this.outcomeSort;
-        this.outcomeSource.filterPredicate = (data: LearningOutcome, filter: string) => {
-          const filterValue = filter.trim().toLowerCase();
-          return (
-            data.abbreviation.toLowerCase().includes(filterValue) ||
-            data.shortDescription.toLowerCase().includes(filterValue) ||
-            data.fullOutcomeDescription.toLowerCase().includes(filterValue)
-          );
-        };
+        this.initialiseTable(learningOutcomes);
       }),
     );
 
@@ -178,27 +137,24 @@ export class FeedbackTemplateEditorComponent
     this.subscriptions.forEach((s) => s.unsubscribe());
   }
 
-  public getFeedbackChips() {
-    this.feedbackTemplateService.cache.values.subscribe((templates) => {
-      const outcomeTemplates = templates.filter(
-        (temp) => temp.learningOutcomeId === this.selectedOutcome.id,
+  setAbbreviationPrefix(): void {
+    if (!this.context) this.abbreviationPrefix = 'GLO';
+    else if (this.context instanceof TaskDefinition) this.abbreviationPrefix = 'TLO';
+    else if (this.context instanceof Unit) this.abbreviationPrefix = 'ULO';
+  }
+
+  initialiseTable(learningOutcomes: LearningOutcome[]) {
+    this.outcomeSource = new MatTableDataSource<LearningOutcome>(learningOutcomes);
+    this.outcomeSource.paginator = this.outcomePaginator;
+    this.outcomeSource.sort = this.outcomeSort;
+    this.outcomeSource.filterPredicate = (data: LearningOutcome, filter: string) => {
+      const filterValue = filter.trim().toLowerCase();
+      return (
+        data.abbreviation.toLowerCase().includes(filterValue) ||
+        data.shortDescription.toLowerCase().includes(filterValue) ||
+        data.fullOutcomeDescription.toLowerCase().includes(filterValue)
       );
-      this.possibleParents = outcomeTemplates.filter((temp) => temp.type === 'group');
-
-      this.templateSource = new MatTableDataSource<FeedbackTemplate>(outcomeTemplates);
-      this.templateSource.paginator = this.templatePaginator;
-      this.templateSource.sort = this.templateSort;
-      this.templateSource.filterPredicate = (data: FeedbackTemplate, filter: string) => {
-        const filterValue = filter.trim().toLowerCase();
-        return (
-          data.chipText.toLowerCase().includes(filterValue) ||
-          data.commentText.toLowerCase().includes(filterValue) ||
-          data.summaryText.toLowerCase().includes(filterValue) ||
-          data.description.toLowerCase().includes(filterValue)
-        );
-      };
-      this.sortTemplateData({active: 'chipText', direction: 'asc'});
-    });
+    };
   }
 
   public saveLearningOutcome(learningOutcome: LearningOutcome) {
@@ -212,17 +168,6 @@ export class FeedbackTemplateEditorComponent
     });
   }
 
-  public saveFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
-    feedbackTemplate.save().subscribe({
-      next: () => {
-        this.alerts.success('Template saved');
-        feedbackTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
-        this.selectFeedbackTemplate(this.selectedTemplate);
-      },
-      error: () => this.alerts.error('Failed to save feedback template. Please try again.'),
-    });
-  }
-
   public selectLearningOutcome(learningOutcome: LearningOutcome) {
     if (this.selectedOutcome === learningOutcome) {
       this.selectedOutcome = null;
@@ -235,21 +180,6 @@ export class FeedbackTemplateEditorComponent
       if (!this.selectedOutcome.hasOriginalSaveData) {
         this.selectedOutcome.setOriginalSaveData(this.learningOutcomeService.mapping);
       }
-
-      this.selectedTemplate = null;
-      this.getFeedbackChips();
-    }
-  }
-
-  public selectFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
-    if (this.selectedTemplate === feedbackTemplate) {
-      this.selectedTemplate = null;
-    } else {
-      this.selectedTemplate = feedbackTemplate;
-
-      if (!this.selectedTemplate.hasOriginalSaveData) {
-        this.selectedTemplate.setOriginalSaveData(this.feedbackTemplateService.mapping);
-      }
     }
   }
 
@@ -276,94 +206,14 @@ export class FeedbackTemplateEditorComponent
     });
   }
 
-  public sortTemplateData(sort: Sort) {
-    sort.active = sort.active || 'chipText';
-    sort.direction = sort.direction || 'asc';
-
-    const isAsc = sort.direction === 'asc';
-
-    // Generic sorting function for dynamic property access
-    const compare = (a: FeedbackTemplate, b: FeedbackTemplate) => {
-      const key = sort.active as keyof FeedbackTemplate;
-      const aValue = a[key];
-      const bValue = b[key];
-
-      if (typeof aValue === 'string' && typeof bValue === 'string') {
-        return aValue.localeCompare(bValue) * (isAsc ? 1 : -1);
-      }
-      return 0;
-    };
-
-    // Initial sorting by the chosen method
-    const sortedTemplates = [...this.templateSource.data].sort(compare);
-
-    // Determine maximum depth of the hierarchy (only groups contribute to depth)
-    const depthMap = new Map<number, number>();
-    let maxDepth = 0;
-
-    const feedbackGroups = sortedTemplates.filter((t) => t.type === 'group');
-    const feedbackTemplates = sortedTemplates.filter((t) => t.type !== 'group');
-
-    feedbackGroups.forEach((template) => {
-      let depth = 0;
-      let parentId = template.parentChipId;
-
-      while (parentId) {
-        depth++;
-        parentId = sortedTemplates.find((t) => t.id === parentId)?.parentChipId ?? null;
-      }
-
-      depthMap.set(template.id, depth);
-      maxDepth = Math.max(maxDepth, depth);
-    });
-
-    // Assign sequential order numbers
-    const orderMap = new Map<number, number>();
-    let orderIndex = 1;
-
-    sortedTemplates.forEach((template) => {
-      orderMap.set(template.id, orderIndex++);
-    });
-
-    feedbackGroups.sort((a, b) => depthMap.get(a.id)! - depthMap.get(b.id)!);
-
-    // Assign hierarchical order to groups using depth-based multiplier
-    feedbackGroups.forEach((template) => {
-      const parentOrder = template.parentChipId ? orderMap.get(template.parentChipId)! : 0;
-      const depth = depthMap.get(template.id) ?? 0;
-      const multiplier = 10 ** (maxDepth + 5 - depth * 3); // Proper scaling based on depth
-
-      orderMap.set(template.id, parentOrder + orderMap.get(template.id)! * multiplier);
-    });
-
-    // Assign order values to templates by directly adding their parent's order
-    feedbackTemplates.forEach((template) => {
-      const parentOrder = orderMap.get(template.parentChipId) ?? 0;
-      orderMap.set(template.id, parentOrder + orderMap.get(template.id)!);
-    });
-
-    // Sort again by computed hierarchical order
-    sortedTemplates.sort((a, b) => orderMap.get(a.id)! - orderMap.get(b.id)!);
-
-    // Update the data source
-    this.templateSource.data = [...sortedTemplates];
-  }
-
   public compare(a: number | string, b: number | string, isAsc: boolean): number {
     return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
   }
 
-  applyFilter(filterValue: string, table: string) {
-    if (table === 'outcome') {
-      this.outcomeSource.filter = filterValue;
-      if (this.outcomeSource.paginator) {
-        this.outcomeSource.paginator.firstPage();
-      }
-    } else if (table === 'template') {
-      this.templateSource.filter = filterValue;
-      if (this.templateSource.paginator) {
-        this.templateSource.paginator.firstPage();
-      }
+  applyFilter(filterValue: string) {
+    this.outcomeSource.filter = filterValue;
+    if (this.outcomeSource.paginator) {
+      this.outcomeSource.paginator.firstPage();
     }
   }
 
@@ -371,10 +221,6 @@ export class FeedbackTemplateEditorComponent
     return learningOutcome.hasChanges(this.learningOutcomeService.mapping);
   }
 
-  public feedbackTemplateHasChanges(feedbackTemplate: FeedbackTemplate): boolean {
-    return feedbackTemplate.hasChanges(this.feedbackTemplateService.mapping);
-  }
-
   public deleteLearningOutcome(learningOutcome: LearningOutcome) {
     this.confirmationModal.show(
       'Delete learning outcome',
@@ -392,30 +238,12 @@ export class FeedbackTemplateEditorComponent
     );
   }
 
-  public deleteFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
-    this.confirmationModal.show(
-      'Delete feedback template',
-      'Are you sure you want to delete this template? This action is final.',
-      () => {
-        feedbackTemplate.delete().subscribe({
-          next: () => {
-            this.alerts.success('Feedback template deleted');
-            if (this.selectedTemplate === feedbackTemplate)
-              this.selectFeedbackTemplate(this.selectedTemplate);
-          },
-          error: () => this.alerts.error('Failed to delete feedback template. Please try again.'),
-        });
-      },
-    );
-  }
-
-  public uploadCsv(type: 'Learning Outcomes' | 'Feedback Templates', byOutcome: boolean) {
+  public uploadCsv(type: 'Learning Outcomes' | 'Feedback Templates') {
     let url: string;
 
     if (type === 'Learning Outcomes') url = this.context.getOutcomeBatchUploadUrl();
     else {
-      if (byOutcome) url = this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
-      else if (this.context) url = this.context.getFeedbackTemplateBatchUploadUrl();
+      if (this.context) url = this.context.getFeedbackTemplateBatchUploadUrl();
       else url = `${API_URL}/global/feedback_chips/csv`;
     }
 
@@ -433,26 +261,22 @@ export class FeedbackTemplateEditorComponent
     );
   }
 
-  public downloadCsv(type: 'Learning Outcomes' | 'Feedback Templates', byOutcome: boolean) {
+  public downloadCsv(type: 'Learning Outcomes' | 'Feedback Templates') {
     let url: string;
 
     if (type === 'Learning Outcomes') url = this.context.getOutcomeBatchUploadUrl();
     else {
-      if (byOutcome) url = this.selectedOutcome.getFeedbackTemplateBatchUploadUrl();
-      else if (this.context) url = this.context.getFeedbackTemplateBatchUploadUrl();
+      if (this.context) url = this.context.getFeedbackTemplateBatchUploadUrl();
       else url = `${API_URL}/global/feedback_chips/csv`;
     }
 
     let name = `${type}.csv`;
 
-    if (type === 'Feedback Templates' && byOutcome)
-      name = `${this.selectedOutcome.abbreviation}-${name}`;
     if (this.context instanceof TaskDefinition)
       name = `${this.context.unit.code}-${this.context.abbreviation}-${name}`;
     else if (this.context instanceof Unit) name = `${this.context.code}-${name}`;
 
-    if (this.context instanceof Unit && !byOutcome)
-      this.nestedCsvDownloadModalService.show(url, name, type);
+    if (this.context instanceof Unit) this.nestedCsvDownloadModalService.show(url, name, type);
     else this.fileDownloaderService.downloadFile(url, name);
   }
 
@@ -470,30 +294,9 @@ export class FeedbackTemplateEditorComponent
     learningOutcome.fullOutcomeDescription = '';
     this.selectedConnectedOutcomes.update((_selectedConnectedOutcomes) => []);
 
-    this.templateSource = new MatTableDataSource<FeedbackTemplate>([]);
-    this.selectedTemplate = null;
-
     this.selectedOutcome = learningOutcome;
   }
 
-  public createFeedbackTemplate() {
-    if (this.selectedOutcome.isNew) {
-      this.alerts.error('Save the new outcome to proceed.');
-      return;
-    }
-
-    const feedbackTemplate = new FeedbackTemplate();
-
-    feedbackTemplate.type = 'template';
-    feedbackTemplate.chipText = '';
-    feedbackTemplate.description = '';
-    feedbackTemplate.commentText = '';
-    feedbackTemplate.summaryText = '';
-    feedbackTemplate.learningOutcomeId = this.selectedOutcome.id;
-
-    this.selectedTemplate = feedbackTemplate;
-  }
-
   readonly separatorKeysCodes: number[] = [ENTER, COMMA];
   readonly typedConnectedOutcome = model('');
   readonly filteredOutcomes = computed(() => {
@@ -559,26 +362,6 @@ export class FeedbackTemplateEditorComponent
     );
   }
 
-  onTemplateTypeChange(event: MatSelectChange): void {
-    if (!this.selectedTemplate.isNew) {
-      this.alerts.error('Template type change forbidden.');
-      event.source.writeValue(this.selectedTemplate.type);
-    } else {
-      this.selectedTemplate.type = event.value;
-    }
-  }
-
-  getPossibleParents(): FeedbackTemplate[] {
-    if (!this.selectedTemplate.isNew)
-      return this.possibleParents.filter((p) => p.id != this.selectedTemplate.id);
-    else return this.possibleParents;
-  }
-
-  getParentChipText(parentId: number): string {
-    const parent = this.possibleParents.find((p) => p.id === parentId);
-    return parent ? parent.chipText : '';
-  }
-
   getNextOutcomeNumber(): number {
     if (this.outcomeSource.data && this.outcomeSource.data.length > 0) {
       let abbr = this.outcomeSource.data[this.outcomeSource.data.length - 1].abbreviation;
diff --git a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html b/src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component.html
similarity index 100%
rename from src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.html
rename to src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component.html
diff --git a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.ts b/src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component.ts
similarity index 100%
rename from src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component.ts
rename to src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component.ts
diff --git a/src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts b/src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.service.ts
similarity index 100%
rename from src/app/common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service.ts
rename to src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.service.ts
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index da1e727f4c..b2c3394db6 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -238,10 +238,11 @@ import {TestAttemptService} from './api/services/test-attempt.service';
 import {ScormExtensionCommentComponent} from './tasks/task-comments-viewer/scorm-extension-comment/scorm-extension-comment.component';
 import {ScormExtensionModalComponent} from './common/modals/scorm-extension-modal/scorm-extension-modal.component';
 import {FeedbackTemplateService} from './api/services/feedback-template.service';
-import {FeedbackTemplateEditorComponent} from './common/feedback-template/feedback-template-editor.component';
+import {FeedbackTemplateEditorComponent} from './common/feedback-template-editor/feedback-template-editor.component';
+import {LearningOutcomeEditorComponent} from './common/learning-outcome-editor/learning-outcome-editor.component';
 import {TaskFeedbackTemplatesComponent} from './tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component';
-import {NestedCsvDownloadModalComponent} from './common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.component';
-import {NestedCsvDownloadModalService} from './common/feedback-template/nested-csv-download-modal/nested-csv-download-modal.service';
+import {NestedCsvDownloadModalComponent} from './common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component';
+import {NestedCsvDownloadModalService} from './common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -363,6 +364,7 @@ const MY_DATE_FORMAT = {
     ScormExtensionCommentComponent,
     ScormExtensionModalComponent,
     FeedbackTemplateEditorComponent,
+    LearningOutcomeEditorComponent,
     TaskFeedbackTemplatesComponent,
     NestedCsvDownloadModalComponent,
   ],
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 14e93b2e65..db9be1c3c6 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -225,7 +225,7 @@ import {MarkedPipe} from './common/pipes/marked.pipe';
 import {AlertService} from './common/services/alert.service';
 import {GradeService} from './common/services/grade.service';
 import {TaskScormCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-scorm-card/task-scorm-card.component';
-import {FeedbackTemplateEditorComponent} from './common/feedback-template/feedback-template-editor.component';
+import {LearningOutcomeEditorComponent} from './common/learning-outcome-editor/learning-outcome-editor.component';
 import {FeedbackTemplateService} from './api/services/feedback-template.service';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
@@ -471,8 +471,8 @@ DoubtfireAngularJSModule.directive(
   downgradeComponent({component: StatusIconComponent}),
 );
 DoubtfireAngularJSModule.directive(
-  'fFeedbackTemplateEditor',
-  downgradeComponent({component: FeedbackTemplateEditorComponent}),
+  'fLearningOutcomeEditor',
+  downgradeComponent({component: LearningOutcomeEditorComponent}),
 );
 DoubtfireAngularJSModule.directive('newFUnits', downgradeComponent({component: FUnitsComponent}));
 
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index c0268ba5a0..ae3453dbaf 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -232,7 +232,7 @@ export class TaskFeedbackTemplatesComponent implements OnInit, OnChanges {
   }
 
   private suggestTaskStatus(template: FeedbackTemplate) {
-    if (this.task.suggestedTaskStatus) {
+    if (template.taskStatus && this.task.suggestedTaskStatus) {
       const currentSeq = this.taskService.statusSeq.get(this.task.suggestedTaskStatus);
       const templateSeq = this.taskService.statusSeq.get(template.taskStatus);
       if (templateSeq < currentSeq) this.task.suggestedTaskStatus = template.taskStatus;
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 59adc0f043..3e1a5f5d5b 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -34,7 +34,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task details</h
         <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task Learning Outcomes</h3>
         <p class="font-normal text-gray-700">Add learning outcomes for this task</p>
         <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-feedback-template-editor [context]="taskDefinition"></f-feedback-template-editor>
+          <f-learning-outcome-editor [context]="taskDefinition"></f-learning-outcome-editor>
         </div>
       </div>
     </div>
diff --git a/src/app/units/states/edit/edit.tpl.html b/src/app/units/states/edit/edit.tpl.html
index 9871e5efe2..2c9699e496 100644
--- a/src/app/units/states/edit/edit.tpl.html
+++ b/src/app/units/states/edit/edit.tpl.html
@@ -5,7 +5,7 @@
     </tab>
   </tabset><!--/tabs-->
   <unit-details-editor unit="unit" ng-if="activeTab === tabs.unitTab"></unit-details-editor>
-  <f-feedback-template-editor [context]="unit" ng-if="activeTab === tabs.learningOutcomesTab"></f-feedback-template-editor>
+  <f-learning-outcome-editor [context]="unit" ng-if="activeTab === tabs.learningOutcomesTab"></f-learning-outcome-editor>
   <unit-staff-editor ng-if="activeTab === tabs.staffTab"></unit-staff-editor>
   <unit-tutorials-manager ng-if="activeTab === tabs.tutorialsTab" [unit]="unit"></unit-tutorials-manager>
   <unit-students-editor [unit]="unit" ng-if="activeTab === tabs.studentsTab"></unit-students-editor>

From 0eed5477940db511cee09bbdb7ccb0adde57cbbf Mon Sep 17 00:00:00 2001
From: satikaj <117552851+satikaj@users.noreply.github.com>
Date: Sat, 8 Feb 2025 19:46:50 +1100
Subject: [PATCH 243/776] fix: prevent saving empty items

---
 .../feedback-template-editor.component.html   |  4 ++++
 .../feedback-template-editor.component.ts     | 10 ++++++++-
 .../learning-outcome-editor.component.html    | 22 ++++++++++++++++---
 .../learning-outcome-editor.component.ts      |  8 +++++++
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/app/common/feedback-template-editor/feedback-template-editor.component.html b/src/app/common/feedback-template-editor/feedback-template-editor.component.html
index a173ec17e0..7981c9aeaf 100644
--- a/src/app/common/feedback-template-editor/feedback-template-editor.component.html
+++ b/src/app/common/feedback-template-editor/feedback-template-editor.component.html
@@ -187,6 +187,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
               <input
                 matInput
                 required
+                pattern=".*\S.*"
                 [(ngModel)]="selectedTemplate.chipText"
                 maxlength="20"
                 placeholder="Short text shown on the chip"
@@ -198,6 +199,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
               <input
                 matInput
                 required
+                pattern=".*\S.*"
                 [(ngModel)]="selectedTemplate.description"
                 maxlength="116"
                 placeholder="Description of the feedback template"
@@ -211,6 +213,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
               <textarea
                 matInput
                 required
+                pattern=".*\S.*"
                 [(ngModel)]="selectedTemplate.commentText"
                 placeholder="Feedback text that is added to the comment area"
               >
@@ -223,6 +226,7 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Template</h4>
                 <input
                   matInput
                   required
+                  pattern=".*\S.*"
                   [(ngModel)]="selectedTemplate.summaryText"
                   placeholder="Summary of the feedback"
                 />
diff --git a/src/app/common/feedback-template-editor/feedback-template-editor.component.ts b/src/app/common/feedback-template-editor/feedback-template-editor.component.ts
index 6cc4930974..25c00f7d99 100644
--- a/src/app/common/feedback-template-editor/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template-editor/feedback-template-editor.component.ts
@@ -26,7 +26,6 @@ import {
   csvUploadModalService,
 } from 'src/app/ajs-upgraded-providers';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
-import { id } from 'date-fns/locale';
 
 @Component({
   selector: 'f-feedback-template-editor',
@@ -101,6 +100,15 @@ export class FeedbackTemplateEditorComponent implements OnChanges, AfterViewInit
   }
 
   public saveFeedbackTemplate(feedbackTemplate: FeedbackTemplate) {
+    if (
+      !feedbackTemplate.chipText.trim() ||
+      !feedbackTemplate.description.trim() ||
+      (feedbackTemplate.type === 'template' &&
+        (!feedbackTemplate.commentText.trim() || !feedbackTemplate.summaryText.trim()))
+    ) {
+      this.alerts.error('Failed to save feedback template. Fill in required fields.');
+      return;
+    }
     feedbackTemplate.save().subscribe({
       next: () => {
         this.alerts.success('Template saved');
diff --git a/src/app/common/learning-outcome-editor/learning-outcome-editor.component.html b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.html
index ffff5103d0..9031ccde39 100644
--- a/src/app/common/learning-outcome-editor/learning-outcome-editor.component.html
+++ b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.html
@@ -124,18 +124,34 @@ <h4 class="mt-1 font-bold text-2xl text-gray-900">Edit Outcome</h4>
         <div class="flex flex-row gap-4">
           <mat-form-field appearance="outline" class="basis-1/3">
             <mat-label>Abbreviation</mat-label>
-            <input matInput required [(ngModel)]="selectedOutcome.abbreviation" maxlength="5" />
+            <input
+              matInput
+              required
+              pattern=".*\S.*"
+              [(ngModel)]="selectedOutcome.abbreviation"
+              maxlength="5"
+            />
           </mat-form-field>
 
           <mat-form-field appearance="outline" class="flex-grow">
             <mat-label>Short Description</mat-label>
-            <input matInput required [(ngModel)]="selectedOutcome.shortDescription" />
+            <input
+              matInput
+              required
+              pattern=".*\S.*"
+              [(ngModel)]="selectedOutcome.shortDescription"
+            />
           </mat-form-field>
         </div>
 
         <mat-form-field appearance="outline" class="flex flex-grow">
           <mat-label>Full Outcome Description</mat-label>
-          <textarea matInput required [(ngModel)]="selectedOutcome.fullOutcomeDescription">
+          <textarea
+            matInput
+            required
+            pattern=".*\S.*"
+            [(ngModel)]="selectedOutcome.fullOutcomeDescription"
+          >
           </textarea>
         </mat-form-field>
 
diff --git a/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
index 465d4d6aa0..e93bc4ef37 100644
--- a/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
+++ b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
@@ -158,6 +158,14 @@ export class LearningOutcomeEditorComponent implements OnChanges, AfterViewInit,
   }
 
   public saveLearningOutcome(learningOutcome: LearningOutcome) {
+    if (
+      !learningOutcome.abbreviation.trim() ||
+      !learningOutcome.shortDescription.trim() ||
+      !learningOutcome.fullOutcomeDescription.trim()
+    ) {
+      this.alerts.error('Failed to save learning outcome. Fill in required fields.');
+      return;
+    }
     learningOutcome.save().subscribe({
       next: () => {
         this.alerts.success('Outcome saved');

From 226bdead1984714e4d9cfd6df03ac5049732a4a5 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 12 Feb 2025 22:07:13 +1100
Subject: [PATCH 244/776] chore: update entity service

Fixes issues with task definitions not getting their id
when created. Which caused upload of
task sheets to fail until reloaded.
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eb29449b23..fdf38a290d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,7 +66,7 @@
         "ng-flex-layout": "^17.3.7-beta.1",
         "ng2-pdf-viewer": "^10.2",
         "ngx-bootstrap": "^6.1.0",
-        "ngx-entity-service": "^0.0.39",
+        "ngx-entity-service": "^0.0.40",
         "ngx-lottie": "^11.0.2",
         "nvd3": "1.8.6",
         "rxjs": "~7.4.0",
@@ -15812,9 +15812,9 @@
       }
     },
     "node_modules/ngx-entity-service": {
-      "version": "0.0.39",
-      "resolved": "https://registry.npmjs.org/ngx-entity-service/-/ngx-entity-service-0.0.39.tgz",
-      "integrity": "sha512-81DdRQxN7R2lELTiZkB5FkjeK147C8AUmyl52sxZgtYw/WiFay7iWk9KTSsZAJ8OhKKkmllXfMkOpQzvoYTafw==",
+      "version": "0.0.40",
+      "resolved": "https://registry.npmjs.org/ngx-entity-service/-/ngx-entity-service-0.0.40.tgz",
+      "integrity": "sha512-JEYUAAp83zfw6d9ETBYgNxSh1VB4Ko0fACF6OQiEYHbqQye/Yb0De4Md+FHJPDQ1DBjJk8GjT328cEPbW8xlNQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
diff --git a/package.json b/package.json
index 4607430eb3..b85f8d067a 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "ng-flex-layout": "^17.3.7-beta.1",
     "ng2-pdf-viewer": "^10.2",
     "ngx-bootstrap": "^6.1.0",
-    "ngx-entity-service": "^0.0.39",
+    "ngx-entity-service": "^0.0.40",
     "ngx-lottie": "^11.0.2",
     "nvd3": "1.8.6",
     "rxjs": "~7.4.0",

From 48348c8e6a7ffdb4186fe3e6d27fe860076922e1 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 12 Feb 2025 22:08:53 +1100
Subject: [PATCH 245/776] fix: enhance rollover messages

Make sure roll over in a unit indicates it
copies to a new teaching period or custom
dates.
---
 .../unit-details-editor/unit-details-editor.tpl.html          | 2 +-
 .../unit-dates-selector/unit-dates-selector.tpl.html          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
index 66d289e0cc..bbb967a71b 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
@@ -426,7 +426,7 @@ <h3 class="panel-title">Update Unit</h3>
           </div>
           <div>
             <a class="btn btn-success" ui-sref="units/rollover">
-              <header>Rollover</header>
+              <header>Copy</header>
             </a>
             <input
               type="submit"
diff --git a/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.tpl.html b/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.tpl.html
index 08d6a1a87d..c3be994325 100644
--- a/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.tpl.html
+++ b/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.tpl.html
@@ -1,8 +1,8 @@
 <div class="unit-dates-selector">
   <div class="panel panel-primary">
     <div class="panel-heading">
-      <h3 class="panel-title">Create Unit</h3>
-      Duplicate an existing unit by specifying the time period.
+      <h3 class="panel-title">Copy {{unit.code}} {{unit.nameAndPeriod}}</h3>
+      Duplicate this unit by copying it to the indicated teaching period, or a custom start and end date.
     </div>
     <form class="form-horizontal" role="form" name="rolloverUnitForm" ng-submit="saveUnit()">
       <div class="panel-body">

From 2d083a52da3ef7b600bcb6e14be46b54727cf341 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 12 Feb 2025 22:09:02 +1100
Subject: [PATCH 246/776] chore(release): 8.0.34

---
 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 512760e10d..922a094cf6 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.
 
+### [8.0.34](https://github.com/macite/doubtfire-deploy/compare/v8.0.33...v8.0.34) (2025-02-12)
+
+
+### Bug Fixes
+
+* enhance rollover messages ([48348c8](https://github.com/macite/doubtfire-deploy/commit/48348c8e6a7ffdb4186fe3e6d27fe860076922e1))
+
 ### [8.0.33](https://github.com/macite/doubtfire-deploy/compare/v8.0.32...v8.0.33) (2025-01-29)
 
 
diff --git a/package-lock.json b/package-lock.json
index fdf38a290d..4ea52bbbb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.33",
+  "version": "8.0.34",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.33",
+      "version": "8.0.34",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index b85f8d067a..5ac6c30eb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.33",
+  "version": "8.0.34",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From ce37bf27689744a6f43be46912be0d14e2cdbc6b Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 20 Feb 2025 13:54:27 +1100
Subject: [PATCH 247/776] fix: correct ability to edit teaching periods

---
 .../teaching-period-list.component.ts         | 67 ++++++++++---------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts b/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts
index 17dc7efdf9..f4099456cf 100644
--- a/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts
+++ b/src/app/admin/states/teaching-periods/teaching-period-list/teaching-period-list.component.ts
@@ -1,14 +1,14 @@
-import { Component, Inject, OnInit, ViewChild } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { MatSort, Sort } from '@angular/material/sort';
-import { MatTableDataSource } from '@angular/material/table';
-import { TeachingPeriodBreak } from 'src/app/api/models/teaching-period';
-import { TeachingPeriod } from 'src/app/api/models/teaching-period';
-import { TeachingPeriodBreakService } from 'src/app/api/services/teaching-period-break.service';
-import { TeachingPeriodService } from 'src/app/api/services/teaching-period.service';
-import { TeachingPeriodUnitImportService } from '../teaching-period-unit-import/teaching-period-unit-import.dialog';
+import {Component, Inject, OnInit, ViewChild} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material/dialog';
+import {MatPaginator} from '@angular/material/paginator';
+import {MatSort, Sort} from '@angular/material/sort';
+import {MatTableDataSource} from '@angular/material/table';
+import {TeachingPeriodBreak} from 'src/app/api/models/teaching-period';
+import {TeachingPeriod} from 'src/app/api/models/teaching-period';
+import {TeachingPeriodBreakService} from 'src/app/api/services/teaching-period-break.service';
+import {TeachingPeriodService} from 'src/app/api/services/teaching-period.service';
+import {TeachingPeriodUnitImportService} from '../teaching-period-unit-import/teaching-period-unit-import.dialog';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
   selector: 'f-teaching-period-list',
@@ -53,7 +53,7 @@ export class TeachingPeriodListComponent implements OnInit {
 
   selectTeachingPeriod(selectedTeachingPeriod: TeachingPeriod) {
     this.teachingPeriodsService.get(selectedTeachingPeriod.id).subscribe((teachingPeriod) => {
-      this.dialog.open(NewTeachingPeriodDialogComponent, { data: { teachingPeriod: teachingPeriod } });
+      this.dialog.open(NewTeachingPeriodDialogComponent, {data: {teachingPeriod: teachingPeriod}});
     });
   }
 
@@ -101,18 +101,24 @@ export class NewTeachingPeriodDialogComponent {
     private dialogRef: MatDialogRef<NewTeachingPeriodDialogComponent>,
     public teachingPeriodService: TeachingPeriodService,
     public teachingPeriodBreakService: TeachingPeriodBreakService,
-    private _snackBar: MatSnackBar
+    public alertService: AlertService,
   ) {}
   public newOrSelectedTeachingPeriod = this.data.teachingPeriod || new TeachingPeriod();
 
   public tempBreak = new TeachingPeriodBreak();
 
   addTeachingBreak() {
-    this.newOrSelectedTeachingPeriod.addBreak(this.tempBreak.startDate, this.tempBreak.numberOfWeeks).subscribe({
-      next: (teachingPeriodBreak) => {
-        console.log(teachingPeriodBreak);
-      },
-    });
+    this.newOrSelectedTeachingPeriod
+      .addBreak(this.tempBreak.startDate, this.tempBreak.numberOfWeeks)
+      .subscribe({
+        next: (teachingPeriodBreak) => {
+          this.alertService.success('Break added');
+          console.log(teachingPeriodBreak);
+        },
+        error: (response) => {
+          this.alertService.error(`Error adding break. ${response}`);
+        },
+      });
   }
 
   deleteBreak(teachingPeriod: TeachingPeriod, teachingBreak: TeachingPeriodBreak): void {
@@ -120,26 +126,25 @@ export class NewTeachingPeriodDialogComponent {
       next: (teachingPeriodBreak) => {
         console.log(teachingPeriodBreak);
       },
-      error: (response) => {},
+      error: (response) => {
+        this.alertService.error(`Error deleting break. ${response}`);
+      },
     });
   }
 
   submitTeachingPeriod() {
-    // todo: use alert service
-    this.teachingPeriodService.store(this.newOrSelectedTeachingPeriod).subscribe({
+    // Check if we are updating or creating a new teaching period
+    const observer = this.newOrSelectedTeachingPeriod.id
+      ? this.teachingPeriodService.update(this.newOrSelectedTeachingPeriod)
+      : this.teachingPeriodService.store(this.newOrSelectedTeachingPeriod);
+
+    // Save the teaching period
+    observer.subscribe({
       next: (teachingPeriod) => {
-        this._snackBar.open(`${teachingPeriod.name} saved`, 'dismiss', {
-          duration: 2000,
-          horizontalPosition: 'end',
-          verticalPosition: 'top',
-        });
+        this.alertService.success(`${teachingPeriod.name} saved`);
       },
       error: (response) => {
-        this._snackBar.open(response, 'dismiss', {
-          duration: 5000,
-          horizontalPosition: 'end',
-          verticalPosition: 'top',
-        });
+        this.alertService.error(`Error saving teaching period. ${response}`);
       },
     });
   }

From 7daacd1bf0af050aeb6db503d963e574f68b9a94 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 20 Feb 2025 13:55:10 +1100
Subject: [PATCH 248/776] fix: ensure an old grade is present in portfolio
 assessment

Fixes an issue where this somehow becomes null or undefined.
---
 src/app/api/models/project.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index bde396b74b..d8f6548398 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -229,7 +229,7 @@ export class Project extends Entity {
   public assignGrade(score: number, rationale: string): void {
     const alerts = AppInjector.get(AlertService);
     const projectService: ProjectService = AppInjector.get(ProjectService);
-    const oldGrade: number = this.grade;
+    const oldGrade: number = this.grade || 0;
     this.grade = score;
     this.gradeRationale = rationale;
 

From 3479b7af589b9ba986ddbb7dc8a84fd0be3e66e6 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 25 Feb 2025 13:59:56 +1100
Subject: [PATCH 249/776] fix: ensure overseer images can be edited

---
 src/app/api/models/unit.ts                    | 20 +++++++++++++
 src/app/api/services/unit.service.ts          |  2 +-
 .../task-definition-editor.component.ts       | 30 ++++++++++++-------
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index f157355da0..73c58642c2 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -23,6 +23,8 @@ import {
   TutorialStreamService,
   UnitRoleService,
   D2lAssessmentMappingService,
+  OverseerImage,
+  OverseerImageService,
 } from './doubtfire-model';
 import {LearningOutcome} from './learning-outcome';
 import {AlertService} from 'src/app/common/services/alert.service';
@@ -53,6 +55,7 @@ export class Unit extends Entity {
 
   assessmentEnabled: boolean;
   overseerImageId: number = null; // image needs to be lazy loadaed
+  private _overseerImage: OverseerImage;
 
   autoApplyExtensionBeforeDeadline: boolean;
   sendNotifications: boolean;
@@ -446,6 +449,23 @@ export class Unit extends Entity {
     return this.groupSetsCache.currentValues;
   }
 
+  public set overseerImage(image: OverseerImage) {
+    this._overseerImage = image;
+    this.overseerImageId = image.id;
+  }
+
+  public get overseerImage(): OverseerImage {
+    if (this._overseerImage === undefined && this.overseerImageId) {
+      const overseerImageService = AppInjector.get(OverseerImageService);
+      overseerImageService.get(this.overseerImageId).subscribe({
+        next: (image) => {
+          this._overseerImage = image;
+        },
+      });
+    }
+    return this._overseerImage;
+  }
+
   public get overseerEnabled(): boolean {
     return this.assessmentEnabled && AppInjector.get(DoubtfireConstants).IsOverseerEnabled.value; // && this.overseerImageId !== null && this.overseerImageId !== undefined;
   }
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index c3c38c7406..95b4161d75 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -227,7 +227,7 @@ export class UnitService extends CachedEntityService<Unit> {
       'portfolioAutoGenerationDate',
 
       'assessmentEnabled',
-      // 'overseerImage', - map to overseer image
+      'overseerImageId',
 
       'autoApplyExtensionBeforeDeadline',
       'sendNotifications',
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.ts
index 88f7ccfe2d..d77a3d5ad8 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.ts
@@ -1,25 +1,33 @@
-import { Component, Input } from '@angular/core';
-import { TaskDefinition } from 'src/app/api/models/task-definition';
-import { Unit } from 'src/app/api/models/unit';
-import { TaskDefinitionService } from 'src/app/api/services/task-definition.service';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {Component, Input, OnInit} from '@angular/core';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {Unit} from 'src/app/api/models/unit';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 
 @Component({
   selector: 'f-task-definition-editor',
   templateUrl: 'task-definition-editor.component.html',
   styleUrls: ['task-definition-editor.component.scss'],
 })
-export class TaskDefinitionEditorComponent {
+export class TaskDefinitionEditorComponent implements OnInit {
   @Input() taskDefinition: TaskDefinition;
   @Input() unit: Unit;
 
-  constructor(private taskDefinitionService: TaskDefinitionService, private alerts: AlertService, private constants: DoubtfireConstants) {
-    constants.IsOverseerEnabled.subscribe((enabled) => (this.overseerEnabled = enabled && this.unit.overseerEnabled));
-  }
-
   public overseerEnabled: boolean = false;
 
+  constructor(
+    private taskDefinitionService: TaskDefinitionService,
+    private alerts: AlertService,
+    private constants: DoubtfireConstants,
+  ) {}
+
+  public ngOnInit() {
+    this.constants.IsOverseerEnabled.subscribe((enabled) => {
+      this.overseerEnabled = enabled && this.unit.overseerEnabled;
+    });
+  }
+
   public save() {
     this.taskDefinition.save().subscribe({
       next: (response) => {

From 34beff4c45227ba9fe496e3c6a9f90a72e720260 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 28 Feb 2025 13:43:32 +1100
Subject: [PATCH 250/776] chore(release): 8.0.35

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 922a094cf6..6a17667d20 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.
 
+### [8.0.35](https://github.com/macite/doubtfire-deploy/compare/v8.0.34...v8.0.35) (2025-02-28)
+
+
+### Bug Fixes
+
+* correct ability to edit teaching periods ([ce37bf2](https://github.com/macite/doubtfire-deploy/commit/ce37bf27689744a6f43be46912be0d14e2cdbc6b))
+* ensure an old grade is present in portfolio assessment ([7daacd1](https://github.com/macite/doubtfire-deploy/commit/7daacd1bf0af050aeb6db503d963e574f68b9a94))
+* ensure overseer images can be edited ([3479b7a](https://github.com/macite/doubtfire-deploy/commit/3479b7af589b9ba986ddbb7dc8a84fd0be3e66e6))
+
 ### [8.0.34](https://github.com/macite/doubtfire-deploy/compare/v8.0.33...v8.0.34) (2025-02-12)
 
 
diff --git a/package-lock.json b/package-lock.json
index 4ea52bbbb1..ee2bf0f666 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.34",
+  "version": "8.0.35",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.34",
+      "version": "8.0.35",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 5ac6c30eb8..0a9c62b3a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.34",
+  "version": "8.0.35",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 72c89b30cca426d56c7efbbac34e00fd734fe714 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 6 Mar 2025 20:36:45 +1100
Subject: [PATCH 251/776] fix: overseer image admin in unit and task

Correct connections and concurrency bug in loading overseer image when unit loaded.
---
 package-lock.json                             |  8 ++--
 package.json                                  |  2 +-
 src/app/api/models/task-definition.ts         |  6 +--
 src/app/api/models/unit.ts                    |  8 ----
 .../api/services/task-definition.service.ts   | 10 ++++-
 src/app/api/services/unit.service.ts          | 22 ++++++++++-
 .../task-definition-overseer.component.html   | 38 ++++++++++++++-----
 .../task-definition-overseer.component.ts     | 30 +++++++++++++--
 8 files changed, 90 insertions(+), 34 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ee2bf0f666..d88d723428 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,7 +66,7 @@
         "ng-flex-layout": "^17.3.7-beta.1",
         "ng2-pdf-viewer": "^10.2",
         "ngx-bootstrap": "^6.1.0",
-        "ngx-entity-service": "^0.0.40",
+        "ngx-entity-service": "^0.0.41",
         "ngx-lottie": "^11.0.2",
         "nvd3": "1.8.6",
         "rxjs": "~7.4.0",
@@ -15812,9 +15812,9 @@
       }
     },
     "node_modules/ngx-entity-service": {
-      "version": "0.0.40",
-      "resolved": "https://registry.npmjs.org/ngx-entity-service/-/ngx-entity-service-0.0.40.tgz",
-      "integrity": "sha512-JEYUAAp83zfw6d9ETBYgNxSh1VB4Ko0fACF6OQiEYHbqQye/Yb0De4Md+FHJPDQ1DBjJk8GjT328cEPbW8xlNQ==",
+      "version": "0.0.41",
+      "resolved": "https://registry.npmjs.org/ngx-entity-service/-/ngx-entity-service-0.0.41.tgz",
+      "integrity": "sha512-rf3gZQr4CthXV34WKySg200c06ZuXm2Z7EclUR6bAuiuvUDwRAPMEAJmtSmDyYbnpQqLMMb+5rfaQQakkTNotA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
diff --git a/package.json b/package.json
index 0a9c62b3a6..a3e5c190a1 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "ng-flex-layout": "^17.3.7-beta.1",
     "ng2-pdf-viewer": "^10.2",
     "ngx-bootstrap": "^6.1.0",
-    "ngx-entity-service": "^0.0.40",
+    "ngx-entity-service": "^0.0.41",
     "ngx-lottie": "^11.0.2",
     "nvd3": "1.8.6",
     "rxjs": "~7.4.0",
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index b848686768..9bda428e75 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -202,7 +202,7 @@ export class TaskDefinition extends Entity {
     }/scorm_data`;
   }
 
-  public get taskAssessmentResourcesUploadUrl(): string {
+  public get taskOverseerResourcesUploadUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
       this.id
     }/task_assessment_resources`;
@@ -229,10 +229,10 @@ export class TaskDefinition extends Entity {
     return httpClient.delete(this.scormDataUploadUrl).pipe(tap(() => (this.hasScormData = false)));
   }
 
-  public deleteTaskAssessmentResources(): Observable<any> {
+  public deleteOverseerResources(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
     return httpClient
-      .delete(this.taskAssessmentResourcesUploadUrl)
+      .delete(this.taskOverseerResourcesUploadUrl)
       .pipe(tap(() => (this.hasTaskAssessmentResources = false)));
   }
 }
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 73c58642c2..7d5c35745e 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -455,14 +455,6 @@ export class Unit extends Entity {
   }
 
   public get overseerImage(): OverseerImage {
-    if (this._overseerImage === undefined && this.overseerImageId) {
-      const overseerImageService = AppInjector.get(OverseerImageService);
-      overseerImageService.get(this.overseerImageId).subscribe({
-        next: (image) => {
-          this._overseerImage = image;
-        },
-      });
-    }
     return this._overseerImage;
   }
 
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 0914929fbe..f646d763f3 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -133,13 +133,19 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
   public uploadTaskResources(taskDefinition: TaskDefinition, file: File): Observable<boolean> {
     const formData = new FormData();
     formData.append('file', file);
-    return AppInjector.get(HttpClient).post<boolean>(taskDefinition.taskResourcesUploadUrl, formData);
+    return AppInjector.get(HttpClient).post<boolean>(
+      taskDefinition.taskResourcesUploadUrl,
+      formData,
+    );
   }
 
   public uploadOverseerResources(taskDefinition: TaskDefinition, file: File): Observable<boolean> {
     const formData = new FormData();
     formData.append('file', file);
-    return AppInjector.get(HttpClient).post<boolean>(taskDefinition.taskAssessmentResourcesUploadUrl, formData);
+    return AppInjector.get(HttpClient).post<boolean>(
+      taskDefinition.taskOverseerResourcesUploadUrl,
+      formData,
+    );
   }
 
   public uploadScormData(taskDefinition: TaskDefinition, file: File): Observable<boolean> {
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index 95b4161d75..8151cbb6cc 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { GroupSetService, LearningOutcomeService, TaskOutcomeAlignmentService, TeachingPeriodService, TutorialService, TutorialStreamService, Unit, UserService } from 'src/app/api/models/doubtfire-model';
+import { GroupSetService, LearningOutcomeService, OverseerImageService, TaskOutcomeAlignmentService, TeachingPeriodService, TutorialService, TutorialStreamService, Unit, UserService } from 'src/app/api/models/doubtfire-model';
 import { CachedEntityService, Entity, EntityMapping } from 'ngx-entity-service';
 import API_URL from 'src/app/config/constants/apiURL';
 import { UnitRoleService } from './unit-role.service';
@@ -124,7 +124,25 @@ export class UnitService extends CachedEntityService<Unit> {
         }
       },
       'assessmentEnabled',
-      'overseerImageId',
+      // 'overseerImageId',
+      {
+        keys: 'overseerImageId',
+        toEntityFn: (data, key, entity) => {
+          const overSeerEntityId = data[key];
+          if (overSeerEntityId) {
+            const overseerImageService = AppInjector.get(OverseerImageService);
+            overseerImageService.get(data[key]).subscribe({
+              next: (image) => {
+                entity.overseerImage = image;
+              },
+            });
+          }
+          return overSeerEntityId;
+        },
+        toJsonFn: (unit: Unit, _key: string) => {
+          return unit.overseerImage?.id;
+        },
+      },
       'autoApplyExtensionBeforeDeadline',
       'sendNotifications',
       'enableSyncEnrolments',
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
index 31c683077f..bf187030aa 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
@@ -12,8 +12,8 @@
     <mat-label>Docker Image</mat-label>
     <mat-select [(value)]="taskDefinition.overseerImageId" [disabled]="!overseerEnabled">
       @for (image of images | async; track image) {
-  <mat-option [value]="image.id">{{ image.description }}</mat-option>
-}
+        <mat-option [value]="image.id">{{ image.description }}</mat-option>
+      }
     </mat-select>
     <mat-hint>Docker image for Overseer</mat-hint>
   </mat-form-field>
@@ -24,27 +24,45 @@
     accept="application/zip,application/x-zip-compressed"
     [desiredFileName]="'Task ' + taskDefinition.abbreviation + ' Overseer zip'"
   />
+  @if (taskDefinition.hasTaskAssessmentResources) {
+    <div class="flex flex-row gap-4 pt-4">
+      <button
+        mat-flat-button
+        color="warn"
+        (click)="removeOverseerResources()"
+        class="grow me-4"
+      >
+        Delete Overseer Resources Zip
+      </button>
+      <button
+        mat-flat-button
+        color="accent"
+        (click)="downloadOverseerResources()"
+        class="grow ms-4"
+      >
+        Download Overseer Resources Zip
+      </button>
+    </div>
+  }
 
-  <div class="flex flex-row gap-4">
+  <div class="flex flex-row gap-4 pt-4">
     <button
-      mat-button
-      mat-raised-button
+      mat-flat-button
       color="primary"
       [disabled]="!taskDefinition.id || !taskDefinition.hasTaskAssessmentResources"
       (click)="testSubmission()"
-      style="width: 100%; line-height: 36px; padding: 0 16px"
+      class="flex-grow me-4"
     >
       <mat-icon>upload_file</mat-icon> Test Submission
     </button>
     <button
-      mat-button
-      mat-raised-button
+      mat-flat-button
       color="accent"
       [disabled]="!currentUserTask"
       (click)="testSubmissionHistory()"
-      style="width: 100%; line-height: 36px; padding: 0 16px"
+      class="flex-grow ms-4"
     >
-      <mat-icon>preview</mat-icon> Test Submission History
+      <mat-icon>preview</mat-icon> Submission History
     </button>
   </div>
 </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
index 0cf7764274..d3de432e9f 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
@@ -11,6 +11,7 @@ import {
 import { TaskDefinition } from 'src/app/api/models/task-definition';
 import { Unit } from 'src/app/api/models/unit';
 import { TaskDefinitionService } from 'src/app/api/services/task-definition.service';
+import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
 import { TaskAssessmentModalService } from 'src/app/common/modals/task-assessment-modal/task-assessment-modal.service';
 import { AlertService } from 'src/app/common/services/alert.service';
 import { TaskSubmissionService } from 'src/app/common/services/task-submission.service';
@@ -31,7 +32,8 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
     private modalService: TaskAssessmentModalService,
     private submissions: TaskSubmissionService,
     private userService: UserService,
-    private taskDefinitionService: TaskDefinitionService
+    private taskDefinitionService: TaskDefinitionService,
+    private fileDownloaderService: FileDownloaderService,
   ) {}
 
   public get overseerEnabled(): boolean {
@@ -86,18 +88,38 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
     });
   }
 
+  public removeOverseerResources() {
+    this.taskDefinition.deleteOverseerResources().subscribe({
+      next: () => {
+        this.alerts.success('Deleted Overseer Resources', 2000);
+        this.taskDefinition.hasTaskAssessmentResources = false;
+      }
+    });
+  }
+
+  public downloadOverseerResources() {
+    this.fileDownloaderService.downloadFile(
+      this.taskDefinition.getTaskPDFUrl(),
+      this.taskDefinition.name + '.pdf',
+    );
+  }
+
+
   public uploadOverseerResources(files: FileList) {
     const validFiles = Array.from(files as ArrayLike<File>).filter(
       (f) => f.type === 'application/zip' || f.type === 'application/x-zip-compressed',
     );
     if (validFiles.length > 0) {
       const file = validFiles[0];
-      this.taskDefinitionService.uploadTaskResources(this.taskDefinition, file).subscribe({
-        next: () => this.alerts.success('Uploaded task sheet', 2000),
+      this.taskDefinitionService.uploadOverseerResources(this.taskDefinition, file).subscribe({
+        next: () => {
+          this.alerts.success('Uploaded Overseer Resources', 2000);
+          this.taskDefinition.hasTaskAssessmentResources = true;
+        },
         error: (message) => this.alerts.error(message, 6000),
       });
     } else {
-      this.alerts.error('Please drop a PDF to upload for this task', 6000);
+      this.alerts.error('Please drop a zip with scripts for this task to upload', 6000);
     }
   }
 }

From 8a0ca1cdc42890c317d4a143f1277b184a6a9be8 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 6 Mar 2025 20:37:14 +1100
Subject: [PATCH 252/776] chore: add proxy for running in dev using compose

---
 package.json            | 2 ++
 proxy-compose.conf.json | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 proxy-compose.conf.json

diff --git a/package.json b/package.json
index a3e5c190a1..fe262a3f69 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,9 @@
     "lint:fix": "ng lint --fix",
     "lint": "ng lint",
     "serve:angular17": "export NODE_OPTIONS=--max_old_space_size=4096 && ng serve --configuration $NODE_ENV --proxy-config proxy.conf.json",
+    "serve:angular17-compose": "export NODE_OPTIONS=--max_old_space_size=4096 && ng serve --configuration $NODE_ENV --proxy-config proxy-compose.conf.json",
     "start": "npm-run-all -l -s build:angular1 serve:angular17",
+    "start-compose": "npm-run-all -l -s build:angular1 serve:angular17-compose",
     "watch:angular1": "grunt delta",
     "deploy:build2api": "ng build --delete-output-path=true --optimization=true --configuration production --output-path dist",
     "deploy": "run-s -l build:angular1 deploy:build2api",
diff --git a/proxy-compose.conf.json b/proxy-compose.conf.json
new file mode 100644
index 0000000000..4b62591235
--- /dev/null
+++ b/proxy-compose.conf.json
@@ -0,0 +1,6 @@
+{
+  "/api": {
+    "target": "http://doubtfire-api:3000",
+    "secure": false
+  }
+}

From d224680eeb8f57460f6b3990140cc5dad0e759a0 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 7 Mar 2025 21:18:44 +1100
Subject: [PATCH 253/776] chore(release): 8.0.36

---
 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 6a17667d20..975163dc71 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.
 
+### [8.0.36](https://github.com/macite/doubtfire-deploy/compare/v8.0.35...v8.0.36) (2025-03-07)
+
+
+### Bug Fixes
+
+* overseer image admin in unit and task ([72c89b3](https://github.com/macite/doubtfire-deploy/commit/72c89b30cca426d56c7efbbac34e00fd734fe714))
+
 ### [8.0.35](https://github.com/macite/doubtfire-deploy/compare/v8.0.34...v8.0.35) (2025-02-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index d88d723428..b0f8bb6ef3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.35",
+  "version": "8.0.36",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.35",
+      "version": "8.0.36",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index fe262a3f69..219f72d7ef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.35",
+  "version": "8.0.36",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From a1e4d71b34733bc53cd2cfa63ee1e70f8f43386f Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 10 Mar 2025 20:04:27 +1100
Subject: [PATCH 254/776] fix: ensure overseer download get resources zip

---
 src/app/api/models/task-definition.ts                         | 2 +-
 .../task-definition-overseer.component.ts                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 9bda428e75..934d8d6df6 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -208,7 +208,7 @@ export class TaskDefinition extends Entity {
     }/task_assessment_resources`;
   }
 
-  public getTaskAssessmentResourcesUrl(): string {
+  public getOverseerResourcesUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
       this.id
     }/task_assessment_resources.json`;
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
index d3de432e9f..597296d707 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
@@ -99,8 +99,8 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
 
   public downloadOverseerResources() {
     this.fileDownloaderService.downloadFile(
-      this.taskDefinition.getTaskPDFUrl(),
-      this.taskDefinition.name + '.pdf',
+      this.taskDefinition.getOverseerResourcesUrl(),
+      this.taskDefinition.name + '.zip',
     );
   }
 

From 54ac9243265ff2302939c83e59b5a0c1f2692dc1 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 10 Mar 2025 20:06:06 +1100
Subject: [PATCH 255/776] chore(release): 8.0.37

---
 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 975163dc71..b15ccc9c5d 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.
 
+### [8.0.37](https://github.com/macite/doubtfire-deploy/compare/v8.0.36...v8.0.37) (2025-03-10)
+
+
+### Bug Fixes
+
+* ensure overseer download get resources zip ([a1e4d71](https://github.com/macite/doubtfire-deploy/commit/a1e4d71b34733bc53cd2cfa63ee1e70f8f43386f))
+
 ### [8.0.36](https://github.com/macite/doubtfire-deploy/compare/v8.0.35...v8.0.36) (2025-03-07)
 
 
diff --git a/package-lock.json b/package-lock.json
index b0f8bb6ef3..fdc977e148 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.36",
+  "version": "8.0.37",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.36",
+      "version": "8.0.37",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 219f72d7ef..b8bc8a0e0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.36",
+  "version": "8.0.37",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 4b7901fd03d9652230aecb52791313f052d7b53d Mon Sep 17 00:00:00 2001
From: Lolretrorat <joshuabevan@live.com>
Date: Sun, 16 Mar 2025 21:20:54 +1000
Subject: [PATCH 256/776] fix: correct a typo in /edit_profile

---
 .../common/edit-profile-form/edit-profile-form.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/edit-profile-form/edit-profile-form.component.html b/src/app/common/edit-profile-form/edit-profile-form.component.html
index b18f430fc8..659a44bc80 100644
--- a/src/app/common/edit-profile-form/edit-profile-form.component.html
+++ b/src/app/common/edit-profile-form/edit-profile-form.component.html
@@ -122,7 +122,7 @@ <h1>{{ initialFirstName }}</h1>
       @if(tiiEnabled){
       <section fxLayout="row" fxFlexFill fxLayoutAlign="start center">
         <mat-checkbox color="primary" [(ngModel)]="user.acceptedTiiEula" [disableRipple]="true" (click)="$event.preventDefault()" name="acceptedTiiEula" disabled
-          >Acceptted TurnItIn EULA
+          >Accepted TurnItIn EULA
         </mat-checkbox>
       </section>
       }

From 5141529b1ed37f8ca254e89e1b91edac3139f166 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Mon, 17 Mar 2025 09:56:11 +1100
Subject: [PATCH 257/776] feat: add option for institution logo

Embedded top left in toolbar.
---
 src/app/common/header/header.component.html   |   6 +++
 src/app/common/header/header.component.ts     |  37 +++++++++++++++---
 .../config/constants/doubtfire-constants.ts   |  24 ++++++++++++
 src/assets/images/institution-logo.png        | Bin 0 -> 2278 bytes
 4 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 src/assets/images/institution-logo.png

diff --git a/src/app/common/header/header.component.html b/src/app/common/header/header.component.html
index bac6b77c07..f6bb52f08c 100644
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
@@ -5,6 +5,12 @@
     style="min-height: 85px"
   >
     @if (!media.isActive('xs')) {
+      @if (logoSettings.hasLogo) {
+        <a [href]="logoSettings.logoLinkUrl" class="mx-6">
+          <img [src]="logoSettings.logoUrl" style="height: 32px" />
+        </a>
+      }
+
       <a uiSref="home" class="pt-4">
         <mat-icon
           uiSref="home"
diff --git a/src/app/common/header/header.component.ts b/src/app/common/header/header.component.ts
index a07349c94e..0ef0bae956 100644
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
@@ -8,6 +8,7 @@ import { UserService } from 'src/app/api/services/user.service';
 import { AuthenticationService, Project, Task, Unit, UnitRole, User } from 'src/app/api/models/doubtfire-model';
 import { Subscription } from 'rxjs';
 import { MediaObserver } from 'ng-flex-layout';
+import { DoubtfireConstants, LogoSettings } from 'src/app/config/constants/doubtfire-constants';
 
 @Component({
   selector: 'app-header',
@@ -16,7 +17,7 @@ import { MediaObserver } from 'ng-flex-layout';
 })
 export class HeaderComponent implements OnInit, OnDestroy {
   task: Task;
-  data: { isTutor: boolean } = {
+  data: {isTutor: boolean} = {
     isTutor: false,
   };
   unitRoles: UnitRole[];
@@ -30,6 +31,11 @@ export class HeaderComponent implements OnInit, OnDestroy {
   currentView: ViewType;
   showHeader = true;
 
+  logoSettings: LogoSettings = {
+    hasLogo: false,
+    logoLinkUrl: '/assets/images/institution-logo.png',
+    logoUrl: null,
+  };
   private subscriptions: Subscription[] = [];
 
   constructor(
@@ -41,6 +47,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
     private userService: UserService,
     private authService: AuthenticationService,
     protected media: MediaObserver,
+    protected doubtfireConstants: DoubtfireConstants,
   ) {}
 
   ngOnInit(): void {
@@ -50,7 +57,9 @@ export class HeaderComponent implements OnInit, OnDestroy {
           this.showHeader = shouldShow;
         },
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        error: (err) => {},
+        error: (err) => {
+          console.log(`Error showing header: ${err}`);
+        },
       }),
     );
 
@@ -64,7 +73,9 @@ export class HeaderComponent implements OnInit, OnDestroy {
             .transform(this.unitRoles)
             .filter((role) => this.isUniqueRole(role));
         },
-        error: (err) => {},
+        error: (err) => {
+          console.log(`Error fetching unit roles: ${err}`);
+        },
       }),
     );
 
@@ -74,7 +85,9 @@ export class HeaderComponent implements OnInit, OnDestroy {
           if (projects == null) return;
           this.projects = projects.filter((project) => project.unit.myRole === 'Student');
         },
-        error: (err) => {},
+        error: (err) => {
+          console.log(`Error fetching projects: ${err}`);
+        },
       }),
     );
 
@@ -94,7 +107,21 @@ export class HeaderComponent implements OnInit, OnDestroy {
           }
         },
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        error: (_err) => {},
+        error: (err) => {
+          console.log(`Error on switching view and entity: ${err}`);
+        },
+      }),
+    );
+
+    // Subscribe to logo changes
+    this.subscriptions.push(
+      this.doubtfireConstants.LogoSettings.subscribe({
+        next: (settings) => {
+          this.logoSettings = settings;
+        },
+        error: (err) => {
+          console.log(`Error getting settings: ${err}`);
+        }
       }),
     );
   }
diff --git a/src/app/config/constants/doubtfire-constants.ts b/src/app/config/constants/doubtfire-constants.ts
index 32f05ac739..67a8bbea42 100644
--- a/src/app/config/constants/doubtfire-constants.ts
+++ b/src/app/config/constants/doubtfire-constants.ts
@@ -6,11 +6,20 @@ import API_URL from 'src/app/config/constants/apiURL';
 
 interface SettingsResponseFormat {
   externalName: string;
+  hasLogo: boolean;
+  logoUrl: string;
+  logoLinkUrl: string;
   overseerEnabled: boolean;
   tiiEnabled: boolean;
   d2lEnabled: boolean;
 }
 
+export interface LogoSettings {
+  hasLogo: boolean;
+  logoUrl: string;
+  logoLinkUrl: string;
+}
+
 interface SignOutUrlResponseFormat {
   auth_signout_url: string;
 }
@@ -43,6 +52,15 @@ export class DoubtfireConstants {
    */
   public IsD2LEnabled: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  /**
+   * Details on the logo
+   */
+  public LogoSettings: BehaviorSubject<LogoSettings> = new BehaviorSubject<LogoSettings>({
+    hasLogo: false,
+    logoUrl: '/assets/images/institution-logo.png',
+    logoLinkUrl: '/',
+  });
+
   /**
    * Whether or not the TurnItIn integration is enabled.
    */
@@ -73,6 +91,12 @@ export class DoubtfireConstants {
       this.IsOverseerEnabled.next(result.overseerEnabled);
       this.IsTiiEnabled.next(result.tiiEnabled);
       this.IsD2LEnabled.next(result.d2lEnabled);
+
+      this.LogoSettings.next({
+        hasLogo: result.hasLogo,
+        logoUrl: result.logoUrl,
+        logoLinkUrl: result.logoLinkUrl
+      });
     });
   }
 }
diff --git a/src/assets/images/institution-logo.png b/src/assets/images/institution-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1d13c1071e991cab1c7ade45a7c3319e04ef289
GIT binary patch
literal 2278
zcmZ`)3pkVQ8-JNYW+If$aprUSv`v_#jmqRu4y|%1CWjfHW@{V6<ZL2e*p*LB<(!I4
zq>@wV`%3LYIri^BsYIcq_=n|tS3Y(1zy8m4-S2%r_xt<Z_x;@Wdp&Qar@NC9R1*pS
zfRc+dkpyZgC_1a8!KaPjl>(@wSR|)yKuwqSIJn8B__&0+xdFd|_9{S5N)CWXAOMJ$
zQeC#CKwA@#{ptq*FDb1Rn=EDW9iI^n$Sh+*K`mL%pn&XU4JnrT9<f+@1x+o6tk^md
znq}jlAE*=<&b}-FP*jtM6d*VS2LNfs@I5|kAGe*h!E_oXFoYgN!NkxQ5*C1uu?0;U
zg&l~Dp&g85*~So1UlF#TEpcN}$gdD~1Oesa=81HmGbu=Gj5)>}Wd}tfk$7fEs4a=O
zeVGpK2&gbNn_-K^ayT3e#}Y$lQn4F0ZQ6u2x4>Fhpg{zh6&uM8j6p}T488^VHx7})
z3TB2g*x~d@q$F-&5Iu@bK%pdwR@S#V+2NtzGexqNj|CnOD|v(6fHB9e#0IH&iPx4y
zVbKppNy6`q3}@R};J<=@c7M<Ijpe}%r-1cJXm%TxDL?vt#yiky3?_xelHhU6_#b^g
z<2}RZY&zI$W_YkmB%8tn$;;XPE%5&%mSf?ul6L*jzHhVn>IH{m2gPGo25krJgT65V
z0NIBw#I1Y6WG4%DID73^zayN*C@D1TtS9Y?PYTQO;%BPjYLkzQl&SY6rz7)`6>uoR
zmExiKk@SnPp&P$l+h==u_?kCccAV=VAIZ-nT%N*uafT0f&zZ(&MA+C+8LbV2U*1K{
zlDQX`_7(MZ7uhe>>B<wHO(2I-mOdoC!dV_V5Zn1dfKWc+8~m35-0Pax-wvt%JtqhJ
zaN1&~g9P-RUi{(t%k}j${Z-z(Z{C2xVEBZ^n4qAbU;jSXS5LpCrmd~5t{&ofL7(h%
zHS+0`M%F9ysi`UM+?4o>xJeor|7CHLz5Q@!r<;xq3N>>3cP-md@xmMefvBmeN%6hL
z2qcku>Z#rAY(AIEJ$>rbYHgchE7Z%;(NaAf9g5GcUC9R*)HO6LMI|3isZ^?-UQu&%
z^G5p65mU&P<abY-i~+HD;r*MKRrU#sC*F(-$t{BX{06Z0)hcRgmUw*jXh)vG+`Hkn
zsJ8<tvWh-mp5MwyOH0d8);n8KVQ6eD^lMag(j&yN7iK5XXmn;~<^ghRd}Hj)sIkWx
z#sqr*mG%2BkIha#u5>@0m7U!jJ7aXU^qtd{KhGK)8!N>%qIcEN%+u4;tGtB+fo}(e
z8j7Mn&}OEldFONV?5#I$EV55bU@&T1TAr>eUSGYh!S(JE^tz&>(fviSnD&X7TToC?
zSxF5DC=yVFO`LbPpG?2F;~4w?*;ZcjTDfFHVlUV-M_*4*VD#^kmbP+<orN2*7>v7j
z)=p?D7LCU3Jd{3WIB-uS%Hzhx!QhBT1oi2^_=CcL)JuxB5zq=qbM*6eS$I}FOhMs!
z@CTK<I2_LJMTtX(x%_Z{fB)zC`9JdW#gNaRM123IXeqdsmcceGxf#B8t)t%<JOx7_
zw3L;lUhDm2Y0NqbUz(jPEGuH%i10HQ;7mLW{I8rsA)hb3HJ2lUPs=}fauc;n8<I_I
z<<4P<Mo;Jw@{3)kH^=U#!Xl_a9pb#gh=J-$MX9|BJ*$Oo=^4BZ3x3}^6%~~vk{=K0
zketV>&DqBn2(ol|2?+_V=VeYvAvU{~DT2eYJ2aA3^LhSLl^t=YHW0E?XtuDhkUl=t
z!gXpEslR+YFko$A!JM7&l|4Ix^{pc+t$FsJ&77$*%{-m=ns>vR$X4aL(n%ggcKTa9
zpbCgXRlhlJSi8B7IPT~f4U0oC<w~M)j~_j9eNoC=)u*kjtnB|{WCZ1K<-x;;CKgjh
z8yd^q3aw4w_f+gqLIC~eeEq>55LNWuG~>A3w??^!w$c#DT`!zEtWq_=uQfh)xb?7!
zp{n7COxe)AV?ATie|r1-UyP`$uU8_!;9rC5l!cV;KYX0|q^~b6=iG(C8h<s|)Y)TZ
zi&pK4DY2T`yB|Dw(2VuJ9+I>s;G-TJj<2<&$*d-|h_cq2IsbO1q(t8ruB+>AZf#`+
zpD?c$3SYaG)SjMC#NEf}R`Q~wqE6OMBn>i|%p-NdcaFK}A@#~;9@bNptu7@lC0Lb1
z{0&!MsIKng+~TudcV)`i_mJ)4J{}2myyMrFAikGxHa$H}di3!;g74tqP-3lidy;CR
zqtaJZm}+!1E6e>1-o>H&W^QnB@VLH>@!@q7NHly$$C|Eyy?Y&Vw$mz1OXO=VUaXM!
z!krm{THJ0sF1on?s%qTv!QM)b8BR)q&r(g91wm=yf%lq6kFU^rajv5|N-}e^llujp
z$FEdwcd@)2J-M&p<yBxDt~)M<U3(=eP@K4#Dj$+N?<A|SMTwWVhfUjK_9+Kic>}3}
zsxom2%6MPyl%Dj;VGlLz?dO@-yv`2BJVs;pjdBt0V4?n@&h;5}w5REYre)H#{zrK!
z2Hg9@?y!l{O79VkFIpq_&R>9uF2NQ^jqUC2quoXHK_q-^QB;8a<>+;VrVif<tMLZk
zD4u;ALjJ<dqTwgi;!^Os^bY>t>oW^yNnX$@7Hk|2z0~h0`N6w5x)W=*9Z2~H8Qi2g

literal 0
HcmV?d00001


From aa06cbf3a08efa02f508062d47c127289fc8c6fa Mon Sep 17 00:00:00 2001
From: Felix Montanari <captainboggle108@gmail.com>
Date: Thu, 20 Mar 2025 11:22:25 +1100
Subject: [PATCH 258/776] fix: correct string manipulation for task period
 formatting

---
 src/app/api/models/task.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2aa167adfd..3792de1871 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -276,7 +276,7 @@ export class Task extends Entity {
         return `${diff} ${data.period.charAt(0).toUpperCase() + data.period.substring(1)}`;
       } else if (diff === 1 && data.period !== 'weeks') {
         return `1 ${
-          data.period.charAt(0).toUpperCase() + data.period.substring(1, data.period.length - 2)
+          data.period.charAt(0).toUpperCase() + data.period.slice(1, -1)
         }`;
       }
     }

From e065c46c3fe6689a7b295a3f91a576eabc11f7bd Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 21 Mar 2025 10:51:20 +1100
Subject: [PATCH 259/776] fix: reply to position and wrapping

---
 .../task-comment-composer.component.html      | 26 +++++++++----------
 .../task-comments-viewer.component.scss       |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.html b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
index 448f88f46c..c1bb1e7014 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.html
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
@@ -11,21 +11,19 @@
 
 @if (task) {
   <div id="replyContainer" [hidden]="originalComment === null">
-    <div>
-      <div class="replying-wrap">
-        Replying to:
-        <b>{{ originalComment !== null ? originalComment.author.name : '' }}</b>
-        <button
-          id="cancelReplyButton"
-          (click)="cancelReply()"
-          mat-icon-button
-          aria-label="Close reply"
-        >
-          <mat-icon inline="true" aria-label="Quit cross icon">close</mat-icon>
-        </button>
-      </div>
-      <p>{{ originalComment !== null ? originalComment.text : '' }}</p>
+    <div class="replying-wrap" style="width: 100%">
+      <button
+        id="cancelReplyButton"
+        (click)="cancelReply()"
+        mat-icon-button
+        aria-label="Close reply"
+      >
+        <mat-icon aria-label="Quit cross icon">close</mat-icon>
+      </button>
+      Replying to:
+      <b>{{ originalComment !== null ? originalComment.author.name : '' }}</b>
     </div>
+    <p>{{ originalComment !== null ? originalComment.text : '' }}</p>
   </div>
 }
 
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
index a1b4811941..5f78a88a4c 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.scss
@@ -230,7 +230,7 @@ $comment-inner-border-radius: 4px;
         overflow-y: hidden;
         -webkit-box-orient: vertical;
         -webkit-font-smoothing: antialiased;
-        overflow-wrap: break-word;
+        overflow-wrap: anywhere;
         text-align: left;
         text-rendering: optimizelegibility;
         user-select: text;

From 92ecdfb7013f8da3b30c87b523b24068782138bb Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 21 Mar 2025 10:52:03 +1100
Subject: [PATCH 260/776] chore: remove unused old angular tools

---
 package-lock.json                             | 442 +-----------------
 package.json                                  |   3 -
 src/app/config/config.coffee                  |   1 -
 .../config/local-storage/local-storage.coffee |   7 -
 .../vendor-dependencies.coffee                |   3 -
 src/app/doubtfire-angularjs.module.ts         |   4 -
 6 files changed, 9 insertions(+), 451 deletions(-)
 delete mode 100644 src/app/config/local-storage/local-storage.coffee

diff --git a/package-lock.json b/package-lock.json
index fdc977e148..0ecc508840 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,10 +31,7 @@
         "@uirouter/core": "^6.1.0",
         "@uirouter/rx": "^1.0.0",
         "angular": "1.5.11",
-        "angular-cookies": "1.5.11",
-        "angular-file-upload": "~1",
         "angular-filter": "0.5.17",
-        "angular-local-storage": "0.7.1",
         "angular-markdown-filter": "1.3.2",
         "angular-md5": "0.1.10",
         "angular-mocks": "1.5.11",
@@ -5685,6 +5682,7 @@
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
+      "dev": true,
       "license": "ISC"
     },
     "node_modules/accepts": {
@@ -5883,408 +5881,10 @@
         "stable": "~0.1.3"
       }
     },
-    "node_modules/amdefine": {
-      "version": "1.0.1",
-      "license": "BSD-3-Clause OR MIT",
-      "engines": {
-        "node": ">=0.4.2"
-      }
-    },
     "node_modules/angular": {
       "version": "1.5.11",
       "license": "MIT"
     },
-    "node_modules/angular-cookies": {
-      "version": "1.5.11",
-      "license": "MIT"
-    },
-    "node_modules/angular-file-upload": {
-      "version": "1.1.6",
-      "dependencies": {
-        "coffee-script": "~1.6.2",
-        "grunt": "~0.4.1",
-        "grunt-contrib-clean": "~0.4.0",
-        "grunt-contrib-concat": "~0.3.0",
-        "grunt-contrib-copy": "~0.4.1",
-        "grunt-contrib-uglify": "~0.2.1"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/argparse": {
-      "version": "0.1.16",
-      "license": "MIT",
-      "dependencies": {
-        "underscore": "~1.7.0",
-        "underscore.string": "~2.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/argparse/node_modules/underscore.string": {
-      "version": "2.4.0",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/async": {
-      "version": "0.1.22"
-    },
-    "node_modules/angular-file-upload/node_modules/camelcase": {
-      "version": "1.2.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/colors": {
-      "version": "0.6.2",
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/dateformat": {
-      "version": "1.0.2-1.2.3",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/esprima": {
-      "version": "1.0.4",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/findup-sync": {
-      "version": "0.1.3",
-      "dependencies": {
-        "glob": "~3.2.9",
-        "lodash": "~2.4.1"
-      },
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/findup-sync/node_modules/glob": {
-      "version": "3.2.11",
-      "license": "BSD",
-      "dependencies": {
-        "inherits": "2",
-        "minimatch": "0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/findup-sync/node_modules/lodash": {
-      "version": "2.4.2",
-      "engines": [
-        "node",
-        "rhino"
-      ],
-      "license": "MIT"
-    },
-    "node_modules/angular-file-upload/node_modules/findup-sync/node_modules/minimatch": {
-      "version": "0.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "lru-cache": "2",
-        "sigmund": "~1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/getobject": {
-      "version": "0.1.0",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/glob": {
-      "version": "3.1.21",
-      "license": "BSD",
-      "dependencies": {
-        "graceful-fs": "~1.2.0",
-        "inherits": "1",
-        "minimatch": "~0.2.11"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/glob/node_modules/inherits": {
-      "version": "1.0.2"
-    },
-    "node_modules/angular-file-upload/node_modules/graceful-fs": {
-      "version": "1.2.3",
-      "license": "BSD",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt": {
-      "version": "0.4.5",
-      "dependencies": {
-        "async": "~0.1.22",
-        "coffee-script": "~1.3.3",
-        "colors": "~0.6.2",
-        "dateformat": "1.0.2-1.2.3",
-        "eventemitter2": "~0.4.13",
-        "exit": "~0.1.1",
-        "findup-sync": "~0.1.2",
-        "getobject": "~0.1.0",
-        "glob": "~3.1.21",
-        "grunt-legacy-log": "~0.1.0",
-        "grunt-legacy-util": "~0.2.0",
-        "hooker": "~0.2.3",
-        "iconv-lite": "~0.2.11",
-        "js-yaml": "~2.0.5",
-        "lodash": "~0.9.2",
-        "minimatch": "~0.2.12",
-        "nopt": "~1.0.10",
-        "rimraf": "~2.2.8",
-        "underscore.string": "~2.2.1",
-        "which": "~1.0.5"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-contrib-clean": {
-      "version": "0.4.1",
-      "engines": {
-        "node": ">= 0.8.0"
-      },
-      "peerDependencies": {
-        "grunt": "~0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-contrib-concat": {
-      "version": "0.3.0",
-      "engines": {
-        "node": ">= 0.8.0"
-      },
-      "peerDependencies": {
-        "grunt": "~0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-contrib-copy": {
-      "version": "0.4.1",
-      "engines": {
-        "node": ">= 0.8.0"
-      },
-      "peerDependencies": {
-        "grunt": "~0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-contrib-uglify": {
-      "version": "0.2.7",
-      "dependencies": {
-        "grunt-lib-contrib": "~0.6.1",
-        "uglify-js": "~2.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      },
-      "peerDependencies": {
-        "grunt": "~0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-legacy-log": {
-      "version": "0.1.3",
-      "license": "MIT",
-      "dependencies": {
-        "colors": "~0.6.2",
-        "grunt-legacy-log-utils": "~0.1.1",
-        "hooker": "~0.2.3",
-        "lodash": "~2.4.1",
-        "underscore.string": "~2.3.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-legacy-log-utils": {
-      "version": "0.1.1",
-      "dependencies": {
-        "colors": "~0.6.2",
-        "lodash": "~2.4.1",
-        "underscore.string": "~2.3.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-legacy-log-utils/node_modules/lodash": {
-      "version": "2.4.2",
-      "engines": [
-        "node",
-        "rhino"
-      ],
-      "license": "MIT"
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-legacy-log/node_modules/lodash": {
-      "version": "2.4.2",
-      "engines": [
-        "node",
-        "rhino"
-      ],
-      "license": "MIT"
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-legacy-util": {
-      "version": "0.2.0",
-      "dependencies": {
-        "async": "~0.1.22",
-        "exit": "~0.1.1",
-        "getobject": "~0.1.0",
-        "hooker": "~0.2.3",
-        "lodash": "~0.9.2",
-        "underscore.string": "~2.2.1",
-        "which": "~1.0.5"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt-legacy-util/node_modules/underscore.string": {
-      "version": "2.2.1",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt/node_modules/coffee-script": {
-      "version": "1.3.3",
-      "bin": {
-        "cake": "bin/cake",
-        "coffee": "bin/coffee"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/grunt/node_modules/underscore.string": {
-      "version": "2.2.1",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/iconv-lite": {
-      "version": "0.2.11",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/js-yaml": {
-      "version": "2.0.5",
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "~ 0.1.11",
-        "esprima": "~ 1.0.2"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      },
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/lodash": {
-      "version": "0.9.2",
-      "engines": [
-        "node",
-        "rhino"
-      ],
-      "license": "MIT"
-    },
-    "node_modules/angular-file-upload/node_modules/lru-cache": {
-      "version": "2.7.3",
-      "license": "ISC"
-    },
-    "node_modules/angular-file-upload/node_modules/minimatch": {
-      "version": "0.2.14",
-      "license": "MIT",
-      "dependencies": {
-        "lru-cache": "2",
-        "sigmund": "~1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/nopt": {
-      "version": "1.0.10",
-      "license": "MIT",
-      "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/rimraf": {
-      "version": "2.2.8",
-      "license": "MIT",
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/source-map": {
-      "version": "0.1.34",
-      "dependencies": {
-        "amdefine": ">=0.0.4"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/uglify-js": {
-      "version": "2.4.24",
-      "license": "BSD",
-      "dependencies": {
-        "async": "~0.2.6",
-        "source-map": "0.1.34",
-        "uglify-to-browserify": "~1.0.0",
-        "yargs": "~3.5.4"
-      },
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/uglify-js/node_modules/async": {
-      "version": "0.2.10"
-    },
-    "node_modules/angular-file-upload/node_modules/underscore": {
-      "version": "1.7.0"
-    },
-    "node_modules/angular-file-upload/node_modules/which": {
-      "version": "1.0.9",
-      "license": "ISC",
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/wordwrap": {
-      "version": "0.0.2",
-      "license": "MIT/X11",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/angular-file-upload/node_modules/yargs": {
-      "version": "3.5.4",
-      "license": "MIT/X11",
-      "dependencies": {
-        "camelcase": "^1.0.2",
-        "decamelize": "^1.0.0",
-        "window-size": "0.1.0",
-        "wordwrap": "0.0.2"
-      }
-    },
     "node_modules/angular-filter": {
       "version": "0.5.17",
       "license": "MIT",
@@ -6295,10 +5895,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/angular-local-storage": {
-      "version": "0.7.1",
-      "license": "MIT"
-    },
     "node_modules/angular-markdown-filter": {
       "version": "1.3.2",
       "license": "MIT",
@@ -7783,16 +7379,6 @@
       "version": "5.65.0",
       "license": "MIT"
     },
-    "node_modules/coffee-script": {
-      "version": "1.6.3",
-      "bin": {
-        "cake": "bin/cake",
-        "coffee": "bin/coffee"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/coffeelint": {
       "version": "1.16.2",
       "dev": true,
@@ -10031,6 +9617,7 @@
     },
     "node_modules/eventemitter2": {
       "version": "0.4.14",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/eventemitter3": {
@@ -10070,6 +9657,7 @@
     },
     "node_modules/exit": {
       "version": "0.1.2",
+      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -12038,15 +11626,6 @@
         "node": "*"
       }
     },
-    "node_modules/grunt-lib-contrib": {
-      "version": "0.6.1",
-      "dependencies": {
-        "zlib-browserify": "0.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/grunt-newer": {
       "version": "1.3.0",
       "dev": true,
@@ -12483,6 +12062,7 @@
     },
     "node_modules/hooker": {
       "version": "0.2.3",
+      "dev": true,
       "engines": {
         "node": "*"
       }
@@ -20009,10 +19589,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/sigmund": {
-      "version": "1.0.1",
-      "license": "ISC"
-    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "license": "ISC"
@@ -21597,7 +21173,9 @@
     },
     "node_modules/uglify-to-browserify": {
       "version": "1.0.2",
-      "license": "MIT"
+      "dev": true,
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
@@ -22536,6 +22114,8 @@
     },
     "node_modules/window-size": {
       "version": "0.1.0",
+      "dev": true,
+      "optional": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -22772,10 +22352,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/zlib-browserify": {
-      "version": "0.0.1",
-      "license": "MIT"
-    },
     "node_modules/zone.js": {
       "version": "0.14.5",
       "license": "MIT",
diff --git a/package.json b/package.json
index b8bc8a0e0e..226d4856db 100644
--- a/package.json
+++ b/package.json
@@ -50,10 +50,7 @@
     "@uirouter/core": "^6.1.0",
     "@uirouter/rx": "^1.0.0",
     "angular": "1.5.11",
-    "angular-cookies": "1.5.11",
-    "angular-file-upload": "~1",
     "angular-filter": "0.5.17",
-    "angular-local-storage": "0.7.1",
     "angular-markdown-filter": "1.3.2",
     "angular-md5": "0.1.10",
     "angular-mocks": "1.5.11",
diff --git a/src/app/config/config.coffee b/src/app/config/config.coffee
index 853d046373..b7699efbf5 100644
--- a/src/app/config/config.coffee
+++ b/src/app/config/config.coffee
@@ -7,7 +7,6 @@
 #
 angular.module('doubtfire.config', [
   'doubtfire.config.vendor-dependencies'
-  'doubtfire.config.local-storage'
   'doubtfire.config.routing'
   'doubtfire.config.analytics'
   'doubtfire.config.runtime'
diff --git a/src/app/config/local-storage/local-storage.coffee b/src/app/config/local-storage/local-storage.coffee
deleted file mode 100644
index f6b5c0403e..0000000000
--- a/src/app/config/local-storage/local-storage.coffee
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('doubtfire.config.local-storage', [])
-#
-# Local Storage Configuration
-#
-.config((localStorageServiceProvider) ->
-  localStorageServiceProvider.setPrefix('doubtfire')
-)
diff --git a/src/app/config/vendor-dependencies/vendor-dependencies.coffee b/src/app/config/vendor-dependencies/vendor-dependencies.coffee
index 5d91403d40..2d1aca3a25 100644
--- a/src/app/config/vendor-dependencies/vendor-dependencies.coffee
+++ b/src/app/config/vendor-dependencies/vendor-dependencies.coffee
@@ -4,7 +4,6 @@
 #
 angular.module('doubtfire.config.vendor-dependencies', [
   # ng*
-  'ngCookies'
   'ngCsv'
   'ngSanitize'
 
@@ -18,13 +17,11 @@ angular.module('doubtfire.config.vendor-dependencies', [
   'ui.codemirror'
 
   # other libraries
-  'angularFileUpload'
   'angular.filter'
   'localization'
   'markdown'
   'nvd3'
   'xeditable'
-  'LocalStorageModule'
   'angular-md5'
 
   # analytics
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index c7b5c2502c..26e631048f 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -10,12 +10,9 @@ import {downgradeInjectable, downgradeComponent} from '@angular/upgrade/static';
 
 // Here are the old angular node modules, previously loaded via grunt
 //#region
-import 'angular-cookies/angular-cookies.js';
-import 'angular-local-storage/dist/angular-local-storage.js';
 import 'angular-resource/angular-resource.js';
 import 'angular-ui-bootstrap/ui-bootstrap-tpls.js';
 import 'angular-nvd3/dist/angular-nvd3.js';
-import 'angular-file-upload/angular-file-upload.js';
 import 'ng-file-upload/dist/ng-file-upload-all.min.js';
 import 'angular-sanitize/angular-sanitize.js';
 import 'ng-csv/build/ng-csv.js';
@@ -57,7 +54,6 @@ import 'build/src/app/config/privacy-policy/privacy-policy.js';
 import 'build/src/app/config/runtime/runtime.js';
 import 'build/src/app/config/config.js';
 import 'build/src/app/config/root-controller/root-controller.js';
-import 'build/src/app/config/local-storage/local-storage.js';
 import 'build/src/app/config/routing/routing.js';
 import 'build/src/app/config/vendor-dependencies/vendor-dependencies.js';
 import 'build/src/app/config/analytics/analytics.js';

From 35945288c73052afd28209a7381335af2b14ba10 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 26 Mar 2025 11:40:32 +1100
Subject: [PATCH 261/776] fix: support windows build

---
 package-lock.json | 1474 +++++++++++++++++++++++++++++++++++++--------
 package.json      |    4 +-
 2 files changed, 1226 insertions(+), 252 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4ea52bbbb1..5c67f73f52 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -149,10 +149,12 @@
         "node": ">=20.9.0"
       },
       "optionalDependencies": {
+        "@esbuild/linux-x64": "*",
         "@nx/nx-darwin-arm64": "^18.0",
         "@nx/nx-darwin-x64": "^18.0",
         "@nx/nx-linux-x64-gnu": "^18.0",
-        "@nx/nx-win32-x64-msvc": "^18.0"
+        "@nx/nx-win32-x64-msvc": "^18.0",
+        "@rollup/rollup-linux-x64-gnu": "*"
       }
     },
     "node_modules/@alloc/quick-lru": {
@@ -3163,399 +3165,750 @@
         "node": "^14 || ^16 || ^17 || ^18"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
+    "node_modules/@esbuild/aix-ppc64": {
       "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
+      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
       "cpu": [
-        "arm64"
+        "ppc64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "aix"
       ],
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
+      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
+      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
+      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ajv": {
-      "version": "6.12.6",
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
+      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
+      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
+      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
+      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
+      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "*"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.20.1",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/js": {
-      "version": "8.57.0",
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
+      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
+      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
+      "cpu": [
+        "loong64"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
+      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
+      "cpu": [
+        "mips64el"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
+      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "*"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
+      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
+      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "license": "MIT",
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz",
+      "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "license": "MIT",
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "license": "MIT"
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
+      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
+      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
+      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
+      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-      "version": "4.1.0",
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-      "version": "5.0.0",
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.10.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-      "version": "2.3.0",
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-try": "^2.0.0"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-      "version": "4.1.0",
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+      "version": "1.1.11",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.24.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
+        "type-fest": "^0.20.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@jridgewell/resolve-uri": {
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
       "version": "3.1.2",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "*"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
       "dev": true,
-      "license": "MIT",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.6",
+    "node_modules/@eslint/js": {
+      "version": "8.57.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "license": "MIT"
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4805,10 +5158,88 @@
         "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+    "node_modules/@rollup/rollup-android-arm-eabi": {
       "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
+      "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
       "cpu": [
-        "arm64"
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
+      "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
+      "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
+      "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
+      "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
+      "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.17.2",
+      "cpu": [
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
@@ -4829,6 +5260,109 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
+      "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
+      "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
+      "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.36.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.36.0.tgz",
+      "integrity": "sha512-5KtoW8UWmwFKQ96aQL3LlRXX16IMwyzMq/jSSVIIyAANiE1doaQsx/KRyhAvpHlPjPiSU/AYX/8m+lQ9VToxFQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
+      "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
+      "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
+      "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
+      "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@scarf/scarf": {
       "version": "1.3.0",
       "hasInstallScript": true,
@@ -7115,6 +7649,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "node_modules/bl": {
       "version": "4.1.0",
       "license": "MIT",
@@ -9483,6 +10027,22 @@
         "node": ">=12"
       }
     },
+    "node_modules/esbuild/node_modules/@esbuild/linux-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
+      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/escalade": {
       "version": "3.1.2",
       "license": "MIT",
@@ -10419,6 +10979,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "dev": true,
@@ -10747,6 +11314,20 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "license": "MIT",
@@ -11721,6 +12302,25 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/grunt-html2js/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
     "node_modules/grunt-html2js/node_modules/glob-parent": {
       "version": "3.1.0",
       "dev": true,
@@ -15607,6 +16207,13 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "node_modules/nan": {
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+      "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/nanoid": {
       "version": "3.3.7",
       "dev": true,
@@ -19281,6 +19888,19 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/rollup/node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
+      "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/run-async": {
       "version": "3.0.0",
       "license": "MIT",
@@ -21977,6 +22597,150 @@
         }
       }
     },
+    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/vite/node_modules/@esbuild/linux-arm64": {
       "version": "0.19.12",
       "cpu": [
@@ -21992,6 +22756,214 @@
         "node": ">=12"
       }
     },
+    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/vite/node_modules/esbuild": {
       "version": "0.19.12",
       "dev": true,
diff --git a/package.json b/package.json
index 5ac6c30eb8..d20a9e0260 100644
--- a/package.json
+++ b/package.json
@@ -166,6 +166,8 @@
     "@nx/nx-darwin-arm64": "^18.0",
     "@nx/nx-darwin-x64": "^18.0",
     "@nx/nx-linux-x64-gnu": "^18.0",
-    "@nx/nx-win32-x64-msvc": "^18.0"
+    "@nx/nx-win32-x64-msvc": "^18.0",
+    "@rollup/rollup-linux-x64-gnu": "*",
+    "@esbuild/linux-x64": "*"
   }
 }

From 247330e46d74186519dbcbbef8378b508eaca83f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 2 Apr 2025 23:20:31 +1100
Subject: [PATCH 262/776] fix: support hot reloading on windows

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d20a9e0260..213af03e0b 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "build:angular17": "ng build",
     "lint:fix": "ng lint --fix",
     "lint": "ng lint",
-    "serve:angular17": "export NODE_OPTIONS=--max_old_space_size=4096 && ng serve --configuration $NODE_ENV --proxy-config proxy.conf.json",
+    "serve:angular17": "export NODE_OPTIONS=--max_old_space_size=4096 && ng serve --poll=2000 --configuration $NODE_ENV --proxy-config proxy.conf.json",
     "start": "npm-run-all -l -s build:angular1 serve:angular17",
     "watch:angular1": "grunt delta",
     "deploy:build2api": "ng build --delete-output-path=true --optimization=true --configuration production --output-path dist",

From 5a5a0cb093ef1eb762103b1f44a7ff01179f82c1 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 3 Apr 2025 01:47:49 +1100
Subject: [PATCH 263/776] chore: update package-lock.json

---
 package-lock.json | 1439 ++++++++-------------------------------------
 1 file changed, 251 insertions(+), 1188 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5c67f73f52..cceeca2a84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3165,742 +3165,391 @@
         "node": "^14 || ^16 || ^17 || ^18"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
-      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz",
+      "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==",
       "cpu": [
-        "ppc64"
+        "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
-        "aix"
+        "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
-      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "license": "MIT",
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
-      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.10.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
-      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
       "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
-      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
       "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
-      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
       "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+      "license": "Python-2.0"
     },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
-      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+      "version": "1.1.11",
       "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
-      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.24.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
-      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
-      "cpu": [
-        "arm"
-      ],
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.1",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "MIT"
+    },
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "*"
       }
     },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
-      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
-      "cpu": [
-        "ia32"
-      ],
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
-      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
-      "cpu": [
-        "loong64"
-      ],
+    "node_modules/@eslint/js": {
+      "version": "8.57.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
-      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
-      "cpu": [
-        "mips64el"
-      ],
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10.10.0"
       }
     },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
-      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
-      "cpu": [
-        "ppc64"
-      ],
+    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+      "version": "1.1.11",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
-      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
-      "cpu": [
-        "riscv64"
-      ],
+    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "*"
       }
     },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
-      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
-      "cpu": [
-        "s390x"
-      ],
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
       "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=12"
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz",
-      "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       }
     },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
-      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "license": "MIT"
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
       "engines": {
         "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
-      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
       "engines": {
         "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
-      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
       "engines": {
         "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
-      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
-      "cpu": [
-        "x64"
-      ],
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
       "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+      "version": "2.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ajv": {
-      "version": "6.12.6",
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "p-limit": "^2.2.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "@sinclair/typebox": "^0.27.8"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+    "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "license": "MIT"
-    },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-      "version": "2.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5049,11 +4698,12 @@
     },
     "node_modules/@nx/nx-linux-arm64-gnu": {
       "version": "18.3.4",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-18.3.4.tgz",
+      "integrity": "sha512-g/2IaB2bZTKaBNPEf9LxtIXb1XHdhh3VO9PnePIrwkkixPMLN0dTxT5Sttt75lvLP3EU1AUR5w3Aaz2Q1mYtWA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5064,11 +4714,12 @@
     },
     "node_modules/@nx/nx-linux-arm64-musl": {
       "version": "18.3.4",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-18.3.4.tgz",
+      "integrity": "sha512-MgfKLoEF6I1cCS+0ooFLEjJSSVdCYyCT9Q96IHRJntAEL8u/0GR2OUoBoLC+q1lnbIkJr/uqTJxA2Jh+sJTIbA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -5158,147 +4809,6 @@
         "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
-      "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
-      "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
-      "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
-      "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
-      "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
-      "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.17.2",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.17.2",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
-      "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
-      "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
-      "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
       "version": "4.36.0",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.36.0.tgz",
@@ -5324,45 +4834,6 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
-      "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
-      "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
-      "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@scarf/scarf": {
       "version": "1.3.0",
       "hasInstallScript": true,
@@ -7649,16 +7120,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
     "node_modules/bl": {
       "version": "4.1.0",
       "license": "MIT",
@@ -10979,13 +10440,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "dev": true,
@@ -11314,20 +10768,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "license": "MIT",
@@ -12302,25 +11742,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/grunt-html2js/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
     "node_modules/grunt-html2js/node_modules/glob-parent": {
       "version": "3.1.0",
       "dev": true,
@@ -16207,13 +15628,6 @@
         "thenify-all": "^1.0.0"
       }
     },
-    "node_modules/nan": {
-      "version": "2.22.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
-      "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/nanoid": {
       "version": "3.3.7",
       "dev": true,
@@ -22597,261 +22011,6 @@
         }
       }
     },
-    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
-      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.12",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/vite/node_modules/@esbuild/linux-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
@@ -22868,102 +22027,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/win32-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/vite/node_modules/esbuild": {
       "version": "0.19.12",
       "dev": true,

From e5a57f8ba3669345a272b308b0c892fdab4843ef Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 3 Apr 2025 02:20:30 +1100
Subject: [PATCH 264/776] fix: update packages

---
 package-lock.json | 1717 +++++++++++++++++++++++++++++++++++----------
 package.json      |    5 +-
 2 files changed, 1339 insertions(+), 383 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cceeca2a84..d75d9be7fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,7 @@
         "@angular/service-worker": "^17.3.6",
         "@angular/upgrade": "^17.3.6",
         "@ctrl/ngx-emoji-mart": "^9.2.0",
+        "@esbuild/linux-arm64": "^0.25.2",
         "@ngneat/hotkeys": "^4.0.0",
         "@uirouter/angular": "^13.0",
         "@uirouter/angular-hybrid": "^17.1.0",
@@ -149,11 +150,11 @@
         "node": ">=20.9.0"
       },
       "optionalDependencies": {
-        "@esbuild/linux-x64": "*",
         "@nx/nx-darwin-arm64": "^18.0",
         "@nx/nx-darwin-x64": "^18.0",
         "@nx/nx-linux-x64-gnu": "^18.0",
         "@nx/nx-win32-x64-msvc": "^18.0",
+        "@rollup/rollup-linux-arm64-gnu": "*",
         "@rollup/rollup-linux-x64-gnu": "*"
       }
     },
@@ -3165,399 +3166,750 @@
         "node": "^14 || ^16 || ^17 || ^18"
       }
     },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz",
-      "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==",
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
+      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
       "cpu": [
-        "x64"
+        "ppc64"
       ],
+      "dev": true,
       "optional": true,
       "os": [
-        "linux"
+        "aix"
       ],
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
+      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
+      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
+      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ajv": {
-      "version": "6.12.6",
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
+      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
+      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
+      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
+      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
+      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "*"
+        "node": ">=12"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
+      "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
+      "cpu": [
+        "arm64"
+      ],
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=18"
       }
     },
-    "node_modules/@eslint/js": {
-      "version": "8.57.0",
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
+      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
+      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
+      "cpu": [
+        "loong64"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
+      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
+      "cpu": [
+        "mips64el"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
+      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": "*"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
+      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
-      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
+        "node": ">=12"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
+      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "license": "MIT",
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
+      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "license": "MIT",
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "license": "MIT"
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
+      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
+      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
+      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
+      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.20.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
+      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-      "version": "4.1.0",
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-      "version": "5.0.0",
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.10.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-      "version": "2.3.0",
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-try": "^2.0.0"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-      "version": "4.1.0",
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+      "version": "1.1.11",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.24.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
+        "type-fest": "^0.20.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.2",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
-        "node": ">=6.0.0"
+        "node": "*"
       }
     },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.6",
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.57.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.14",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "license": "MIT"
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/schemas": {
+      "version": "29.6.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sinclair/typebox": "^0.27.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4809,10 +5161,152 @@
         "url": "https://opencollective.com/unts"
       }
     },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
+      "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
+      "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
+      "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
+      "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
+      "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
+      "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.39.0.tgz",
+      "integrity": "sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
+      "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
+      "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
+      "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
+      "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.36.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.36.0.tgz",
-      "integrity": "sha512-5KtoW8UWmwFKQ96aQL3LlRXX16IMwyzMq/jSSVIIyAANiE1doaQsx/KRyhAvpHlPjPiSU/AYX/8m+lQ9VToxFQ==",
+      "version": "4.39.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz",
+      "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==",
       "cpu": [
         "x64"
       ],
@@ -4834,6 +5328,45 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
+      "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
+      "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
+      "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@scarf/scarf": {
       "version": "1.3.0",
       "hasInstallScript": true,
@@ -7120,6 +7653,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "node_modules/bl": {
       "version": "4.1.0",
       "license": "MIT",
@@ -9488,12 +10031,12 @@
         "node": ">=12"
       }
     },
-    "node_modules/esbuild/node_modules/@esbuild/linux-x64": {
+    "node_modules/esbuild/node_modules/@esbuild/linux-arm64": {
       "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
-      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz",
+      "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==",
       "cpu": [
-        "x64"
+        "arm64"
       ],
       "dev": true,
       "optional": true,
@@ -10440,6 +10983,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "dev": true,
@@ -10768,6 +11318,20 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "license": "MIT",
@@ -11742,6 +12306,25 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/grunt-html2js/node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
     "node_modules/grunt-html2js/node_modules/glob-parent": {
       "version": "3.1.0",
       "dev": true,
@@ -15628,6 +16211,13 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "node_modules/nan": {
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+      "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/nanoid": {
       "version": "3.3.7",
       "dev": true,
@@ -19302,6 +19892,19 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/rollup/node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
+      "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/rollup/node_modules/@rollup/rollup-linux-x64-gnu": {
       "version": "4.17.2",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
@@ -21852,176 +22455,528 @@
         "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/upper-case": {
-      "version": "1.1.3",
+    "node_modules/upper-case": {
+      "version": "1.1.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/uri-path": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "WTFPL OR MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "license": "MIT"
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "3.4.0",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/v8flags": {
+      "version": "3.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/validate-npm-package-name": {
+      "version": "5.0.1",
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/verror": {
+      "version": "1.10.0",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "node_modules/vite": {
+      "version": "5.1.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.19.3",
+        "postcss": "^8.4.35",
+        "rollup": "^4.2.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
+      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
+      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
+      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
+      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
+      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
+      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
+      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
+      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
+      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "punycode": "^2.1.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/uri-path": {
-      "version": "1.0.0",
+    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
+      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "WTFPL OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=12"
       }
     },
-    "node_modules/urix": {
-      "version": "0.1.0",
+    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
+      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "license": "MIT"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/use": {
-      "version": "3.1.1",
+    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
+      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "cpu": [
+        "loong64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "license": "MIT"
+    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
+      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
+    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
+      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">=12"
       }
     },
-    "node_modules/uuid": {
-      "version": "3.4.0",
+    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
+      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "uuid": "bin/uuid"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
+    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
+      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
-      "license": "MIT"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/v8flags": {
-      "version": "3.2.0",
+    "node_modules/vite/node_modules/@esbuild/linux-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
+      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=12"
       }
     },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
+    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/validate-npm-package-name": {
-      "version": "5.0.1",
-      "license": "ISC",
+    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
+      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/vary": {
-      "version": "1.1.2",
+    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
+      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=12"
       }
     },
-    "node_modules/verror": {
-      "version": "1.10.0",
+    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
+      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "engines": [
-        "node >=0.6.0"
+      "optional": true,
+      "os": [
+        "win32"
       ],
-      "license": "MIT",
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/vite": {
-      "version": "5.1.7",
+    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
+      "version": "0.19.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
+      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esbuild": "^0.19.3",
-        "postcss": "^8.4.35",
-        "rollup": "^4.2.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
+        "node": ">=12"
       }
     },
-    "node_modules/vite/node_modules/@esbuild/linux-x64": {
+    "node_modules/vite/node_modules/@esbuild/win32-x64": {
       "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
+      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
       "optional": true,
       "os": [
-        "linux"
+        "win32"
       ],
       "engines": {
         "node": ">=12"
diff --git a/package.json b/package.json
index 213af03e0b..f7528af6f0 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "@angular/service-worker": "^17.3.6",
     "@angular/upgrade": "^17.3.6",
     "@ctrl/ngx-emoji-mart": "^9.2.0",
+    "@esbuild/linux-arm64": "^0.25.2",
     "@ngneat/hotkeys": "^4.0.0",
     "@uirouter/angular": "^13.0",
     "@uirouter/angular-hybrid": "^17.1.0",
@@ -167,7 +168,7 @@
     "@nx/nx-darwin-x64": "^18.0",
     "@nx/nx-linux-x64-gnu": "^18.0",
     "@nx/nx-win32-x64-msvc": "^18.0",
-    "@rollup/rollup-linux-x64-gnu": "*",
-    "@esbuild/linux-x64": "*"
+    "@rollup/rollup-linux-arm64-gnu": "*",
+    "@rollup/rollup-linux-x64-gnu": "*"
   }
 }

From 259b6bff2b7d1bd6e0fc5cb84ae13163b867583a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 3 Apr 2025 05:55:21 +1100
Subject: [PATCH 265/776] chore: save esbuild to devdependencies

---
 package-lock.json | 3 ++-
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d75d9be7fd..27cbb859f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,6 @@
         "@angular/service-worker": "^17.3.6",
         "@angular/upgrade": "^17.3.6",
         "@ctrl/ngx-emoji-mart": "^9.2.0",
-        "@esbuild/linux-arm64": "^0.25.2",
         "@ngneat/hotkeys": "^4.0.0",
         "@uirouter/angular": "^13.0",
         "@uirouter/angular-hybrid": "^17.1.0",
@@ -87,6 +86,7 @@
         "@angular/language-service": "^17.3.6",
         "@commitlint/cli": "^16.0.1",
         "@commitlint/config-conventional": "^17",
+        "@esbuild/linux-arm64": "^0.25.2",
         "@types/angular": "1.5.11",
         "@types/canvas-confetti": "^1.6.0",
         "@types/d3": "^3.5.17",
@@ -3317,6 +3317,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "os": [
         "linux"
       ],
diff --git a/package.json b/package.json
index f7528af6f0..21f1550c7d 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "@angular/service-worker": "^17.3.6",
     "@angular/upgrade": "^17.3.6",
     "@ctrl/ngx-emoji-mart": "^9.2.0",
-    "@esbuild/linux-arm64": "^0.25.2",
     "@ngneat/hotkeys": "^4.0.0",
     "@uirouter/angular": "^13.0",
     "@uirouter/angular-hybrid": "^17.1.0",
@@ -104,6 +103,7 @@
     "@angular/language-service": "^17.3.6",
     "@commitlint/cli": "^16.0.1",
     "@commitlint/config-conventional": "^17",
+    "@esbuild/linux-arm64": "^0.25.2",
     "@types/angular": "1.5.11",
     "@types/canvas-confetti": "^1.6.0",
     "@types/d3": "^3.5.17",

From 2cf62152524ec728c73aaa23f678bbce9ae6b4d1 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 3 Apr 2025 06:38:52 +1100
Subject: [PATCH 266/776] fix: lock ng2-pdf-viewer to 10.2.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 27cbb859f3..08ea1b3931 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,7 @@
         "ng-csv": "0.2.3",
         "ng-file-upload": "~5.0.9",
         "ng-flex-layout": "^17.3.7-beta.1",
-        "ng2-pdf-viewer": "^10.2",
+        "ng2-pdf-viewer": "10.2.2",
         "ngx-bootstrap": "^6.1.0",
         "ngx-entity-service": "^0.0.40",
         "ngx-lottie": "^11.0.2",
diff --git a/package.json b/package.json
index 21f1550c7d..e3858d8c5f 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "ng-csv": "0.2.3",
     "ng-file-upload": "~5.0.9",
     "ng-flex-layout": "^17.3.7-beta.1",
-    "ng2-pdf-viewer": "^10.2",
+    "ng2-pdf-viewer": "10.2.2",
     "ngx-bootstrap": "^6.1.0",
     "ngx-entity-service": "^0.0.40",
     "ngx-lottie": "^11.0.2",

From 245aef11f8e18f0d87e5d3ebcbc947fb5f7928f2 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 3 Apr 2025 17:54:25 +1100
Subject: [PATCH 267/776] chore: add arm64 nx linux

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index e8ce3e55c0..c0dde0bf2a 100644
--- a/package.json
+++ b/package.json
@@ -166,6 +166,7 @@
     "@nx/nx-darwin-arm64": "^18.0",
     "@nx/nx-darwin-x64": "^18.0",
     "@nx/nx-linux-x64-gnu": "^18.0",
+    "@nx/nx-linux-arm64-gnu": "^18.0",
     "@nx/nx-win32-x64-msvc": "^18.0",
     "@rollup/rollup-linux-arm64-gnu": "*",
     "@rollup/rollup-linux-x64-gnu": "*"

From b4b1113605bda33e5380447dc37b896a212eeee0 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 3 Apr 2025 20:23:25 +1100
Subject: [PATCH 268/776] chore: remove arm specific package

---
 package-lock.json | 18 +-----------------
 package.json      |  1 -
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eb39475619..a473b68baf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -83,7 +83,6 @@
         "@angular/language-service": "^17.3.6",
         "@commitlint/cli": "^16.0.1",
         "@commitlint/config-conventional": "^17",
-        "@esbuild/linux-arm64": "^0.25.2",
         "@types/angular": "1.5.11",
         "@types/canvas-confetti": "^1.6.0",
         "@types/d3": "^3.5.17",
@@ -149,6 +148,7 @@
       "optionalDependencies": {
         "@nx/nx-darwin-arm64": "^18.0",
         "@nx/nx-darwin-x64": "^18.0",
+        "@nx/nx-linux-arm64-gnu": "^18.0",
         "@nx/nx-linux-x64-gnu": "^18.0",
         "@nx/nx-win32-x64-msvc": "^18.0",
         "@rollup/rollup-linux-arm64-gnu": "*",
@@ -3307,21 +3307,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
-      "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@esbuild/linux-ia32": {
       "version": "0.20.1",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
@@ -5053,7 +5038,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
diff --git a/package.json b/package.json
index c0dde0bf2a..efb04e7e42 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,6 @@
     "@angular/language-service": "^17.3.6",
     "@commitlint/cli": "^16.0.1",
     "@commitlint/config-conventional": "^17",
-    "@esbuild/linux-arm64": "^0.25.2",
     "@types/angular": "1.5.11",
     "@types/canvas-confetti": "^1.6.0",
     "@types/d3": "^3.5.17",

From 922b6ac7992f0bd996360d14ddf09a83fff12747 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 3 Apr 2025 20:23:25 +1100
Subject: [PATCH 269/776] chore: remove arm specific package

---
 package-lock.json | 18 +-----------------
 package.json      |  1 -
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eb39475619..a473b68baf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -83,7 +83,6 @@
         "@angular/language-service": "^17.3.6",
         "@commitlint/cli": "^16.0.1",
         "@commitlint/config-conventional": "^17",
-        "@esbuild/linux-arm64": "^0.25.2",
         "@types/angular": "1.5.11",
         "@types/canvas-confetti": "^1.6.0",
         "@types/d3": "^3.5.17",
@@ -149,6 +148,7 @@
       "optionalDependencies": {
         "@nx/nx-darwin-arm64": "^18.0",
         "@nx/nx-darwin-x64": "^18.0",
+        "@nx/nx-linux-arm64-gnu": "^18.0",
         "@nx/nx-linux-x64-gnu": "^18.0",
         "@nx/nx-win32-x64-msvc": "^18.0",
         "@rollup/rollup-linux-arm64-gnu": "*",
@@ -3307,21 +3307,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
-      "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@esbuild/linux-ia32": {
       "version": "0.20.1",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
@@ -5053,7 +5038,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
diff --git a/package.json b/package.json
index e8ce3e55c0..58def090b9 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,6 @@
     "@angular/language-service": "^17.3.6",
     "@commitlint/cli": "^16.0.1",
     "@commitlint/config-conventional": "^17",
-    "@esbuild/linux-arm64": "^0.25.2",
     "@types/angular": "1.5.11",
     "@types/canvas-confetti": "^1.6.0",
     "@types/d3": "^3.5.17",

From 1f265221220023d8857f77e4243650ebdf93e32d Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 4 Apr 2025 11:08:59 +1100
Subject: [PATCH 270/776] chore: progress switch to refresh token secure cookie

---
 .../api/services/authentication.service.ts    | 28 ++++++++++++++++++-
 .../states/sign-in/sign-in.component.html     | 14 ++++++++--
 .../states/sign-in/sign-in.component.ts       | 13 +++++----
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index 0e84fa22e5..efb2e3a046 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -22,6 +22,32 @@ export class AuthenticationService {
     this.AUTH_URL = `${this.doubtfireConstants.API_URL}/auth`;
   }
 
+  /**
+   * Use the refresh token cookie and username to get a new access token.
+   */
+  public refreshAccessToken() {
+    this.httpClient.post(this.AUTH_URL + '/refresh-token/access-token', {}).subscribe({
+      next: (response) => {
+
+      },
+      error: (error) => {
+        console.error('Error refreshing token:', error);
+      },
+    });
+  }
+
+  public getRefreshToken() {
+    this.httpClient.post(this.AUTH_URL + '/refresh-token', {}).subscribe({
+      next: (response) => {
+        console.log(response);
+        this.refreshAccessToken();
+      },
+      error: (error) => {
+        console.error('Error refreshing token:', error);
+      },
+    });
+  }
+
   public checkUserCookie(): void {
     const userData = JSON.parse(localStorage.getItem(this.USERNAME_KEY));
 
@@ -59,13 +85,13 @@ export class AuthenticationService {
   public saveCurrentUser(
     remember: boolean = localStorage.getItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN) === 'true',
   ): void {
+    // this.getRefreshToken();
     if (remember && this.userService.currentUser.id) {
       localStorage.setItem(this.USERNAME_KEY, JSON.stringify(this.userService.currentUser));
       localStorage.setItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN, 'true');
       localStorage.setItem(this.DOUBTFIRE_LOGIN_TIME, JSON.stringify(new Date().getTime()));
     } else {
       localStorage.removeItem(this.USERNAME_KEY);
-      localStorage.setItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN, 'false');
       localStorage.removeItem(this.DOUBTFIRE_LOGIN_TIME);
     }
   }
diff --git a/src/app/sessions/states/sign-in/sign-in.component.html b/src/app/sessions/states/sign-in/sign-in.component.html
index cf7b12c70c..4108af6d1a 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.html
+++ b/src/app/sessions/states/sign-in/sign-in.component.html
@@ -12,7 +12,14 @@ <h1 class="welcome-heading flex flex-row place-content-start">
         </h1>
         <form
           #form="ngForm"
-          (ngSubmit)="signIn({username: formData.username, password: formData.password})"
+          (ngSubmit)="
+            signIn({
+              username: formData.username,
+              password: formData.password,
+              remember: formData.remember,
+              autoLogin: formData.autoLogin
+            })
+          "
           class="sign-in-form flex flex-col"
         >
           @if (showCredentials) {
@@ -36,9 +43,12 @@ <h1 class="welcome-heading flex flex-row place-content-start">
           }
           @if (!showCredentials) {
             <mat-checkbox matInput name="autoLogin" [(ngModel)]="formData.autoLogin"
-              >Login via Institution</mat-checkbox
+              >Automatically redirect</mat-checkbox
             >
           }
+          <mat-checkbox matInput name="remember" [(ngModel)]="formData.remember"
+              >Stay logged in</mat-checkbox
+            >
           <button
             class="w-full"
             mat-flat-button
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index 1ac97cca73..532a95dee3 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -49,8 +49,8 @@ export class SignInComponent implements OnInit {
     this.formData = {
       username: '',
       password: '',
-      remember: false,
-      autoLogin: localStorage.getItem('autoLogin') ? true : false,
+      remember: localStorage.getItem(this.authService.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN) == 'true',
+      autoLogin: localStorage.getItem('autoLogin') == 'true',
     };
     // Check for SSO
     this.globalState.hideHeader();
@@ -69,12 +69,12 @@ export class SignInComponent implements OnInit {
           return this.signIn({
             auth_token: this.transition.params().authToken,
             username: this.transition.params().username,
-            remember: true,
+            remember: this.formData.remember,
           });
         } else if (this.formData.autoLogin) {
           return wait.then(() => {
             // Double check in case changed in the meantime
-            if (this.formData.autoLogin) {
+            if (this.formData.autoLogin && this.formData.remember) {
               this.redirectToSSO();
             }
           });
@@ -124,8 +124,11 @@ export class SignInComponent implements OnInit {
       return this.redirectToSSO();
     }
 
-    signInCredentials.remember = true;
     this.signingIn = true;
+    localStorage.setItem(
+      this.authService.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN,
+      signInCredentials.remember ? 'true' : 'false',
+    );
 
     this.authService.signIn(signInCredentials).subscribe({
       next: () => {

From 5d3a36e8f16e8993c5607241112c490361a31c97 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 4 Apr 2025 21:19:42 +1100
Subject: [PATCH 271/776] feat: rebuild auth with refresh token

---
 src/app/api/models/user/user.ts               |  64 ++--
 .../api/services/authentication.service.ts    | 299 +++++++++++-------
 src/app/api/services/user.service.ts          |  11 -
 src/app/common/header/header.component.html   |   2 +-
 src/app/config/runtime/runtime.coffee         |  27 +-
 src/app/doubtfire.states.ts                   |   2 +-
 src/app/home/states/home/home.component.ts    |   4 -
 .../states/index/global-state.service.ts      |  12 +-
 .../states/sign-in/sign-in.component.html     |   6 +-
 .../states/sign-in/sign-in.component.ts       |  69 ++--
 10 files changed, 284 insertions(+), 212 deletions(-)

diff --git a/src/app/api/models/user/user.ts b/src/app/api/models/user/user.ts
index 10357a1898..a613870b28 100644
--- a/src/app/api/models/user/user.ts
+++ b/src/app/api/models/user/user.ts
@@ -1,31 +1,34 @@
-import { HttpClient } from '@angular/common/http';
-import { Entity, EntityMapping } from 'ngx-entity-service';
-import { Observable, map } from 'rxjs';
-import { AppInjector } from 'src/app/app-injector';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { AuthenticationService } from '../doubtfire-model';
+import {HttpClient} from '@angular/common/http';
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {Observable, map} from 'rxjs';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {AuthenticationService} from '../doubtfire-model';
 
 export type Tutor = User;
 
 export class User extends Entity {
-  id: number;
-  firstName: string;
-  lastName: string;
-  optInToResearch: boolean;
-  studentId: string;
-  email: string;
-  username: string;
-  nickname: string;
-  systemRole: 'Admin' | 'Convenor' | 'Tutor' | 'Student' | 'Auditor';
-  receiveTaskNotifications: boolean;
-  receivePortfolioNotifications: boolean;
-  receiveFeedbackNotifications: boolean;
-  hasRunFirstTimeSetup: boolean;
-  authenticationToken: string;
-  pronouns: string | null;
-  acceptedTiiEula: boolean;
+  public id: number;
+  public firstName: string;
+  public lastName: string;
+  public optInToResearch: boolean;
+  public studentId: string;
+  public email: string;
+  public username: string;
+  public nickname: string;
+  public systemRole: 'Admin' | 'Convenor' | 'Tutor' | 'Student' | 'Auditor';
+  public receiveTaskNotifications: boolean;
+  public receivePortfolioNotifications: boolean;
+  public receiveFeedbackNotifications: boolean;
+  public hasRunFirstTimeSetup: boolean;
+  public authenticationToken: string;
+  public pronouns: string | null;
+  public acceptedTiiEula: boolean;
 
-  public override toJson<T extends Entity>(mappingData: EntityMapping<T>, ignoreKeys?: string[]): object {
+  public override toJson<T extends Entity>(
+    mappingData: EntityMapping<T>,
+    ignoreKeys?: string[],
+  ): object {
     return {
       user: super.toJson(mappingData, ignoreKeys),
     };
@@ -42,7 +45,8 @@ export class User extends Entity {
   public get name(): string {
     const fn = this.firstName.slice(0, 11);
     const sn = this.lastName.slice(0, 11);
-    const nn = this.nickname && this.nickname.trim() ? ` (${this.nickname.trim().slice(0, 11)})` : '';
+    const nn =
+      this.nickname && this.nickname.trim() ? ` (${this.nickname.trim().slice(0, 11)})` : '';
     return `${fn} ${sn}${nn}`;
   }
 
@@ -60,10 +64,12 @@ export class User extends Entity {
   public acceptTiiEula(): Observable<boolean> {
     const httpClient = AppInjector.get(HttpClient);
     const uri = `${AppInjector.get(DoubtfireConstants).API_URL}/tii_eula/users/${this.id}/accept`;
-    return httpClient.put(uri, {}).pipe(map(() => {
-      this.acceptedTiiEula = true;
-      AppInjector.get(AuthenticationService).saveCurrentUser();
-      return true;
-    }));
+    return httpClient.put(uri, {}).pipe(
+      map(() => {
+        this.acceptedTiiEula = true;
+        // AppInjector.get(AuthenticationService).saveCurrentUser();
+        return true;
+      }),
+    );
   }
 }
diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index efb2e3a046..cea02c8944 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -5,11 +5,41 @@ import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {StateService, UIRouter, UIRouterGlobals} from '@uirouter/angular';
 import {GlobalStateService, ViewType} from 'src/app/projects/states/index/global-state.service';
 import {AppInjector} from 'src/app/app-injector';
-import {map, Observable} from 'rxjs';
+import {AsyncSubject, catchError, map, Observable} from 'rxjs';
 import {AlertService} from 'src/app/common/services/alert.service';
 
+/**
+ * The format for the data returned from the auth api.
+ */
+interface AuthResponse {
+  user: object;
+  auth_token: string;
+}
+
 @Injectable()
 export class AuthenticationService {
+
+  /**
+   * The URL for the authentication API endpoint
+   */
+  private readonly AUTH_URL: string;
+
+  /**
+   * The key used to store the username in local storage - now removed.
+   */
+  public readonly USERNAME_KEY: string = 'doubtfire_user';
+
+  /**
+   * The key used to store the remember me option in local storage.
+   */
+  public readonly REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN: string =
+    'remember_doubtfire_credentials_token';
+
+  /**
+   * AsyncSubject to indicate when the authentication process is complete.
+   */
+  private authComplete$: AsyncSubject<boolean> = new AsyncSubject<boolean>();
+
   constructor(
     private httpClient: HttpClient,
     private userService: UserService,
@@ -20,127 +50,101 @@ export class AuthenticationService {
     private uiRouterGlobals: UIRouterGlobals,
   ) {
     this.AUTH_URL = `${this.doubtfireConstants.API_URL}/auth`;
+    // Ensure any only user data is removed from local storage
+    localStorage.removeItem(this.USERNAME_KEY);
   }
 
-  /**
-   * Use the refresh token cookie and username to get a new access token.
-   */
-  public refreshAccessToken() {
-    this.httpClient.post(this.AUTH_URL + '/refresh-token/access-token', {}).subscribe({
-      next: (response) => {
+  private actionAuthFailed() {
+    // Complete the auth - so that waiting actions can continue
+    this.authComplete$.next(false);
+    this.authComplete$.complete();
 
-      },
-      error: (error) => {
-        console.error('Error refreshing token:', error);
-      },
-    });
-  }
-
-  public getRefreshToken() {
-    this.httpClient.post(this.AUTH_URL + '/refresh-token', {}).subscribe({
-      next: (response) => {
-        console.log(response);
-        this.refreshAccessToken();
-      },
-      error: (error) => {
-        console.error('Error refreshing token:', error);
-      },
-    });
+    this.signOut(false);
   }
 
-  public checkUserCookie(): void {
-    const userData = JSON.parse(localStorage.getItem(this.USERNAME_KEY));
+  /**
+   * Attempt to login using the refresh token secure cookie.
+   * This requires the remember option to be true - and the server to have sent a
+   * secure cookie.
+   * @param loginResultCallback - Callback function to indicate success or failure of login.
+   */
+  public attemptLoginUsingRefreshToken(loginResultCallback: (result: boolean) => void): void {
+    // Check we have indication of secure cookie in local storage
+    const remember: boolean = this.rememberMe;
 
-    // Exit if no user data
-    if (!userData || !userData.id) {
+    if (!remember) {
+      loginResultCallback(false);
       return;
     }
 
-    // Get current user from the user service - ensure the object exists there
-    const user = this.userService.cache.getOrCreate(userData.id, this.userService, {
-      username: userData.username,
+    // Attempt to get an access token using the refresh token cookie
+    this.httpClient.post(this.AUTH_URL + '/access-token', {}).subscribe({
+      next: (response: AuthResponse | null) => {
+        if (response && response.auth_token) {
+          this.setupUserFromResponse(response);
+          loginResultCallback(true);
+        } else {
+          this.actionAuthFailed();
+          loginResultCallback(false);
+        }
+      },
+      error: (_error) => {
+        // Will occur on 404 when the refresh token cookie is not present
+        this.actionAuthFailed();
+        loginResultCallback(false);
+      },
     });
-
-    // Merge in the cached data
-    Object.assign(user, userData);
-
-    if (this.tryChangeUser(user)) {
-      this.userService.currentUser = user;
-
-      const resetTime = new Date(
-        Number.parseInt(localStorage.getItem(this.DOUBTFIRE_LOGIN_TIME)) + 60 * 60 * 1000,
-      );
-      const waitTime = resetTime.valueOf() - new Date().valueOf();
-
-      setTimeout(() => this.updateAuth(), waitTime);
-    }
-  }
-
-  private readonly AUTH_URL: string;
-  public readonly USERNAME_KEY: string = 'doubtfire_user';
-  public readonly REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN: string =
-    'remember_doubtfire_credentials_token';
-  public readonly DOUBTFIRE_LOGIN_TIME: string = 'doubtfire_login_time';
-
-  public saveCurrentUser(
-    remember: boolean = localStorage.getItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN) === 'true',
-  ): void {
-    // this.getRefreshToken();
-    if (remember && this.userService.currentUser.id) {
-      localStorage.setItem(this.USERNAME_KEY, JSON.stringify(this.userService.currentUser));
-      localStorage.setItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN, 'true');
-      localStorage.setItem(this.DOUBTFIRE_LOGIN_TIME, JSON.stringify(new Date().getTime()));
-    } else {
-      localStorage.removeItem(this.USERNAME_KEY);
-      localStorage.removeItem(this.DOUBTFIRE_LOGIN_TIME);
-    }
   }
 
+  /**
+   * Check if the user is authenticated.
+   *
+   * @returns true if the user is authenticated, false otherwise.
+   */
   public isAuthenticated(): boolean {
-    return this.userService.currentUser.id !== undefined;
+    return (
+      this.userService.currentUser.id !== undefined &&
+      !!this.userService.currentUser.authenticationToken
+    );
   }
 
-  private updateAuth() {
-    if (!this.isAuthenticated()) {
-      return;
-    }
+  public get rememberMe(): boolean {
+    return localStorage.getItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN) === 'true';
+  }
 
-    const remember: boolean =
-      localStorage.getItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN) === 'true';
-    localStorage.setItem(this.DOUBTFIRE_LOGIN_TIME, JSON.stringify(new Date().getTime()));
-
-    this.httpClient
-      .put(this.AUTH_URL, {
-        username: this.userService.currentUser.username,
-        remember: remember,
-      })
-      .subscribe({
-        next: (response) => {
-          this.userService.currentUser.authenticationToken = response['auth_token'];
-          this.saveCurrentUser(remember);
-
-          // Update auth each hour
-          setTimeout(() => this.updateAuth(), 1000 * 60 * 60);
-        },
-      });
+  public set rememberMe(remember: boolean) {
+    localStorage.setItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN, String(remember));
   }
 
-  private tryChangeUser(user: User, remember?: boolean) {
-    if (user) {
-      // Clear the current user object and populate it with the new values.
-      // Note how the actual user object reference doesn't change.
-      // delete currentUser[prop] for prop of currentUser
-      // _.extend currentUser, user
-      this.userService.currentUser = user;
-      this.saveCurrentUser(remember);
+  /**
+   * Get a new access token - and delete the old one.
+   *
+   * @returns void
+   */
+  private cycleAccessToken() {
+    const remember: boolean = this.rememberMe;
 
-      return true;
-    } else {
-      return false;
+    // We cant get a new token if there is no refresh token cookie
+    if (!this.isAuthenticated() || !remember) {
+      return;
     }
+
+    // Attempt to get a new access token using the refresh token cookie
+    this.attemptLoginUsingRefreshToken((result: boolean) => {
+      if (result) {
+        console.log('Successfully refreshed access token');
+      }
+    });
   }
 
-  private readonly validRoles: string[] = ['anon', 'Student', 'Tutor', 'Convenor', 'Admin', 'Auditor'];
+  private readonly validRoles: string[] = [
+    'anon',
+    'Student',
+    'Tutor',
+    'Convenor',
+    'Admin',
+    'Auditor',
+  ];
 
   private isValidRoleWhitelist(roleWhitelist: string[]) {
     return roleWhitelist.filter((role: string) => this.validRoles.includes(role)).length !== 0;
@@ -158,6 +162,53 @@ export class AuthenticationService {
     );
   }
 
+  /**
+   * Use the user service to get or create a user object, and update it
+   * from the response. Ensure that the authentication token is set.
+   *
+   * @param response the response from the authentication API
+   */
+  private setupUserFromResponse(response: AuthResponse): void {
+    // Extract relevant data from response and construct user object to store in cache.
+    const user: User = this.userService.cache.getOrCreate(
+      response.user['id'],
+      this.userService,
+      response.user,
+    );
+
+    // Set the user's authentication token for access to api.
+    user.authenticationToken = response['auth_token'];
+
+    // Record the current user
+    this.userService.currentUser = user;
+
+    // Load everything!
+    AppInjector.get(GlobalStateService).loadGlobals();
+
+    // Update token in one hour
+    setTimeout(() => this.cycleAccessToken(), 1000 * 60 * 60);
+
+    // Inidcate that the authentication was successful
+    this.authComplete$.next(true);
+    this.authComplete$.complete();
+  }
+
+  /**
+   * Register a callback to be called when the authentication process is complete.
+   * This is used by the runtime.coffee for now to check authorisation after login
+   * completes. The callback will be called with true if user is authorised and if
+   * not will redirect to another page.
+   *
+   * @param callback the callback function to call
+   */
+  public afterAuthCall(callback: (result: boolean) => void): void {
+    this.authComplete$.subscribe({
+      next: (result) => {
+        callback(result);
+      }
+    });
+  }
+
   public signIn(
     userCredentials:
       | {
@@ -170,39 +221,40 @@ export class AuthenticationService {
           username: string;
           remember: boolean;
         },
-  ): Observable<any> {
+  ): Observable<void> {
     return this.httpClient.post(this.AUTH_URL, userCredentials).pipe(
-      map((response: any) => {
-        // Extract relevant data from response and construct user object to store in cache.
-        const user: User = this.userService.cache.getOrCreate(
-          response['user']['id'],
-          this.userService,
-          response['user'],
-        );
-
-        user.authenticationToken = response['auth_token'];
-
-        if (this.tryChangeUser(user, userCredentials.remember)) {
-          AppInjector.get(GlobalStateService).loadGlobals();
-        } else {
-          return new Error('Failed to change user');
-        }
+      map((response: AuthResponse) => {
+        this.setupUserFromResponse(response);
+      }),
+      catchError((_error, caught: Observable<void>) => {
+        this.authComplete$.next(false);
+        this.authComplete$.complete();
 
-        // Update token in one hour
-        setTimeout(() => this.updateAuth(), 1000 * 60 * 60);
+        return caught;
       }),
     );
   }
 
   public signOut(ssoSignOut = true): void {
+    // This function is called after the token is deleted...
     const doSignOut = () => {
-      this.tryChangeUser(this.userService.anonymousUser, false);
+      // Setup ability to auth again
+      this.authComplete$.complete();
+      this.authComplete$ = new AsyncSubject<boolean>();
+
+      // Change the current user to the anonymous user
+      this.userService.currentUser = this.userService.anonymousUser;
+
+      // Clear global state
       const globalStateService = AppInjector.get(GlobalStateService);
+      globalStateService.clearUnitsAndProjects();
+      this.userService.cache.clear();
+
+      // Trigger the UI changes
       globalStateService.hideHeader();
       globalStateService.setView(ViewType.OTHER);
-      globalStateService.clearUnitsAndProjects();
 
-      // if string is not null
+      // if we have a signout URL, redirect to it
       if (ssoSignOut && this.doubtfireConstants.SignoutURL) {
         window.location.assign(this.doubtfireConstants.SignoutURL);
       } else {
@@ -210,8 +262,9 @@ export class AuthenticationService {
       }
     };
 
+    // If we have a token, delete it...
     if (this.userService.currentUser.authenticationToken) {
-      this.httpClient.delete(this.AUTH_URL).subscribe({
+      this.httpClient.delete(this.AUTH_URL, {params: {remember: false}}).subscribe({
         next: (_response) => doSignOut(),
         error: (_response) => doSignOut(),
       });
@@ -234,4 +287,6 @@ export class AuthenticationService {
       }),
     );
   }
+
+
 }
diff --git a/src/app/api/services/user.service.ts b/src/app/api/services/user.service.ts
index 3473607c02..9a9998c2d2 100644
--- a/src/app/api/services/user.service.ts
+++ b/src/app/api/services/user.service.ts
@@ -72,17 +72,6 @@ export class UserService extends CachedEntityService<User> {
     this._currentUser = user;
   }
 
-  // Specific to the User entity
-  public override update(pathIds: object | User, options?: RequestOptions<User>): Observable<User> {
-    return super.update(pathIds, options).pipe(
-      tap((user) => {
-        if (user === this.currentUser) {
-          AppInjector.get(AuthenticationService).saveCurrentUser();
-        }
-      })
-    );
-  }
-
   public getTutors(): Observable<User[]> {
     return this.query(undefined, { endpointFormat: this.tutorEndpointFormat });
   }
diff --git a/src/app/common/header/header.component.html b/src/app/common/header/header.component.html
index f6bb52f08c..185a818593 100644
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
@@ -72,7 +72,7 @@
     </mat-menu>
 
     <button mat-button [matMenuTriggerFor]="menu2">
-      <user-icon [size]="32"></user-icon>
+      <user-icon [size]="32" [user]="currentUser"></user-icon>
     </button>
     <mat-menu #menu2="matMenu">
       <button mat-menu-item uiSref="edit_profile">
diff --git a/src/app/config/runtime/runtime.coffee b/src/app/config/runtime/runtime.coffee
index bd6cd78354..b5b9f95f0d 100644
--- a/src/app/config/runtime/runtime.coffee
+++ b/src/app/config/runtime/runtime.coffee
@@ -9,26 +9,15 @@ angular.module('doubtfire.config.runtime', [])
   editableThemes.bs3.inputClass = 'input-sm'
   editableThemes.bs3.buttonsClass = 'btn-sm'
 
-  serialize = (obj, prefix) ->
-    str = []
-    for p, v of obj
-      k = if prefix then prefix + "[" + p + "]" else p
-      if typeof v == "object"
-        str.push(serialize(v, k))
-      else
-        str.push(encodeURIComponent(k) + "=" + encodeURIComponent(v))
-
-    str.join("&")
-
   handleUnauthorisedDest = (toState) ->
     if authenticationService.isAuthenticated()
       $state.go "unauthorised"
     else if $state.current.name isnt "sign_in"
-      $state.go "sign_in", { dest: toState.name }
+      $state.go "sign_in"
 
   handleTokenTimeout = ->
     if $state.current.name isnt "timeout"
-      $state.go "timeout", { dest: $state.current.name, params: serialize($state.params) }
+      $state.go "timeout"
 
   handleUnauthorised = ->
     handleUnauthorisedDest($state.current)
@@ -46,7 +35,13 @@ angular.module('doubtfire.config.runtime', [])
     toState = trans.to()
     return true unless toState.data.roleWhitelist
 
-    unless authenticationService.isAuthorised toState.data.roleWhitelist
-      handleUnauthorisedDest(toState)
-      return false
+    # Get the auth service to check this when the auth is complete
+    authenticationService.afterAuthCall(
+      (isAuthenticated) ->
+        unless isAuthenticated && authenticationService.isAuthorised(toState.data.roleWhitelist)
+          handleUnauthorisedDest(toState)
+    )
+
+    # We can always transition... but may have to redirect after auth call...
+    return true
 )
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 07ded93064..92f55f0c21 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -176,7 +176,7 @@ const WelcomeState: NgHybridStateDeclaration = {
  */
 const SignInState: NgHybridStateDeclaration = {
   name: 'sign_in',
-  url: '/sign_in?dest&params&authToken&username',
+  url: '/sign_in?authToken&username',
   views: {
     main: {
       component: SignInComponent,
diff --git a/src/app/home/states/home/home.component.ts b/src/app/home/states/home/home.component.ts
index ece46282a3..e066368acf 100644
--- a/src/app/home/states/home/home.component.ts
+++ b/src/app/home/states/home/home.component.ts
@@ -46,10 +46,6 @@ export class HomeComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    if (this.userService.isAnonymousUser()) {
-      this.router.stateService.go('sign_in');
-    }
-
     this.AnalyticsService.event('Home', 'Viewed Home page');
     this.globalState.setView(ViewType.OTHER);
 
diff --git a/src/app/projects/states/index/global-state.service.ts b/src/app/projects/states/index/global-state.service.ts
index a05b7705de..1376818555 100644
--- a/src/app/projects/states/index/global-state.service.ts
+++ b/src/app/projects/states/index/global-state.service.ts
@@ -118,17 +118,16 @@ export class GlobalStateService implements OnDestroy {
     this.loadedUnits = this.unitService.cache;
     this.currentUserProjects = this.projectService.cache;
 
-    this.authenticationService.checkUserCookie();
-
-    setTimeout(() => {
-      if (this.authenticationService.isAuthenticated()) {
+    // Try to login using the refresh token
+    this.authenticationService.attemptLoginUsingRefreshToken((result: boolean) => {
+      if (result) {
         this.loadGlobals();
       } else {
         // not loading anything as no user - just redirect to sign in
         this.isLoadingSubject.next(false);
         this.router.stateService.go('sign_in');
       }
-    }, 800);
+    });
 
     // this is a hack to workaround horrific IOS "feature"
     // https://stackoverflow.com/questions/37112218/css3-100vh-not-constant-in-mobile-browser
@@ -205,9 +204,8 @@ export class GlobalStateService implements OnDestroy {
     this.isLoadingSubject.next(true);
     this.userService.cache.clear();
     this.clearUnitsAndProjects();
-    this.authenticationService.signOut();
     this.isLoadingSubject.next(false);
-    this.router.stateService.go('sign_in');
+    this.authenticationService.signOut();
   }
 
   public ngOnDestroy(): void {
diff --git a/src/app/sessions/states/sign-in/sign-in.component.html b/src/app/sessions/states/sign-in/sign-in.component.html
index 4108af6d1a..18a47084f4 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.html
+++ b/src/app/sessions/states/sign-in/sign-in.component.html
@@ -1,7 +1,7 @@
 <section class="welcome flex flex-row custom-md-h-screen">
   <f-hero-sidebar class="sidebar self-start flex-col h-full"></f-hero-sidebar>
   <section class="content flex flex-col custom-md-h-screen">
-    <div class="container">
+    <div class="container" *ngIf="!isLoading">
       <div class="subcontainer">
         <div class="wordmark flex-row place-content-start">
           <img src="../../../assets/images/logo-bw.svg" width="40px" alt="Homepage Logo" />
@@ -47,8 +47,8 @@ <h1 class="welcome-heading flex flex-row place-content-start">
             >
           }
           <mat-checkbox matInput name="remember" [(ngModel)]="formData.remember"
-              >Stay logged in</mat-checkbox
-            >
+            >Stay logged in</mat-checkbox
+          >
           <button
             class="w-full"
             mat-flat-button
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index 532a95dee3..b39a1ab73a 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -1,6 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, Inject, OnInit } from '@angular/core';
 import { StateService, Transition } from '@uirouter/core';
+import { BehaviorSubject } from 'rxjs';
 import { AuthenticationService } from 'src/app/api/services/authentication.service';
 import { AlertService } from 'src/app/common/services/alert.service';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
@@ -27,14 +28,16 @@ type signInData =
   styleUrls: ['./sign-in.component.scss'],
 })
 export class SignInComponent implements OnInit {
-  signingIn: boolean;
-  showCredentials = false;
-  invalidCredentials: boolean;
-  api: string;
-  SSOLoginUrl: any;
-  authMethodLoaded: boolean;
-  externalName: any;
-  formData: signInData;
+  public signingIn: boolean;
+  public showCredentials: boolean = false;
+  public invalidCredentials: boolean;
+  public api: string;
+  public SSOLoginUrl: string;
+  public authMethodLoaded: boolean;
+  public externalName: BehaviorSubject<string>;
+  public formData: signInData;
+  public isLoading: boolean = true;
+
   constructor(
     private authService: AuthenticationService,
     private state: StateService,
@@ -57,9 +60,13 @@ export class SignInComponent implements OnInit {
     this.api = this.constants.API_URL;
     this.externalName = this.constants.ExternalName;
 
+    this.attemptRefreshTokenSignIn();
+
     // wait 2 seconds with rxjs
     const wait = new Promise((resolve) => setTimeout(resolve, 2000));
     this.http.get(`${this.constants.API_URL}/auth/method`).subscribe((response: any) => {
+      this.isLoading = false;
+
       // if there is a string in response.data.redirect_to
       this.SSOLoginUrl = response.redirect_to || false;
 
@@ -95,13 +102,29 @@ export class SignInComponent implements OnInit {
         this.authMethodFailed = true;
         this.error = err;
 
-        // return after waiting 1500 with the wait promise
+        // return after waiting with the wait promise
         return wait.then();
       };
+  }
 
-    if (this.authService.isAuthenticated()) {
-      this.state.go('home');
-    }
+  /**
+   * Perform the actions needed when the user successfully signs in.
+   */
+  private actionSignInSuccess(): void {
+    this.globalState.loadGlobals();
+    this.state.go('home');
+  }
+
+  /**
+   * Try to sign in using the refresh token cookie.
+   */
+  private attemptRefreshTokenSignIn(): void {
+    // Attempt to get an access token using the refresh token cookie
+    this.authService.attemptLoginUsingRefreshToken((loggedIn: boolean) => {
+      if (loggedIn) {
+        this.actionSignInSuccess();
+      }
+    });
   }
 
   /**
@@ -119,20 +142,30 @@ export class SignInComponent implements OnInit {
     }
   }
 
-  signIn(signInCredentials: signInData): void {
+  /**
+   * Sign in using the provided credentials. For SSO, this will redirect to the SSO login URL
+   * if the auth token is not provided. Then when the api redirects hack to us, with the auth token,
+   * we will then use the passed login auth token to get an access token.#form
+   *
+   * For all logins, if rememberMe is set, the api will also send a secure cookie
+   * with the refresh token. This will be used to get an access token when the user
+   * refreshes the page / returns to the app / etc.
+   */
+  public signIn(signInCredentials: signInData): void {
+    // Save remember me state
+    this.authService.rememberMe = signInCredentials.remember;
+
+    // Redirect to SSO if we do not have an auth token already (from SSO callback)
     if (this.SSOLoginUrl && !signInCredentials.auth_token) {
       return this.redirectToSSO();
     }
 
+    // Indicate we are signing in...
     this.signingIn = true;
-    localStorage.setItem(
-      this.authService.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN,
-      signInCredentials.remember ? 'true' : 'false',
-    );
 
     this.authService.signIn(signInCredentials).subscribe({
       next: () => {
-        this.state.go('home');
+        this.actionSignInSuccess();
       },
       error: (err) => {
         this.signingIn = false;

From 2ec2418298946ff7baf2064d374cb5dd42307222 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 4 Apr 2025 21:37:13 +1100
Subject: [PATCH 272/776] refactor: adjust handling of remember me

---
 src/app/api/services/authentication.service.ts     |  2 +-
 .../sessions/states/sign-in/sign-in.component.html | 14 +++++++-------
 .../sessions/states/sign-in/sign-in.component.ts   |  9 +++------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index cea02c8944..99717c44a7 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -109,7 +109,7 @@ export class AuthenticationService {
   }
 
   public get rememberMe(): boolean {
-    return localStorage.getItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN) === 'true';
+    return localStorage.getItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN) !== 'false';
   }
 
   public set rememberMe(remember: boolean) {
diff --git a/src/app/sessions/states/sign-in/sign-in.component.html b/src/app/sessions/states/sign-in/sign-in.component.html
index 18a47084f4..a8162799ac 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.html
+++ b/src/app/sessions/states/sign-in/sign-in.component.html
@@ -16,7 +16,7 @@ <h1 class="welcome-heading flex flex-row place-content-start">
             signIn({
               username: formData.username,
               password: formData.password,
-              remember: formData.remember,
+              remember: authService.rememberMe,
               autoLogin: formData.autoLogin
             })
           "
@@ -42,13 +42,13 @@ <h1 class="welcome-heading flex flex-row place-content-start">
             </mat-form-field>
           }
           @if (!showCredentials) {
-            <mat-checkbox matInput name="autoLogin" [(ngModel)]="formData.autoLogin"
-              >Automatically redirect</mat-checkbox
-            >
+            <mat-checkbox matInput name="autoLogin" [(ngModel)]="formData.autoLogin">
+              Automatically redirect
+            </mat-checkbox>
           }
-          <mat-checkbox matInput name="remember" [(ngModel)]="formData.remember"
-            >Stay logged in</mat-checkbox
-          >
+          <mat-checkbox matInput name="remember" [(ngModel)]="authService.rememberMe">
+            Stay logged in
+          </mat-checkbox>
           <button
             class="w-full"
             mat-flat-button
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index b39a1ab73a..4ddde5f7b1 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -52,7 +52,7 @@ export class SignInComponent implements OnInit {
     this.formData = {
       username: '',
       password: '',
-      remember: localStorage.getItem(this.authService.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN) == 'true',
+      remember: this.authService.rememberMe,
       autoLogin: localStorage.getItem('autoLogin') == 'true',
     };
     // Check for SSO
@@ -76,12 +76,12 @@ export class SignInComponent implements OnInit {
           return this.signIn({
             auth_token: this.transition.params().authToken,
             username: this.transition.params().username,
-            remember: this.formData.remember,
+            remember: this.authService.rememberMe,
           });
         } else if (this.formData.autoLogin) {
           return wait.then(() => {
             // Double check in case changed in the meantime
-            if (this.formData.autoLogin && this.formData.remember) {
+            if (this.formData.autoLogin && this.authService.rememberMe) {
               this.redirectToSSO();
             }
           });
@@ -152,9 +152,6 @@ export class SignInComponent implements OnInit {
    * refreshes the page / returns to the app / etc.
    */
   public signIn(signInCredentials: signInData): void {
-    // Save remember me state
-    this.authService.rememberMe = signInCredentials.remember;
-
     // Redirect to SSO if we do not have an auth token already (from SSO callback)
     if (this.SSOLoginUrl && !signInCredentials.auth_token) {
       return this.redirectToSSO();

From b6f683175db6ab9549b8b4481ab54bb89700016a Mon Sep 17 00:00:00 2001
From: Jude Roz <juderoz@icloud.com>
Date: Wed, 9 Apr 2025 20:29:42 +1000
Subject: [PATCH 273/776] feat(comments): enhanced drafting for messages using
 localStorage

---
 .../common/services/comment-draft.service.ts  |  29 ++
 .../task-comment-composer.component.html      |  31 +-
 .../task-comment-composer.component.scss      |  30 ++
 .../task-comment-composer.component.ts        | 445 +++++++++++++-----
 4 files changed, 397 insertions(+), 138 deletions(-)
 create mode 100644 src/app/common/services/comment-draft.service.ts

diff --git a/src/app/common/services/comment-draft.service.ts b/src/app/common/services/comment-draft.service.ts
new file mode 100644
index 0000000000..3394435564
--- /dev/null
+++ b/src/app/common/services/comment-draft.service.ts
@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+import { Observable, of } from 'rxjs';
+
+@Injectable({ providedIn: 'root' })
+export class CommentDraftService {
+  private readonly PREFIX = 'df_comment_draft_'; // Prefix for localStorage keys
+
+  getDraft(projectId: number, taskDefinitionId: number): Observable<string> {
+    const key = this.generateKey(projectId, taskDefinitionId);
+    const draft = localStorage.getItem(key);
+    return of(draft || ''); // Return empty string if no draft exists
+  }
+
+  saveDraft(projectId: number, taskDefinitionId: number, text: string): Observable<boolean> {
+    const key = this.generateKey(projectId, taskDefinitionId);
+    localStorage.setItem(key, text);
+    return of(true); // Simulate successful save
+  }
+
+  clearDraft(projectId: number, taskDefinitionId: number): Observable<boolean> {
+    const key = this.generateKey(projectId, taskDefinitionId);
+    localStorage.removeItem(key);
+    return of(true); // Simulate successful deletion
+  }
+
+  private generateKey(projectId: number, taskDefinitionId: number): string {
+    return `${this.PREFIX}p${projectId}_td${taskDefinitionId}`;
+  }
+}
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.html b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
index 448f88f46c..5fc620bcb9 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.html
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
@@ -10,11 +10,12 @@
 ></emoji-mart>
 
 @if (task) {
-  <div id="replyContainer" [hidden]="originalComment === null">
+  <div id="replyContainer" [hidden]="!originalComment">
     <div>
       <div class="replying-wrap">
         Replying to:
-        <b>{{ originalComment !== null ? originalComment.author.name : '' }}</b>
+
+        <b>{{ originalComment?.author?.name }}</b>
         <button
           id="cancelReplyButton"
           (click)="cancelReply()"
@@ -24,7 +25,7 @@
           <mat-icon inline="true" aria-label="Quit cross icon">close</mat-icon>
         </button>
       </div>
-      <p>{{ originalComment !== null ? originalComment.text : '' }}</p>
+      <p>{{ originalComment?.text }}</p>
     </div>
   </div>
 }
@@ -56,7 +57,6 @@
 >
   <div fxLayout="row" fxLayoutAlign="space-around center" class="composer-container">
     <div class="composer-action-group" [@shrinkgrow]="$userIsTyping | async">
-      <!-- if active -->
       <div fxLayout="row" fxLayoutAlign="start center">
         @if ($userIsTyping | async) {
           <button
@@ -73,20 +73,6 @@
           </button>
         }
 
-        <!-- <button
-          [hidden]="shrinkGrowToggle"
-          *ngIf="isStaff"
-          matTooltip="Create a Real Talk discussion"
-          matTooltipShowDelay="400"
-          mat-icon-button
-          class="btn-no-outline"
-          type="button"
-          aria-label="launch real talk took"
-          (click)="openDiscussionComposer()"
-        >
-          <mat-icon>crisis_alert</mat-icon>
-        </button> -->
-
         @if (isStaff) {
           <button
             [hidden]="$userIsTyping | async"
@@ -119,7 +105,7 @@
             multiple="multiple"
             accept="audio/*,image/*,.pdf"
             style="display: none"
-            (change)="uploadFiles($event.target.files)"
+            (change)="uploadFiles($event)"
           />
         </button>
 
@@ -140,7 +126,7 @@
     <div
       id="textFieldContainer"
       [class.active]="$userIsTyping | async"
-      [ngClass]="{recording: recording}"
+      [ngClass]="{recording: recording, 'draft-loaded': isDraftLoaded}"
     >
       <div
         [hidden]="recording"
@@ -152,6 +138,7 @@
         [attr.contenteditable]="contentEditableValue() && !recording"
         (keydown.enter)="send($event)"
         (keydown)="keyTyped()"
+        (input)="onInputChange($event)"
         placeholder="Aa"
         name="commentComposer"
         enterkeyhint="send"
@@ -169,9 +156,7 @@
           id="emojiButton"
           (click)="this.showEmojiPicker = !this.showEmojiPicker"
           aria-label="Emoji picker button"
-        >
-          emoji_emotions</mat-icon
-        >
+        >emoji_emotions</mat-icon>
       </div>
     </div>
   </div>
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.scss b/src/app/tasks/task-comment-composer/task-comment-composer.component.scss
index a79e6a5be4..d83ccd18a0 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.scss
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.scss
@@ -64,6 +64,36 @@ $emoji-color: lighten(
   }
 }
 
+
+#textField.draft-loaded {
+  animation: draftFadeIn 0.3s ease-in;
+}
+
+@keyframes draftFadeIn {
+  from { opacity: 0.5; background-color: rgba(0, 0, 255, 0.05); }
+  to { opacity: 1; background-color: transparent; }
+}
+
+.draft-loaded {
+  animation: blueGlowFade 1.5s ease;
+  border-radius: 4px;
+}
+
+@keyframes blueGlowFade {
+  0% {
+    background-color: rgba(66, 133, 244, 0.2);
+    box-shadow: 0 0 8px 2px rgba(66, 133, 244, 0.6);
+  }
+  70% {
+    background-color: rgba(66, 133, 244, 0.1);
+    box-shadow: 0 0 6px 1px rgba(66, 133, 244, 0.3);
+  }
+  100% {
+    background-color: transparent;
+    box-shadow: none;
+  }
+}
+
 #innerButtons {
   align-items: flex-end;
   display: flex;
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index 9a4a3297ea..6a5c49bf44 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -10,6 +10,11 @@ import {
   ElementRef,
   ViewChild,
   DoCheck,
+  OnDestroy,
+  AfterViewInit,
+  ChangeDetectorRef,
+  OnChanges,
+  SimpleChanges
 } from '@angular/core';
 import {trigger, style, animate, transition} from '@angular/animations';
 import {analyticsService} from 'src/app/ajs-upgraded-providers';
@@ -19,71 +24,67 @@ import {EmojiData} from '@ctrl/ngx-emoji-mart/ngx-emoji/';
 import {EmojiService} from 'src/app/common/services/emoji.service';
 import {Task, TaskComment, TaskCommentService} from 'src/app/api/models/doubtfire-model';
 import {TaskCommentsViewerComponent} from '../task-comments-viewer/task-comments-viewer.component';
-import {BehaviorSubject} from 'rxjs';
+import {BehaviorSubject, Subscription} from 'rxjs';
 import {AlertService} from 'src/app/common/services/alert.service';
 
-/**
- * The task comment viewer needs to share data with the Task Comment Composer. The data needed
- * id defined through this interface.
- */
+interface ApiError {
+  error?: string;
+  message?: string;
+  status?: number;
+}
+
 export interface TaskCommentComposerData {
   originalComment: TaskComment;
 }
 
 const ACCEPTED_FILE_TYPES = [
-  'audio/mpeg',
-  'audio/vorbis',
-  'audio/mp4',
-  'audio/ogg',
-  'audio/wav',
-  'audio/x-wav',
-  'audio/webm',
-  'image/png',
-  'image/pdf',
-  'application/pdf',
-  'image/gif',
-  'image/jpg',
-  'image/jpeg',
+  'audio/mpeg', 'audio/vorbis', 'audio/mp4', 'audio/ogg',
+  'audio/wav', 'audio/x-wav', 'audio/webm', 'image/png',
+  'image/pdf', 'application/pdf', 'image/gif', 'image/jpg',
+  'image/jpeg'
 ];
 
-/**
- * The task comment composer is responsible for creating and adding comments to a given task.
- */
 @Component({
   selector: 'task-comment-composer',
   templateUrl: './task-comment-composer.component.html',
   styleUrls: ['./task-comment-composer.component.scss'],
   animations: [
     trigger('shrinkgrow', [
-      // 38.4 and 80 are the precise sizes of the buttons to the left of the input field
       transition('true => false', [style({width: 38.4}), animate('150ms 0ms ease-in-out')]),
       transition('false => true', [style({width: 80}), animate('150ms 0ms ease-in-out')]),
     ]),
   ],
 })
-export class TaskCommentComposerComponent implements DoCheck {
+export class TaskCommentComposerComponent
+  implements OnInit, AfterViewInit, DoCheck, OnDestroy, OnChanges
+{
   @Input() task: Task;
   @Input() sharedData: TaskCommentComposerData;
 
   public $userIsTyping = new BehaviorSubject<boolean>(false);
-
-  comment = {
-    text: '',
-    type: 'text',
-  };
+  private draftSaveSubscription = new Subscription();
+  private readonly DRAFT_KEY_PREFIX = 'task_comment_draft_';
+  public isDraftLoaded = false;
+  private previousTaskId: number;
+  private hasSubmittedComment = false;
+  private submittedTaskIds: Set<number | string> = new Set();
+
+  comment = { text: '', type: 'text' };
+  showEmojiPicker = false;
+  emojiSearchMode = false;
+  emojiRegex: RegExp = /(?:\:)(.*?)(?=\:|$)/;
+  emojiSearchResults: EmojiData[] = [];
+  emojiMatch: string;
+  recording = false;
 
   @ViewChildren('commentInput') input: QueryList<ElementRef>;
   @ViewChildren('cag') cag: QueryList<ElementRef>;
   @ViewChild('uploader') uploader: ElementRef;
 
   differ: KeyValueDiffer<string, any>;
-  showEmojiPicker: boolean = false;
-  emojiSearchMode: boolean = false;
-  emojiRegex: RegExp = /(?:\:)(.*?)(?=\:|$)/;
-  emojiSearchResults: EmojiData[] = [];
-  emojiMatch: string;
-  recording = false;
-  cagStartWidth: number;
+
+  // Add a task content map to store text per task
+  private taskDraftContents: Map<string, string> = new Map();
 
   constructor(
     private differs: KeyValueDiffers,
@@ -94,37 +95,85 @@ export class TaskCommentComposerComponent implements DoCheck {
     @Inject(analyticsService) private analytics,
     private alerts: AlertService,
     @Inject(TaskCommentService) private taskCommentService: TaskCommentService,
+    private cdRef: ChangeDetectorRef
   ) {
     this.differ = this.differs.find({}).create();
+    // Initialize submitted tasks from sessionStorage
+    try {
+      const saved = sessionStorage.getItem('task_comments_submitted');
+      if (saved) {
+        this.submittedTaskIds = new Set(JSON.parse(saved));
+      }
+    } catch (e) {
+      console.error('Error loading submitted tasks:', e);
+    }
   }
 
-  ngDoCheck() {
-    // Check to see if the sharedData has changed
-    const change = this.differ.diff(this.sharedData);
-    if (change) {
-      change.forEachChangedItem((item) => {
-        // If it has changed to be an actual comment
-        if (item != null) {
-          // Set the input field as focused, so the user can start typing
-          // timeout is required
-          setTimeout(() => {
-            this.input.first.nativeElement.focus();
-          });
-        }
-      });
+  ngOnInit() {
+    window.addEventListener('storage', (event) => {
+      console.log('[STORAGE-EVENT]', event);
+    });
+    this.testLocalStorage();
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes.task && changes.task.currentValue !== changes.task.previousValue) {
+      const newTask = changes.task.currentValue;
+      const previousTask = changes.task.previousValue;
+
+      if (previousTask && !this.hasSubmittedComment) {
+        this.saveDraftForTask(previousTask);
+      }
+
+      this.hasSubmittedComment = false;
+
+      this.previousTaskId = newTask?.id;
+
+      this.clearInput();
+
+      if (newTask) {
+        this.loadDraftForTask(newTask);
+      }
     }
   }
 
-  get originalComment(): TaskComment {
-    return this.sharedData.originalComment;
+  ngAfterViewInit() {
+    setTimeout(() => {
+      if (this.task?.id) {
+        this.loadDraftForTask(this.task);
+      }
+    }, 100);
   }
 
-  get isStaff() {
-    return this.task?.unit?.currentUserIsStaff;
+  ngOnDestroy() {
+    if (this.task?.id) {
+      try {
+        const inputElement = this.input?.first?.nativeElement;
+        if (inputElement) {
+          const text = inputElement.innerText.trim();
+          console.log('[DRAFT-DEBUG] On destroy, text to save:',
+            { taskId: this.task.id, length: text.length, preview: text.substring(0, 20) });
+
+          if (text && !this.hasSubmittedComment) {
+            localStorage.setItem(this.getDraftKey(this.task), text);
+          } else {
+          }
+        }
+      } catch (error) {
+      }
+    }
   }
 
-  cancelReply() {
-    this.sharedData.originalComment = null;
+  private testLocalStorage() {
+    try {
+      const testKey = 'test_draft_' + Date.now();
+      localStorage.setItem(testKey, 'test_value');
+      const value = localStorage.getItem(testKey);
+      console.log('LocalStorage test:', value === 'test_value' ? 'Working' : 'Not working');
+      localStorage.removeItem(testKey);
+    } catch (e) {
+      console.error('LocalStorage error:', e);
+    }
   }
 
   contentEditableValue() {
@@ -133,17 +182,162 @@ export class TaskCommentComposerComponent implements DoCheck {
     return isWebkit ? 'plaintext-only' : 'true';
   }
 
-  formatImageName(imageName) {
-    const index = imageName.indexOf('.');
-    let nameString = imageName.substring(0, index);
-    const typeString = imageName.substring(index);
+  get isStaff() {
+    return this.task?.unit?.currentUserIsStaff;
+  }
+
+  // Update onInputChange to reset submitted status
+  onInputChange(event: Event) {
+    const target = event.target as HTMLElement;
+    const text = target.innerText;
+
+    // If user is typing something new after submission, reset the submitted status
+    if (this.task) {
+      const taskKey = this.task.id ||
+        `${this.task.projectId || this.task.project?.id}_${this.task.definition?.id}`;
+
+      // If this was a previously submitted task and user is typing again,
+      // remove from submitted set
+      if (this.submittedTaskIds.has(taskKey) && text.trim()) {
+        this.submittedTaskIds.delete(taskKey);
+
+        // Update session storage
+        try {
+          sessionStorage.setItem('task_comments_submitted',
+            JSON.stringify([...this.submittedTaskIds]));
+        } catch (e) {
+          console.error('Error saving submitted tasks:', e);
+        }
+      }
+
+      const key = this.getDraftKey(this.task);
+      this.taskDraftContents.set(key, text);
+    }
+
+    this.saveCurrentDraft();
+  }
+
+  private getDraftKey(task: Task): string {
+    // If task has an ID, use it
+    if (task.id) {
+      return `${this.DRAFT_KEY_PREFIX}${task.id}`;
+    }
+
+    // For "not started" tasks, create a composite key using only valid properties
+    const projectId = task.projectId || (task.project?.id) || 'unknown';
+    // Fix: Use task.definition.id instead of task.definition_id
+    const definitionId = task.definition?.id || 'unknown';
 
-    if (nameString.length > 20) {
-      nameString = nameString.substring(0, 20) + '..';
+    return `${this.DRAFT_KEY_PREFIX}${projectId}_${definitionId}`;
+  }
+
+  // Update saveDraftForTask to use the taskDraftContents map
+  private saveDraftForTask(task: Task) {
+    if (!task) {
+      return;
     }
 
-    const finalString = nameString + typeString;
-    return finalString;
+    try {
+      const draftKey = this.getDraftKey(task);
+
+      // Get text from map for this specific task
+      let text: string;
+
+      // If it's the current task, get from input directly
+      if (this.task && this.task.id === task.id) {
+        text = this.input?.first?.nativeElement?.innerText?.trim() || '';
+      } else {
+        // Otherwise get from our map
+        text = this.taskDraftContents.get(draftKey) || '';
+      }
+
+      // Rest of the method remains the same
+      if (!text) {
+        return;
+      }
+
+
+      localStorage.setItem(draftKey, text);
+    } catch (error) {
+    }
+  }
+
+  private loadDraftForTask(task: Task) {
+    if (!task) {
+      return;
+    }
+
+    const taskKey = task.id ||
+      `${task.projectId || task.project?.id}_${task.definition?.id}`;
+
+    if (this.submittedTaskIds.has(taskKey)) {
+      return;
+    }
+
+    const draftKey = this.getDraftKey(task);
+    try {
+      const draft = localStorage.getItem(draftKey);
+      console.log('[DRAFT-DEBUG] Draft found?', draft ? 'Yes' : 'No',
+        draft ? { length: draft.length, preview: draft.substring(0, 20) } : '');
+
+      if (!draft) {
+        console.log('[DRAFT-DEBUG] No draft found for task', task.id || 'without ID');
+        return;
+      }
+
+      const maxRetries = 5;
+      const retryWithTimeout = (attempt = 0) => {
+        if (!this.input || !this.input.first || !this.input.first.nativeElement) {
+          if (attempt < maxRetries) {
+            setTimeout(() => retryWithTimeout(attempt + 1), 200);
+            return;
+          } else {
+            return;
+          }
+        }
+
+        this.input.first.nativeElement.innerText = draft;
+        this.isDraftLoaded = true;
+        this.cdRef.detectChanges();
+
+        setTimeout(() => {
+          this.isDraftLoaded = false;
+          this.cdRef.detectChanges();
+        }, 1500);
+      };
+
+      retryWithTimeout();
+    } catch (error) {
+    }
+  }
+
+  private clearInput() {
+    if (this.input?.first?.nativeElement) {
+      this.input.first.nativeElement.innerText = '';
+      this.cdRef.detectChanges();
+    }
+  }
+
+  private saveCurrentDraft() {
+    if (!this.task) return;
+    this.saveDraftForTask(this.task);
+  }
+
+  ngDoCheck() {
+    const change = this.differ.diff(this.sharedData);
+    if (change) {
+      change.forEachChangedItem((item) => {
+        if (item != null) {
+          setTimeout(() => {
+            this.input.first?.nativeElement?.focus();
+          });
+        }
+      });
+    }
+  }
+
+  cancelReply() {
+    this.sharedData.originalComment = null;
   }
 
   recordingMode(): void {
@@ -163,33 +357,23 @@ export class TaskCommentComposerComponent implements DoCheck {
   keyTyped() {
     setTimeout(() => {
       const commentText: string = this.input.first.nativeElement.innerText;
+      this.saveCurrentDraft();
       this.emojiSearchMode = !commentText.includes('`') && this.emojiRegex.test(commentText);
-
       if (this.emojiSearchMode) {
-        // get the cursor position in the content-editable
         const cursorPosition = this.caretOffset();
-
-        // get the text from the start of the string up to the cursor.
         const testText = commentText.slice(0, cursorPosition);
-
-        // within this smaller string, find the last :
         const lastColPos = testText.lastIndexOf(':');
-
-        // The emoji search term will be from the position after the last :
-        // Note, the second parameter is a length not position, so we subtract.
         this.emojiMatch = testText.substr(lastColPos + 1, cursorPosition - lastColPos);
-
         if (this.emojiMatch?.includes(' ')) {
           this.emojiSearchMode = false;
           this.emojiSearchResults = null;
         } else {
-          // results is the list of emoji returned.
           const results = this.emojiSearch.search(this.emojiMatch);
           if (results?.length > 0) {
             this.emojiSearchResults = results.slice(0, 15);
           }
         }
-      } // timeout to ensure that the inner html is updated with the new character.
+      }
     }, 0);
   }
 
@@ -203,30 +387,19 @@ export class TaskCommentComposerComponent implements DoCheck {
 
   private caretOffset() {
     const element = this.input.first.nativeElement;
-    let caretOffset: number = 0;
-    const doc = element.ownerDocument || element.document;
-    const win = doc.defaultView || doc.parentWindow;
-    let sel;
-    if (typeof win.getSelection !== 'undefined') {
-      sel = win.getSelection();
-      if (sel.rangeCount > 0) {
-        const range = win.getSelection().getRangeAt(0);
-        const preCaretRange = range.cloneRange();
-        preCaretRange.selectNodeContents(element);
-        preCaretRange.setEnd(range.endContainer, range.endOffset);
-        caretOffset = preCaretRange.toString().length;
-      }
-    } else if (sel === doc.selection && sel.type !== 'Control') {
-      const textRange = sel.createRange();
-      const preCaretTextRange = doc.body.createTextRange();
-      preCaretTextRange.moveToElementText(element);
-      preCaretTextRange.setEndPoint('EndToEnd', textRange);
-      caretOffset = preCaretTextRange.text.length;
+    let caretOffset = 0;
+    const sel = window.getSelection();
+    if (sel?.rangeCount > 0) {
+      const range = sel.getRangeAt(0);
+      const preCaretRange = range.cloneRange();
+      preCaretRange.selectNodeContents(element);
+      preCaretRange.setEnd(range.endContainer, range.endOffset);
+      caretOffset = preCaretRange.toString().length;
     }
     return caretOffset;
   }
 
-  addEmoji(e): void {
+  addEmoji(e: any) {
     let char: string;
     if (typeof e === 'string') {
       char = e;
@@ -250,29 +423,76 @@ export class TaskCommentComposerComponent implements DoCheck {
       maxWidth: '800px',
       disableClose: true,
     });
-
-    // dialogRef.afterOpened().subscribe((result: any) => {
-    // });
-
-    // dialogRef.afterClosed().subscribe((result: any) => {
-    // });
   }
 
   addComment() {
+
+
     const originalComment = this.sharedData.originalComment;
     if (originalComment != null) {
       this.cancelReply();
+
     }
+
     const text = this.emojiService.nativeEmojiToColons(this.input.first.nativeElement.innerText);
+    console.log('[DRAFT-DEBUG] Comment text prepared for submission:', { length: text.length });
+
+    this.hasSubmittedComment = true;
+
+
+
+    const taskKey = this.task.id ||
+      `${this.task.projectId || this.task.project?.id}_${this.task.definition?.id}`;
+
+    this.submittedTaskIds.add(taskKey);
+
+
+
+    try {
+      sessionStorage.setItem('task_comments_submitted',
+        JSON.stringify([...this.submittedTaskIds]));
+    } catch (e) {
+      console.error('Error saving submitted tasks:', e);
+    }
+
+    if (this.task) {
+      localStorage.removeItem(this.getDraftKey(this.task));
+      this.previousTaskId = this.task.id;
+    }
+
+    this.taskCommentService.addComment(this.task, text, 'text', originalComment).subscribe({
+      next: (tc: TaskComment) => {
+
+        const inputEl = this.input.first.nativeElement;
+        const originalOnInput = inputEl.oninput;
+        inputEl.oninput = null;
 
-    this.taskCommentService.addComment(this.task, text, 'text', originalComment).subscribe(
-      (tc: TaskComment) => {
         this.input.first.nativeElement.innerText = '';
+        console.log('[DRAFT-DEBUG] Cleared input field');
+
+        setTimeout(() => {
+          inputEl.oninput = originalOnInput;
+        }, 100);
+
+
+        if (this.task?.id) {
+          localStorage.removeItem(this.getDraftKey(this.task));
+          console.log('[DRAFT-DEBUG] Double-checked draft removal from localStorage');
+        }
       },
-      (error: any) => {
-        this.alerts.error(error || error?.message, 2000);
-      },
-    );
+      error: (error: ApiError) => {
+        console.log('[DRAFT-DEBUG] Error submitting comment:', error);
+        this.hasSubmittedComment = false;
+        console.log('[DRAFT-DEBUG] Reset hasSubmittedComment flag due to error');
+
+        this.alerts.error(error.error || error.message || 'Failed to add comment', 2000);
+
+        if (this.task?.id) {
+          console.log('[DRAFT-DEBUG] Restoring draft due to submission error');
+          this.saveDraftForTask(this.task);
+        }
+      }
+    });
   }
 
   addCommentWithType(comment: string, type: string) {
@@ -280,8 +500,6 @@ export class TaskCommentComposerComponent implements DoCheck {
       next: (success: TaskComment) => {
         this.comment.text = '';
         this.commentsViewer.scrollDown();
-        console.log('implement - check map comments');
-        //this.task.comments = this.ts.mapComments(this.task.comments);
       },
       error: (message: string) => this.alerts.error(message, 6000),
     });
@@ -291,7 +509,7 @@ export class TaskCommentComposerComponent implements DoCheck {
     this.uploader.nativeElement.click();
   }
 
-  uploadFiles(event) {
+  uploadFiles(event: FileList | any) {
     [...event].forEach((file) => {
       if (
         ACCEPTED_FILE_TYPES.includes(file.type) ||
@@ -305,8 +523,7 @@ export class TaskCommentComposerComponent implements DoCheck {
     });
   }
 
-  // # Upload image files as comments to a given task
-  postAttachmentComment(file) {
+  postAttachmentComment(file: File) {
     this.taskCommentService.addComment(this.task, file, 'file', null).subscribe(
       (tc: TaskComment) => {
         this.commentsViewer.scrollDown();
@@ -318,8 +535,6 @@ export class TaskCommentComposerComponent implements DoCheck {
   }
 }
 
-// The discussion prompt composer dialog Component
-// eslint-disable-next-line max-classes-per-file
 @Component({
   selector: 'discussion-prompt-composer-dialog.html',
   templateUrl: 'discussion-prompt-composer-dialog.html',
@@ -328,7 +543,7 @@ export class TaskCommentComposerComponent implements DoCheck {
 export class DiscussionComposerDialog implements OnInit {
   constructor(
     public dialogRef: MatDialogRef<DiscussionComposerDialog>,
-    @Inject(MAT_DIALOG_DATA) public data: any,
+    @Inject(MAT_DIALOG_DATA) public data: { task: Task },
   ) {}
 
   ngOnInit() {}

From 032a84db15d746e194467fc7f975720397c4546f Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 10 Apr 2025 10:52:20 +1000
Subject: [PATCH 274/776] chore(release): 10.0.0-1

---
 CHANGELOG.md      | 76 +++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |  4 +--
 package.json      |  2 +-
 3 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b15ccc9c5d..5e6aa2091e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,82 @@
 
 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.
 
+## [10.0.0-1](https://github.com/macite/doubtfire-deploy/compare/v8.0.37...v10.0.0-1) (2025-04-10)
+
+
+### Features
+
+* add comment text to comment area ([5c45415](https://github.com/macite/doubtfire-deploy/commit/5c45415eafb38e221963781e4575480294d74e09))
+* add connected learning outcomes ([9532d9f](https://github.com/macite/doubtfire-deploy/commit/9532d9ffe620d67d7bc83137d59e0a91ecf8a73a))
+* add editor for task feedback templates ([3da7a4b](https://github.com/macite/doubtfire-deploy/commit/3da7a4b54a5892ea99cd365ae439677b0f52ed6f))
+* add feedback template picker to comment composer ([9acc365](https://github.com/macite/doubtfire-deploy/commit/9acc36502dc3fd2365817f73ccc742dd3947e293))
+* add field to connect outcomes ([db2d2bc](https://github.com/macite/doubtfire-deploy/commit/db2d2bc32b19165bac8ff6ba0282a16adffbb815))
+* add glo editor ([4efe876](https://github.com/macite/doubtfire-deploy/commit/4efe87694a426c4b6a55ef943576fe47498166e5))
+* add greeting and summary chip ([ed68317](https://github.com/macite/doubtfire-deploy/commit/ed683174ab7b330a48b2aeacdd65012396357479))
+* add option for institution logo ([5141529](https://github.com/macite/doubtfire-deploy/commit/5141529b1ed37f8ca254e89e1b91edac3139f166))
+* add startpage property to auto scroll to on pdf render ([90830cd](https://github.com/macite/doubtfire-deploy/commit/90830cdba73bcfe564362015b5abaf2c40810f5f))
+* combine outcome and template editor ([c12536b](https://github.com/macite/doubtfire-deploy/commit/c12536bc4375b1ae5f19d4e54d0783b6948921eb))
+* edit feedback chips ([04f8dce](https://github.com/macite/doubtfire-deploy/commit/04f8dce30f79d86637abd6db2aa9fa3aa14d1de2))
+* **feedback-template:** add hierarchical sorting for feedback templates ([8db1844](https://github.com/macite/doubtfire-deploy/commit/8db1844402d080902a9d3938ecc04dd7a2f0340f))
+* **feedback-template:** improve sorting logic for feedback templates ([d3f156a](https://github.com/macite/doubtfire-deploy/commit/d3f156a640e6a3da99c147c4c2303a1af3050f8f))
+* **feedback-template:** merge upstream changes ([0fb1d8a](https://github.com/macite/doubtfire-deploy/commit/0fb1d8abfa3264befddd97e1ce0832359866919d))
+* fetch feedback chips when selecting task in unit editor ([9caeda4](https://github.com/macite/doubtfire-deploy/commit/9caeda4e71946ddb7907027ebf7a54397f11606f))
+* init pdf viewer on page 2 for student submissions ([45cc89e](https://github.com/macite/doubtfire-deploy/commit/45cc89e18cff8fcde66480448eea178940d316a2))
+* make template editor reusable across contexts ([a42f177](https://github.com/macite/doubtfire-deploy/commit/a42f177f61b3f7166edf3b9c93dfd2dcd3949df7))
+* modify fields and operate on learning outcomes ([65ffc4f](https://github.com/macite/doubtfire-deploy/commit/65ffc4f8d61a9d0b2cc7c5f8d13db932436fc4f5))
+* persistent pdf zoom level ([1348da2](https://github.com/macite/doubtfire-deploy/commit/1348da2d345b080002a62a24d717fac15c4b0a92))
+* rebuild auth with refresh token ([5d3a36e](https://github.com/macite/doubtfire-deploy/commit/5d3a36e8f16e8993c5607241112c490361a31c97))
+* show chips on picker ([e54216f](https://github.com/macite/doubtfire-deploy/commit/e54216f8472b67cf9f2ff69c9bcb3355efa90081))
+* suggest task status according to feedback ([95796da](https://github.com/macite/doubtfire-deploy/commit/95796da4e7855bcd76023754d95cec8d033668fc))
+
+
+### Bug Fixes
+
+* adjust ui for nested csv modal ([d7fac6f](https://github.com/macite/doubtfire-deploy/commit/d7fac6f0fb23f060373fd4c40f5e82b960098c77))
+* check difference before updating linked outcomes ([aa0bc76](https://github.com/macite/doubtfire-deploy/commit/aa0bc76d32656dc14d28ebca520e4f90d6d9434e))
+* check for unit context for template csv name ([6ecec84](https://github.com/macite/doubtfire-deploy/commit/6ecec8483222304161f9cda87a8bdf3ecd774bcb))
+* comment console logs ([e86162d](https://github.com/macite/doubtfire-deploy/commit/e86162d1592d8418bab3c889b1d0bbfe3662b86d))
+* correct a typo in /edit_profile ([4b7901f](https://github.com/macite/doubtfire-deploy/commit/4b7901fd03d9652230aecb52791313f052d7b53d))
+* correct string manipulation for task period formatting ([aa06cbf](https://github.com/macite/doubtfire-deploy/commit/aa06cbf3a08efa02f508062d47c127289fc8c6fa))
+* display feedback picker chips in color ([6ae0771](https://github.com/macite/doubtfire-deploy/commit/6ae077149d16e5af538d432a9ce2db974298b549))
+* display nested feedback groups in picker ([db93b18](https://github.com/macite/doubtfire-deploy/commit/db93b187cfe6e197a3b6243445809ec6d767d4bd))
+* display task status in coloured chip in feedback editor ([73986e8](https://github.com/macite/doubtfire-deploy/commit/73986e89839603b19f643404e5a48964ac9a3c1b))
+* exclude greeting and summary from selected ([1978e54](https://github.com/macite/doubtfire-deploy/commit/1978e5410f6aa9314252ae3cf922917033f551f0))
+* feedback picker search ([3a5e02e](https://github.com/macite/doubtfire-deploy/commit/3a5e02e2f7864b9e1ea4f8d49ce69d23addbcc5a))
+* **feedback-template-editor:** add missing operator ([a1f220c](https://github.com/macite/doubtfire-deploy/commit/a1f220c9f5462a2b91035eb936f3ff25b7d4cd67))
+* **feedback-template-editor:** improve feedback template sorting logic ([bd48c40](https://github.com/macite/doubtfire-deploy/commit/bd48c40c4c3b0a3d67d41373b624ed8b3b754f4a))
+* **feedback-template:** ensure sorting defaults are applied ([96f7555](https://github.com/macite/doubtfire-deploy/commit/96f7555f9dfcf4c62ee3dd54b9e9e74087bec47a))
+* focus on composer input after selecting chip ([95afdff](https://github.com/macite/doubtfire-deploy/commit/95afdff12aac914bb8af8727f8b8d960bc3b072c))
+* hide feedback group comment text ([55a6625](https://github.com/macite/doubtfire-deploy/commit/55a662584c4b8b6123335bcbc5149a9f0f0701d8))
+* hide picker on task change ([198b7f9](https://github.com/macite/doubtfire-deploy/commit/198b7f9d0ccad631059ed5e1ad5487604582074b))
+* hide summary instead of comment text for groups ([7644cba](https://github.com/macite/doubtfire-deploy/commit/7644cba92f92f5c261501c1907f7f5418538e3a7))
+* hide template editor on outcome switch ([a3706e9](https://github.com/macite/doubtfire-deploy/commit/a3706e9394b78edf9ec15030246c98acca9d3852))
+* lock ng2-pdf-viewer to 10.2.2 ([2cf6215](https://github.com/macite/doubtfire-deploy/commit/2cf62152524ec728c73aaa23f678bbce9ae6b4d1))
+* only get feedback chips if staff ([7f4381e](https://github.com/macite/doubtfire-deploy/commit/7f4381e1179400642821068d1acdba346a2969a2))
+* organise outcome and feedback csv functionality ([641f1d9](https://github.com/macite/doubtfire-deploy/commit/641f1d9f75177d48b3911c300e23c901e0a603e1))
+* prevent saving empty items ([0eed547](https://github.com/macite/doubtfire-deploy/commit/0eed5477940db511cee09bbdb7ccb0adde57cbbf))
+* refine feedback editor ([f410cfe](https://github.com/macite/doubtfire-deploy/commit/f410cfe47b0c242f1a164c6345bc4d29f5659f6a))
+* refresh context when changing task defs ([c078bcf](https://github.com/macite/doubtfire-deploy/commit/c078bcf40198c5495d4c94354fab411d3e0ee934))
+* remove duplicate alert ([955d0a1](https://github.com/macite/doubtfire-deploy/commit/955d0a17ae23be77954145ba189ac8bb0aa90da0))
+* remove glo outcome specific csv buttons ([579c491](https://github.com/macite/doubtfire-deploy/commit/579c49170808a6fcca1bfd67f0923f0339255463))
+* remove selected outcomes from dropdown ([5494384](https://github.com/macite/doubtfire-deploy/commit/5494384f1a4becf462dd031e89fae2734ed46e55))
+* reply to position and wrapping ([e065c46](https://github.com/macite/doubtfire-deploy/commit/e065c46c3fe6689a7b295a3f91a576eabc11f7bd))
+* reset template table for new outcome ([7585c1c](https://github.com/macite/doubtfire-deploy/commit/7585c1c60ca8fe168084ec3d857aec4856bfb0db))
+* save connected outcomes ([eb3cf6d](https://github.com/macite/doubtfire-deploy/commit/eb3cf6daf99b893642336efb48ed58bc9c8b8207))
+* save linked outcomes upon selection ([07f103d](https://github.com/macite/doubtfire-deploy/commit/07f103de46defa2a78f5d7c43030e67255c0d5fe))
+* save to proper cache and clean up ([80edff2](https://github.com/macite/doubtfire-deploy/commit/80edff2ef04137b3d38ccdd252788cfb40f458f0))
+* show description for connected outcome selection ([0f2c164](https://github.com/macite/doubtfire-deploy/commit/0f2c164579491298b81849cc110301229f2ca5af))
+* show picker above composer and below comments ([ef524f1](https://github.com/macite/doubtfire-deploy/commit/ef524f1b048b3bfe1781307a34e1a5fe364943a4))
+* show proper selected outcome or template ([0ac3881](https://github.com/macite/doubtfire-deploy/commit/0ac3881e7f6d0f5b7ddeb85e5e8f9e6835c5dba6))
+* support hot reloading on windows ([247330e](https://github.com/macite/doubtfire-deploy/commit/247330e46d74186519dbcbbef8378b508eaca83f))
+* support windows build ([3594528](https://github.com/macite/doubtfire-deploy/commit/35945288c73052afd28209a7381335af2b14ba10))
+* template editor not showing if new ([6cfe379](https://github.com/macite/doubtfire-deploy/commit/6cfe37999fa7f484e1b89f4dbe657b99907adae1))
+* tlo csv url ([73588d8](https://github.com/macite/doubtfire-deploy/commit/73588d886118861bbd3e5ae380cddc7baa532dbb))
+* update packages ([e5a57f8](https://github.com/macite/doubtfire-deploy/commit/e5a57f8ba3669345a272b308b0c892fdab4843ef))
+* upon save update entity in frontend ([a128744](https://github.com/macite/doubtfire-deploy/commit/a1287449b945295ced60e86a21bcaab67ed0f9bd))
+* use icon instead of color for template task status ([11a3993](https://github.com/macite/doubtfire-deploy/commit/11a399324ee64af901f44f28de3526cbd7650bac))
+* use task status color for recommended button ([174cde0](https://github.com/macite/doubtfire-deploy/commit/174cde0022d0c728d2c6408d40129d6c343aa91d))
+
 ### [8.0.37](https://github.com/macite/doubtfire-deploy/compare/v8.0.36...v8.0.37) (2025-03-10)
 
 
diff --git a/package-lock.json b/package-lock.json
index a473b68baf..27e23b1a59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "8.0.37",
+  "version": "10.0.0-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "8.0.37",
+      "version": "10.0.0-1",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index efb04e7e42..bd474ca920 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "8.0.37",
+  "version": "10.0.0-1",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 622768a06112910d5ba79061689fc0ba486982a5 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 10 Apr 2025 20:32:22 +1000
Subject: [PATCH 275/776] fix: correct handling of errors on auth

---
 src/app/api/services/authentication.service.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index 99717c44a7..1f398df711 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -5,7 +5,7 @@ import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {StateService, UIRouter, UIRouterGlobals} from '@uirouter/angular';
 import {GlobalStateService, ViewType} from 'src/app/projects/states/index/global-state.service';
 import {AppInjector} from 'src/app/app-injector';
-import {AsyncSubject, catchError, map, Observable} from 'rxjs';
+import {AsyncSubject, catchError, map, Observable, throwError} from 'rxjs';
 import {AlertService} from 'src/app/common/services/alert.service';
 
 /**
@@ -226,11 +226,11 @@ export class AuthenticationService {
       map((response: AuthResponse) => {
         this.setupUserFromResponse(response);
       }),
-      catchError((_error, caught: Observable<void>) => {
+      catchError((error) => {
         this.authComplete$.next(false);
         this.authComplete$.complete();
 
-        return caught;
+        return throwError(() => error);
       }),
     );
   }

From de15aba4280b25cf85f799bbaec14033444f9ef9 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 10 Apr 2025 20:48:10 +1000
Subject: [PATCH 276/776] chore(release): 10.0.0-2

---
 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 5e6aa2091e..1c6dbfc756 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.
 
+## [10.0.0-2](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-1...v10.0.0-2) (2025-04-10)
+
+
+### Bug Fixes
+
+* correct handling of errors on auth ([622768a](https://github.com/macite/doubtfire-deploy/commit/622768a06112910d5ba79061689fc0ba486982a5))
+
 ## [10.0.0-1](https://github.com/macite/doubtfire-deploy/compare/v8.0.37...v10.0.0-1) (2025-04-10)
 
 
diff --git a/package-lock.json b/package-lock.json
index 27e23b1a59..7a51bc9f9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-1",
+  "version": "10.0.0-2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-1",
+      "version": "10.0.0-2",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index bd474ca920..99877af91e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-1",
+  "version": "10.0.0-2",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 2e087d267c8bfde633550823aed460379a643ad9 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 10 Apr 2025 22:23:00 +1000
Subject: [PATCH 277/776] fix: correct auth callback

---
 src/app/api/services/authentication.service.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index 1f398df711..07609fb5fb 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -55,10 +55,6 @@ export class AuthenticationService {
   }
 
   private actionAuthFailed() {
-    // Complete the auth - so that waiting actions can continue
-    this.authComplete$.next(false);
-    this.authComplete$.complete();
-
     this.signOut(false);
   }
 
@@ -227,8 +223,8 @@ export class AuthenticationService {
         this.setupUserFromResponse(response);
       }),
       catchError((error) => {
-        this.authComplete$.next(false);
-        this.authComplete$.complete();
+        // this.authComplete$.next(false);
+        // this.authComplete$.complete();
 
         return throwError(() => error);
       }),

From fc624caa79fbf5f7ce4e8dc318ae1c7d52f61770 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Thu, 10 Apr 2025 22:24:28 +1000
Subject: [PATCH 278/776] chore(release): 10.0.0-3

---
 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 1c6dbfc756..714505fb3c 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.
 
+## [10.0.0-3](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-2...v10.0.0-3) (2025-04-10)
+
+
+### Bug Fixes
+
+* correct auth callback ([2e087d2](https://github.com/macite/doubtfire-deploy/commit/2e087d267c8bfde633550823aed460379a643ad9))
+
 ## [10.0.0-2](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-1...v10.0.0-2) (2025-04-10)
 
 
diff --git a/package-lock.json b/package-lock.json
index 7a51bc9f9b..d17b37dadd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-2",
+  "version": "10.0.0-3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-2",
+      "version": "10.0.0-3",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 99877af91e..6568146ba8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-2",
+  "version": "10.0.0-3",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From f33173409f0804da4de24e1e6ec53971896b28e9 Mon Sep 17 00:00:00 2001
From: Jude Roz <juderoz@icloud.com>
Date: Sun, 13 Apr 2025 19:21:36 +1000
Subject: [PATCH 279/776] feat(comments): enhanced drafting for messages using
 localStorage

---
 .../task-comment-composer.component.html      |  28 +++-
 .../task-comment-composer.component.ts        | 156 ++++++++++++++----
 2 files changed, 142 insertions(+), 42 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.html b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
index 5fc620bcb9..9dedcccdd7 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.html
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.html
@@ -10,12 +10,11 @@
 ></emoji-mart>
 
 @if (task) {
-  <div id="replyContainer" [hidden]="!originalComment">
+  <div id="replyContainer" [hidden]="originalComment === null">
     <div>
       <div class="replying-wrap">
         Replying to:
-
-        <b>{{ originalComment?.author?.name }}</b>
+        <b>{{ originalComment !== null ? originalComment.author.name : '' }}</b>
         <button
           id="cancelReplyButton"
           (click)="cancelReply()"
@@ -25,7 +24,7 @@
           <mat-icon inline="true" aria-label="Quit cross icon">close</mat-icon>
         </button>
       </div>
-      <p>{{ originalComment?.text }}</p>
+      <p>{{ originalComment !== null ? originalComment.text : '' }}</p>
     </div>
   </div>
 }
@@ -57,6 +56,7 @@
 >
   <div fxLayout="row" fxLayoutAlign="space-around center" class="composer-container">
     <div class="composer-action-group" [@shrinkgrow]="$userIsTyping | async">
+      <!-- if active -->
       <div fxLayout="row" fxLayoutAlign="start center">
         @if ($userIsTyping | async) {
           <button
@@ -73,6 +73,20 @@
           </button>
         }
 
+        <!-- <button
+          [hidden]="shrinkGrowToggle"
+          *ngIf="isStaff"
+          matTooltip="Create a Real Talk discussion"
+          matTooltipShowDelay="400"
+          mat-icon-button
+          class="btn-no-outline"
+          type="button"
+          aria-label="launch real talk took"
+          (click)="openDiscussionComposer()"
+        >
+          <mat-icon>crisis_alert</mat-icon>
+        </button> -->
+
         @if (isStaff) {
           <button
             [hidden]="$userIsTyping | async"
@@ -105,7 +119,7 @@
             multiple="multiple"
             accept="audio/*,image/*,.pdf"
             style="display: none"
-            (change)="uploadFiles($event)"
+            (change)="uploadFiles($event.target.files)"
           />
         </button>
 
@@ -156,7 +170,9 @@
           id="emojiButton"
           (click)="this.showEmojiPicker = !this.showEmojiPicker"
           aria-label="Emoji picker button"
-        >emoji_emotions</mat-icon>
+        >
+          emoji_emotions</mat-icon
+        >
       </div>
     </div>
   </div>
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index 6a5c49bf44..c765a91d42 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -33,17 +33,34 @@ interface ApiError {
   status?: number;
 }
 
+/**
+ * The task comment viewer needs to share data with the Task Comment Composer. The data needed
+ * id defined through this interface.
+ */
+
 export interface TaskCommentComposerData {
   originalComment: TaskComment;
 }
 
 const ACCEPTED_FILE_TYPES = [
-  'audio/mpeg', 'audio/vorbis', 'audio/mp4', 'audio/ogg',
-  'audio/wav', 'audio/x-wav', 'audio/webm', 'image/png',
-  'image/pdf', 'application/pdf', 'image/gif', 'image/jpg',
-  'image/jpeg'
+  'audio/mpeg',
+  'audio/vorbis',
+  'audio/mp4',
+  'audio/ogg',
+  'audio/wav',
+  'audio/x-wav',
+  'audio/webm',
+  'image/png',
+  'image/pdf',
+  'application/pdf',
+  'image/gif',
+  'image/jpg',
+  'image/jpeg',
 ];
 
+/**
+ * The task comment composer is responsible for creating and adding comments to a given task.
+ */
 @Component({
   selector: 'task-comment-composer',
   templateUrl: './task-comment-composer.component.html',
@@ -69,19 +86,27 @@ export class TaskCommentComposerComponent
   private hasSubmittedComment = false;
   private submittedTaskIds: Set<number | string> = new Set();
 
-  comment = { text: '', type: 'text' };
+  comment = {
+    text: '',
+    type: 'text',
+  };
+
+  @ViewChildren('commentInput') input: QueryList<ElementRef>;
+  @ViewChildren('cag') cag: QueryList<ElementRef>;
+  @ViewChild('uploader') uploader: ElementRef;
+
+  differ: KeyValueDiffer<string, any>;
   showEmojiPicker = false;
   emojiSearchMode = false;
   emojiRegex: RegExp = /(?:\:)(.*?)(?=\:|$)/;
   emojiSearchResults: EmojiData[] = [];
   emojiMatch: string;
   recording = false;
+  cagStartWidth: number;
+
+
 
-  @ViewChildren('commentInput') input: QueryList<ElementRef>;
-  @ViewChildren('cag') cag: QueryList<ElementRef>;
-  @ViewChild('uploader') uploader: ElementRef;
 
-  differ: KeyValueDiffer<string, any>;
 
   // Add a task content map to store text per task
   private taskDraftContents: Map<string, string> = new Map();
@@ -98,7 +123,7 @@ export class TaskCommentComposerComponent
     private cdRef: ChangeDetectorRef
   ) {
     this.differ = this.differs.find({}).create();
-    // Initialize submitted tasks from sessionStorage
+    // submitted tasks from sessionStorage
     try {
       const saved = sessionStorage.getItem('task_comments_submitted');
       if (saved) {
@@ -128,6 +153,7 @@ export class TaskCommentComposerComponent
       this.hasSubmittedComment = false;
 
       this.previousTaskId = newTask?.id;
+      this.cancelReply();
 
       this.clearInput();
 
@@ -151,7 +177,7 @@ export class TaskCommentComposerComponent
         const inputElement = this.input?.first?.nativeElement;
         if (inputElement) {
           const text = inputElement.innerText.trim();
-          console.log('[DRAFT-DEBUG] On destroy, text to save:',
+          console.log('text to save:',
             { taskId: this.task.id, length: text.length, preview: text.substring(0, 20) });
 
           if (text && !this.hasSubmittedComment) {
@@ -176,15 +202,9 @@ export class TaskCommentComposerComponent
     }
   }
 
-  contentEditableValue() {
-    const UA = navigator.userAgent;
-    const isWebkit = /WebKit/.test(UA) && !/Edge/.test(UA);
-    return isWebkit ? 'plaintext-only' : 'true';
-  }
 
-  get isStaff() {
-    return this.task?.unit?.currentUserIsStaff;
-  }
+
+
 
   // Update onInputChange to reset submitted status
   onInputChange(event: Event) {
@@ -277,11 +297,11 @@ export class TaskCommentComposerComponent
     const draftKey = this.getDraftKey(task);
     try {
       const draft = localStorage.getItem(draftKey);
-      console.log('[DRAFT-DEBUG] Draft found?', draft ? 'Yes' : 'No',
+      console.log('Draft found?', draft ? 'Yes' : 'No',
         draft ? { length: draft.length, preview: draft.substring(0, 20) } : '');
 
       if (!draft) {
-        console.log('[DRAFT-DEBUG] No draft found for task', task.id || 'without ID');
+        console.log('No draft found for task', task.id || 'without ID');
         return;
       }
 
@@ -324,22 +344,53 @@ export class TaskCommentComposerComponent
   }
 
   ngDoCheck() {
+    // Check to see if the sharedData has changed
     const change = this.differ.diff(this.sharedData);
     if (change) {
       change.forEachChangedItem((item) => {
+        // If it has changed to be an actual comment
         if (item != null) {
+          // Set the input field as focused, so the user can start typing
+          // timeout is required
           setTimeout(() => {
-            this.input.first?.nativeElement?.focus();
+            this.input.first.nativeElement.focus();
           });
         }
       });
     }
   }
 
+  get originalComment(): TaskComment {
+    return this.sharedData.originalComment;
+  }
+
+  get isStaff() {
+    return this.task?.unit?.currentUserIsStaff;
+  }
+
   cancelReply() {
     this.sharedData.originalComment = null;
   }
 
+  contentEditableValue() {
+    const UA = navigator.userAgent;
+    const isWebkit = /WebKit/.test(UA) && !/Edge/.test(UA);
+    return isWebkit ? 'plaintext-only' : 'true';
+  }
+
+  formatImageName(imageName) {
+    const index = imageName.indexOf('.');
+    let nameString = imageName.substring(0, index);
+    const typeString = imageName.substring(index);
+
+    if (nameString.length > 20) {
+      nameString = nameString.substring(0, 20) + '..';
+    }
+
+    const finalString = nameString + typeString;
+    return finalString;
+  }
+
   recordingMode(): void {
     this.recording = !this.recording;
     this.$userIsTyping.next(true);
@@ -357,23 +408,33 @@ export class TaskCommentComposerComponent
   keyTyped() {
     setTimeout(() => {
       const commentText: string = this.input.first.nativeElement.innerText;
-      this.saveCurrentDraft();
       this.emojiSearchMode = !commentText.includes('`') && this.emojiRegex.test(commentText);
+
       if (this.emojiSearchMode) {
+        // get the cursor position in the content-editable
         const cursorPosition = this.caretOffset();
+
+        // get the text from the start of the string up to the cursor.
         const testText = commentText.slice(0, cursorPosition);
+
+        // within this smaller string, find the last :
         const lastColPos = testText.lastIndexOf(':');
+
+        // The emoji search term will be from the position after the last :
+        // Note, the second parameter is a length not position, so we subtract.
         this.emojiMatch = testText.substr(lastColPos + 1, cursorPosition - lastColPos);
+
         if (this.emojiMatch?.includes(' ')) {
           this.emojiSearchMode = false;
           this.emojiSearchResults = null;
         } else {
+          // results is the list of emoji returned.
           const results = this.emojiSearch.search(this.emojiMatch);
           if (results?.length > 0) {
             this.emojiSearchResults = results.slice(0, 15);
           }
         }
-      }
+      } // timeout to ensure that the inner html is updated with the new character.
     }, 0);
   }
 
@@ -387,19 +448,30 @@ export class TaskCommentComposerComponent
 
   private caretOffset() {
     const element = this.input.first.nativeElement;
-    let caretOffset = 0;
-    const sel = window.getSelection();
-    if (sel?.rangeCount > 0) {
-      const range = sel.getRangeAt(0);
-      const preCaretRange = range.cloneRange();
-      preCaretRange.selectNodeContents(element);
-      preCaretRange.setEnd(range.endContainer, range.endOffset);
-      caretOffset = preCaretRange.toString().length;
+    let caretOffset: number = 0;
+    const doc = element.ownerDocument || element.document;
+    const win = doc.defaultView || doc.parentWindow;
+    let sel;
+    if (typeof win.getSelection !== 'undefined') {
+      sel = win.getSelection();
+      if (sel.rangeCount > 0) {
+        const range = win.getSelection().getRangeAt(0);
+        const preCaretRange = range.cloneRange();
+        preCaretRange.selectNodeContents(element);
+        preCaretRange.setEnd(range.endContainer, range.endOffset);
+        caretOffset = preCaretRange.toString().length;
+      }
+    } else if (sel === doc.selection && sel.type !== 'Control') {
+      const textRange = sel.createRange();
+      const preCaretTextRange = doc.body.createTextRange();
+      preCaretTextRange.moveToElementText(element);
+      preCaretTextRange.setEndPoint('EndToEnd', textRange);
+      caretOffset = preCaretTextRange.text.length;
     }
     return caretOffset;
   }
 
-  addEmoji(e: any) {
+  addEmoji(e): void {
     let char: string;
     if (typeof e === 'string') {
       char = e;
@@ -423,8 +495,16 @@ export class TaskCommentComposerComponent
       maxWidth: '800px',
       disableClose: true,
     });
+
+    // dialogRef.afterOpened().subscribe((result: any) => {
+    // });
+
+    // dialogRef.afterClosed().subscribe((result: any) => {
+    // });
   }
 
+
+
   addComment() {
 
 
@@ -435,7 +515,6 @@ export class TaskCommentComposerComponent
     }
 
     const text = this.emojiService.nativeEmojiToColons(this.input.first.nativeElement.innerText);
-    console.log('[DRAFT-DEBUG] Comment text prepared for submission:', { length: text.length });
 
     this.hasSubmittedComment = true;
 
@@ -500,6 +579,8 @@ export class TaskCommentComposerComponent
       next: (success: TaskComment) => {
         this.comment.text = '';
         this.commentsViewer.scrollDown();
+        console.log('implement - check map comments');
+        //this.task.comments = this.ts.mapComments(this.task.comments);
       },
       error: (message: string) => this.alerts.error(message, 6000),
     });
@@ -509,7 +590,7 @@ export class TaskCommentComposerComponent
     this.uploader.nativeElement.click();
   }
 
-  uploadFiles(event: FileList | any) {
+  uploadFiles(event) {
     [...event].forEach((file) => {
       if (
         ACCEPTED_FILE_TYPES.includes(file.type) ||
@@ -523,7 +604,8 @@ export class TaskCommentComposerComponent
     });
   }
 
-  postAttachmentComment(file: File) {
+  // # Upload image files as comments to a given task
+  postAttachmentComment(file) {
     this.taskCommentService.addComment(this.task, file, 'file', null).subscribe(
       (tc: TaskComment) => {
         this.commentsViewer.scrollDown();
@@ -535,6 +617,8 @@ export class TaskCommentComposerComponent
   }
 }
 
+// The discussion prompt composer dialog Component
+// eslint-disable-next-line max-classes-per-file
 @Component({
   selector: 'discussion-prompt-composer-dialog.html',
   templateUrl: 'discussion-prompt-composer-dialog.html',

From fb6e61f874797cd48e77f2a8d0a32f345f5b785b Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 16 Apr 2025 07:28:37 +1000
Subject: [PATCH 280/776] fix: ensure sign in waits for global load

---
 src/app/doubtfire.states.ts                   | 14 ++++
 src/app/errors/states/timeout/timeout.coffee  |  4 +-
 .../states/index/global-state.service.ts      | 29 +++++---
 .../states/sign-in/sign-in.component.ts       | 69 +++++++++++++------
 4 files changed, 84 insertions(+), 32 deletions(-)

diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 92f55f0c21..31cafd031b 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -185,6 +185,20 @@ const SignInState: NgHybridStateDeclaration = {
   data: {
     pageTitle: 'Sign In',
   },
+  resolve: {
+    username: [
+      '$stateParams',
+      function ($stateParams: {username: string}) {
+        return $stateParams.username;
+      }
+    ],
+    authToken: [
+      '$stateParams',
+      function ($stateParams: {authToken: string}) {
+        return $stateParams.authToken;
+      },
+    ],
+  },
 };
 
 /**
diff --git a/src/app/errors/states/timeout/timeout.coffee b/src/app/errors/states/timeout/timeout.coffee
index 2eb125c4dc..d39ee75792 100644
--- a/src/app/errors/states/timeout/timeout.coffee
+++ b/src/app/errors/states/timeout/timeout.coffee
@@ -5,7 +5,7 @@ angular.module("doubtfire.errors.states.timeout", [])
 #
 .config(($stateProvider) ->
   stateData =
-    url: "/timeout?dest&params"
+    url: "/timeout"
     views:
       main:
         controller: "TimeoutCtrl"
@@ -16,5 +16,5 @@ angular.module("doubtfire.errors.states.timeout", [])
 )
 # this can be removed... timeout should just sign out and redirect to login
 .controller("TimeoutCtrl", (authenticationService) ->
-  authenticationService.signOut(false)
+  setTimeout((-> authenticationService.signOut(false)), 2000)
 )
diff --git a/src/app/projects/states/index/global-state.service.ts b/src/app/projects/states/index/global-state.service.ts
index 1376818555..7b3b3b2ded 100644
--- a/src/app/projects/states/index/global-state.service.ts
+++ b/src/app/projects/states/index/global-state.service.ts
@@ -118,16 +118,24 @@ export class GlobalStateService implements OnDestroy {
     this.loadedUnits = this.unitService.cache;
     this.currentUserProjects = this.projectService.cache;
 
-    // Try to login using the refresh token
-    this.authenticationService.attemptLoginUsingRefreshToken((result: boolean) => {
-      if (result) {
-        this.loadGlobals();
-      } else {
-        // not loading anything as no user - just redirect to sign in
-        this.isLoadingSubject.next(false);
-        this.router.stateService.go('sign_in');
-      }
-    });
+    // Use timeout to ensure everything is loaded before we try to login
+    setTimeout(() => {
+      // Try to login using the refresh token
+      this.authenticationService.attemptLoginUsingRefreshToken((result: boolean) => {
+        if (result) {
+          this.loadGlobals();
+        } else {
+          // Loading is finshed...
+          this.isLoadingSubject.next(false);
+
+          // and if we are not going to the sign in page, then redirect to it
+          if (this.router.globals.current.name !== 'sign_in') {
+            // not loading anything as no user - just redirect to sign in
+            this.router.stateService.go('sign_in');
+          }
+        }
+      });
+    }, 100);
 
     // this is a hack to workaround horrific IOS "feature"
     // https://stackoverflow.com/questions/37112218/css3-100vh-not-constant-in-mobile-browser
@@ -215,6 +223,7 @@ export class GlobalStateService implements OnDestroy {
   }
 
   public loadGlobals(): void {
+    // Indicate we are loading data...
     this.isLoadingSubject.next(true);
 
     // Loading observer watches for loading of campuses, and teaching periods before loading unit roles, and projects
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index 4ddde5f7b1..86e2e27a08 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -1,11 +1,25 @@
-import { HttpClient } from '@angular/common/http';
-import { Component, Inject, OnInit } from '@angular/core';
-import { StateService, Transition } from '@uirouter/core';
-import { BehaviorSubject } from 'rxjs';
-import { AuthenticationService } from 'src/app/api/services/authentication.service';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { GlobalStateService } from 'src/app/projects/states/index/global-state.service';
+import {HttpClient} from '@angular/common/http';
+import {Component, Input, OnInit} from '@angular/core';
+import {StateService, Transition} from '@uirouter/core';
+import {BehaviorSubject} from 'rxjs';
+import {AuthenticationService} from 'src/app/api/services/authentication.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {GlobalStateService} from 'src/app/projects/states/index/global-state.service';
+
+// Add fallback to check url for query parameters
+interface IParams {
+  [key: string]: string;
+}
+
+const paramReducer = (params: IParams, pair: string): IParams => {
+  const [key, value] = `${pair}=`.split('=').map(decodeURIComponent);
+
+  return key.length > 0 ? {...params, [key]: value} : params;
+};
+
+const getUrlParams = (search: string): IParams =>
+  `${search}?`.split('?')[1].split('&').reduce<IParams>(paramReducer, {});
 
 type signInData =
   | {
@@ -38,6 +52,10 @@ export class SignInComponent implements OnInit {
   public formData: signInData;
   public isLoading: boolean = true;
 
+  // Get query params from the resolve in the router state
+  @Input() username: string;
+  @Input() authToken: string;
+
   constructor(
     private authService: AuthenticationService,
     private state: StateService,
@@ -49,6 +67,10 @@ export class SignInComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
+    this.globalState.onLoad(() => this.initAfterGlobalLoad());
+  }
+
+  private initAfterGlobalLoad(): void {
     this.formData = {
       username: '',
       password: '',
@@ -60,28 +82,35 @@ export class SignInComponent implements OnInit {
     this.api = this.constants.API_URL;
     this.externalName = this.constants.ExternalName;
 
-    this.attemptRefreshTokenSignIn();
+    // this.attemptRefreshTokenSignIn();
+
+    // HACK: Workaround the fact that query params do not work in Safari with ui-router
+    if (!this.username) {
+      const params = getUrlParams(document.location.href);
+      this.username = this.transition.params().username || params.username;
+      this.authToken = this.transition.params().authToken || params.authToken;
+    }
 
     // wait 2 seconds with rxjs
-    const wait = new Promise((resolve) => setTimeout(resolve, 2000));
+    const wait = new Promise((resolve) => setTimeout(resolve, 3000));
     this.http.get(`${this.constants.API_URL}/auth/method`).subscribe((response: any) => {
       this.isLoading = false;
 
       // if there is a string in response.data.redirect_to
       this.SSOLoginUrl = response.redirect_to || false;
 
-      if (this.SSOLoginUrl) {
-        if (this.transition.params().authToken) {
-          // This is SSO and we just got an auth_token? Must request to sign in
-          return this.signIn({
-            auth_token: this.transition.params().authToken,
-            username: this.transition.params().username,
-            remember: this.authService.rememberMe,
-          });
-        } else if (this.formData.autoLogin) {
+      if (this.authToken) {
+        // We have an auth token - so attempt to convert to access token
+        return this.signIn({
+          auth_token: this.authToken,
+          username: this.username,
+          remember: this.authService.rememberMe,
+        });
+      } else if (this.SSOLoginUrl) {
+        if (this.formData.autoLogin) {
           return wait.then(() => {
             // Double check in case changed in the meantime
-            if (this.formData.autoLogin && this.authService.rememberMe) {
+            if (this.formData.autoLogin) {
               this.redirectToSSO();
             }
           });

From e8bb0ba397e4cfd9fb6195ac9a65d51981a4aadb Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 16 Apr 2025 09:06:15 +1000
Subject: [PATCH 281/776] chore(release): 10.0.0-4

---
 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 714505fb3c..358e373ea4 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.
 
+## [10.0.0-4](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-3...v10.0.0-4) (2025-04-15)
+
+
+### Bug Fixes
+
+* ensure sign in waits for global load ([fb6e61f](https://github.com/macite/doubtfire-deploy/commit/fb6e61f874797cd48e77f2a8d0a32f345f5b785b))
+
 ## [10.0.0-3](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-2...v10.0.0-3) (2025-04-10)
 
 
diff --git a/package-lock.json b/package-lock.json
index d17b37dadd..8824c99555 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-3",
+  "version": "10.0.0-4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-3",
+      "version": "10.0.0-4",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 6568146ba8..e9c9c06f6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-3",
+  "version": "10.0.0-4",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 56a9b0f2bc41f7a778b857af50c45e394a364ae9 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 18 Apr 2025 17:47:43 +1000
Subject: [PATCH 282/776] chore: minor comment fix

---
 src/app/projects/states/index/global-state.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/projects/states/index/global-state.service.ts b/src/app/projects/states/index/global-state.service.ts
index 7b3b3b2ded..6d3cdb12d2 100644
--- a/src/app/projects/states/index/global-state.service.ts
+++ b/src/app/projects/states/index/global-state.service.ts
@@ -130,7 +130,6 @@ export class GlobalStateService implements OnDestroy {
 
           // and if we are not going to the sign in page, then redirect to it
           if (this.router.globals.current.name !== 'sign_in') {
-            // not loading anything as no user - just redirect to sign in
             this.router.stateService.go('sign_in');
           }
         }

From 34410d4afdf5bd73d9c244a6f40c7fb78b714e63 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 18 Apr 2025 23:05:40 +1000
Subject: [PATCH 283/776] fix: delay authorisation code until after
 authentication

Issue due to delay when loading from cookie.
---
 src/app/sessions/transition-hooks.service.ts | 53 +++++++++++++-------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/app/sessions/transition-hooks.service.ts b/src/app/sessions/transition-hooks.service.ts
index 7720d96fe0..92103a9b39 100644
--- a/src/app/sessions/transition-hooks.service.ts
+++ b/src/app/sessions/transition-hooks.service.ts
@@ -29,6 +29,10 @@ export class TransitionHooksService {
 
     // Hook into "onBefore" to check transitions before they occur
     this.transitions.onBefore({}, (transition) => {
+      // log all possible states
+      // console.log(transition.router.stateRegistry.get())
+
+
       // Where is the transition coming from and going to?
       const toState = transition.to().name;
       // const fromState = transition.from().name;
@@ -62,26 +66,37 @@ export class TransitionHooksService {
           break;
       }
 
-      // Redirect to welcome if user has not run first time setup
-      if (
-        !this.userService.isAnonymousUser() &&
-        !userService.currentUser.hasRunFirstTimeSetup &&
-        toState !== 'welcome'
-      ) {
-        return transition.router.stateService.target('welcome');
-      }
+      // After auth... check the following
+      this.authenticationService.afterAuthCall(() => {
+        // Check authorization whitelist
+        if (toStateData.roleWhitelist && !this.authenticationService.isAuthorised(toStateData.roleWhitelist)) {
+          if (authenticationService.isAuthenticated()) {
+            return transition.router.stateService.go('unauthorised');
+          } else if (toState !== "sign_in") {
+            return transition.router.stateService.go('sign_in');
+          }
+        }
+        // Redirect to welcome if user has not run first time setup
+        if (
+          !this.userService.isAnonymousUser() &&
+          !userService.currentUser.hasRunFirstTimeSetup &&
+          toState !== 'welcome'
+        ) {
+          return transition.router.stateService.go('welcome');
+        }
 
-      // Redirect to eula if user has not accepted eula
-      // they are loged in, have run first time setup,
-      // but not accepted eula
-      if ( this.tiiEnabled &&
-        !this.userService.isAnonymousUser() &&
-        userService.currentUser.hasRunFirstTimeSetup &&
-        !userService.currentUser.acceptedTiiEula &&
-        toState !== 'eula'
-      ) {
-        return transition.router.stateService.target('eula');
-      }
+        // Redirect to eula if user has not accepted eula
+        // they are loged in, have run first time setup,
+        // but not accepted eula
+        if ( this.tiiEnabled &&
+          !this.userService.isAnonymousUser() &&
+          userService.currentUser.hasRunFirstTimeSetup &&
+          !userService.currentUser.acceptedTiiEula &&
+          toState !== 'eula'
+        ) {
+          return transition.router.stateService.go('eula');
+        }
+      });
     });
   }
 

From 6ef91e0ddb119e03dbaf2b6e53e450e5bcc58b8b Mon Sep 17 00:00:00 2001
From: Jude Roz <juderoz@icloud.com>
Date: Wed, 7 May 2025 19:33:13 +1000
Subject: [PATCH 284/776] fix(task-comment-composer): deleting the key when
 text is empty

---
 .../task-comment-composer.component.ts        | 41 ++++++++++++-------
 src/styles/common/extensions/col-xl.scss      | 15 ++++---
 src/styles/mixins/dropdown-selector.scss      |  6 ++-
 3 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index c765a91d42..d014e06902 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -210,6 +210,7 @@ export class TaskCommentComposerComponent
   onInputChange(event: Event) {
     const target = event.target as HTMLElement;
     const text = target.innerText;
+    const raw = target.innerText;
 
     // If user is typing something new after submission, reset the submitted status
     if (this.task) {
@@ -230,8 +231,8 @@ export class TaskCommentComposerComponent
         }
       }
 
-      const key = this.getDraftKey(this.task);
-      this.taskDraftContents.set(key, text);
+      const draftKey = this.getDraftKey(this.task);
+      this.taskDraftContents.set(draftKey, raw);
     }
 
     this.saveCurrentDraft();
@@ -251,34 +252,43 @@ export class TaskCommentComposerComponent
     return `${this.DRAFT_KEY_PREFIX}${projectId}_${definitionId}`;
   }
 
+  private hasContent(raw: string): boolean {
+    return raw.replace(/\s+/g, '').length > 0;
+  }
+
   // Update saveDraftForTask to use the taskDraftContents map
-  private saveDraftForTask(task: Task) {
+  private saveDraftForTask(task: Task): void {
     if (!task) {
       return;
     }
 
-    try {
-      const draftKey = this.getDraftKey(task);
+    const draftKey = this.getDraftKey(task);
 
-      // Get text from map for this specific task
-      let text: string;
+    try {
 
-      // If it's the current task, get from input directly
-      if (this.task && this.task.id === task.id) {
-        text = this.input?.first?.nativeElement?.innerText?.trim() || '';
+      let raw: string;
+      if (this.task?.id === task.id && this.input.first) {
+        raw = this.input.first.nativeElement.innerText;
       } else {
-        // Otherwise get from our map
-        text = this.taskDraftContents.get(draftKey) || '';
+        raw = this.taskDraftContents.get(draftKey) ?? '';
       }
 
-      // Rest of the method remains the same
-      if (!text) {
+
+      if (!this.hasContent(raw)) {
+        console.log('No text to save for task', task.id ?? 'without ID');
+        console.log('Removing draft from localStorage, key:', draftKey);
+        this.taskDraftContents.delete(draftKey);
+        localStorage.removeItem(draftKey);
         return;
       }
 
-
+      const text = raw.trim();
+      console.log('Saving draft for', draftKey, 'preview:', text);
+      this.taskDraftContents.set(draftKey, text);
       localStorage.setItem(draftKey, text);
+
     } catch (error) {
+      console.error('saveDraftForTask error:', error);
     }
   }
 
@@ -317,6 +327,7 @@ export class TaskCommentComposerComponent
         }
 
         this.input.first.nativeElement.innerText = draft;
+        this.taskDraftContents.set(draftKey, draft);
         this.isDraftLoaded = true;
         this.cdRef.detectChanges();
 
diff --git a/src/styles/common/extensions/col-xl.scss b/src/styles/common/extensions/col-xl.scss
index 2b1c99052e..804971716d 100644
--- a/src/styles/common/extensions/col-xl.scss
+++ b/src/styles/common/extensions/col-xl.scss
@@ -1,11 +1,14 @@
 // From https://gist.github.com/juukie/d71133e69877b46f060e
 
-$screen-xl:                  1560px !default;
-$screen-xl-min:              $screen-xl !default;
-$screen-xl-desktop:          $screen-xl-min !default;
-$screen-lg-max:              ($screen-xl-min - 1) !default;
-$container-xlarge-desktop:   (1530px + $grid-gutter-width) !default;
-$container-xl:               $container-xlarge-desktop !default;
+$grid-gutter-width: 30px !default;
+$grid-columns: 12 !default;
+
+$screen-xl: 1560px !default;
+$screen-xl-min: $screen-xl !default;
+$screen-lg-max: ($screen-xl-min - 1) !default;
+$container-xlarge-desktop: (1530px + $grid-gutter-width) !default;
+$container-xl: $container-xlarge-desktop !default;
+
 
 .container {
   // @include container-fixed; No need for, already done.
diff --git a/src/styles/mixins/dropdown-selector.scss b/src/styles/mixins/dropdown-selector.scss
index 01036b0cca..116eead826 100644
--- a/src/styles/mixins/dropdown-selector.scss
+++ b/src/styles/mixins/dropdown-selector.scss
@@ -1,3 +1,7 @@
+@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
+
+
+
 @mixin dropdown-selector {
   height: 100%;
   padding-left: 0px;
@@ -33,7 +37,7 @@
     margin-top: 0px;
     border-top-left-radius: 0px;
     border-top-right-radius: 0px;
-    @media (max-width: $screen-sm) {
+    @media (max-width: $screen-sm-min) {
       position: relative;
       bottom: 0;
       left: 0;

From 770377c00b68261b65e61e7759a1a52bb9abb4ba Mon Sep 17 00:00:00 2001
From: J Roz <92691800+nodogx@users.noreply.github.com>
Date: Wed, 7 May 2025 19:49:39 +1000
Subject: [PATCH 285/776] Update col-xl.scss - Edited by mistake

---
 src/styles/common/extensions/col-xl.scss | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/styles/common/extensions/col-xl.scss b/src/styles/common/extensions/col-xl.scss
index 804971716d..2b1c99052e 100644
--- a/src/styles/common/extensions/col-xl.scss
+++ b/src/styles/common/extensions/col-xl.scss
@@ -1,14 +1,11 @@
 // From https://gist.github.com/juukie/d71133e69877b46f060e
 
-$grid-gutter-width: 30px !default;
-$grid-columns: 12 !default;
-
-$screen-xl: 1560px !default;
-$screen-xl-min: $screen-xl !default;
-$screen-lg-max: ($screen-xl-min - 1) !default;
-$container-xlarge-desktop: (1530px + $grid-gutter-width) !default;
-$container-xl: $container-xlarge-desktop !default;
-
+$screen-xl:                  1560px !default;
+$screen-xl-min:              $screen-xl !default;
+$screen-xl-desktop:          $screen-xl-min !default;
+$screen-lg-max:              ($screen-xl-min - 1) !default;
+$container-xlarge-desktop:   (1530px + $grid-gutter-width) !default;
+$container-xl:               $container-xlarge-desktop !default;
 
 .container {
   // @include container-fixed; No need for, already done.

From 32f087878e602640c1e1559532cbccb297c7912b Mon Sep 17 00:00:00 2001
From: J Roz <92691800+nodogx@users.noreply.github.com>
Date: Wed, 7 May 2025 19:51:25 +1000
Subject: [PATCH 286/776] Update dropdown-selector.scss - changed by mistake,
 changing back to original

---
 src/styles/mixins/dropdown-selector.scss | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/styles/mixins/dropdown-selector.scss b/src/styles/mixins/dropdown-selector.scss
index 116eead826..01036b0cca 100644
--- a/src/styles/mixins/dropdown-selector.scss
+++ b/src/styles/mixins/dropdown-selector.scss
@@ -1,7 +1,3 @@
-@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
-
-
-
 @mixin dropdown-selector {
   height: 100%;
   padding-left: 0px;
@@ -37,7 +33,7 @@
     margin-top: 0px;
     border-top-left-radius: 0px;
     border-top-right-radius: 0px;
-    @media (max-width: $screen-sm-min) {
+    @media (max-width: $screen-sm) {
       position: relative;
       bottom: 0;
       left: 0;

From d237eda82dd989fc1b69d6e4236932050bc5b1a4 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 16 May 2025 14:41:32 +1000
Subject: [PATCH 287/776] fix: correct broken transition hooks

---
 src/app/sessions/transition-hooks.service.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/sessions/transition-hooks.service.ts b/src/app/sessions/transition-hooks.service.ts
index 92103a9b39..d0497a7cbf 100644
--- a/src/app/sessions/transition-hooks.service.ts
+++ b/src/app/sessions/transition-hooks.service.ts
@@ -4,6 +4,7 @@ import { UserService } from '../api/services/user.service';
 import { DoubtfireAngularModule } from '../doubtfire-angular.module';
 import { GlobalStateService } from '../projects/states/index/global-state.service';
 import { DoubtfireConstants } from '../config/constants/doubtfire-constants';
+import { AuthenticationService } from '../api/services/authentication.service';
 
 /**
  * The TransitionHooksService is responsible for intercepting transitions between states.
@@ -20,7 +21,8 @@ export class TransitionHooksService {
     private userService: UserService,
     private transitions: TransitionService,
     private globalState: GlobalStateService,
-    private constants: DoubtfireConstants
+    private constants: DoubtfireConstants,
+    private authenticationService: AuthenticationService,
   ) {
     // Get the tii settings...
     this.constants.IsTiiEnabled.subscribe((enabled) => {
@@ -35,6 +37,7 @@ export class TransitionHooksService {
 
       // Where is the transition coming from and going to?
       const toState = transition.to().name;
+      const toStateData = transition.to().data;
       // const fromState = transition.from().name;
 
       // Setup the global state

From 68a2f38167c792974aafd907f04fcf9e8b5bf091 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 16 May 2025 14:42:00 +1000
Subject: [PATCH 288/776] fix: ensure transition in student pages update pdf
 view

---
 .../task-dashboard/task-dashboard.coffee      | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
index b36e94e005..87379d09b5 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
@@ -15,6 +15,13 @@ angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard',
     $scope.overseerEnabled = () ->
       DoubtfireConstants.IsOverseerEnabled.value && $scope.task?.overseerEnabled
 
+    $scope.urls = {
+      taskSheetPdfUrl: null
+      taskSubmissionPdfUrl: null
+      taskSubmissionPdfAttachmentUrl: null
+      taskFilesUrl: null
+    }
+
     # Is the current user a tutor?
     $scope.tutor = $stateParams.tutor
     # the ways in which the dashboard can be viewed
@@ -32,17 +39,21 @@ angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard',
     # Cleanup
     listeners = listenerService.listenTo($scope)
     # Required changes when task changes
-    listeners.push $scope.$watch('task.id', ->
+    listeners.push $scope.$watch('task.definition.id', ->
       return unless $scope.task?
+      task = $scope.task
       # get the url for the task sheet and the submissions
-      $scope.urls = {
-        taskSheetPdfUrl: $scope.task.definition.getTaskPDFUrl()
-        taskSubmissionPdfUrl: $scope.task.submissionUrl()
-        taskSubmissionPdfAttachmentUrl: $scope.task.submissionUrl(true)
-        taskFilesUrl: $scope.task.submittedFilesUrl()
-      }
+      $scope.urls.taskSheetPdfUrl = task.definition.getTaskPDFUrl()
+      $scope.urls.taskSubmissionPdfUrl = task.submissionUrl()
+      $scope.urls.taskSubmissionPdfAttachmentUrl = task.submissionUrl(true)
+      $scope.urls.taskFilesUrl = task.submittedFilesUrl()
 
-      updateCurrentView()
+      if $scope.isCurrentView('task') && !task.definition.hasTaskSheet
+        # If the task sheet is not available, switch to details view
+        updateCurrentView()
+      else if $scope.isCurrentView('submission') && !task.hasPdf
+        # If the submission is not available, switch to details view
+        updateCurrentView()
     )
 
     # Set the selected dashboard view

From da8e4fce303ad8ad9778aa3d53bb68a542c5acac Mon Sep 17 00:00:00 2001
From: J Roz <92691800+nodogx@users.noreply.github.com>
Date: Sat, 17 May 2025 00:19:05 +1000
Subject: [PATCH 289/776] Update task-comment-composer.component.ts

Removed redundant code which causes errors.

NgOnChanges now only looks to see if the task is changed. If the task is changed, it loads its content based on its key. Every keystroke is saved in the local storage; therefore, we draft is loaded, we can pull this from the storage straight away.

When its empty, it already deletes the whole key, so the content is no longer loaded.
---
 .../task-comment-composer.component.ts                   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index d014e06902..c5e0009264 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -143,12 +143,9 @@ export class TaskCommentComposerComponent
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.task && changes.task.currentValue !== changes.task.previousValue) {
-      const newTask = changes.task.currentValue;
-      const previousTask = changes.task.previousValue;
+      const newTask = changes.task.currentValue as Task;
+      // Check if the task has changed
 
-      if (previousTask && !this.hasSubmittedComment) {
-        this.saveDraftForTask(previousTask);
-      }
 
       this.hasSubmittedComment = false;
 
@@ -257,7 +254,7 @@ export class TaskCommentComposerComponent
   }
 
   // Update saveDraftForTask to use the taskDraftContents map
-  private saveDraftForTask(task: Task): void {
+  private saveDraftForTask(task: Task, rawFromDom?: string): void {
     if (!task) {
       return;
     }

From 60dbceb2a104894b4eff157c038446796bf01708 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 30 May 2025 17:08:57 +1000
Subject: [PATCH 290/776] fix: simplify setting of auto redirect on login

---
 src/app/api/services/authentication.service.ts |  2 +-
 .../states/sign-in/sign-in.component.html      |  4 ++--
 .../states/sign-in/sign-in.component.ts        | 18 ++++++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index 07609fb5fb..f54eeb705d 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -109,7 +109,7 @@ export class AuthenticationService {
   }
 
   public set rememberMe(remember: boolean) {
-    localStorage.setItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN, String(remember));
+    localStorage.setItem(this.REMEMBER_DOUBTFIRE_CREDENTIALS_TOKEN, remember ? 'true' : 'false');
   }
 
   /**
diff --git a/src/app/sessions/states/sign-in/sign-in.component.html b/src/app/sessions/states/sign-in/sign-in.component.html
index a8162799ac..0d2b8a58c9 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.html
+++ b/src/app/sessions/states/sign-in/sign-in.component.html
@@ -17,7 +17,7 @@ <h1 class="welcome-heading flex flex-row place-content-start">
               username: formData.username,
               password: formData.password,
               remember: authService.rememberMe,
-              autoLogin: formData.autoLogin
+              autoLogin: autoLogin
             })
           "
           class="sign-in-form flex flex-col"
@@ -42,7 +42,7 @@ <h1 class="welcome-heading flex flex-row place-content-start">
             </mat-form-field>
           }
           @if (!showCredentials) {
-            <mat-checkbox matInput name="autoLogin" [(ngModel)]="formData.autoLogin">
+            <mat-checkbox matInput name="autoLogin" [(ngModel)]="autoLogin">
               Automatically redirect
             </mat-checkbox>
           }
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index 86e2e27a08..f080a578ce 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -75,7 +75,7 @@ export class SignInComponent implements OnInit {
       username: '',
       password: '',
       remember: this.authService.rememberMe,
-      autoLogin: localStorage.getItem('autoLogin') == 'true',
+      autoLogin: this.autoLogin,
     };
     // Check for SSO
     this.globalState.hideHeader();
@@ -107,10 +107,10 @@ export class SignInComponent implements OnInit {
           remember: this.authService.rememberMe,
         });
       } else if (this.SSOLoginUrl) {
-        if (this.formData.autoLogin) {
+        if (this.autoLogin) {
           return wait.then(() => {
             // Double check in case changed in the meantime
-            if (this.formData.autoLogin) {
+            if (this.autoLogin) {
               this.redirectToSSO();
             }
           });
@@ -136,6 +136,16 @@ export class SignInComponent implements OnInit {
       };
   }
 
+  public get autoLogin(): boolean {
+    // Check if autoLogin is set in localStorage
+    return localStorage.getItem('autoLogin') === 'true';
+  }
+
+  public set autoLogin(value: boolean) {
+    // Set autoLogin in localStorage
+    localStorage.setItem('autoLogin', value ? 'true' : 'false');
+  }
+
   /**
    * Perform the actions needed when the user successfully signs in.
    */
@@ -161,7 +171,7 @@ export class SignInComponent implements OnInit {
    */
   private redirectToSSO(): void {
     if (this.SSOLoginUrl) {
-      if (this.formData.autoLogin) {
+      if (this.autoLogin) {
         localStorage.setItem('autoLogin', 'true');
       } else {
         localStorage.removeItem('autoLogin');

From 0fc882a3acdaa9adbf137270f126bf284fcc5538 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 30 May 2025 17:10:03 +1000
Subject: [PATCH 291/776] chore(release): 10.0.0-5

---
 CHANGELOG.md      | 10 ++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 358e373ea4..d67134449c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 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.
 
+## [10.0.0-5](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-4...v10.0.0-5) (2025-05-30)
+
+
+### Bug Fixes
+
+* correct broken transition hooks ([d237eda](https://github.com/macite/doubtfire-deploy/commit/d237eda82dd989fc1b69d6e4236932050bc5b1a4))
+* delay authorisation code until after authentication ([34410d4](https://github.com/macite/doubtfire-deploy/commit/34410d4afdf5bd73d9c244a6f40c7fb78b714e63))
+* ensure transition in student pages update pdf view ([68a2f38](https://github.com/macite/doubtfire-deploy/commit/68a2f38167c792974aafd907f04fcf9e8b5bf091))
+* simplify setting of auto redirect on login ([60dbceb](https://github.com/macite/doubtfire-deploy/commit/60dbceb2a104894b4eff157c038446796bf01708))
+
 ## [10.0.0-4](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-3...v10.0.0-4) (2025-04-15)
 
 
diff --git a/package-lock.json b/package-lock.json
index 8824c99555..404db32af2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-4",
+  "version": "10.0.0-5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-4",
+      "version": "10.0.0-5",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index e9c9c06f6a..f6f550e5e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-4",
+  "version": "10.0.0-5",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 8341b933487ccd451a15cb8f7ec6afc1695cb121 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Sun, 8 Jun 2025 19:46:07 +1000
Subject: [PATCH 292/776] fix: only get task feedback templates if staff

---
 .../task-comments-viewer/task-comments-viewer.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 43c4e61e5e..0ab1081955 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -81,7 +81,7 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
           }
         });
 
-      if (this.userService.currentUser.isStaff) {
+      if (this.project.unit.currentUserIsStaff) {
         this.feedbackTemplateService
           .query({contextType: 'task_definitions', contextId: this.task.definition.id}, {})
           .subscribe({

From c92242ad9afb0a934d4e8fb00afee0c69782c625 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 13 Jun 2025 22:15:20 +1000
Subject: [PATCH 293/776] fix: remove unnecessary safe pipe

---
 .../common/modals/calendar-modal/calendar-modal.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/modals/calendar-modal/calendar-modal.component.html b/src/app/common/modals/calendar-modal/calendar-modal.component.html
index ad4bddd473..cdd72ca70b 100644
--- a/src/app/common/modals/calendar-modal/calendar-modal.component.html
+++ b/src/app/common/modals/calendar-modal/calendar-modal.component.html
@@ -45,7 +45,7 @@ <h2 mat-dialog-title>Web calendar</h2>
       </p>
       <div fxLayout="row">
         <div fxFlex="grow" class="webcal-url-container">
-          <a [href]="webcalUrl | safe">{{ webcalUrl }}</a>
+          <a [href]="webcalUrl">{{ webcalUrl }}</a>
         </div>
         <div fxLayout="row">
           <button

From a874cff846e788a1820da7e19899ecb20a113888 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 13 Jun 2025 22:21:57 +1000
Subject: [PATCH 294/776] feat: add spec con and flexible dates

---
 src/app/api/models/project.ts                 | 21 +++--
 src/app/api/models/task-definition.ts         |  8 ++
 src/app/api/models/task.ts                    | 71 +++++++++++++--
 src/app/api/models/unit.ts                    | 17 +++-
 src/app/api/services/mapping-fn.ts            | 22 +++++
 src/app/api/services/project.service.ts       |  1 +
 src/app/api/services/unit.service.ts          |  4 +-
 .../task-dropdown.component.html              | 22 ++---
 .../task-date-slider.component.html           | 78 ++++++++++++++++
 .../task-date-slider.component.scss           |  0
 .../task-date-slider.component.ts             | 90 +++++++++++++++++++
 .../spec-con-modal.component.html             | 25 ++++++
 .../spec-con-modal.component.ts               | 35 ++++++++
 .../spec-con-modal/spec-con-modal.service.ts  | 20 +++++
 src/app/doubtfire-angular.module.ts           |  8 ++
 src/app/doubtfire.states.ts                   | 25 +++++-
 .../task-description-card.component.html      |  9 +-
 .../task-description-card.component.ts        | 10 ++-
 .../task-status-card.component.html           | 65 +++++++-------
 .../task-status-card.component.ts             |  4 +
 .../task-dashboard/task-dashboard.coffee      |  4 +
 .../task-dashboard/task-dashboard.tpl.html    |  2 +-
 .../states/plan/project-plan.component.html   | 13 +++
 .../states/plan/project-plan.component.ts     | 30 +++++++
 .../upload-submission-modal.coffee            |  2 +-
 .../task-comments-viewer.component.html       |  4 +
 .../unit-details-editor.tpl.html              | 30 ++++++-
 .../unit-students-editor.component.html       | 30 ++++---
 .../unit-students-editor.component.ts         |  8 +-
 29 files changed, 582 insertions(+), 76 deletions(-)
 create mode 100644 src/app/common/modals/date-change-modal/task-date-slider.component.html
 create mode 100644 src/app/common/modals/date-change-modal/task-date-slider.component.scss
 create mode 100644 src/app/common/modals/date-change-modal/task-date-slider.component.ts
 create mode 100644 src/app/common/modals/spec-con-modal/spec-con-modal.component.html
 create mode 100644 src/app/common/modals/spec-con-modal/spec-con-modal.component.ts
 create mode 100644 src/app/common/modals/spec-con-modal/spec-con-modal.service.ts
 create mode 100644 src/app/projects/states/plan/project-plan.component.html
 create mode 100644 src/app/projects/states/plan/project-plan.component.ts

diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index d8f6548398..a1b7743428 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -38,6 +38,8 @@ export class Project extends Entity {
   public portfolioAvailable: boolean;
   public usesDraftLearningSummary: boolean;
 
+  public specConDays: number = 0;
+
   public hasPortfolio: boolean;
   public portfolioStatus: number;
   public portfolioFiles: { kind: string; name: string; idx: number }[];
@@ -177,13 +179,13 @@ export class Project extends Entity {
 
   public calcTopTasks() {
     // We will assign current weight to tasks...
-    var currentWeight: number = 0;
+    let currentWeight: number = 0;
 
     // Assign weights to tasks in final state - complete, fail, etc
     const sortedCompletedTasks: Task[] = this.taskCache.currentValues
       .filter((task) => task.inFinalState())
       .sort((a, b) => a.definition.seq - b.definition.seq)
-      .sort((a, b) => a.definition.startDate.getTime() - b.definition.startDate.getTime());
+      .sort((a, b) => a.startDate.getTime() - b.startDate.getTime());
 
     sortedCompletedTasks.forEach((task) => {
       task.topWeight = currentWeight;
@@ -193,8 +195,8 @@ export class Project extends Entity {
     // Sort valid top tasks by start date - tasks in non-final state
     const sortedTasks: Task[] = this.taskCache.currentValues
       .filter((task) => task.isValidTopTask())
-      .sort((a, b) => a.definition.seq - b.definition.seq)
-      .sort((a, b) => a.definition.startDate.getTime() - b.definition.startDate.getTime());
+      .sort((a, b) => a.startDate.getTime() - b.startDate.getTime())
+      .sort((a, b) => a.definition.seq - b.definition.seq);
 
     const overdueTasks: Task[] = sortedTasks.filter((task) => task.daysUntilDueDate() <= 7);
 
@@ -215,7 +217,7 @@ export class Project extends Entity {
     const toAdd: Task[] = sortedTasks
       .filter((task) => task.daysUntilDueDate() > 7)
       .sort((a, b) => a.definition.targetGrade - b.definition.targetGrade)
-      .sort((a, b) => a.definition.startDate.getTime() - b.definition.startDate.getTime());
+      .sort((a, b) => a.startDate.getTime() - b.startDate.getTime());
 
     // Sort by the targetGrade. Pass task are done first if same due date as others.
 
@@ -513,4 +515,13 @@ export class Project extends Entity {
 
     this.burndownChartData = result;
   }
+
+  public applySpecCon(days: number): Observable<Project> {
+    const projectService: ProjectService = AppInjector.get(ProjectService);
+    return projectService.update(this, {body: {spec_con_days: days}, endpointFormat: 'projects/:id:/spec_con'}).pipe(
+      tap((project: Project) => {
+        project.specConDays = days;
+      }),
+    );
+  }
 }
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index d07c34ffdb..34796ffe40 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -143,6 +143,14 @@ export class TaskDefinition extends Entity {
     return this.dueDate;
   }
 
+  public get dueWeek(): number {
+    const startDate = this.unit.startDate;
+    const dueDate = this.localDueDate() || this.unit.endDate;
+
+    const diffInMs = dueDate.getTime() - startDate.getTime();
+    return Math.ceil(diffInMs / (1000 * 60 * 60 * 24 * 7)); // Convert ms to weeks
+  }
+
   public matches(text: string): boolean {
     return this.abbreviation.toLowerCase().indexOf(text) !== -1 || this.name.toLowerCase().indexOf(text) !== -1;
   }
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 24586b86bc..c1fd8d2a3b 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -179,8 +179,56 @@ export class Task extends Entity {
     return formatDate(this.localDueDate(), 'd MMM', locale);
   }
 
+  public get dueWeek(): number {
+    const startDate: Date = this.unit.startDate;
+    const dueDate: Date = this.localDueDate();
+    const diffInMs: number = dueDate.getTime() - startDate.getTime();
+    const diffInDays: number = Math.ceil(diffInMs / (1000 * 3600 * 24));
+
+    return Math.ceil(diffInDays / 7);
+  }
+
+  /**
+   * Set the task to be due in a specific week.
+   *
+   * @returns the new due week
+   */
+  public set dueWeek(week: number) {
+    // Get original due week and current due week
+    const tdDueWeek: number = this.definition.dueWeek;
+    const currentDueWeek = this.dueWeek;
+
+    // Determine how long the extension needs to be
+    this.extensions = week - tdDueWeek;
+
+    // Map to ms to adjust due date
+    const currentWeekDueMs = MappingFunctions.weeksMs(currentDueWeek);
+    const newWeekDueMs = MappingFunctions.weeksMs(week);
+
+    // Adjust due date based on difference in current and new due weeks
+    this.dueDate = new Date(this.localDueDate().getTime() - currentWeekDueMs + newWeekDueMs);
+  }
+
   public localDeadlineDate(): Date {
-    return this.definition.localDeadlineDate();
+    return MappingFunctions.addDays(this.definition.localDeadlineDate(), this.project.specConDays);
+  }
+
+  public savePlannedDate(): Observable<Task> {
+    const taskService: TaskService = AppInjector.get(TaskService);
+
+    return taskService.update(
+      {
+        projectId: this.project.id,
+        taskDefId: this.definition.id,
+      },
+      {
+        endpointFormat: '/projects/:projectId:/task_def_id/:taskDefId:/plan',
+        entity: this,
+        body: {
+          extensions: this.extensions,
+        },
+      },
+    );
   }
 
   /**
@@ -243,12 +291,22 @@ export class Task extends Entity {
     return this.daysUntilDueDate() == 0 && !this.inSubmittedState();
   }
 
+  public get startDate(): Date {
+    if (this.extensions < 0) {
+      // If the task has an extension, the start date is the due date minus the extension
+      return MappingFunctions.addWeeks(this.definition.startDate, this.extensions);
+    } else {
+      // If the task does not have an extension, the start date is the definition's start date
+      return this.definition.startDate;
+    }
+  }
+
   public timeUntilStartDate(): number {
-    return this.timeBetween(new Date(), this.definition.startDate);
+    return this.timeBetween(new Date(), this.startDate);
   }
 
   public daysUntilStartDate() {
-    return this.daysBetween(new Date(), this.definition.startDate);
+    return this.daysBetween(new Date(), this.startDate);
   }
 
   public isBeforeStartDate(): boolean {
@@ -763,7 +821,8 @@ export class Task extends Entity {
 
   public canApplyForExtension(): boolean {
     return (
-      this.unit.allowStudentExtensionRequests &&
+      (this.unit.allowStudentExtensionRequests || this.unit.currentUserIsStaff) &&
+      !this.unit.allowFlexibleDates &&
       this.inStateThatAllowsExtension() &&
       (!this.isPastDeadline() || this.wasSubmittedOnTime()) &&
       this.maxWeeksCanExtend() > 0
@@ -778,9 +837,7 @@ export class Task extends Entity {
   }
 
   public maxWeeksCanExtend(): number {
-    return Math.ceil(
-      this.daysBetween(this.localDueDate(), this.definition.localDeadlineDate()) / 7,
-    );
+    return Math.ceil(this.daysBetween(this.localDueDate(), this.localDeadlineDate()) / 7);
   }
 
   /**
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 67ae823146..df07d32d04 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -65,6 +65,7 @@ export class Unit extends Entity {
   draftTaskDefinition: TaskDefinition;
 
   allowStudentExtensionRequests: boolean;
+  allowFlexibleDates: boolean = false;
   extensionWeeksOnResubmitRequest: number;
   allowStudentChangeTutorial: boolean;
 
@@ -226,6 +227,20 @@ export class Unit extends Entity {
     }
   }
 
+  /**
+   * Get the total duration of the unit in milliseconds.
+   */
+  public get totalDuration(): number {
+    return this.endDate.valueOf() - this.startDate.valueOf();
+  }
+
+  /**
+   * Get the number of weeks in the unit's teaching period.
+   */
+  public get totalWeeks(): number {
+    return Math.ceil(this.totalDuration / (1000 * 60 * 60 * 24 * 7));
+  }
+
   /**
    * Calculate how much time has elapsed in the teaching period, based on the start and
    * end date of the unit relative to the current date.
@@ -240,7 +255,7 @@ export class Unit extends Entity {
     if (today >= this.endDate) return 100;
 
     const startToNow = Math.abs(today.valueOf() - this.startDate.valueOf());
-    const totalDuration = Math.abs(this.endDate.valueOf() - this.startDate.valueOf());
+    const totalDuration = Math.abs(this.totalDuration);
     return Math.round((startToNow / totalDuration) * 100);
   }
 
diff --git a/src/app/api/services/mapping-fn.ts b/src/app/api/services/mapping-fn.ts
index 9124152095..8da53e0bb0 100644
--- a/src/app/api/services/mapping-fn.ts
+++ b/src/app/api/services/mapping-fn.ts
@@ -60,6 +60,28 @@ export class MappingFunctions {
     return result;
   }
 
+  /**
+   * Add a number of days to a date.
+   *
+   * @param date starting date
+   * @param days days to add
+   * @returns the date that is `days` days after `date`
+   */
+  public static addDays(date: Date, days: number): Date {
+    return new Date(date.getTime() + MappingFunctions.dayMs(days));
+  }
+
+  /**
+   * Add a number of weeks to a date.
+   *
+   * @param date starting date
+   * @param weeks days to add
+   * @returns the date that is `days` days after `date`
+   */
+  public static addWeeks(date: Date, weeks: number): Date {
+    return new Date(date.getTime() + MappingFunctions.weeksMs(weeks));
+  }
+
   /**
    * Calculate the time between two dates
    *
diff --git a/src/app/api/services/project.service.ts b/src/app/api/services/project.service.ts
index 6bb50481a3..3ae0f4c7ec 100644
--- a/src/app/api/services/project.service.ts
+++ b/src/app/api/services/project.service.ts
@@ -66,6 +66,7 @@ export class ProjectService extends CachedEntityService<Project> {
       'portfolioFiles',
       'compilePortfolio',
       'similarityFlag',
+      'specConDays',
       {
         keys: 'hasPortfolio',
         toEntityFn: (data: object, key: string, entity: Project, params?: any) => {
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index 886baef6b3..7193289049 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -148,6 +148,7 @@ export class UnitService extends CachedEntityService<Unit> {
       'enableSyncEnrolments',
       'enableSyncTimetable',
       'allowStudentExtensionRequests',
+      'allowFlexibleDates',
       'extensionWeeksOnResubmitRequest',
       'allowStudentChangeTutorial',
       {
@@ -253,9 +254,10 @@ export class UnitService extends CachedEntityService<Unit> {
       'enableSyncTimetable',
 
       'draftTaskDefinition',
+      'allowFlexibleDates',
       'allowStudentExtensionRequests',
       'extensionWeeksOnResubmitRequest',
-      'allowStudentChangeTutorial'
+      'allowStudentChangeTutorial',
     );
   }
 
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index c7bee65bf6..c4c8d206de 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -63,6 +63,13 @@
         >
           <mat-icon aria-label="Dashboard icon" fontIcon="dashboard"></mat-icon> Dashboard
         </button>
+        @if (currentProject.unit.allowFlexibleDates) {
+          <mat-divider></mat-divider>
+          <button uiSref="project/plan" [uiParams]="{projectId: currentProject.id}" mat-menu-item>
+            <mat-icon aria-label="Plan icon" fontIcon="calendar_month"></mat-icon>
+            Plan Tasks
+          </button>
+        }
         <mat-divider></mat-divider>
         <button
           uiSref="projects/portfolio"
@@ -106,11 +113,7 @@
         </button>
         <mat-divider></mat-divider>
         <!-- <p class="task-dropdown-heading">Students</p> -->
-        <button
-          uiSref="units/students/list"
-          [uiParams]="{unitId: unitRole.unit.id}"
-          mat-menu-item
-        >
+        <button uiSref="units/students/list" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
           <mat-icon aria-label="Students list" fontIcon="group"></mat-icon> Students
         </button>
         <button
@@ -125,10 +128,7 @@
           [uiParams]="{unitId: unitRole.unit.id}"
           mat-menu-item
         >
-          <mat-icon
-            aria-label="Student portfolios icon"
-            fontIcon="collections_bookmark"
-          ></mat-icon>
+          <mat-icon aria-label="Student portfolios icon" fontIcon="collections_bookmark"></mat-icon>
           Portfolios
         </button>
         <mat-divider></mat-divider>
@@ -136,7 +136,9 @@
         <button uiSref="units/analytics" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
           <mat-icon aria-label="Unit Analytics icon" fontIcon="insights"></mat-icon>Analytics
         </button>
-        @if (unitRole.role === 'Convenor' || unitRole.role === 'Admin' || unitRole.role === 'Auditor') {
+        @if (
+          unitRole.role === 'Convenor' || unitRole.role === 'Admin' || unitRole.role === 'Auditor'
+        ) {
           <button uiSref="units/admin" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
             <mat-icon aria-label="Unit Administration" fontIcon="admin_panel_settings"></mat-icon>
             Administration
diff --git a/src/app/common/modals/date-change-modal/task-date-slider.component.html b/src/app/common/modals/date-change-modal/task-date-slider.component.html
new file mode 100644
index 0000000000..43940cd1af
--- /dev/null
+++ b/src/app/common/modals/date-change-modal/task-date-slider.component.html
@@ -0,0 +1,78 @@
+<div class="flex flex-col gap-2">
+  @if (showTaskAbbr && editMode) {
+    <label>{{ task.definition.name }}</label>
+  }
+  <div class="flex flex-row items-center gap-4">
+    @if (showTaskAbbr) {
+      <label>{{ task.definition.abbreviation }}: </label>
+    } @else {
+      <label>Complete By: </label>
+    }
+    <mat-slider [max]="max" min="0" class="grow">
+      <input
+        matSliderThumb
+        [(ngModel)]="value"
+        (input)="updateExtension($event)"
+        [disabled]="!editMode"
+      />
+    </mat-slider>
+    <label class="grow-0" style="min-width: 4em">{{ task.localDueDateString() }}</label>
+
+    @if (editMode) {
+      <button
+        mat-icon-button
+        aria-label="Save task due date"
+        matTooltip="Save task due date"
+        (click)="saveDueDate()"
+      >
+        <mat-icon>save</mat-icon>
+      </button>
+
+      <button
+        mat-icon-button
+        aria-label="Cancel editing task due date"
+        matTooltip="Cancel editing task due date"
+        (click)="cancelEdit()"
+      >
+        <mat-icon>cancel</mat-icon>
+      </button>
+    } @else {
+      <button
+        mat-icon-button
+        aria-label="Edit task due date"
+        matTooltip="Change task due date"
+        (click)="editDueDate()"
+        [disabled]="!canEdit()"
+        color=""
+      >
+        <mat-icon>edit</mat-icon>
+      </button>
+      <button
+        mat-icon-button
+        aria-label="Cancel editing task due date"
+        matTooltip="Cancel editing task due date"
+        (click)="cancelEdit()"
+        disabled="true"
+      >
+        <mat-icon>cancel</mat-icon>
+      </button>
+    }
+  </div>
+  <div class="flex flex-row">
+    @if (editMode) {
+      @if (afterDeadline()) {
+        <label class="text-s bg-orange-100 p-2">
+          <strong>Warning: </strong>
+          Your planned due date is after the last date to receive feedback for this task. You will
+          not receive feedback on this task to help you ensure it is up to the required standard.
+        </label>
+      } @else if (closeToDeadline()) {
+        <label class="text-s bg-yellow-100 p-2">
+          <strong>Caution: </strong>
+          Your planned due date is close to the last date to receive feedback for this task. This
+          may make it challenging to have sufficient time to address any feedback you receive.
+        </label>
+      }
+    }
+  </div>
+</div>
diff --git a/src/app/common/modals/date-change-modal/task-date-slider.component.scss b/src/app/common/modals/date-change-modal/task-date-slider.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/common/modals/date-change-modal/task-date-slider.component.ts b/src/app/common/modals/date-change-modal/task-date-slider.component.ts
new file mode 100644
index 0000000000..0969834605
--- /dev/null
+++ b/src/app/common/modals/date-change-modal/task-date-slider.component.ts
@@ -0,0 +1,90 @@
+import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
+import {Task} from 'src/app/api/models/doubtfire-model';
+import { MappingFunctions } from 'src/app/api/services/mapping-fn';
+import { AlertService } from '../../services/alert.service';
+
+@Component({
+  selector: 'f-task-date-slider',
+  styleUrl: './task-date-slider.component.scss',
+  templateUrl: './task-date-slider.component.html',
+})
+export class TaskDateSliderComponent implements OnChanges {
+  @Input() task: Task;
+  @Input() showTaskAbbr: boolean = false;
+
+  /**
+   * The value of the slider, representing the number of weeks
+   */
+  public value: number;
+
+  private _originalDueDate: Date;
+  private _originalExtension: number;
+
+  /**
+   * Switch between edit and view mode.
+   */
+  public editMode: boolean = false;
+
+  public constructor(
+    private alerts: AlertService,
+  ) {}
+
+  public get max(): number {
+    return this.task.unit.totalWeeks + Math.ceil(this.task.project.specConDays / 7);
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.task && changes.task.currentValue) {
+      if (this.editMode) {
+        this.cancelEdit();
+      }
+
+      this.value = this.task.dueWeek;
+      this._originalDueDate = this.task.dueDate;
+      this._originalExtension = this.task.extensions;
+    }
+  }
+
+  public cancelEdit(): void {
+    this.editMode = false;
+    // Reset the task to its original state
+    this.task.dueDate = this._originalDueDate;
+    this.task.extensions = this._originalExtension;
+    this.value = this.task.dueWeek;
+  }
+
+  public updateExtension(event: Event): void {
+    const value = (event.target as HTMLInputElement).valueAsNumber;
+    this.task.dueWeek = value;
+  }
+
+  public editDueDate(): void {
+    this.editMode = true;
+  }
+
+  public saveDueDate(): void {
+    this.task.savePlannedDate().subscribe({
+      next: () => {
+        this.alerts.success('Plan updated successfully.');
+        this.editMode = false;
+        this.task.project.calcTopTasks();
+      },
+      error: (message) => {
+        this.alerts.error(`Error updating due date: ${message}`);
+        this.cancelEdit();
+      }
+    });
+  }
+
+  public afterDeadline(): boolean {
+    return this.task.localDueDate() > this.task.localDeadlineDate();
+  }
+
+  public closeToDeadline(): boolean {
+    return MappingFunctions.addDays(this.task.localDueDate(), 7) > this.task.localDeadlineDate();
+  }
+
+  public canEdit(): boolean {
+    return !this.task.isGroupTask() && this.task.unit.allowFlexibleDates;
+  }
+}
diff --git a/src/app/common/modals/spec-con-modal/spec-con-modal.component.html b/src/app/common/modals/spec-con-modal/spec-con-modal.component.html
new file mode 100644
index 0000000000..7bb56e4b07
--- /dev/null
+++ b/src/app/common/modals/spec-con-modal/spec-con-modal.component.html
@@ -0,0 +1,25 @@
+<h3 mat-dialog-title>Grant Extension / Special Consideration</h3>
+<div mat-dialog-content>
+  <p class="w-full">
+    Please enter number of days to extend the portfolio due date and all tasks for this student.
+  </p>
+
+  <mat-form-field appearance="outline">
+    <mat-label>Number of days</mat-label>
+    <input matInput min="0" type="number" placeholder="Number of days" [(ngModel)]="days" />
+  </mat-form-field>
+</div>
+
+<div mat-dialog-actions style="float: right">
+  <button mat-dialog-close mat-stroked-button color="warn">Cancel</button>
+  <button
+    mat-dialog-close
+    style="margin-right: 10px"
+    mat-stroked-button
+    color="primary"
+    mat-button
+    (click)="save()"
+  >
+    Apply
+  </button>
+</div>
diff --git a/src/app/common/modals/spec-con-modal/spec-con-modal.component.ts b/src/app/common/modals/spec-con-modal/spec-con-modal.component.ts
new file mode 100644
index 0000000000..167d196190
--- /dev/null
+++ b/src/app/common/modals/spec-con-modal/spec-con-modal.component.ts
@@ -0,0 +1,35 @@
+import {Component, Inject} from '@angular/core';
+import {MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {Project} from 'src/app/api/models/doubtfire-model';
+import {AlertService} from '../../services/alert.service';
+
+@Component({
+  selector: 'f-spec-con-modal',
+  templateUrl: './spec-con-modal.component.html',
+})
+export class SpecConModalComponent {
+  public days: number = 0;
+
+  constructor(
+    public dialogRef: MatDialogRef<SpecConModalComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: {project: Project},
+    private alerts: AlertService,
+  ) {
+    this.days = this.data.project.specConDays;
+  }
+
+  public get project(): Project {
+    return this.data.project;
+  }
+
+  public save(): void {
+    this.project.applySpecCon(this.days).subscribe({
+      next: (_project: Project) => {
+        this.alerts.success('Extension applied.');
+      },
+      error: (message) => {
+        this.alerts.error(`Error applying extension: ${message}`);
+      },
+    });
+  }
+}
diff --git a/src/app/common/modals/spec-con-modal/spec-con-modal.service.ts b/src/app/common/modals/spec-con-modal/spec-con-modal.service.ts
new file mode 100644
index 0000000000..f26e93d7db
--- /dev/null
+++ b/src/app/common/modals/spec-con-modal/spec-con-modal.service.ts
@@ -0,0 +1,20 @@
+import {Injectable} from '@angular/core';
+import {MatDialogRef, MatDialog} from '@angular/material/dialog';
+import {SpecConModalComponent} from './spec-con-modal.component';
+import {Project} from 'src/app/api/models/doubtfire-model';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SpecConModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(project: Project) {
+    const dialogRef: MatDialogRef<SpecConModalComponent, {project: Project}> = this.dialog.open(
+      SpecConModalComponent,
+      {
+        data: {project: project},
+      },
+    );
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 603da99601..699e1b909f 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -251,6 +251,10 @@ import {LearningOutcomeEditorComponent} from './common/learning-outcome-editor/l
 import {TaskFeedbackTemplatesComponent} from './tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component';
 import {NestedCsvDownloadModalComponent} from './common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component';
 import {NestedCsvDownloadModalService} from './common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.service';
+import { TaskDateSliderComponent } from './common/modals/date-change-modal/task-date-slider.component';
+import { SpecConModalComponent } from './common/modals/spec-con-modal/spec-con-modal.component';
+import { SpecConModalService } from './common/modals/spec-con-modal/spec-con-modal.service';
+import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -278,6 +282,7 @@ const MY_DATE_FORMAT = {
     MicrophoneTesterComponent,
     DiscussionPromptComposerComponent,
     IntelligentDiscussionPlayerComponent,
+    TaskDateSliderComponent,
     IntelligentDiscussionDialog,
     DiscussionComposerDialog,
     IntelligentDiscussionRecorderComponent,
@@ -287,9 +292,11 @@ const MY_DATE_FORMAT = {
     ActivityTypeListComponent,
     OverseerImageListComponent,
     ExtensionModalComponent,
+    SpecConModalComponent,
     CalendarModalComponent,
     ConfirmationModalComponent,
     InstitutionSettingsComponent,
+    ProjectPlanComponent,
     SuccessCloseComponent,
     HomeComponent,
     CommentBubbleActionComponent,
@@ -447,6 +454,7 @@ const MY_DATE_FORMAT = {
     },
     AboutDoubtfireModal,
     AboutDoubtfireModalService,
+    SpecConModalService,
     DoubtfireConstants,
     TasksOfTaskDefinitionPipe,
     TasksInTutorialsPipe,
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 31cafd031b..e00252fe28 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -10,6 +10,7 @@ import {FUsersComponent} from './admin/states/f-users/f-users.component';
 import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
 import { SuccessCloseComponent } from './common/success-close/success-close.component';
+import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
 
 /*
  * Use this file to store any states that are sourced by angular components.
@@ -419,6 +420,27 @@ const SuccessCloseState: NgHybridStateDeclaration = {
   },
 };
 
+/**
+ * Allow the uesr to plan the task due dates for their project.
+ */
+const projectPlanState: NgHybridStateDeclaration = {
+  name: 'project/plan',
+  parent: 'projects/index',
+  url: '/plan',
+  component: ProjectPlanComponent,
+  // views: {
+  //   main: {
+  //     // Main body links to angular component
+  //     component: ProjectPlanComponent,
+  //   },
+  // },
+  data: {
+    pageTitle: 'Task Plan',
+    task: 'Plan Tasks',
+    roleWhitelist: ['Student', 'Tutor', 'Convenor', 'Admin', 'Auditor'],
+  },
+};
+
 
 /**
  * Export the list of states we have created in angular
@@ -438,5 +460,6 @@ export const doubtfireStates = [
   ScormPlayerNormalState,
   ScormPlayerReviewState,
   ScormPlayerStudentReviewState,
-  SuccessCloseState
+  SuccessCloseState,
+  projectPlanState,
 ];
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html
index 5c7cc82d56..48f76aaa7c 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html
@@ -7,11 +7,12 @@
   </mat-card-header>
   <mat-card-content>
     <div class="markdown-to-pdf" [innerHTML]="taskDef?.description | marked"></div>
+    <f-task-date-slider [task]="task" />
     <ul>
       <li>{{ grades.names[taskDef?.targetGrade] }} Task</li>
       <li>Start Date &mdash; Aim to start this task by {{ startDate() | date: 'EEE d MMM' }}.</li>
       <li [hidden]="!task?.extensions || task?.extensions <= 0">
-        Extension &mdash; You have an extension for
+        Extension &mdash; The due date has been extended by
         {{ task?.extensions }} week{{ task?.extensions > 1 ? 's' : '' }}.
       </li>
       <li>Due Date &mdash; Aim to complete by {{ dueDate() | date: 'EEE d MMM' }}.</li>
@@ -21,6 +22,12 @@
     class="space-x-2"
     [hidden]="!(taskDef?.hasTaskSheet || taskDef?.hasTaskResources)"
   >
+    <button mat-stroked-button [hidden]="!taskDef?.hasTaskSheet" (click)="viewTaskSheet()">
+      <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="View icon"
+        >description</mat-icon
+      >
+      Task Sheet
+    </button>
     <button mat-stroked-button [hidden]="!taskDef?.hasTaskSheet" (click)="downloadTaskSheet()">
       <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="Download icon"
         >download</mat-icon
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
index cf88db9f7b..765d67766d 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, Inject} from '@angular/core';
+import {Component, Input, Inject, EventEmitter, Output} from '@angular/core';
 
 import {Task, TaskDefinition, Unit} from 'src/app/api/models/doubtfire-model';
 import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
@@ -10,6 +10,8 @@ import {GradeService} from 'src/app/common/services/grade.service';
   styleUrls: ['task-description-card.component.scss'],
 })
 export class TaskDescriptionCardComponent {
+  @Output() switchView$: EventEmitter<string> = new EventEmitter();
+
   @Input() task: Task;
   @Input() taskDef: TaskDefinition;
   @Input() unit: Unit;
@@ -33,6 +35,10 @@ export class TaskDescriptionCardComponent {
     );
   }
 
+  public viewTaskSheet() {
+    this.switchView$.emit('task');
+  }
+
   public downloadResources() {
     this.fileDownloader.downloadFile(
       this.taskDef.getTaskResourcesUrl(true),
@@ -47,7 +53,7 @@ export class TaskDescriptionCardComponent {
   }
 
   public startDate(): Date {
-    return this.taskDef?.startDate;
+    return this.task?.startDate;
   }
 
   public shouldShowDeadline(): boolean {
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
index e210890833..e1d81c95e2 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
@@ -1,44 +1,47 @@
 <mat-card appearance="outlined">
   @if (triggers?.length > 0) {
-  <mat-form-field class="px-4 pt-4" appearance="outline">
-    <mat-select [value]="task?.status" (selectionChange)="triggerTransition($event.value)">
-      <mat-select-trigger>
-        <span style="display: inline-flex">
-          <status-icon [status]="task?.status" style="margin-right: 10px"></status-icon>
-          <h2 class="mb-0">{{ task?.statusLabel() }}</h2>
-        </span>
-      </mat-select-trigger>
-      @for (trigger of triggers; track trigger) {
-      <mat-option [value]="trigger.status">
-        <status-icon [status]="trigger.status" [showTooltip]="false"></status-icon>
-        <span style="display: inline-flex; margin-left: 10px"
-          ><h5>{{ trigger.label }}</h5></span
-        >
-      </mat-option>
-      }
-    </mat-select>
-  </mat-form-field>
-  } @if (triggers?.length < 0) {
-  <mat-card-title>
-    <span style="display: inline-flex">
-      <status-icon [status]="task?.status" style="margin-right: 10px"></status-icon>
-      <h5>{{ task?.statusLabel() }}</h5>
-    </span>
-  </mat-card-title>
+    <mat-form-field class="px-4 pt-4" appearance="outline">
+      <mat-select [value]="task?.status" (selectionChange)="triggerTransition($event.value)">
+        <mat-select-trigger>
+          <span style="display: inline-flex">
+            <status-icon [status]="task?.status" style="margin-right: 10px"></status-icon>
+            <h2 class="mb-0">{{ task?.statusLabel() }}</h2>
+          </span>
+        </mat-select-trigger>
+        @for (trigger of triggers; track trigger) {
+          <mat-option [value]="trigger.status">
+            <status-icon [status]="trigger.status" [showTooltip]="false"></status-icon>
+            <span style="display: inline-flex; margin-left: 10px"
+              ><h5>{{ trigger.label }}</h5></span
+            >
+          </mat-option>
+        }
+      </mat-select>
+    </mat-form-field>
+  }
+  @if (triggers?.length < 0) {
+    <mat-card-title>
+      <span style="display: inline-flex">
+        <status-icon [status]="task?.status" style="margin-right: 10px"></status-icon>
+        <h5>{{ task?.statusLabel() }}</h5>
+      </span>
+    </mat-card-title>
   }
 
   <mat-card-content>
     <p>{{ task?.statusHelp().reason }} {{ task?.statusHelp().action }}</p>
   </mat-card-content>
 
-  @if ( task?.unit.currentUserIsStaff || task?.canApplyForExtension() || (task?.inSubmittedState() &&
-  task?.requiresFileUpload()) ) {
   <mat-card-actions class="space-x-2">
+    <button mat-stroked-button (click)="triggerTransition('ready_for_feedback')" [disabled]="isReadyForFeedback()">
+      Upload Submission
+    </button>
+
     @if (task?.canApplyForExtension()) {
-    <button mat-stroked-button (click)="applyForExtension()">Request extension</button>
-    } @if (task?.inSubmittedState() && task?.requiresFileUpload()) {
-    <button mat-stroked-button (click)="updateFilesInSubmission()">Upload new files</button>
+      <button mat-stroked-button (click)="applyForExtension()">Request extension</button>
+    }
+    @if (task?.inSubmittedState() && task?.requiresFileUpload()) {
+      <button mat-stroked-button (click)="updateFilesInSubmission()">Upload new files</button>
     }
   </mat-card-actions>
-  }
 </mat-card>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index d33646b066..a8970aec50 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -53,6 +53,10 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     this.taskService.statusKeys;
   }
 
+  public isReadyForFeedback(): boolean {
+    return this.task.status === 'ready_for_feedback';
+  }
+
   triggerTransition(trigger: TaskStatusEnum): void {
     this.task.triggerTransition(trigger);
   }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
index 87379d09b5..8fe60b7574 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
@@ -86,5 +86,9 @@ angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard',
     $scope.downloadSubmittedFiles = () ->
       fileDownloaderService.downloadFile($scope.urls.taskFilesUrl)
 
+    $scope.switchView = (view) ->
+      if view in $scope.dashboardViews
+        $scope.currentView = view
+
 
 )
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index d2797fa663..905f99a266 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -41,10 +41,10 @@
   <div class="panel-body task-detail-cards" ng-show="isCurrentView('details')">
     <!-- <div class="col-sm-12 col-xl-6"> -->
     <!-- migrated -->
+    <task-description-card [task-def]="task.definition" [task]="task" [unit]="task.unit" (switch-view$)="switchView($event)"></task-description-card>
     <f-task-scorm-card [task]="task"></f-task-scorm-card>
     <f-task-status-card [task]="task"></f-task-status-card>
     <f-task-due-card [task]="task"></f-task-due-card>
-    <task-description-card [task-def]="task.definition" [task]="task" [unit]="task.unit"></task-description-card>
     <!-- </div> -->
     <!--/task-description-column-->
     <!-- <div class="col-sm-12 col-xl-6"> -->
diff --git a/src/app/projects/states/plan/project-plan.component.html b/src/app/projects/states/plan/project-plan.component.html
new file mode 100644
index 0000000000..d8f43331cb
--- /dev/null
+++ b/src/app/projects/states/plan/project-plan.component.html
@@ -0,0 +1,13 @@
+<div class="flex flex-col container">
+  <h2>Plan Your Tasks</h2>
+  <p>
+    View and adjust the due dates of tasks. Remember to leave time to get and respond to feedback.
+  </p>
+  <!-- Add your project plan content here -->
+
+  <div class="flex flex-col gap-4 mb-10">
+    @for (taskDef of taskDefs(); track $index) {
+      <f-task-date-slider [task]="project.findTaskForDefinition(taskDef.id)" showTaskAbbr="true" />
+    }
+  </div>
+</div>
diff --git a/src/app/projects/states/plan/project-plan.component.ts b/src/app/projects/states/plan/project-plan.component.ts
new file mode 100644
index 0000000000..c3002f3026
--- /dev/null
+++ b/src/app/projects/states/plan/project-plan.component.ts
@@ -0,0 +1,30 @@
+import {Component} from '@angular/core';
+import {GlobalStateService} from '../index/global-state.service';
+import { Project, TaskDefinition } from 'src/app/api/models/doubtfire-model';
+
+@Component({
+  selector: 'f-project-plan',
+  templateUrl: 'project-plan.component.html',
+  // styleUrls: ['project-plan.component.scss']
+})
+export class ProjectPlanComponent {
+  public project: Project;
+
+  constructor(private globalStateService: GlobalStateService) {
+    this.globalStateService.currentViewAndEntitySubject$.subscribe((viewAndEntity) => {
+      if (viewAndEntity.viewType === 'PROJECT' && viewAndEntity.entity) {
+        this.project = viewAndEntity.entity as Project;
+      }
+    });
+  }
+
+  public taskDefs(): TaskDefinition[] {
+    if (!this.project || !this.project.unit.taskDefinitions) {
+      return [];
+    }
+
+    return this.project.unit.taskDefinitions.filter((taskDef) => {
+      return taskDef.targetGrade <= this.project.targetGrade;
+    });
+  }
+}
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index 8279c595b9..bd9df32258 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -32,7 +32,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
 
   UploadSubmissionModal
 )
-.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, newTaskService, newProjectService, task, reuploadEvidence, PrivacyPolicy) ->
+.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, newTaskService, newProjectService, task, reuploadEvidence, PrivacyPolicy, alertService) ->
   $scope.privacyPolicy = PrivacyPolicy
   # Expose task to scope
   $scope.task = task
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index 81b09e6011..c9423fe9e3 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -64,6 +64,10 @@
                 <hr class="hr-text" [attr.data-content]="comment.text" />
               </div>
 
+              <div *ngSwitchCase="'plan'" class="comment-status">
+                <hr class="hr-text" [attr.data-content]="comment.text" />
+              </div>
+
               <div *ngSwitchCase="'assessment'" class="comment-assessment">
                 <app-task-assessment-comment
                   [task]="task"
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
index bbb967a71b..124f2662e5 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
@@ -168,6 +168,32 @@ <h3 class="panel-title">Update Unit</h3>
         </div>
         <!--/portfolio-auto-generation-date-->
 
+        <div class="form-group">
+          <label class="col-sm-2 control-label" for="enddate">Allow flexible dates</label>
+          <div class="col-sm-9">
+            <div class="btn-group">
+              <label
+                class="btn btn-{{unit.allowFlexibleDates ? 'success' : 'default'}}"
+                ng-model="unit.allowFlexibleDates"
+                btn-radio="true"
+                uncheckable
+              >
+                <i class="fa fa-check"></i>
+              </label>
+              <label
+                class="btn btn-{{unit.allowFlexibleDates ? 'default' : 'danger'}}"
+                ng-model="unit.allowFlexibleDates"
+                btn-radio="false"
+                uncheckable
+              >
+                <i class="fa fa-times"></i>
+              </label>
+            </div>
+            <span class="help-block"> Allows students to set planned due dates, without using extensions. </span>
+          </div>
+        </div>
+        <!--/allowStudentExtensionRequests-->
+
         <div class="form-group">
           <label class="col-sm-2 control-label" for="enddate">Allow student extensions</label>
           <div class="col-sm-9">
@@ -195,11 +221,11 @@ <h3 class="panel-title">Update Unit</h3>
         <!--/allowStudentExtensionRequests-->
 
         <div class="form-group">
-          <label class="col-sm-2 control-label" for="code">Extension duration on resubmit</label>
+          <label class="col-sm-2 control-label" for="extn-on-resub">Extension duration on resubmit</label>
           <div class="col-sm-9">
             <input
               class="form-control"
-              id="code"
+              id="extn-on-resub"
               type="number"
               placeholder="1"
               ng-model="unit.extensionWeeksOnResubmitRequest"
diff --git a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.html b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.html
index 4797fff33b..ccba19f15a 100644
--- a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.html
@@ -15,14 +15,14 @@ <h3>Enrolled Students</h3>
   <table mat-table [dataSource]="dataSource" matSort (matSortChange)="sortTableData($event)" class="f-table">
     <!-- Username Column -->
     <ng-container matColumnDef="username" sticky>
-      <th mat-header-cell *matHeaderCellDef mat-sort-header>Username</th>
-      <td mat-cell *matCellDef="let project">
+      <th mat-header-cell *matHeaderCellDef mat-sort-header class="bg-white">Username</th>
+      <td mat-cell *matCellDef="let project" class="bg-white">
         {{ project.student.username }}
       </td>
     </ng-container>
 
     <!-- First name Column -->
-    <ng-container matColumnDef="firstName" sticky>
+    <ng-container matColumnDef="firstName">
       <th mat-header-cell *matHeaderCellDef mat-sort-header>First Name</th>
       <td mat-cell *matCellDef="let project">
         {{ project.student.firstName }}
@@ -30,7 +30,7 @@ <h3>Enrolled Students</h3>
     </ng-container>
 
     <!-- Last name Column -->
-    <ng-container matColumnDef="lastName" sticky>
+    <ng-container matColumnDef="lastName">
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Last Name</th>
       <td mat-cell *matCellDef="let project">
         {{ project.student.lastName }}
@@ -38,7 +38,7 @@ <h3>Enrolled Students</h3>
     </ng-container>
 
     <!-- email Column -->
-    <ng-container matColumnDef="email" sticky>
+    <ng-container matColumnDef="email">
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Email</th>
       <td mat-cell *matCellDef="let project">
         {{ project.student.email }}
@@ -46,7 +46,7 @@ <h3>Enrolled Students</h3>
     </ng-container>
 
     <!-- campus Column -->
-    <ng-container matColumnDef="campus" sticky>
+    <ng-container matColumnDef="campus">
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Campus</th>
       <td mat-cell *matCellDef="let project" class="pt-4">
         <student-campus-select [unit]="unit" [student]="project" [update]="true"></student-campus-select>
@@ -54,7 +54,7 @@ <h3>Enrolled Students</h3>
     </ng-container>
 
     <!-- Tutorial Column -->
-    <ng-container matColumnDef="tutorial" sticky>
+    <ng-container matColumnDef="tutorial">
       <th mat-header-cell *matHeaderCellDef>Tutorial</th>
       <td mat-cell *matCellDef="let project" class="pt-4">
         <student-tutorial-select [unit]="unit" [student]="project"></student-tutorial-select>
@@ -62,7 +62,7 @@ <h3>Enrolled Students</h3>
     </ng-container>
 
     <!-- Enrolled Column -->
-    <ng-container matColumnDef="enrolled" sticky>
+    <ng-container matColumnDef="enrolled">
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Enrolled</th>
       <td mat-cell *matCellDef="let project">
         <mat-checkbox
@@ -74,12 +74,18 @@ <h3>Enrolled Students</h3>
     </ng-container>
 
     <!-- Goto Column -->
-    <ng-container matColumnDef="goto" sticky>
+    <ng-container matColumnDef="goto">
       <th mat-header-cell *matHeaderCellDef mat-sort-header></th>
       <td mat-cell *matCellDef="let project">
-        <button mat-button target="_blank" (click)="gotoStudent(project)">
-          <i class="fa fa-share"></i>
-        </button>
+        <div class="flex flex-row">
+          <button mat-icon-button (click)="updateSpecCon(project)">
+            <mat-icon>edit</mat-icon>
+          </button>
+
+          <button mat-icon-button (click)="gotoStudent(project)">
+            <mat-icon>chevron_right</mat-icon>
+          </button>
+        </div>
       </td>
     </ng-container>
 
diff --git a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
index f29d36c605..0db5d3b722 100644
--- a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
@@ -13,6 +13,7 @@ import { Project, ProjectService, Unit } from 'src/app/api/models/doubtfire-mode
 import { UIRouter } from '@uirouter/angular';
 import { Subscription } from 'rxjs';
 import { AlertService } from 'src/app/common/services/alert.service';
+import { SpecConModalService } from 'src/app/common/modals/spec-con-modal/spec-con-modal.service';
 
 @Component({
   selector: 'unit-students-editor',
@@ -41,7 +42,8 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
     @Inject(csvResultModalService) private csvResultModal: any,
     private fileDownloader: FileDownloaderService,
     private router: UIRouter,
-    private projectService: ProjectService
+    private projectService: ProjectService,
+    private specConModalService: SpecConModalService
   ) {}
 
   // The paginator is inside the table
@@ -148,4 +150,8 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
 
     this.fileDownloader.downloadFile(url, `${this.unit.code}-students.csv`);
   }
+
+  public updateSpecCon(student: Project) {
+    this.specConModalService.show(student);
+  }
 }

From c2f00ccabec6525d2bfa6d8d904439d63ccbc604 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Fri, 13 Jun 2025 22:25:34 +1000
Subject: [PATCH 295/776] chore(release): 10.0.0-6

---
 CHANGELOG.md      | 13 +++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d67134449c..a357c2d911 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 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.
 
+## [10.0.0-6](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-5...v10.0.0-6) (2025-06-13)
+
+
+### Features
+
+* add spec con and flexible dates ([a874cff](https://github.com/macite/doubtfire-deploy/commit/a874cff846e788a1820da7e19899ecb20a113888))
+
+
+### Bug Fixes
+
+* only get task feedback templates if staff ([8341b93](https://github.com/macite/doubtfire-deploy/commit/8341b933487ccd451a15cb8f7ec6afc1695cb121))
+* remove unnecessary safe pipe ([c92242a](https://github.com/macite/doubtfire-deploy/commit/c92242ad9afb0a934d4e8fb00afee0c69782c625))
+
 ## [10.0.0-5](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-4...v10.0.0-5) (2025-05-30)
 
 
diff --git a/package-lock.json b/package-lock.json
index 404db32af2..c4049fc672 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-5",
+  "version": "10.0.0-6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-5",
+      "version": "10.0.0-6",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index f6f550e5e8..b2a1341790 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-5",
+  "version": "10.0.0-6",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 14ad26e8ed4acf6f77043447a2691360fd62ce51 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Jun 2025 12:26:51 +1000
Subject: [PATCH 296/776] fix: welcome page redirect issues

---
 .../edit-profile/edit-profile.component.html  |  4 +-
 .../edit-profile/edit-profile.component.ts    | 22 ++++++++++-
 .../edit-profile-form.component.ts            | 26 ++++++-------
 .../states/sign-in/sign-in.component.ts       | 16 +-------
 src/app/sessions/transition-hooks.service.ts  | 39 ++++++++++++-------
 5 files changed, 60 insertions(+), 47 deletions(-)

diff --git a/src/app/account/edit-profile/edit-profile.component.html b/src/app/account/edit-profile/edit-profile.component.html
index 54a4e0e362..a7b9c7b6e9 100644
--- a/src/app/account/edit-profile/edit-profile.component.html
+++ b/src/app/account/edit-profile/edit-profile.component.html
@@ -1,7 +1,9 @@
 <div FxLayout="row" fxLayoutAlign="center center" id="parent">
   <div fxFlex.gt-sm="20"></div>
   <div fxFlex class="form-container">
-    <f-edit-profile-form mode="edit"></f-edit-profile-form>
+    @if (!loading) {
+      <f-edit-profile-form mode="edit"></f-edit-profile-form>
+    }
   </div>
   <div fxFlex.gt-sm="20"></div>
 </div>
diff --git a/src/app/account/edit-profile/edit-profile.component.ts b/src/app/account/edit-profile/edit-profile.component.ts
index 266530b422..55c6143ca4 100644
--- a/src/app/account/edit-profile/edit-profile.component.ts
+++ b/src/app/account/edit-profile/edit-profile.component.ts
@@ -1,9 +1,27 @@
-import { Component } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
+import {StateService} from '@uirouter/core';
+import {AuthenticationService} from 'src/app/api/services/authentication.service';
 
 @Component({
   selector: 'f-edit-profile',
   templateUrl: './edit-profile.component.html',
   styleUrls: ['./edit-profile.component.scss'],
 })
-export class EditProfileComponent {
+export class EditProfileComponent implements OnInit {
+  public loading: boolean = true;
+
+  constructor(
+    private authenticationService: AuthenticationService,
+    private state: StateService,
+  ) {}
+
+  public ngOnInit(): void {
+    this.loading = true;
+    this.authenticationService.afterAuthCall((result) => {
+      if (!result) {
+        return this.state.go('sign_in');
+      }
+      this.loading = false;
+    });
+  }
 }
diff --git a/src/app/common/edit-profile-form/edit-profile-form.component.ts b/src/app/common/edit-profile-form/edit-profile-form.component.ts
index a31fa6d581..f3787429dc 100644
--- a/src/app/common/edit-profile-form/edit-profile-form.component.ts
+++ b/src/app/common/edit-profile-form/edit-profile-form.component.ts
@@ -1,11 +1,11 @@
-import { Component, Inject, Input, OnInit, Optional } from '@angular/core';
-import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { StateService } from '@uirouter/core';
-import { User } from 'src/app/api/models/user/user';
-import { AuthenticationService } from 'src/app/api/services/authentication.service';
-import { UserService } from 'src/app/api/services/user.service';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {Component, Inject, Input, OnInit, Optional} from '@angular/core';
+import {MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {MatSnackBar} from '@angular/material/snack-bar';
+import {StateService} from '@uirouter/core';
+import {User} from 'src/app/api/models/user/user';
+import {AuthenticationService} from 'src/app/api/services/authentication.service';
+import {UserService} from 'src/app/api/services/user.service';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 
 @Component({
   selector: 'f-edit-profile-form',
@@ -18,8 +18,8 @@ export class EditProfileFormComponent implements OnInit {
     private userService: UserService,
     private state: StateService,
     private authService: AuthenticationService,
-    @Optional() @Inject(MAT_DIALOG_DATA) public data: { user: User; mode: 'edit' | 'create' | 'new' },
-    private _snackBar: MatSnackBar
+    @Optional() @Inject(MAT_DIALOG_DATA) public data: {user: User; mode: 'edit' | 'create' | 'new'},
+    private _snackBar: MatSnackBar,
   ) {
     this.user = data?.user || this.userService.currentUser;
   }
@@ -35,7 +35,7 @@ export class EditProfileFormComponent implements OnInit {
   public user: User;
   public externalName = this.constants.ExternalName;
   public initialFirstName: string;
-  public formPronouns = { pronouns: '' };
+  public formPronouns = {pronouns: ''};
   public get customPronouns(): boolean {
     return this.formPronouns.pronouns === '__customPronouns';
   }
@@ -45,10 +45,6 @@ export class EditProfileFormComponent implements OnInit {
       this.mode = this.data.mode;
     }
 
-    if (this.userService.isAnonymousUser()) {
-      this.state.go('sign_in');
-    }
-
     this.user.optInToResearch = false;
     this.user.receiveFeedbackNotifications = true;
     this.user.receivePortfolioNotifications = true;
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index f080a578ce..fca3d3ed24 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -82,8 +82,6 @@ export class SignInComponent implements OnInit {
     this.api = this.constants.API_URL;
     this.externalName = this.constants.ExternalName;
 
-    // this.attemptRefreshTokenSignIn();
-
     // HACK: Workaround the fact that query params do not work in Safari with ui-router
     if (!this.username) {
       const params = getUrlParams(document.location.href);
@@ -151,19 +149,7 @@ export class SignInComponent implements OnInit {
    */
   private actionSignInSuccess(): void {
     this.globalState.loadGlobals();
-    this.state.go('home');
-  }
-
-  /**
-   * Try to sign in using the refresh token cookie.
-   */
-  private attemptRefreshTokenSignIn(): void {
-    // Attempt to get an access token using the refresh token cookie
-    this.authService.attemptLoginUsingRefreshToken((loggedIn: boolean) => {
-      if (loggedIn) {
-        this.actionSignInSuccess();
-      }
-    });
+    this.state.go('welcome');
   }
 
   /**
diff --git a/src/app/sessions/transition-hooks.service.ts b/src/app/sessions/transition-hooks.service.ts
index d0497a7cbf..949e312f31 100644
--- a/src/app/sessions/transition-hooks.service.ts
+++ b/src/app/sessions/transition-hooks.service.ts
@@ -1,10 +1,10 @@
-import { Injectable } from '@angular/core';
-import { TransitionService } from '@uirouter/angular';
-import { UserService } from '../api/services/user.service';
-import { DoubtfireAngularModule } from '../doubtfire-angular.module';
-import { GlobalStateService } from '../projects/states/index/global-state.service';
-import { DoubtfireConstants } from '../config/constants/doubtfire-constants';
-import { AuthenticationService } from '../api/services/authentication.service';
+import {Injectable} from '@angular/core';
+import {TransitionService} from '@uirouter/angular';
+import {UserService} from '../api/services/user.service';
+import {DoubtfireAngularModule} from '../doubtfire-angular.module';
+import {GlobalStateService} from '../projects/states/index/global-state.service';
+import {DoubtfireConstants} from '../config/constants/doubtfire-constants';
+import {AuthenticationService} from '../api/services/authentication.service';
 
 /**
  * The TransitionHooksService is responsible for intercepting transitions between states.
@@ -34,7 +34,6 @@ export class TransitionHooksService {
       // log all possible states
       // console.log(transition.router.stateRegistry.get())
 
-
       // Where is the transition coming from and going to?
       const toState = transition.to().name;
       const toStateData = transition.to().data;
@@ -56,10 +55,13 @@ export class TransitionHooksService {
           this.globalState.hideHeader();
           break;
         case 'welcome':
-          // block acess to welcome once run
-          if (this.userService.currentUser.hasRunFirstTimeSetup || this.userService.isAnonymousUser()) {
-            return false;
+          if (
+            authenticationService.isAuthenticated() &&
+            userService.currentUser.hasRunFirstTimeSetup
+          ) {
+            return transition.router.stateService.target('home');
           }
+
           this.globalState.hideHeader();
           break;
         case 'home':
@@ -72,10 +74,13 @@ export class TransitionHooksService {
       // After auth... check the following
       this.authenticationService.afterAuthCall(() => {
         // Check authorization whitelist
-        if (toStateData.roleWhitelist && !this.authenticationService.isAuthorised(toStateData.roleWhitelist)) {
+        if (
+          toStateData.roleWhitelist &&
+          !this.authenticationService.isAuthorised(toStateData.roleWhitelist)
+        ) {
           if (authenticationService.isAuthenticated()) {
             return transition.router.stateService.go('unauthorised');
-          } else if (toState !== "sign_in") {
+          } else if (toState !== 'sign_in') {
             return transition.router.stateService.go('sign_in');
           }
         }
@@ -88,10 +93,16 @@ export class TransitionHooksService {
           return transition.router.stateService.go('welcome');
         }
 
+        // Block access to welcome after account setup
+        if (userService.currentUser.hasRunFirstTimeSetup && toState === 'welcome') {
+          return transition.router.stateService.go('home');
+        }
+
         // Redirect to eula if user has not accepted eula
         // they are loged in, have run first time setup,
         // but not accepted eula
-        if ( this.tiiEnabled &&
+        if (
+          this.tiiEnabled &&
           !this.userService.isAnonymousUser() &&
           userService.currentUser.hasRunFirstTimeSetup &&
           !userService.currentUser.acceptedTiiEula &&

From c1aeb9f4350f57ca9b0a136729d503626ac43c11 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 25 Jun 2025 17:28:57 +1000
Subject: [PATCH 297/776] refactor: update jplag methods

---
 src/app/api/models/task-definition.ts         | 29 +++++++-----
 .../api/services/task-definition.service.ts   |  3 +-
 src/app/common/footer/footer.component.ts     | 10 ++++
 .../task-similarity-view.component.html       | 12 +++++
 .../task-similarity-view.component.ts         | 47 ++++++++++++++++---
 5 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index d3a7dcf607..52f2fd84fc 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -49,7 +49,8 @@ export class TaskDefinition extends Entity {
   maxQualityPts: number;
   overseerImageId: number;
   assessmentEnabled: boolean;
-  jplagLanguage: string = 'c';
+  similarityLanguage: string = 'c';
+  hasJplagReport: boolean;
 
   public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
     new EntityCache<LearningOutcome>();
@@ -257,19 +258,23 @@ export class TaskDefinition extends Entity {
     }/task_assessment_resources.json`;
   }
 
-  public async hasJplagReport(): Promise<boolean> {
-    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${this.id}/has_jplag_report`;
-    //console.log(url);
-    try {
-      const response = await fetch(url);
-      const result = await response.json();
-      return result === 'true';
-    } catch (error) {
-      console.error('Error fetching JPLAG report:', error);
-      return false;
-    }
+  public getJplagReportUrl() {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${this.id}/jplag_report`;
   }
 
+  // public async hasJplagReport(): Promise<boolean> {
+  //   const url = `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${this.id}/has_jplag_report`;
+  //   console.log(`Jplag api url: ${url}`);
+  //   try {
+  //     const response = await fetch(url);
+  //     const result = await response.json();
+  //     return result === 'true';
+  //   } catch (error) {
+  //     console.error('Error fetching JPLAG report:', error);
+  //     return false;
+  //   }
+  // }
+
   public deleteTaskSheet(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
     return httpClient.delete(this.taskSheetUploadUrl).pipe(tap(() => (this.hasTaskSheet = false)));
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 1434cdb280..1abe274e45 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -24,7 +24,8 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'description',
       'weighting',
       'targetGrade',
-      'jplagLanguage',
+      'similarityLanguage',
+      'hasJplagReport',
       {
         keys: 'targetDate',
         toEntityFn: MappingFunctions.mapDateToEndOfDay,
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 7e4aa4b216..4530012275 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -78,4 +78,14 @@ export class FooterComponent implements OnInit {
   viewSimilarity() {
     this.selectedTaskService.showSimilarity();
   }
+
+  getJplagReport() {
+    if (!this.selectedTask?.definition) {
+      return;
+    }
+    this.fileDownloader.downloadFile(
+      this.selectedTask.definition.getJplagReportUrl(),
+      `${this.selectedTask.definition.abbreviation}-jplag-report`,
+    );
+  }
 }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index 2f42a7974d..7b7230be7d 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -8,6 +8,17 @@ <h1 class="mat-headline m-0">Similarities</h1>
     </div>
   </div>
 
+  <!-- TODO: we can either load the report viewer remotely or build it first and load it from file -->
+  <!-- <iframe src="/assets/jplag/index.html" frameborder="0" class="w-full h-[1000px]"></iframe> -->
+  <iframe
+    [hidden]="!jplagOpenState"
+    #jplagIframe
+    src="http://localhost:5173"
+    frameborder="0"
+    class="w-full h-[750px]"
+  ></iframe>
+
+  @if (!jplagOpenState) {
   <mat-accordion multi>
     @for (similarity of task?.similarityCache.values | async; track similarity) {
       <h1 class="mat-headline"></h1>
@@ -68,4 +79,5 @@ <h1 class="mat-headline"></h1>
       }
     }
   </mat-accordion>
+  }
 </div>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index 584d1c07c1..f6b0ec235f 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -17,7 +17,9 @@ import { AppInjector } from 'src/app/app-injector';
 export class TaskSimilarityViewComponent implements OnChanges {
   @Input() task: Task;
   @ViewChild(MatAccordion) accordion: MatAccordion;
+  @ViewChild('jplagIframe', {static: true}) jplagIframe!: ElementRef<HTMLIFrameElement>;
   panelOpenState = false;
+  jplagOpenState = false;
 
   constructor(
     private taskSimilarityService: TaskSimilarityService,
@@ -28,6 +30,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.task && changes.task.currentValue && this.task?.id) {
+      this.jplagOpenState = false;
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       this.task?.fetchSimilarities().subscribe((_) => {
         console.log('similarities fetched');
@@ -41,7 +44,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
     this.taskSimilarityService
       .update({ taskId: similarity.task.id, id: similarity.id }, { entity: similarity })
       .subscribe((_) => {
-        this.alertService.success('Similarity flag updated');
+        this.alertsService.success('Similarity flag updated');
         similarity.task.similarityFlag = similarity.task.similarityCache.currentValues
           .map((s) => {
             return s.flagged;
@@ -59,20 +62,52 @@ export class TaskSimilarityViewComponent implements OnChanges {
         window.open(url, '_blank');
       },
       error: (err) => {
-        this.alertService.error(`Error accessing TurnItIn: ${err}`);
+        this.alertsService.error(`Error accessing TurnItIn: ${err}`);
       },
     });
   }
 
   downloadJPLAGReport() {
+    this.jplagOpenState = true;
     const taskDef = this.task.definition;
-    this.fileDownloaderService.downloadFile(
-      //this.taskData.selectedTask.jplagReportUrl()
+    this.fileDownloaderService.downloadBlob(
       `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
         this.task.unit.id
       }/task_definitions/${taskDef.id}/jplag_report`,
-      `${this.task.unit.code}-${taskDef.abbreviation}-jplag-report.zip`,
+      (resourceUrl: string, response: HttpResponse<Blob>) => {
+        // Open in embedded iframe
+        setTimeout(() => {
+          const data = {
+            type: 'jplag-zip',
+            file: response.body,
+            name: 'report.jplag',
+          };
+          this.jplagIframe.nativeElement.contentWindow?.postMessage(data, '*');
+        }, 1000);
+
+        // Open in external window
+        // const viewerWindow = window.open(
+        //   'http://localhost:5173',
+        //   '_blank',
+        //   `width=1600,height=800,toolbar=no,menubar=no,scrollbars=no,resizable=yes,location=no,status=no`,
+        // );
+        // if (viewerWindow) {
+        //   // Wait for the viewer to fully load
+        //   setTimeout(() => {
+        //     const data = {
+        //       type: 'jplag-zip',
+        //       file: response.body,
+        //       name: 'report.jplag',
+        //     };
+        //     this.jplagIframe.nativeElement.contentWindow?.postMessage(data, '*');
+
+        //     // viewerWindow.postMessage(data, '*');
+        //   }, 1000);
+        // }
+      },
+      (error) => {
+        console.error(error);
+      },
     );
-    window.open('https://jplag.github.io/JPlag/', '_blank');
   }
 }

From 9a04a815cb0ce0e11bb058ca56f78f740110048b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 11:54:46 +1000
Subject: [PATCH 298/776] chore: format and missing imports

---
 src/app/api/models/task-definition.ts         |  16 +--
 .../api/services/task-definition.service.ts   |  18 +--
 src/app/common/footer/footer.component.ts     |  30 +++--
 .../task-similarity-view.component.html       | 106 +++++++++---------
 .../task-similarity-view.component.ts         |  24 ++--
 .../task-definition-upload.component.html     |  66 +++++++----
 .../staff-task-list.component.html            |   8 +-
 .../staff-task-list.component.ts              |  39 ++++---
 8 files changed, 170 insertions(+), 137 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 52f2fd84fc..69e92c5263 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -1,11 +1,11 @@
-import { HttpClient } from '@angular/common/http';
-import { Entity, EntityCache, EntityMapping } from 'ngx-entity-service';
-import { Observable, tap } from 'rxjs';
-import { AppInjector } from 'src/app/app-injector';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { TaskDefinitionService } from '../services/task-definition.service';
-import { Grade, GroupSet, LearningOutcome, TutorialStream, Unit } from './doubtfire-model';
+import {HttpClient} from '@angular/common/http';
+import {Entity, EntityCache, EntityMapping} from 'ngx-entity-service';
+import {Observable, tap} from 'rxjs';
+import {AppInjector} from 'src/app/app-injector';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {TaskDefinitionService} from '../services/task-definition.service';
+import {Grade, GroupSet, LearningOutcome, TutorialStream, Unit} from './doubtfire-model';
 
 export type UploadRequirement = {
   key: string;
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 1abe274e45..c71adaffbe 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -1,11 +1,11 @@
-import { CachedEntityService } from 'ngx-entity-service';
-import { LearningOutcomeService, TaskDefinition, Unit } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import {CachedEntityService} from 'ngx-entity-service';
+import {LearningOutcomeService, TaskDefinition, Unit} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiURL';
-import { MappingFunctions } from './mapping-fn';
-import { AppInjector } from 'src/app/app-injector';
-import { Observable } from 'rxjs';
+import {MappingFunctions} from './mapping-fn';
+import {AppInjector} from 'src/app/app-injector';
+import {Observable} from 'rxjs';
 
 @Injectable()
 export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
@@ -116,7 +116,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       {
         keys: 'ilos',
         toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
-          data[key]?.forEach(ilo => {
+          data[key]?.forEach((ilo) => {
             taskDefinition.learningOutcomesCache.getOrCreate(
               ilo['id'],
               this.learningOutcomeService,
@@ -132,7 +132,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskSheet',
       'hasTaskResources',
       'hasTaskAssessmentResources',
-      'hasScormData'
+      'hasScormData',
     );
   }
 
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 4530012275..6c3871d0e1 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -1,9 +1,9 @@
-import { Component, ElementRef, HostListener, OnInit, ViewChild } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Task } from 'src/app/api/models/task';
-import { SelectedTaskService } from 'src/app/projects/states/dashboard/selected-task.service';
-import { TaskService } from 'src/app/api/services/task.service';
-import { FileDownloaderService } from '../file-downloader/file-downloader.service';
+import {Component, ElementRef, HostListener, OnInit, ViewChild} from '@angular/core';
+import {Observable} from 'rxjs';
+import {Task} from 'src/app/api/models/task';
+import {SelectedTaskService} from 'src/app/projects/states/dashboard/selected-task.service';
+import {TaskService} from 'src/app/api/services/task.service';
+import {FileDownloaderService} from '../file-downloader/file-downloader.service';
 
 @Component({
   selector: 'f-footer',
@@ -11,13 +11,18 @@ import { FileDownloaderService } from '../file-downloader/file-downloader.servic
   styleUrls: ['./footer.component.scss'],
 })
 export class FooterComponent implements OnInit {
-  constructor(public selectedTaskService: SelectedTaskService, public taskService: TaskService, private fileDownloader: FileDownloaderService) {}
+  constructor(
+    public selectedTaskService: SelectedTaskService,
+    public taskService: TaskService,
+    private fileDownloader: FileDownloaderService,
+  ) {}
 
   selectedTask$: Observable<Task>;
   selectedTask: Task;
 
-  @ViewChild('similaritiesButton', { static: false, read: ElementRef }) similaritiesButton: ElementRef;
-  @ViewChild('warningText', { static: false, read: ElementRef }) warningText: ElementRef;
+  @ViewChild('similaritiesButton', {static: false, read: ElementRef})
+  similaritiesButton: ElementRef;
+  @ViewChild('warningText', {static: false, read: ElementRef}) warningText: ElementRef;
   public leftOffset: number;
   public topOffset: number;
   public warningTextLeftOffset: number;
@@ -37,7 +42,8 @@ export class FooterComponent implements OnInit {
 
     const totalPaddingOffset = 30;
     this.warningTextLeftOffset =
-      this.leftOffset - (this.warningText?.nativeElement.getBoundingClientRect().width + totalPaddingOffset) / 2;
+      this.leftOffset -
+      (this.warningText?.nativeElement.getBoundingClientRect().width + totalPaddingOffset) / 2;
   }
 
   ngOnInit(): void {
@@ -56,14 +62,14 @@ export class FooterComponent implements OnInit {
   downloadFiles() {
     this.fileDownloader.downloadFile(
       this.selectedTask.submittedFilesUrl(true),
-      `${this.selectedTask.project.student.lastName}-${this.selectedTask.definition.name}.zip`
+      `${this.selectedTask.project.student.lastName}-${this.selectedTask.definition.name}.zip`,
     );
   }
 
   downloadSubmissionPdf() {
     this.fileDownloader.downloadFile(
       this.selectedTask.submissionUrl(true),
-      `${this.selectedTask.project.student.lastName}-${this.selectedTask.definition.name}.pdf`
+      `${this.selectedTask.project.student.lastName}-${this.selectedTask.definition.name}.pdf`,
     );
   }
 
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index 7b7230be7d..21981535cf 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -19,65 +19,65 @@ <h1 class="mat-headline m-0">Similarities</h1>
   ></iframe>
 
   @if (!jplagOpenState) {
-  <mat-accordion multi>
-    @for (similarity of task?.similarityCache.values | async; track similarity) {
-      <h1 class="mat-headline"></h1>
-      @for (part of similarity.parts; track part; let i = $index) {
-        <mat-expansion-panel
-          hideToggle
-          (opened)="part.panelOpenState = true"
-          (closed)="part.panelOpenState = false"
-        >
-          <mat-expansion-panel-header [ngClass]="{flagged: similarity.flagged}">
-            <mat-panel-title>
-              {{ similarity.friendlyTypeName }}
-            </mat-panel-title>
-            <mat-panel-description> {{ part.description }} </mat-panel-description>
-            @if (similarity.readyForViewer) {
-              @if (similarity.type === 'JplagTaskSimilarity') {
-                <button
-                  matTooltip="Download report for this similarity"
-                  mat-icon-button
-                  aria-label="View Detailed Report"
-                  (click)="downloadJPLAGReport()"
-                >
-                  <mat-icon>download</mat-icon>
-                </button>
-              } @else {
+    <mat-accordion multi>
+      @for (similarity of task?.similarityCache.values | async; track similarity) {
+        <h1 class="mat-headline"></h1>
+        @for (part of similarity.parts; track part; let i = $index) {
+          <mat-expansion-panel
+            hideToggle
+            (opened)="part.panelOpenState = true"
+            (closed)="part.panelOpenState = false"
+          >
+            <mat-expansion-panel-header [ngClass]="{flagged: similarity.flagged}">
+              <mat-panel-title>
+                {{ similarity.friendlyTypeName }}
+              </mat-panel-title>
+              <mat-panel-description> {{ part.description }} </mat-panel-description>
+              @if (similarity.readyForViewer) {
+                @if (similarity.type === 'JplagTaskSimilarity') {
+                  <button
+                    matTooltip="Download report for this similarity"
+                    mat-icon-button
+                    aria-label="View Detailed Report"
+                    (click)="downloadJPLAGReport()"
+                  >
+                    <mat-icon>download</mat-icon>
+                  </button>
+                } @else {
+                  <button
+                    matTooltip="View similarity for this part"
+                    mat-icon-button
+                    aria-label="View Similarity"
+                    (click)="openViewer($event, similarity, part)"
+                  >
+                    <mat-icon>summarize</mat-icon>
+                  </button>
+                }
+              }
+              @if (i === 0) {
                 <button
-                  matTooltip="View similarity for this part"
+                  [matTooltip]="similarity.flagged ? 'Unflag similarity' : 'Flag similarity'"
                   mat-icon-button
-                  aria-label="View Similarity"
-                  (click)="openViewer($event, similarity, part)"
+                  aria-label="Flag similarities"
+                  (click)="toggleFlag($event, similarity)"
                 >
-                  <mat-icon>summarize</mat-icon>
+                  <mat-icon [color]="similarity.flagged ? 'warn' : ''">{{
+                    similarity.flagged ? 'flag_circle' : 'check_circle'
+                  }}</mat-icon>
                 </button>
               }
+            </mat-expansion-panel-header>
+            @if (part.panelOpenState && part.format) {
+              <f-file-viewer
+                [fileType]="part.format"
+                [src]="similarity.fileUrl(part.idx)"
+              ></f-file-viewer>
+            } @else {
+              <p>There is no local similarity file for this.</p>
             }
-            @if (i === 0) {
-              <button
-                [matTooltip]="similarity.flagged ? 'Unflag similarity' : 'Flag similarity'"
-                mat-icon-button
-                aria-label="Flag similarities"
-                (click)="toggleFlag($event, similarity)"
-              >
-                <mat-icon [color]="similarity.flagged ? 'warn' : ''">{{
-                  similarity.flagged ? 'flag_circle' : 'check_circle'
-                }}</mat-icon>
-              </button>
-            }
-          </mat-expansion-panel-header>
-          @if (part.panelOpenState && part.format) {
-            <f-file-viewer
-              [fileType]="part.format"
-              [src]="similarity.fileUrl(part.idx)"
-            ></f-file-viewer>
-          } @else {
-            <p>There is no local similarity file for this.</p>
-          }
-        </mat-expansion-panel>
+          </mat-expansion-panel>
+        }
       }
-    }
-  </mat-accordion>
+    </mat-accordion>
   }
 </div>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index f6b0ec235f..a5c8b77d08 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -1,13 +1,14 @@
-import { Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
-import { MatAccordion } from '@angular/material/expansion';
-import { Task } from 'src/app/api/models/task';
-import { TaskSimilarity } from 'src/app/api/models/task-similarity';
-import { TaskSimilarityService } from 'src/app/api/services/task-similarity.service';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { SelectedTaskService } from '../../../../selected-task.service';
+import {Component, ElementRef, Input, OnChanges, SimpleChanges, ViewChild} from '@angular/core';
+import {MatAccordion} from '@angular/material/expansion';
+import {Task} from 'src/app/api/models/task';
+import {TaskSimilarity} from 'src/app/api/models/task-similarity';
+import {TaskSimilarityService} from 'src/app/api/services/task-similarity.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {SelectedTaskService} from '../../../../selected-task.service';
 import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { AppInjector } from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {AppInjector} from 'src/app/app-injector';
+import {HttpResponse} from '@angular/common/http';
 
 @Component({
   selector: 'f-task-similarity-view',
@@ -42,7 +43,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
     e.stopPropagation();
     similarity.flagged = !similarity.flagged;
     this.taskSimilarityService
-      .update({ taskId: similarity.task.id, id: similarity.id }, { entity: similarity })
+      .update({taskId: similarity.task.id, id: similarity.id}, {entity: similarity})
       .subscribe((_) => {
         this.alertsService.success('Similarity flag updated');
         similarity.task.similarityFlag = similarity.task.similarityCache.currentValues
@@ -101,8 +102,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
         //     };
         //     this.jplagIframe.nativeElement.contentWindow?.postMessage(data, '*');
 
-        //     // viewerWindow.postMessage(data, '*');
-        //   }, 1000);
+        //     }, 1000);
         // }
       },
       (error) => {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
index 5d1d61eb78..5191ecf70c 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
@@ -39,11 +39,11 @@
     <th style="width: 20%" mat-header-cell *matHeaderCellDef>Flag At</th>
     <td style="width: 20%" mat-cell *matCellDef="let upreq">
       @if (upreq.type === 'document' && upreq.tiiCheck) {
-<mat-form-field appearance="outline" style="width: 7em">
-        <input matInput [(ngModel)]="upreq.tiiPct" type="number" />
-        <span matTextSuffix>&nbsp;%</span>
-      </mat-form-field>
-}
+        <mat-form-field appearance="outline" style="width: 7em">
+          <input matInput [(ngModel)]="upreq.tiiPct" type="number" />
+          <span matTextSuffix>&nbsp;%</span>
+        </mat-form-field>
+      }
     </td>
   </ng-container>
 
@@ -51,7 +51,12 @@
   <ng-container matColumnDef="row-actions" sticky>
     <th style="width: 10%" mat-header-cell *matHeaderCellDef></th>
     <td style="width: 10%" mat-cell *matCellDef="let upreq">
-      <button mat-icon-button aria-label="delete upload requirement" color="warn" (click)="removeUpReq(upreq)">
+      <button
+        mat-icon-button
+        aria-label="delete upload requirement"
+        color="warn"
+        (click)="removeUpReq(upreq)"
+      >
         <mat-icon>delete</mat-icon>
       </button>
     </td>
@@ -63,7 +68,9 @@
       <mat-toolbar>
         <mat-toolbar-row>
           <span class="flex flex-grow"></span>
-          <button mat-flat-button color="primary" (click)="addUpReq()"><mat-icon>add</mat-icon> Add</button>
+          <button mat-flat-button color="primary" (click)="addUpReq()">
+            <mat-icon>add</mat-icon> Add
+          </button>
         </mat-toolbar-row>
       </mat-toolbar>
     </td>
@@ -75,19 +82,34 @@
 </table>
 
 @if (taskDefinition.needsJplag) {
-<div class="flex-grow flex flex-row gap-4">
-  <mat-form-field appearance="outline" class="basis-1/2">
-    <mat-label>Language used for JPLAG checks</mat-label>
-    <mat-select [(ngModel)]="taskDefinition.jplagLanguage">
-      <mat-option value="c">C</mat-option>
-      <mat-option value="csharp">C#</mat-option>
-      <mat-option value="cpp">C++</mat-option>
-      <mat-option value="python">Python</mat-option>
-    </mat-select>
-  </mat-form-field>
-  <mat-form-field appearance="outline" class="basis-1/2">
-    <mat-label>Similarity percent to flag for JPLAG checks</mat-label>
-    <input matInput [(ngModel)]="taskDefinition.plagiarismWarnPct" type="number" />
-  </mat-form-field>
-</div>
+  <div class="flex-grow flex flex-row gap-4">
+    <mat-form-field appearance="outline" class="basis-1/2">
+      <mat-label>Language used for JPLAG checks</mat-label>
+      <mat-select [(ngModel)]="taskDefinition.similarityLanguage">
+        <mat-option value="java">Java</mat-option>
+        <mat-option value="c">C</mat-option>
+        <mat-option value="cpp">C++</mat-option>
+        <mat-option value="csharp">C#</mat-option>
+        <mat-option value="python3">Python</mat-option>
+        <mat-option value="javascript">JavaScript</mat-option>
+        <mat-option value="typescript">TypeScript</mat-option>
+        <mat-option value="golang">Go</mat-option>
+        <mat-option value="kotlin">Kotlin</mat-option>
+        <mat-option value="rlang">R</mat-option>
+        <mat-option value="rust">Rust</mat-option>
+        <mat-option value="swift">Swift</mat-option>
+        <mat-option value="scala">Scala</mat-option>
+        <mat-option value="llvmir">LLVM IR</mat-option>
+        <mat-option value="scheme">Scheme</mat-option>
+        <mat-option value="emf">EMF Metamodel</mat-option>
+        <mat-option value="emf-model">EMF Model</mat-option>
+        <mat-option value="scxml">SCXML</mat-option>
+        <mat-option value="text">Text</mat-option>
+      </mat-select>
+    </mat-form-field>
+    <mat-form-field appearance="outline" class="basis-1/2">
+      <mat-label>Similarity percent to flag for JPLAG checks</mat-label>
+      <input matInput [(ngModel)]="taskDefinition.plagiarismWarnPct" type="number" />
+    </mat-form-field>
+  </div>
 }
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index 0752b1a528..c8d86651bc 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -80,10 +80,10 @@
           <span>Bulk Export Submission Files</span>
         </button>
         <!-- Commented out until hasJplagReport check works correctly -->
-        <!-- <button mat-menu-item (click)="downloadJPLAGReport()" [disabled]="hasJplagReport">
+        <button mat-menu-item (click)="downloadJPLAGReport()" [disabled]="hasJplagReport">
           <mat-icon>download</mat-icon>
           <span>Download JPLAG Report</span>
-        </button> -->
+        </button>
       </mat-menu>
     </div>
     <mat-accordion>
@@ -209,7 +209,7 @@
               id="{{ task.taskKeyToIdString() }}"
               [ngClass]="{
                 selected: isSelectedTask(task),
-                'item-content': task.statusClass(),
+                'item-content': task.statusClass()
               }"
             >
               <div
@@ -223,7 +223,7 @@
                   class="notification"
                   [ngClass]="{
                     active: task.numNewComments > 0 || task.similaritiesDetected,
-                    similarities: task.similaritiesDetected,
+                    similarities: task.similaritiesDetected
                   }"
                 ></span>
                 <user-icon class="self-center" [user]="task.project.student" [size]="30">
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 13f8b4bdb8..bf8a335f95 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -77,7 +77,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
 
   tasks: any[] = null;
 
-  hasJplagReport: boolean;
+  // hasJplagReport: boolean = false;
 
   watchingTaskKey: any;
 
@@ -210,18 +210,23 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   // TODO: Get this to return correct value from the API
-  public async taskHasJplagReport(): Promise<boolean> {
-    const taskDef = this.filters.taskDefinition;
-    return taskDef
-      .hasJplagReport()
-      .then((hasReport) => {
-        return hasReport ?? false;
-      })
-      .catch((error) => {
-        console.error(error);
-        return false;
-      });
-  }
+  // public async taskHasJplagReport(task: TaskDefinition): Promise<boolean> {
+  //   const taskDef = this.filters?.taskDefinition ?? task;
+  //   if (!taskDef) {
+  //     console.log('tasks is invalid?');
+  //     return false;
+  //   }
+
+  //   // return taskDef
+  //   //   .hasJplagReport()
+  //   //   .then((hasReport) => {
+  //   //     return hasReport ?? false;
+  //   //   })
+  //   //   .catch((error) => {
+  //   //     console.error(error);
+  //   //     return false;
+  //   //   });
+  // }
 
   downloadSubmissionPdfs() {
     const taskDef = this.filters.taskDefinition;
@@ -378,10 +383,6 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
         this.alertService.error(message, 6000);
       },
     });
-    this.taskHasJplagReport().then((hasReport) => {
-      this.hasJplagReport = hasReport;
-    });
-    console.log('HAS JPLAG REPORT:', this.hasJplagReport);
   }
 
   setSelectedTask(task: Task) {
@@ -393,6 +394,10 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     if (task) {
       this.scrollToTaskInList(task);
     }
+
+    if (task?.definition) {
+      console.log(`does task def have a jplag report?: ${task.definition.hasJplagReport}`);
+    }
   }
 
   private scrollToTaskInList(task) {

From b38738052e9847b7c03bf00ab91e404592bead9e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:45:09 +1000
Subject: [PATCH 299/776] build: init local jplag report viewer

---
 .gitmodules         | 3 +++
 JPlag-Report-Viewer | 1 +
 angular.json        | 7 ++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .gitmodules
 create mode 160000 JPlag-Report-Viewer

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..0da6e52835
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "JPlag-Report-Viewer"]
+	path = JPlag-Report-Viewer
+	url = https://github.com/doubtfire-lms/jplag-deploy.git
diff --git a/JPlag-Report-Viewer b/JPlag-Report-Viewer
new file mode 160000
index 0000000000..57e8787e24
--- /dev/null
+++ b/JPlag-Report-Viewer
@@ -0,0 +1 @@
+Subproject commit 57e8787e248d95c5cb40ae16dcc734d95cebb5d5
diff --git a/angular.json b/angular.json
index 2c0b1f0b92..36556b7ef4 100644
--- a/angular.json
+++ b/angular.json
@@ -24,7 +24,12 @@
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
               "src/assets",
-              "src/manifest.webmanifest"
+              "src/manifest.webmanifest",
+              {
+                "input": "./JPlag-Report-Viewer",
+                "output": "/JPlag",
+                "glob": "**/*"
+              }
             ],
             "styles": [
               "src/theme.scss",

From 13604383b403dbf82b013786127a72fab08ac895 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 15:45:45 +1000
Subject: [PATCH 300/776] feat: load jplag report viewer into iframe

---
 .../task-similarity-view.component.html       |  6 +-
 .../task-similarity-view.component.ts         | 56 +++++++++----------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index 21981535cf..f680da3b17 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -8,12 +8,10 @@ <h1 class="mat-headline m-0">Similarities</h1>
     </div>
   </div>
 
-  <!-- TODO: we can either load the report viewer remotely or build it first and load it from file -->
-  <!-- <iframe src="/assets/jplag/index.html" frameborder="0" class="w-full h-[1000px]"></iframe> -->
   <iframe
     [hidden]="!jplagOpenState"
     #jplagIframe
-    src="http://localhost:5173"
+    src="/JPlag/"
     frameborder="0"
     class="w-full h-[750px]"
   ></iframe>
@@ -39,7 +37,7 @@ <h1 class="mat-headline"></h1>
                     matTooltip="Download report for this similarity"
                     mat-icon-button
                     aria-label="View Detailed Report"
-                    (click)="downloadJPLAGReport()"
+                    (click)="downloadJPLAGReport(part.description)"
                   >
                     <mat-icon>download</mat-icon>
                   </button>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index a5c8b77d08..3d4bafd854 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -68,42 +68,40 @@ export class TaskSimilarityViewComponent implements OnChanges {
     });
   }
 
-  downloadJPLAGReport() {
-    this.jplagOpenState = true;
+  downloadJPLAGReport(similarityDescription: string) {
+    // TODO: confirm how the users are identified in jplag reports; username or full name?
+    const studentUsername = this.task.project.student.username;
+
     const taskDef = this.task.definition;
     this.fileDownloaderService.downloadBlob(
       `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
         this.task.unit.id
       }/task_definitions/${taskDef.id}/jplag_report`,
       (resourceUrl: string, response: HttpResponse<Blob>) => {
-        // Open in embedded iframe
+        // Open JPlag report viewer in embedded iframe
         setTimeout(() => {
-          const data = {
-            type: 'jplag-zip',
-            file: response.body,
-            name: 'report.jplag',
-          };
-          this.jplagIframe.nativeElement.contentWindow?.postMessage(data, '*');
-        }, 1000);
-
-        // Open in external window
-        // const viewerWindow = window.open(
-        //   'http://localhost:5173',
-        //   '_blank',
-        //   `width=1600,height=800,toolbar=no,menubar=no,scrollbars=no,resizable=yes,location=no,status=no`,
-        // );
-        // if (viewerWindow) {
-        //   // Wait for the viewer to fully load
-        //   setTimeout(() => {
-        //     const data = {
-        //       type: 'jplag-zip',
-        //       file: response.body,
-        //       name: 'report.jplag',
-        //     };
-        //     this.jplagIframe.nativeElement.contentWindow?.postMessage(data, '*');
-
-        //     }, 1000);
-        // }
+          // Send the JPlag report to load
+          this.jplagIframe.nativeElement.contentWindow?.postMessage(
+            {
+              type: 'upload-jplag-file',
+              file: response.body,
+              name: 'report.jplag',
+            },
+            '*',
+          );
+          setTimeout(() => {
+            // Search comparisons by student username, auto load
+            this.jplagIframe.nativeElement.contentWindow?.postMessage(
+              {
+                type: 'set-search-filter-value',
+                filter: studentUsername,
+                autoViewComparison: true,
+              },
+              '*',
+            );
+            this.jplagOpenState = true;
+          }, 100);
+        }, 100);
       },
       (error) => {
         console.error(error);

From 504f1e3dc685bf89967860f008a370bd5a0b3a9e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 16:45:05 +1000
Subject: [PATCH 301/776] chore: add back moss enum

---
 src/app/api/models/task-similarity.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/api/models/task-similarity.ts b/src/app/api/models/task-similarity.ts
index be8b3d9b09..1d6da78588 100644
--- a/src/app/api/models/task-similarity.ts
+++ b/src/app/api/models/task-similarity.ts
@@ -1,11 +1,12 @@
-import { Entity } from 'ngx-entity-service';
-import { AppInjector } from 'src/app/app-injector';
-import { Task, TaskSimilarityService } from './doubtfire-model';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { Observable } from 'rxjs';
+import {Entity} from 'ngx-entity-service';
+import {AppInjector} from 'src/app/app-injector';
+import {Task, TaskSimilarityService} from './doubtfire-model';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {Observable} from 'rxjs';
 
 export enum TaskSimilarityType {
   Jplag = 'JplagTaskSimilarity',
+  Moss = 'MossTaskSimilarity',
   TurnItIn = 'TiiTaskSimilarity',
 }
 

From 9b542e121fd8243a119b596bce8aba6a5fbf62eb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 16:49:06 +1000
Subject: [PATCH 302/776] chore: update jplag report icon

---
 .../task-similarity-view.component.html       | 21 ++++++++---
 .../task-similarity-view.component.ts         | 35 ++++++++-----------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index f680da3b17..56f6a6bdf9 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -4,7 +4,12 @@
     <h1 class="mat-headline m-0">Similarities</h1>
     <span class="grow"></span>
     <div class="example-action-buttons">
-      <button mat-button (click)="accordion.closeAll()">Collapse All</button>
+      @if (!jplagOpenState) {
+        <button mat-button (click)="accordion.closeAll()">Collapse All</button>
+      }
+      @if (jplagOpenState) {
+        <button mat-button (click)="jplagOpenState = false">Back to Summary</button>
+      }
     </div>
   </div>
 
@@ -34,12 +39,20 @@ <h1 class="mat-headline"></h1>
               @if (similarity.readyForViewer) {
                 @if (similarity.type === 'JplagTaskSimilarity') {
                   <button
-                    matTooltip="Download report for this similarity"
+                    [matTooltip]="
+                      similarity.type === 'JplagTaskSimilarity'
+                        ? 'View JPlag report for this similarity'
+                        : 'Download report for this similarity'
+                    "
                     mat-icon-button
                     aria-label="View Detailed Report"
-                    (click)="downloadJPLAGReport(part.description)"
+                    (click)="downloadJPLAGReport()"
                   >
-                    <mat-icon>download</mat-icon>
+                    @if (similarity.type === 'JplagTaskSimilarity') {
+                      <mat-icon>assessment</mat-icon>
+                    } @else {
+                      <mat-icon>download</mat-icon>
+                    }
                   </button>
                 } @else {
                   <button
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index 3d4bafd854..205a0d5697 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -68,8 +68,9 @@ export class TaskSimilarityViewComponent implements OnChanges {
     });
   }
 
-  downloadJPLAGReport(similarityDescription: string) {
-    // TODO: confirm how the users are identified in jplag reports; username or full name?
+  downloadJPLAGReport() {
+    // Students are identified by their username in JPlag reports (configured by API)
+    // In most cases, usernames are a combination of their first and last names
     const studentUsername = this.task.project.student.username;
 
     const taskDef = this.task.definition;
@@ -77,28 +78,22 @@ export class TaskSimilarityViewComponent implements OnChanges {
       `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
         this.task.unit.id
       }/task_definitions/${taskDef.id}/jplag_report`,
-      (resourceUrl: string, response: HttpResponse<Blob>) => {
+      (_, response: HttpResponse<Blob>) => {
         // Open JPlag report viewer in embedded iframe
         setTimeout(() => {
           // Send the JPlag report to load
-          this.jplagIframe.nativeElement.contentWindow?.postMessage(
-            {
-              type: 'upload-jplag-file',
-              file: response.body,
-              name: 'report.jplag',
-            },
-            '*',
-          );
+          this.jplagIframe.nativeElement.contentWindow?.postMessage({
+            type: 'upload-jplag-file',
+            file: response.body,
+            name: 'report.jplag',
+          });
           setTimeout(() => {
-            // Search comparisons by student username, auto load
-            this.jplagIframe.nativeElement.contentWindow?.postMessage(
-              {
-                type: 'set-search-filter-value',
-                filter: studentUsername,
-                autoViewComparison: true,
-              },
-              '*',
-            );
+            // Search comparisons by student username, auto load comparisons if only one is found
+            this.jplagIframe.nativeElement.contentWindow?.postMessage({
+              type: 'set-search-filter-value',
+              filter: studentUsername,
+              autoViewComparison: true,
+            });
             this.jplagOpenState = true;
           }, 100);
         }, 100);

From c80c20274158f84c96d180b5f6abf74d2bc3c6a7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 16:50:54 +1000
Subject: [PATCH 303/776] chore: remove unused code

---
 .../staff-task-list.component.ts              | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index bf8a335f95..c24c705c91 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -209,25 +209,6 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     return this.taskData.taskDefMode;
   }
 
-  // TODO: Get this to return correct value from the API
-  // public async taskHasJplagReport(task: TaskDefinition): Promise<boolean> {
-  //   const taskDef = this.filters?.taskDefinition ?? task;
-  //   if (!taskDef) {
-  //     console.log('tasks is invalid?');
-  //     return false;
-  //   }
-
-  //   // return taskDef
-  //   //   .hasJplagReport()
-  //   //   .then((hasReport) => {
-  //   //     return hasReport ?? false;
-  //   //   })
-  //   //   .catch((error) => {
-  //   //     console.error(error);
-  //   //     return false;
-  //   //   });
-  // }
-
   downloadSubmissionPdfs() {
     const taskDef = this.filters.taskDefinition;
     this.fileDownloaderService.downloadFile(
@@ -394,10 +375,6 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     if (task) {
       this.scrollToTaskInList(task);
     }
-
-    if (task?.definition) {
-      console.log(`does task def have a jplag report?: ${task.definition.hasJplagReport}`);
-    }
   }
 
   private scrollToTaskInList(task) {

From 957e386da6b68c65e084adcd06712534b03227de Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 17:03:47 +1000
Subject: [PATCH 304/776] chore: rename jplag methods

---
 src/app/api/models/task-definition.ts               | 13 -------------
 .../task-similarity-view.component.html             |  4 +++-
 .../task-similarity-view.component.ts               |  2 +-
 .../staff-task-list/staff-task-list.component.ts    |  9 ++++-----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 69e92c5263..8f3fce78ac 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -262,19 +262,6 @@ export class TaskDefinition extends Entity {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${this.id}/jplag_report`;
   }
 
-  // public async hasJplagReport(): Promise<boolean> {
-  //   const url = `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${this.id}/has_jplag_report`;
-  //   console.log(`Jplag api url: ${url}`);
-  //   try {
-  //     const response = await fetch(url);
-  //     const result = await response.json();
-  //     return result === 'true';
-  //   } catch (error) {
-  //     console.error('Error fetching JPLAG report:', error);
-  //     return false;
-  //   }
-  // }
-
   public deleteTaskSheet(): Observable<any> {
     const httpClient = AppInjector.get(HttpClient);
     return httpClient.delete(this.taskSheetUploadUrl).pipe(tap(() => (this.hasTaskSheet = false)));
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index 56f6a6bdf9..7c17ec050c 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -46,7 +46,9 @@ <h1 class="mat-headline"></h1>
                     "
                     mat-icon-button
                     aria-label="View Detailed Report"
-                    (click)="downloadJPLAGReport()"
+                    (click)="
+                      similarity.type === 'JplagTaskSimilarity' ? viewJplagReport() : openReport()
+                    "
                   >
                     @if (similarity.type === 'JplagTaskSimilarity') {
                       <mat-icon>assessment</mat-icon>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index 205a0d5697..924dd0dec4 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -68,7 +68,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
     });
   }
 
-  downloadJPLAGReport() {
+  viewJplagReport() {
     // Students are identified by their username in JPlag reports (configured by API)
     // In most cases, usernames are a combination of their first and last names
     const studentUsername = this.task.project.student.username;
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index c24c705c91..4763e8dc8f 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -232,13 +232,12 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
   downloadJPLAGReport() {
     const taskDef = this.filters.taskDefinition;
     this.fileDownloaderService.downloadFile(
-      //this.taskData.selectedTask.jplagReportUrl()
-      `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
-        this.unit.id
-      }/task_definitions/${taskDef.id}/jplag_report`,
+      taskDef.getJplagReportUrl(),
       `${this.unit.code}-${taskDef.abbreviation}-jplag-report.zip`,
     );
-    window.open('https://jplag.github.io/JPlag/', '_blank');
+
+    // TODO: redirect to our self hosted jplag?
+    // window.open('https://jplag.github.io/JPlag/', '_blank');
   }
 
   openDialog() {

From 8f6bc6ae5b80502b5d81b65bab2be3aaa56ce42f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 17:38:46 +1000
Subject: [PATCH 305/776] feat: native jplag report viewer state

---
 src/app/doubtfire-angular.module.ts           | 29 ++++++++++------
 src/app/doubtfire.states.ts                   | 33 ++++++++++++++-----
 .../task-similarity-view.component.html       |  8 +----
 .../task-similarity-view.component.ts         | 25 +++++---------
 .../jplag/jplag-report-viewer.component.html  |  9 +++++
 .../jplag/jplag-report-viewer.component.ts    | 29 ++++++++++++++++
 .../staff-task-list.component.html            |  7 ++--
 .../staff-task-list.component.ts              |  6 ++--
 8 files changed, 99 insertions(+), 47 deletions(-)
 create mode 100644 src/app/projects/states/jplag/jplag-report-viewer.component.html
 create mode 100644 src/app/projects/states/jplag/jplag-report-viewer.component.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 699e1b909f..f12d427d48 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -47,7 +47,10 @@ import {AlertComponent} from 'src/app/common/services/alert.service';
 import {setTheme} from 'ngx-bootstrap/utils';
 
 import {AboutDoubtfireModalService} from 'src/app/common/modals/about-doubtfire-modal/about-doubtfire-modal.service';
-import { D2lUnitDetailsFormComponent, D2lUnitDetailsModal } from './units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component';
+import {
+  D2lUnitDetailsFormComponent,
+  D2lUnitDetailsModal,
+} from './units/states/edit/directives/unit-details-editor/d2l-details-form/d2l-unit-details-form.component';
 import {
   AboutDoubtfireModal,
   AboutDoubtfireModalContent,
@@ -94,15 +97,19 @@ import {ExtensionCommentComponent} from './tasks/task-comments-viewer/extension-
 import {CampusListComponent} from './admin/institution-settings/campuses/campus-list/campus-list.component';
 import {ExtensionModalComponent} from './common/modals/extension-modal/extension-modal.component';
 import {CalendarModalComponent} from './common/modals/calendar-modal/calendar-modal.component';
-import { ConfirmationModalComponent } from './common/modals/confirmation-modal/confirmation-modal.component';
+import {ConfirmationModalComponent} from './common/modals/confirmation-modal/confirmation-modal.component';
 import {MatRadioModule} from '@angular/material/radio';
 import {MatButtonToggleModule} from '@angular/material/button-toggle';
-import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatOptionModule} from '@angular/material/core';
+import {
+  DateAdapter,
+  MAT_DATE_FORMATS,
+  MAT_DATE_LOCALE,
+  MatOptionModule,
+} from '@angular/material/core';
 import {MatDatepickerModule} from '@angular/material/datepicker';
 
-import { DateFnsAdapter, MAT_DATE_FNS_FORMATS } from '@angular/material-date-fns-adapter';
-import { enAU } from 'date-fns/locale';
-
+import {DateFnsAdapter, MAT_DATE_FNS_FORMATS} from '@angular/material-date-fns-adapter';
+import {enAU} from 'date-fns/locale';
 
 import {doubtfireStates} from './doubtfire.states';
 import {MatTableModule} from '@angular/material/table';
@@ -251,10 +258,11 @@ import {LearningOutcomeEditorComponent} from './common/learning-outcome-editor/l
 import {TaskFeedbackTemplatesComponent} from './tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component';
 import {NestedCsvDownloadModalComponent} from './common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component';
 import {NestedCsvDownloadModalService} from './common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.service';
-import { TaskDateSliderComponent } from './common/modals/date-change-modal/task-date-slider.component';
-import { SpecConModalComponent } from './common/modals/spec-con-modal/spec-con-modal.component';
-import { SpecConModalService } from './common/modals/spec-con-modal/spec-con-modal.service';
-import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
+import {TaskDateSliderComponent} from './common/modals/date-change-modal/task-date-slider.component';
+import {SpecConModalComponent} from './common/modals/spec-con-modal/spec-con-modal.component';
+import {SpecConModalService} from './common/modals/spec-con-modal/spec-con-modal.service';
+import {ProjectPlanComponent} from './projects/states/plan/project-plan.component';
+import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-viewer.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -386,6 +394,7 @@ const MY_DATE_FORMAT = {
     LearningOutcomeEditorComponent,
     TaskFeedbackTemplatesComponent,
     NestedCsvDownloadModalComponent,
+    JplagReportViewerComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index e00252fe28..3125666fcd 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -9,8 +9,9 @@ import {AcceptEulaComponent} from './eula/accept-eula/accept-eula.component';
 import {FUsersComponent} from './admin/states/f-users/f-users.component';
 import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
-import { SuccessCloseComponent } from './common/success-close/success-close.component';
-import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
+import {SuccessCloseComponent} from './common/success-close/success-close.component';
+import {ProjectPlanComponent} from './projects/states/plan/project-plan.component';
+import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-viewer.component';
 
 /*
  * Use this file to store any states that are sourced by angular components.
@@ -191,7 +192,7 @@ const SignInState: NgHybridStateDeclaration = {
       '$stateParams',
       function ($stateParams: {username: string}) {
         return $stateParams.username;
-      }
+      },
     ],
     authToken: [
       '$stateParams',
@@ -318,13 +319,13 @@ const ScormPlayerNormalState: NgHybridStateDeclaration = {
       '$stateParams',
       function ($stateParams: {project_id: number}) {
         return $stateParams.project_id;
-      }
+      },
     ],
     taskDefId: [
       '$stateParams',
       function ($stateParams: {task_definition_id: number}) {
         return $stateParams.task_definition_id;
-      }
+      },
     ],
     mode: function () {
       return 'normal';
@@ -352,19 +353,19 @@ const ScormPlayerStudentReviewState: NgHybridStateDeclaration = {
       '$stateParams',
       function ($stateParams) {
         return $stateParams.project_id;
-      }
+      },
     ],
     taskDefId: [
       '$stateParams',
       function ($stateParams) {
         return $stateParams.task_definition_id;
-      }
+      },
     ],
     testAttemptId: [
       '$stateParams',
       function ($stateParams) {
         return $stateParams.test_attempt_id;
-      }
+      },
     ],
     mode: function () {
       return 'review';
@@ -389,7 +390,7 @@ const ScormPlayerReviewState: NgHybridStateDeclaration = {
       '$stateParams',
       function ($stateParams) {
         return $stateParams.task_definition_id;
-      }
+      },
     ],
     mode: function () {
       return 'preview';
@@ -441,6 +442,19 @@ const projectPlanState: NgHybridStateDeclaration = {
   },
 };
 
+const jplagReportViewerState: NgHybridStateDeclaration = {
+  name: 'jplag-report-viewer',
+  url: '/jplag-report-viewer',
+  views: {
+    main: {
+      component: JplagReportViewerComponent,
+    },
+  },
+  data: {
+    pageTitle: 'JPlag Report Viewer',
+    roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
+  },
+};
 
 /**
  * Export the list of states we have created in angular
@@ -462,4 +476,5 @@ export const doubtfireStates = [
   ScormPlayerStudentReviewState,
   SuccessCloseState,
   projectPlanState,
+  jplagReportViewerState,
 ];
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index 7c17ec050c..e5398f3b42 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -13,13 +13,7 @@ <h1 class="mat-headline m-0">Similarities</h1>
     </div>
   </div>
 
-  <iframe
-    [hidden]="!jplagOpenState"
-    #jplagIframe
-    src="/JPlag/"
-    frameborder="0"
-    class="w-full h-[750px]"
-  ></iframe>
+  <f-jplag-report-viewer #jplagViewer [hidden]="!jplagOpenState" />
 
   @if (!jplagOpenState) {
     <mat-accordion multi>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index 924dd0dec4..e6c36fd518 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -9,6 +9,7 @@ import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloa
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {AppInjector} from 'src/app/app-injector';
 import {HttpResponse} from '@angular/common/http';
+import {JplagReportViewerComponent} from 'src/app/projects/states/jplag/jplag-report-viewer.component';
 
 @Component({
   selector: 'f-task-similarity-view',
@@ -18,7 +19,7 @@ import {HttpResponse} from '@angular/common/http';
 export class TaskSimilarityViewComponent implements OnChanges {
   @Input() task: Task;
   @ViewChild(MatAccordion) accordion: MatAccordion;
-  @ViewChild('jplagIframe', {static: true}) jplagIframe!: ElementRef<HTMLIFrameElement>;
+  @ViewChild('jplagViewer') jplagViewer!: JplagReportViewerComponent;
   panelOpenState = false;
   jplagOpenState = false;
 
@@ -72,28 +73,18 @@ export class TaskSimilarityViewComponent implements OnChanges {
     // Students are identified by their username in JPlag reports (configured by API)
     // In most cases, usernames are a combination of their first and last names
     const studentUsername = this.task.project.student.username;
-
     const taskDef = this.task.definition;
+    // const reportUrl =       `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
+    //     this.task.unit.id
+    //   }/task_definitions/${taskDef.id}/jplag_report`
     this.fileDownloaderService.downloadBlob(
-      `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
-        this.task.unit.id
-      }/task_definitions/${taskDef.id}/jplag_report`,
+      this.task.definition.getJplagReportUrl(),
       (_, response: HttpResponse<Blob>) => {
         // Open JPlag report viewer in embedded iframe
         setTimeout(() => {
-          // Send the JPlag report to load
-          this.jplagIframe.nativeElement.contentWindow?.postMessage({
-            type: 'upload-jplag-file',
-            file: response.body,
-            name: 'report.jplag',
-          });
+          this.jplagViewer.openReport(response.body);
           setTimeout(() => {
-            // Search comparisons by student username, auto load comparisons if only one is found
-            this.jplagIframe.nativeElement.contentWindow?.postMessage({
-              type: 'set-search-filter-value',
-              filter: studentUsername,
-              autoViewComparison: true,
-            });
+            this.jplagViewer.setSearchFilter(studentUsername);
             this.jplagOpenState = true;
           }, 100);
         }, 100);
diff --git a/src/app/projects/states/jplag/jplag-report-viewer.component.html b/src/app/projects/states/jplag/jplag-report-viewer.component.html
new file mode 100644
index 0000000000..9ea58d88b2
--- /dev/null
+++ b/src/app/projects/states/jplag/jplag-report-viewer.component.html
@@ -0,0 +1,9 @@
+<iframe
+  [hidden]="hidden"
+  #jplagIframe
+  src="/JPlag/"
+  frameborder="0"
+  style="overflow: hidden"
+  class="w-full h-[750px] overflow-hidden"
+  [scrolling]="false"
+></iframe>
diff --git a/src/app/projects/states/jplag/jplag-report-viewer.component.ts b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
new file mode 100644
index 0000000000..d9a2ceef73
--- /dev/null
+++ b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
@@ -0,0 +1,29 @@
+import {Component, ElementRef, Input, ViewChild} from '@angular/core';
+
+@Component({
+  selector: 'f-jplag-report-viewer',
+  templateUrl: './jplag-report-viewer.component.html',
+})
+export class JplagReportViewerComponent {
+  @ViewChild('jplagIframe', {static: true}) jplagIframe!: ElementRef<HTMLIFrameElement>;
+
+  @Input() hidden: boolean = false;
+
+  public openReport(file: Blob) {
+    // Send the JPlag report to load
+    this.jplagIframe.nativeElement.contentWindow?.postMessage({
+      type: 'upload-jplag-file',
+      file: file,
+      name: 'report.jplag',
+    });
+  }
+
+  public setSearchFilter(searchTerm: string) {
+    // Search comparisons by student username, auto load comparisons if only one is found
+    this.jplagIframe.nativeElement.contentWindow?.postMessage({
+      type: 'set-search-filter-value',
+      filter: searchTerm,
+      autoViewComparison: true,
+    });
+  }
+}
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index c8d86651bc..be9c666ab9 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -79,8 +79,11 @@
           <mat-icon>download</mat-icon>
           <span>Bulk Export Submission Files</span>
         </button>
-        <!-- Commented out until hasJplagReport check works correctly -->
-        <button mat-menu-item (click)="downloadJPLAGReport()" [disabled]="hasJplagReport">
+        <button
+          mat-menu-item
+          (click)="downloadJPLAGReport()"
+          [disabled]="!this.filters?.taskDefinition?.hasJplagReport"
+        >
           <mat-icon>download</mat-icon>
           <span>Download JPLAG Report</span>
         </button>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 4763e8dc8f..df7a490bd1 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -31,6 +31,7 @@ import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {SelectedTaskService} from 'src/app/projects/states/dashboard/selected-task.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {HotkeysService} from '@ngneat/hotkeys';
+import {Router} from '@angular/router';
 
 @Component({
   selector: 'df-staff-task-list',
@@ -109,6 +110,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     public dialog: MatDialog,
     private userService: UserService,
     private hotkeys: HotkeysService,
+    private router: Router,
   ) {}
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -236,8 +238,8 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
       `${this.unit.code}-${taskDef.abbreviation}-jplag-report.zip`,
     );
 
-    // TODO: redirect to our self hosted jplag?
-    // window.open('https://jplag.github.io/JPlag/', '_blank');
+    const url = this.router.serializeUrl(this.router.createUrlTree(['/jplag-report-viewer']));
+    window.open(url, '_blank');
   }
 
   openDialog() {

From dd1afaecd0c0e9a950f803327f80f85491f9f1da Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 17:51:23 +1000
Subject: [PATCH 306/776] chore: revert similarity type checks

---
 .../task-similarity-view.component.html          | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index e5398f3b42..c088d4407f 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -33,22 +33,12 @@ <h1 class="mat-headline"></h1>
               @if (similarity.readyForViewer) {
                 @if (similarity.type === 'JplagTaskSimilarity') {
                   <button
-                    [matTooltip]="
-                      similarity.type === 'JplagTaskSimilarity'
-                        ? 'View JPlag report for this similarity'
-                        : 'Download report for this similarity'
-                    "
+                    matTooltip="View JPlag report for this similarity"
                     mat-icon-button
                     aria-label="View Detailed Report"
-                    (click)="
-                      similarity.type === 'JplagTaskSimilarity' ? viewJplagReport() : openReport()
-                    "
+                    (click)="viewJplagReport()"
                   >
-                    @if (similarity.type === 'JplagTaskSimilarity') {
-                      <mat-icon>assessment</mat-icon>
-                    } @else {
-                      <mat-icon>download</mat-icon>
-                    }
+                    <mat-icon>summarize</mat-icon>
                   </button>
                 } @else {
                   <button

From ba2684192c2a8a139237affc4c0702af901f1808 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Jun 2025 17:51:36 +1000
Subject: [PATCH 307/776] fix: improve task similarity notice ui

---
 src/app/common/footer/footer.component.html | 91 +++++++++++++--------
 1 file changed, 56 insertions(+), 35 deletions(-)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index fdcafbbaa3..cd70a28ecd 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -1,21 +1,14 @@
 <mat-toolbar class="footer flex-col w-full h-full justify-center p-0">
   @if (selectedTask?.similaritiesDetected) {
-  <div class="bg-red-500 grow w-full rounded-xl h-8 mb-5 mt-4 text-white text-lg">
-    <div
-      #arrow
-      class="shrink border-t-red-500"
-      [ngStyle]="{ 'left.px': leftOffset, 'top.px': topOffset }"
-      style="position: absolute; border: 10px solid transparent; transform: translateX(-50%)"
-    ></div>
-    <p
-      style="position: relative"
-      #warningText
-      [ngStyle]="{ 'left.px': warningTextLeftOffset }"
-      class="mat-caption inline-block select-none"
-    >
-      Similarities flagged for {{ selectedTask?.project.student.name }}
-    </p>
-  </div>
+    <div class="bg-red-500 grow w-full rounded-xl h-8 mb-5 mt-4 text-white text-lg font-bold">
+      <p
+        style="position: relative"
+        #warningText
+        class="mat-caption inline-block select-none text-center w-full"
+      >
+        Similarities flagged for {{ selectedTask?.project.student.name }}
+      </p>
+    </div>
   }
 
   <div class="flex w-full">
@@ -87,17 +80,23 @@
 
     <div fxFlex fxFlexAlign="end start" fxLayout="row" fxLayoutAlign="end center">
       @if (selectedTask?.similaritiesDetected) {
-      <button
-        #similaritiesButton
-        mat-icon-button
-        matTooltip="High confidence of similarities detected for this task"
-        matTooltipPosition="above"
-        aria-label="View detected similarities"
-        class="button small-button"
-        (click)="viewSimilarity()"
-      >
-        <mat-icon class="small-icon">crisis_alert</mat-icon>
-      </button>
+        <div class="relative inline-block">
+          <div
+            class="absolute -top-[1.3rem] left-1/2 -translate-x-1/2 w-0 h-0 border-x-[15px] border-x-transparent border-t-[20px] border-t-red-500"
+          ></div>
+
+          <button
+            #similaritiesButton
+            mat-icon-button
+            matTooltip="High confidence of similarities detected for this task"
+            matTooltipPosition="above"
+            aria-label="View detected similarities"
+            class="button small-button"
+            (click)="viewSimilarity()"
+          >
+            <mat-icon class="small-icon">crisis_alert</mat-icon>
+          </button>
+        </div>
       }
       <button
         [disabled]="selectedTask === undefined"
@@ -112,13 +111,25 @@
       </button>
 
       <mat-menu #aboveMenu="matMenu" yPosition="above">
-        <button mat-menu-item (click)="viewTaskSheet()" [disabled]="!selectedTaskService.hasTaskSheet">
+        <button
+          mat-menu-item
+          (click)="viewTaskSheet()"
+          [disabled]="!selectedTaskService.hasTaskSheet"
+        >
           <mat-icon matListItemIcon aria-label="View Task Sheet">description</mat-icon>
           View task sheet
         </button>
-        <button mat-menu-item (click)="viewSubmission()" [disabled]="!selectedTaskService.hasSubmissionPdf">
-          <mat-icon matListItemIcon aria-label="View student submission" fontIcon="contact_page"></mat-icon>View student
-          submission
+        <button
+          mat-menu-item
+          (click)="viewSubmission()"
+          [disabled]="!selectedTaskService.hasSubmissionPdf"
+        >
+          <mat-icon
+            matListItemIcon
+            aria-label="View student submission"
+            fontIcon="contact_page"
+          ></mat-icon
+          >View student submission
         </button>
         <button mat-menu-item (click)="viewSimilarity()">
           <mat-icon matListItemIcon aria-label="View Similarities">crisis_alert</mat-icon>
@@ -126,10 +137,16 @@
         </button>
         <mat-divider></mat-divider>
         <button mat-menu-item (click)="selectedTask?.updateTaskStatus('feedback_exceeded')">
-          <mat-icon matListItemIcon aria-label="Switch to Feedback Exceeded">running_with_errors</mat-icon>
+          <mat-icon matListItemIcon aria-label="Switch to Feedback Exceeded"
+            >running_with_errors</mat-icon
+          >
           Mark as feedback exceeded
         </button>
-        <button mat-menu-item (click)="selectedTask?.updateTaskStatus('fail')" [disabled]="selectedTask === undefined">
+        <button
+          mat-menu-item
+          (click)="selectedTask?.updateTaskStatus('fail')"
+          [disabled]="selectedTask === undefined"
+        >
           <mat-icon matListItemIcon aria-label="Fail icon" fontIcon="cancel"></mat-icon>
           Mark as fail
         </button>
@@ -157,12 +174,16 @@
         <mat-icon class="small-icon">file_download</mat-icon>
       </button>
       <f-project-progress-bar
-        matTooltip="{{selectedTask?.project.taskStats[4]?.value}}% progress towards {{ selectedTask?.project.targetGradeWord }}"
+        matTooltip="{{ selectedTask?.project.taskStats[4]?.value }}% progress towards {{
+          selectedTask?.project.targetGradeWord
+        }}"
         [matTooltipDisabled]="selectedTask === undefined"
         [progress]="selectedTask?.project.taskStats"
       ></f-project-progress-bar>
       <mat-chip-listbox aria-label="Target Grade Symbol" class="pointer-events-none">
-        <mat-chip-option style="min-width: 33px">{{ selectedTask?.project.targetGradeAcronym }}</mat-chip-option>
+        <mat-chip-option style="min-width: 33px">{{
+          selectedTask?.project.targetGradeAcronym
+        }}</mat-chip-option>
       </mat-chip-listbox>
     </div>
   </div>

From 3ac7933543eb7e2bcc3f457ededf31e662145ea8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 30 Jun 2025 09:43:17 +1000
Subject: [PATCH 308/776] build: update submodule url

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 0da6e52835..f259c41cca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "JPlag-Report-Viewer"]
 	path = JPlag-Report-Viewer
-	url = https://github.com/doubtfire-lms/jplag-deploy.git
+  url = https://github.com/doubtfire-lms/jplag-report-viewer-static.git

From 1cef438b458efcee4adce01cc81648d32bb97f35 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 30 Jun 2025 14:27:05 +1000
Subject: [PATCH 309/776] feat: task and unit ilos ui

---
 src/app/doubtfire-angular.module.ts           |  2 +
 src/app/doubtfire-angularjs.module.ts         |  6 ++
 .../progress-dashboard.tpl.html               |  3 +
 .../task-ilos-card.component.html             | 21 +++++++
 .../task-ilos-card.component.scss             |  0
 .../task-ilos-card.component.ts               | 60 +++++++++++++++++++
 .../task-dashboard/task-dashboard.tpl.html    |  4 ++
 7 files changed, 96 insertions(+)
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.html
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.scss
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 699e1b909f..9229c8dd39 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -255,6 +255,7 @@ import { TaskDateSliderComponent } from './common/modals/date-change-modal/task-
 import { SpecConModalComponent } from './common/modals/spec-con-modal/spec-con-modal.component';
 import { SpecConModalService } from './common/modals/spec-con-modal/spec-con-modal.service';
 import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
+import {TaskIlosCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -386,6 +387,7 @@ const MY_DATE_FORMAT = {
     LearningOutcomeEditorComponent,
     TaskFeedbackTemplatesComponent,
     NestedCsvDownloadModalComponent,
+    TaskIlosCardComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index fc19fee3ce..cbd0129fbe 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -215,6 +215,7 @@ import {FUnitTaskListComponent} from './units/states/tasks/viewer/directives/f-u
 import {FTaskDetailsViewComponent} from './units/states/tasks/viewer/directives/f-task-details-view/f-task-details-view.component';
 import {FTaskSheetViewComponent} from './units/states/tasks/viewer/directives/f-task-sheet-view/f-task-sheet-view.component';
 import {TasksViewerComponent} from './units/states/tasks/tasks-viewer/tasks-viewer.component';
+import {TaskIlosCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component';
 
 import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {MarkedPipe} from './common/pipes/marked.pipe';
@@ -479,6 +480,11 @@ DoubtfireAngularJSModule.directive(
 );
 DoubtfireAngularJSModule.directive('newFUnits', downgradeComponent({component: FUnitsComponent}));
 
+DoubtfireAngularJSModule.directive(
+  'fTaskIlosCard',
+  downgradeComponent({component: TaskIlosCardComponent}),
+);
+
 // Global configuration
 
 // If the user enters a URL that doesn't match any known URL (state), send them to `/home`
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
index 53269a2a95..e9b847af42 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
@@ -39,6 +39,9 @@ <h4>Progress Burndown</h4>
       </div><!--/burndown-card-->
     </div><!--/burndown-column-->
     <div class="col-sm-12 col-xl-6">
+      <div class="card">
+        <f-task-ilos-card [unit]="project.unit" [ilo-context-type]="'Unit'"></f-task-ilos-card>
+      </div>
       <div class="card card-default card-lg card-pie-chart">
         <div class="card-heading">
           <h4>Task Statuses</h4>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.html
new file mode 100644
index 0000000000..36310f1050
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.html
@@ -0,0 +1,21 @@
+@if (learningOutcomes.length) {
+  <mat-card appearance="outlined" class="p-[16px]">
+    <mat-card-title class="f-card-title"
+      >{{ getIloContextLabel() }} Learning Outcomes</mat-card-title
+    >
+    <mat-card-subtitle class="mb-4"
+      >These outcomes describe the key skills and knowledge you are aiming to achieve by completing
+      this {{ getIloContextLabel().toLowerCase() }}.</mat-card-subtitle
+    >
+    <table class="overflow-hidden rounded-lg">
+      <tbody>
+        @for (ilo of learningOutcomes; track ilo) {
+          <tr class="even:bg-white odd:bg-gray-100 border-b border-gray-200">
+            <td class="px-6 py-4 text-black uppercase">{{ ilo.abbreviation }}</td>
+            <td class="px-6 py-4 text-gray-500">{{ ilo.fullOutcomeDescription }}</td>
+          </tr>
+        }
+      </tbody>
+    </table>
+  </mat-card>
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.scss b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.ts
new file mode 100644
index 0000000000..cad3bdc270
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.ts
@@ -0,0 +1,60 @@
+import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
+import {LearningOutcome} from 'src/app/api/models/learning-outcome';
+import {Project} from 'src/app/api/models/project';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {Unit} from 'src/app/api/models/unit';
+
+@Component({
+  selector: 'f-task-ilos-card',
+  templateUrl: './task-ilos-card.component.html',
+  styleUrls: ['./task-ilos-card.component.scss'],
+})
+export class TaskIlosCardComponent implements OnInit, OnChanges {
+  @Input() iloContextType: 'Unit' | 'TaskDefinition' | 'Course' | 'Global';
+  @Input() unit: Unit | undefined;
+  @Input() taskDef: TaskDefinition | undefined;
+  @Input() project: Project;
+
+  learningOutcomes: LearningOutcome[] = [];
+
+  public ngOnChanges(_changes: SimpleChanges) {
+    this.getIlos();
+  }
+
+  public ngOnInit(): void {
+    this.getIlos();
+  }
+
+  private getIlos() {
+    this.learningOutcomes = [];
+
+    if (this.iloContextType === 'Unit' && this.unit) {
+      for (const ilo of this.unit.ilos) {
+        this.learningOutcomes.push(ilo);
+      }
+    } else if (this.iloContextType === 'TaskDefinition' && this.taskDef) {
+      this.taskDef.learningOutcomesCache.values.subscribe((ilos) => {
+        for (const ilo of ilos) {
+          this.learningOutcomes.push(ilo);
+        }
+      });
+    }
+
+    // TODO: implement Course and Global learning outcomes when available
+  }
+
+  public getIloContextLabel(): string {
+    switch (this.iloContextType) {
+      case 'TaskDefinition':
+        return 'Task';
+      case 'Unit':
+        return 'Unit';
+      case 'Course':
+        return 'Course';
+      case 'Global':
+        return 'Global';
+      default:
+        return 'N/A';
+    }
+  }
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index 905f99a266..0c70ec90ad 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -41,6 +41,10 @@
   <div class="panel-body task-detail-cards" ng-show="isCurrentView('details')">
     <!-- <div class="col-sm-12 col-xl-6"> -->
     <!-- migrated -->
+    <f-task-ilos-card
+      [task-def]="task.definition"
+      [ilo-context-type]="'TaskDefinition'"
+    ></f-task-ilos-card>
     <task-description-card [task-def]="task.definition" [task]="task" [unit]="task.unit" (switch-view$)="switchView($event)"></task-description-card>
     <f-task-scorm-card [task]="task"></f-task-scorm-card>
     <f-task-status-card [task]="task"></f-task-status-card>

From 5f779b8cb626ada2e8b6488812424813cc5e9913 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 30 Jun 2025 15:15:36 +1000
Subject: [PATCH 310/776] fix: enable unit name text wrapping

---
 src/app/home/states/home/home.component.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/home/states/home/home.component.scss b/src/app/home/states/home/home.component.scss
index ea7ef284e4..db6c82d11d 100644
--- a/src/app/home/states/home/home.component.scss
+++ b/src/app/home/states/home/home.component.scss
@@ -42,8 +42,8 @@
 
   .f-card-title {
     font-size: 18px;
-    max-height: 30px;
-    white-space: nowrap;
+    min-height: 65px; // Ensures consistent card height while allowing text to wrap
+    white-space: wrap;
     text-overflow: ellipsis;
     width: 100%;
     overflow: hidden;

From 2a5ea7d15108700f9e7915b94b2d060be0136c4d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 30 Jun 2025 17:23:36 +1000
Subject: [PATCH 311/776] refactor: retrieve other student from similarity to
 open jplag comparison

---
 src/app/api/models/task-similarity.ts         |  4 ++-
 .../api/services/task-similarity.service.ts   | 29 +++++++++++++------
 .../task-similarity-view.component.html       |  2 +-
 .../task-similarity-view.component.ts         | 23 +++++++--------
 .../jplag/jplag-report-viewer.component.ts    |  9 ++++++
 5 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/src/app/api/models/task-similarity.ts b/src/app/api/models/task-similarity.ts
index 1d6da78588..00ba0f90ab 100644
--- a/src/app/api/models/task-similarity.ts
+++ b/src/app/api/models/task-similarity.ts
@@ -1,6 +1,6 @@
 import {Entity} from 'ngx-entity-service';
 import {AppInjector} from 'src/app/app-injector';
-import {Task, TaskSimilarityService} from './doubtfire-model';
+import {Task, TaskSimilarityService, User} from './doubtfire-model';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {Observable} from 'rxjs';
 
@@ -37,6 +37,8 @@ export class TaskSimilarity extends Entity {
   parts: TaskSimilarityPart[];
   task: Task;
   readyForViewer: boolean = false;
+  other_task?: Task;
+  other_student?: User;
 
   constructor(task: Task) {
     super();
diff --git a/src/app/api/services/task-similarity.service.ts b/src/app/api/services/task-similarity.service.ts
index d2770d8009..1dced47e0a 100644
--- a/src/app/api/services/task-similarity.service.ts
+++ b/src/app/api/services/task-similarity.service.ts
@@ -1,11 +1,11 @@
-import { Task, TaskSimilarity } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { CachedEntityService } from 'ngx-entity-service';
+import {Task, TaskSimilarity} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
 import API_URL from 'src/app/config/constants/apiURL';
-import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { AppInjector } from 'src/app/app-injector';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {HttpClient} from '@angular/common/http';
+import {Observable} from 'rxjs';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 
 @Injectable()
 export class TaskSimilarityService extends CachedEntityService<TaskSimilarity> {
@@ -14,7 +14,16 @@ export class TaskSimilarityService extends CachedEntityService<TaskSimilarity> {
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
 
-    this.mapping.addKeys('id', 'type', 'flagged', 'pct', 'readyForViewer', 'parts');
+    this.mapping.addKeys(
+      'id',
+      'type',
+      'flagged',
+      'pct',
+      'readyForViewer',
+      'parts',
+      'other_task',
+      'other_student',
+    );
 
     this.mapping.addJsonKey('flagged');
   }
@@ -26,6 +35,8 @@ export class TaskSimilarityService extends CachedEntityService<TaskSimilarity> {
 
   public getSimilarityReportUrl(taskId: number, similarityId: number): Observable<string> {
     const httpClient = AppInjector.get(HttpClient);
-    return httpClient.get<string>(`${AppInjector.get(DoubtfireConstants).API_URL}/tasks/${taskId}/similarities/${similarityId}/viewer_url`);
+    return httpClient.get<string>(
+      `${AppInjector.get(DoubtfireConstants).API_URL}/tasks/${taskId}/similarities/${similarityId}/viewer_url`,
+    );
   }
 }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index c088d4407f..bc5cdb8cff 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -36,7 +36,7 @@ <h1 class="mat-headline"></h1>
                     matTooltip="View JPlag report for this similarity"
                     mat-icon-button
                     aria-label="View Detailed Report"
-                    (click)="viewJplagReport()"
+                    (click)="viewJplagReport(similarity)"
                   >
                     <mat-icon>summarize</mat-icon>
                   </button>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index e6c36fd518..ed4cd223bb 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -1,15 +1,13 @@
-import {Component, ElementRef, Input, OnChanges, SimpleChanges, ViewChild} from '@angular/core';
+import {HttpResponse} from '@angular/common/http';
+import {Component, Input, OnChanges, SimpleChanges, ViewChild} from '@angular/core';
 import {MatAccordion} from '@angular/material/expansion';
 import {Task} from 'src/app/api/models/task';
 import {TaskSimilarity} from 'src/app/api/models/task-similarity';
 import {TaskSimilarityService} from 'src/app/api/services/task-similarity.service';
-import {AlertService} from 'src/app/common/services/alert.service';
-import {SelectedTaskService} from '../../../../selected-task.service';
 import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
-import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
-import {AppInjector} from 'src/app/app-injector';
-import {HttpResponse} from '@angular/common/http';
+import {AlertService} from 'src/app/common/services/alert.service';
 import {JplagReportViewerComponent} from 'src/app/projects/states/jplag/jplag-report-viewer.component';
+import {SelectedTaskService} from '../../../../selected-task.service';
 
 @Component({
   selector: 'f-task-similarity-view',
@@ -69,14 +67,9 @@ export class TaskSimilarityViewComponent implements OnChanges {
     });
   }
 
-  viewJplagReport() {
+  viewJplagReport(similarity: TaskSimilarity) {
     // Students are identified by their username in JPlag reports (configured by API)
     // In most cases, usernames are a combination of their first and last names
-    const studentUsername = this.task.project.student.username;
-    const taskDef = this.task.definition;
-    // const reportUrl =       `${AppInjector.get(DoubtfireConstants).API_URL}/units/${
-    //     this.task.unit.id
-    //   }/task_definitions/${taskDef.id}/jplag_report`
     this.fileDownloaderService.downloadBlob(
       this.task.definition.getJplagReportUrl(),
       (_, response: HttpResponse<Blob>) => {
@@ -84,7 +77,11 @@ export class TaskSimilarityViewComponent implements OnChanges {
         setTimeout(() => {
           this.jplagViewer.openReport(response.body);
           setTimeout(() => {
-            this.jplagViewer.setSearchFilter(studentUsername);
+            // Open comparison between the two students
+            this.jplagViewer.openComparison(
+              similarity.task.project.student.username,
+              similarity.other_student.username,
+            );
             this.jplagOpenState = true;
           }, 100);
         }, 100);
diff --git a/src/app/projects/states/jplag/jplag-report-viewer.component.ts b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
index d9a2ceef73..739aadad92 100644
--- a/src/app/projects/states/jplag/jplag-report-viewer.component.ts
+++ b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
@@ -26,4 +26,13 @@ export class JplagReportViewerComponent {
       autoViewComparison: true,
     });
   }
+
+  public openComparison(submissionId1: string, submissionId2: string) {
+    // Open comparisons between these two submissions (student usernames)
+    this.jplagIframe.nativeElement.contentWindow?.postMessage({
+      type: 'open-comparison',
+      submissionId1,
+      submissionId2,
+    });
+  }
 }

From 97455cfebb22d38e387c4d2ccafa0c7701056b47 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 30 Jun 2025 17:43:32 +1000
Subject: [PATCH 312/776] build: ignore dev files from jplag build

---
 angular.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/angular.json b/angular.json
index 36556b7ef4..38069805ec 100644
--- a/angular.json
+++ b/angular.json
@@ -28,7 +28,7 @@
               {
                 "input": "./JPlag-Report-Viewer",
                 "output": "/JPlag",
-                "glob": "**/*"
+                "glob": "**/!(*.gitignore|README.md)"
               }
             ],
             "styles": [

From b93e3904c0d5f948593bd806185c31f5607b8dca Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 30 Jun 2025 17:44:02 +1000
Subject: [PATCH 313/776] chore: update jplag submodule

---
 JPlag-Report-Viewer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/JPlag-Report-Viewer b/JPlag-Report-Viewer
index 57e8787e24..0cfaed30f0 160000
--- a/JPlag-Report-Viewer
+++ b/JPlag-Report-Viewer
@@ -1 +1 @@
-Subproject commit 57e8787e248d95c5cb40ae16dcc734d95cebb5d5
+Subproject commit 0cfaed30f06b129198ed85ae3726eab4c3739156

From 41d1d61a417573e33c4344898ae6d7562c459004 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 1 Jul 2025 16:43:45 +1000
Subject: [PATCH 314/776] feat: init qr tutor marking state

---
 src/app/doubtfire-angular.module.ts           |   2 +
 src/app/doubtfire.states.ts                   |  35 +++
 .../tutor-marking.component.html              | 230 +++++++++++++++
 .../tutor-marking.component.scss              | 268 ++++++++++++++++++
 .../tutor-marking.component.spec.ts           |  22 ++
 .../tutor-marking/tutor-marking.component.ts  | 169 +++++++++++
 6 files changed, 726 insertions(+)
 create mode 100644 src/app/projects/states/tutor-marking/tutor-marking.component.html
 create mode 100644 src/app/projects/states/tutor-marking/tutor-marking.component.scss
 create mode 100644 src/app/projects/states/tutor-marking/tutor-marking.component.spec.ts
 create mode 100644 src/app/projects/states/tutor-marking/tutor-marking.component.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 699e1b909f..5eb012cbed 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -255,6 +255,7 @@ import { TaskDateSliderComponent } from './common/modals/date-change-modal/task-
 import { SpecConModalComponent } from './common/modals/spec-con-modal/spec-con-modal.component';
 import { SpecConModalService } from './common/modals/spec-con-modal/spec-con-modal.service';
 import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
+import {TutorMarkingComponent} from './projects/states/tutor-marking/tutor-marking.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -386,6 +387,7 @@ const MY_DATE_FORMAT = {
     LearningOutcomeEditorComponent,
     TaskFeedbackTemplatesComponent,
     NestedCsvDownloadModalComponent,
+    TutorMarkingComponent
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index e00252fe28..08bd8148f6 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -441,6 +441,40 @@ const projectPlanState: NgHybridStateDeclaration = {
   },
 };
 
+const TutorMarkingState: NgHybridStateDeclaration = {
+  name: 'tutor-marking',
+  url: '/tutor/marking?unitId&username&projectId',
+  views: {
+    main: {
+      component: TutorMarkingComponent,
+    },
+  },
+  resolve: {
+    unitId: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.unitId;
+      },
+    ],
+    username: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.username;
+      },
+    ],
+    projectId: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.projectId;
+      },
+    ],
+  },
+  data: {
+    pageTitle: 'Tutor Marking',
+    task: 'Tutor Marking',
+    roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
+  },
+};
 
 /**
  * Export the list of states we have created in angular
@@ -462,4 +496,5 @@ export const doubtfireStates = [
   ScormPlayerStudentReviewState,
   SuccessCloseState,
   projectPlanState,
+  TutorMarkingState,
 ];
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-marking/tutor-marking.component.html
new file mode 100644
index 0000000000..e2f9db51b3
--- /dev/null
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.html
@@ -0,0 +1,230 @@
+<div class="w-full flex flex-col h-[calc(100vh-140px)]">
+  <div class="task-inbox flex flex-col flex-1 justify-normal items-center full-width">
+    <!-- Get list of tutorials for student that are either submitted or ready for discussion -->
+    <!-- <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60"> -->
+    <div class="w-full">
+      <button mat-raised-button color="primary" (click)="refresh()">Refresh</button>
+      <button mat-raised-button color="primary" (click)="loadAllTasks()">Load all tasks</button>
+    </div>
+
+    @if (project) {
+      <div class="text-center">{{ student?.firstName }} {{ student?.lastName }}</div>
+      <!-- <div class="text-center">{{ username }}</div>s -->
+      <div class="text-center">Target Grade: {{ getTargetTradeString(project?.targetGrade) }}</div>
+    } @else {
+      <div class="w-full flex justify-center z-50">
+        <!-- <mat-spinner color="blue"></mat-spinner> -->
+        Loading...
+      </div>
+    }
+
+    <mat-selection-list class="m-0 p-0" #tasks (selectionChange)="(taskSelectionChange)">
+      @for (task of filteredTasks; track task) {
+        <mat-list-option
+          [value]="task"
+          class="clearfix"
+          style="padding: 0; height: 60px"
+          togglePosition="before"
+        >
+          @if (task) {
+            <div class="w-full" id="{{ task.id }}">
+              <div
+                class="inbox-entry flex items-center"
+                [ngClass]="{hover: task.hover}"
+                (mouseover)="task.hover = allowHover"
+                (mouseout)="task.hover = task.optionsOpened"
+              >
+                <span
+                  class="notification"
+                  [ngClass]="{
+                    active: task.numNewComments > 0 || task.similaritiesDetected,
+                    similarities: task.similaritiesDetected
+                  }"
+                ></span>
+                <user-icon class="self-center" [user]="student" [size]="30"> </user-icon>
+                <div class="task-list-data truncate flex-1" [hidden]="isNarrow">
+                  <h4 class="student-name">{{ task.definition.name }}</h4>
+                  <div class="task-details truncate">
+                    {{ task.definition.abbreviation }} -
+                    {{ getTargetTradeString(task.definition.targetGrade) }} Task
+                  </div>
+                </div>
+                @if (task.hasGrade()) {
+                  <div matTooltip="The grade assigned to the submission" matTooltipPosition="above">
+                    <mat-chip-option style="margin-right: 6px" [hidden]="isNarrow"
+                      >{{ task.gradeDesc() }}
+                    </mat-chip-option>
+                  </div>
+                }
+                <status-icon
+                  [hidden]="isNarrow"
+                  matBadge="{{ task.qualityPts }}/{{ task.definition.maxQualityPts }}"
+                  [matBadgeHidden]="!task.hasQualityPoints() || !task.qualityPts"
+                  matBadgePosition="before"
+                  [status]="task.status"
+                  class="ml-3"
+                ></status-icon>
+                @if (!isTaskDefMode) {
+                  <div class="overflow" [hidden]="isNarrow">
+                    <button [hidden]="task.hover" mat-icon-button aria-label="task-overflow">
+                      <!-- <mat-icon class="warn-icon" *ngIf="task.similaritiesDetected">remove_red_eye</mat-icon> -->
+
+                      @if (task.pinned) {
+                        <div class="pin-container">
+                          <mat-icon>push_pin</mat-icon>
+                        </div>
+                      }
+                    </button>
+                    <button
+                      [hidden]="!task.hover"
+                      mat-icon-button
+                      aria-label="task overflow"
+                      [matMenuTriggerFor]="overflowMenu"
+                      (menuOpened)="setSelectedTask(task); task.optionsOpened = true"
+                      (menuClosed)="task.hover = false; task.optionsOpened = false"
+                      matTooltip="Submission options"
+                      matTooltipPosition="right"
+                      matTooltipShowDelay="400"
+                    >
+                      <mat-icon>more_horiz</mat-icon>
+                    </button>
+                    <mat-menu #overflowMenu="matMenu" yPosition="below">
+                      <button mat-menu-item (click)="togglePin(task)" class="flex items-center">
+                        <mat-icon class="mr-0">
+                          {{ task.pinned ? 'remove_circle' : 'add_alert' }}
+                        </mat-icon>
+                        <span class="ml-5"
+                          >{{ task.pinned ? 'Unpin from inbox' : 'Pin to inbox' }}
+                        </span>
+                      </button>
+                    </mat-menu>
+                  </div>
+                }
+              </div>
+              <!--/badges-->
+            </div>
+          }
+        </mat-list-option>
+      }
+
+      <!--/task-->
+    </mat-selection-list>
+    <!-- </cdk-virtual-scroll-viewport> -->
+  </div>
+
+  <div class="mt-2">
+    <div class="w-full flex justify-center items-center my-3 gap-3">
+      <button
+        class="bg-gray-100 large-icon-button"
+        mat-fab
+        color="secondary"
+        [disabled]="!tasks.selectedOptions.selected.length"
+        (click)="setSelectedTasksStatus('redo')"
+      >
+        <!-- Redo -->
+        <mat-icon>undo</mat-icon>
+      </button>
+      <button
+        class="bg-green-400 large-icon-button"
+        mat-fab
+        [disabled]="!tasks.selectedOptions.selected.length"
+        (click)="setSelectedTasksStatus('complete')"
+      >
+        <!-- Mark as Complete -->
+        <mat-icon>done</mat-icon>
+        <!-- <mat-icon class="text-2xl leading-none m-0">done</mat-icon> -->
+      </button>
+
+      <!-- <button
+        [disabled]="selectedTask === undefined"
+        mat-icon-button
+        matTooltip="Mark as Resubmit"
+        matTooltipPosition="above"
+        aria-label=""
+        class="button large-button"
+        (click)="selectedTask?.updateTaskStatus('fix')"
+      >
+        <mat-icon>construction</mat-icon>
+      </button> -->
+    </div>
+
+    <!-- <span class="center-buttons flex justify-center">
+    <button
+      [disabled]="selectedTask === undefined"
+      mat-icon-button
+      matTooltip="Mark as Redo"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button"
+      (click)="selectedTask?.updateTaskStatus('redo')"
+    >
+      <mat-icon>undo</mat-icon>
+    </button> -->
+    <!-- <button
+      [disabled]="selectedTask === undefined"
+      mat-icon-button
+      matTooltip="Mark as Resubmit"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button large-button"
+      (click)="selectedTask?.updateTaskStatus('fix')"
+    >
+      <mat-icon>construction</mat-icon>
+    </button> -->
+    <!-- <span class="w-3"></span>
+    @if (selectedTask && selectedTask.suggestedTaskStatus) {
+      <button
+        mat-icon-button
+        matTooltip="Recommended: Mark as {{
+          taskService.statusData(selectedTask.suggestedTaskStatus).label
+        }}"
+        matTooltipPosition="above"
+        aria-label=""
+        class="my-2 rounded-full scale-90 pt-2 status-chip"
+        (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
+        [ngClass]="taskService.statusData(selectedTask.suggestedTaskStatus).class"
+      >
+        <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
+      </button>
+      <span class="w-3"></span>
+    }
+    <button
+      [disabled]="selectedTask === undefined"
+      mat-icon-button
+      matTooltip="Mark as Complete"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button large-button"
+      (click)="selectedTask?.updateTaskStatus('complete')"
+    >
+      <mat-icon>done</mat-icon>
+    </button> -->
+    <!-- <button
+      [disabled]="selectedTask === undefined"
+      mat-icon-button
+      matTooltip="Mark as Discuss"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button"
+      (click)="selectedTask?.updateTaskStatus('discuss')"
+    >
+      <mat-icon>question_answer</mat-icon>
+    </button> -->
+    <!-- </span> -->
+  </div>
+
+  @if (selectedTask && project) {
+    <div #commentspanel class="task-comment-panel inbox-panel w-full flex-1">
+      <task-comments-viewer
+        style="background: white; border-radius: 12px"
+        [task]="selectedTask"
+        [project]="project"
+        class="h-full"
+        refocus-on-task-change="true"
+        ng-if="selectedTask"
+        style="padding: 0 8px 0 12px"
+      >
+      </task-comments-viewer>
+    </div>
+  }
+</div>
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.scss b/src/app/projects/states/tutor-marking/tutor-marking.component.scss
new file mode 100644
index 0000000000..bb31b035a8
--- /dev/null
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.scss
@@ -0,0 +1,268 @@
+@use 'sass:map';
+@use '@angular/material' as mat;
+
+// $my-palette: mat.define-palette(mat.$indigo-palette);
+@import '../../../../theme.scss';
+@import '../../../../styles/mixins/task-list.scss';
+@import '../../../../styles/mixins/scrollable.scss';
+
+$my-palette: mat.define-palette($md-formatif);
+
+:host {
+  --background-gray: rgba(0, 0, 0, 0.04);
+  padding-right: 8px;
+  border-right-color: rgba(0, 0, 0, 0.1);
+  border-right-style: solid;
+  border-right-width: 1px;
+}
+
+::ng-deep .cdk-virtual-scroll-content-wrapper {
+  width: 100%;
+}
+
+.task-inbox.full-width {
+  .inbox-entry {
+    padding-right: 8px;
+    padding-left: 6px;
+    width: 100%;
+    height: 100%;
+  }
+}
+
+$warn-color: #f44336;
+
+.pin-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .mat-icon {
+    color: #bcc0c4;
+  }
+}
+
+.task-inbox {
+  height: 100%;
+  overflow-x: hidden;
+}
+
+.task-inbox.narrow-width {
+  max-width: 60px;
+  width: 60px;
+  min-width: 60px;
+  margin: 0;
+
+  .inbox-entry {
+    padding-right: 0px;
+    width: 45px;
+    height: 100%;
+    padding-left: 5px;
+  }
+}
+
+.scrollable {
+  height: 100%;
+  @include scrollable();
+}
+
+.openSearchDialog {
+  border-radius: 40px;
+  width: 40px;
+  height: 40px;
+  background-color: var(--background-gray);
+}
+
+.omnisearch {
+  background-color: var(--background-gray);
+  font-size: 15px;
+  padding-right: 10px;
+  text-align: left;
+
+  &.expanded {
+    height: 100%;
+  }
+
+  &.mobile {
+  }
+
+  .search {
+    background-color: transparent;
+    border: hidden;
+    outline: none;
+  }
+
+  .mdc-icon-button {
+    display: flex;
+  }
+}
+
+.new_comments {
+  font-size: 10px;
+  font-weight: 700;
+
+  width: 2em;
+  height: 2em;
+
+  margin-left: 10px;
+  box-sizing: initial;
+
+  background: $warn-color;
+  -webkit-font-smoothing: antialiased;
+  color: #fff;
+  text-align: center;
+  border-radius: 50%;
+
+  line-height: 2em;
+  box-sizing: content-box;
+}
+
+.task-badges {
+  width: 50px;
+  height: 35px;
+}
+
+.full-width {
+  width: 100%;
+}
+
+.search-settings-panel {
+  background-color: transparent;
+}
+
+:host ::ng-deep div.mat-expansion-panel-body {
+  padding-right: 0 !important;
+}
+
+user-icon {
+  margin-right: 10px;
+}
+
+.muted {
+  color: rgba(0, 0, 0, 0.5);
+}
+
+.task-list-data {
+  margin-top: 0px;
+  .student-name {
+    font-size: 15px;
+    margin-bottom: -2px;
+    margin-top: 8px;
+  }
+
+  .task-details {
+    margin-bottom: 0px;
+    font-size: 12px;
+  }
+}
+
+.overflow {
+  min-width: 40px;
+  width: 40px;
+  margin-right: -10px;
+  margin-left: -10px;
+}
+
+.mat-mdc-list-item {
+  border: none;
+}
+
+.mat-mdc-list-item .notification {
+  height: 8px;
+  width: 8px;
+  margin-right: 8px;
+
+  border-radius: 50%;
+  display: inline-block;
+
+  background-color: transparent;
+
+  &.active {
+    background-color: mat.get-color-from-palette($my-palette, 500);
+  }
+
+  &.active.similarities {
+    background-color: #f44336;
+  }
+}
+
+.mat-mdc-list-item .item-content {
+  height: 60px;
+  border-radius: 20px;
+}
+
+.mat-mdc-list-item .item-content:hover {
+  cursor: pointer;
+}
+
+.mat-mdc-list-item .item-content.selected {
+  background-color: var(--background-gray);
+}
+
+.task-inbox.narrow-width .mat-mdc-list-item .item-content.selected {
+  margin-right: 12px;
+}
+
+:host {
+  ::ng-deep.mat-pseudo-checkbox {
+    display: none !important;
+  }
+}
+
+.tasks-viewport.list-group-item-text-extended {
+  margin-top: 0.5em;
+  line-height: 1.3;
+
+  p {
+    margin-bottom: 0;
+    padding: 0;
+    color: gray;
+  }
+}
+
+.tasks-viewport {
+  height: 100%;
+}
+
+.center-task-list {
+  align-self: center;
+  position: absolute;
+  top: calc(50% + 40px);
+
+  .mat-icon {
+    // font-size: 50px;
+    color: rgba(0, 0, 0, 0.2);
+  }
+}
+
+.mdc-list-item__start.mat-mdc-list-option-checkbox-before {
+  margin-right: 0 !important;
+  padding: 0 !important;
+}
+
+.medium-icon-button {
+  width: 75px !important;
+  height: 75px !important;
+}
+.large-icon-button {
+  width: 100px !important;
+  height: 100px !important;
+  padding: 0px !important;
+  // display: inline-flex !important;
+  // align-items: center;
+  // justify-content: center;
+
+  font-size: 35px;
+  // & > *[role='img'] {
+  //   width: 75px;
+  //   height: 75px;
+  //   font-size: 35px;
+  //   svg {
+  //     width: 75px;
+  //     height: 75px;
+  //   }
+  // }
+  .mat-mdc-button-touch-target {
+    width: 100px !important;
+    height: 100px !important;
+  }
+}
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.spec.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.spec.ts
new file mode 100644
index 0000000000..4ffb9bb2c3
--- /dev/null
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.spec.ts
@@ -0,0 +1,22 @@
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {TutorMarkingComponent} from './tutor-marking.component';
+
+describe('TutorMarkingComponent', () => {
+  let component: TutorMarkingComponent;
+  let fixture: ComponentFixture<TutorMarkingComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TutorMarkingComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TutorMarkingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
new file mode 100644
index 0000000000..4f1306e85f
--- /dev/null
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -0,0 +1,169 @@
+import {Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
+import {MatListOption, MatSelectionList, MatSelectionListChange} from '@angular/material/list';
+import {Router} from '@angular/router';
+import {StateService, UIRouter} from '@uirouter/core';
+import {
+  AuthenticationService,
+  Project,
+  ProjectService,
+  Task,
+  TaskService,
+  TaskStatusEnum,
+  Unit,
+  UnitService,
+  User,
+} from 'src/app/api/models/doubtfire-model';
+import {UserService} from 'src/app/api/services/user.service';
+import {GradeService} from 'src/app/common/services/grade.service';
+
+@Component({
+  selector: 'f-tutor-marking',
+  templateUrl: './tutor-marking.component.html',
+  styleUrl: './tutor-marking.component.scss',
+  // encapsulation: ViewEncapsulation.None, // enables custom material-ui css
+})
+export class TutorMarkingComponent implements OnInit {
+  @Input() unitId: number;
+  @Input() projectId: number;
+  @Input() username: string;
+
+  @ViewChild('tasks') tasksList: MatSelectionList;
+
+  filteredTasks: Task[] = [];
+  project: Project | null;
+  student: User | null;
+
+  selectedTask: Task | null;
+
+  constructor(
+    private userService: UserService,
+    private unitService: UnitService,
+    private authService: AuthenticationService,
+    private projectService: ProjectService,
+    private taskService: TaskService,
+    private gradeService: GradeService,
+    private state: StateService,
+    private router: UIRouter,
+  ) {}
+
+  public ngOnInit(): void {
+    this.authService.afterAuthCall((result) => {
+      if (!result) {
+        // return this.state.go('sign_in');
+      } else {
+        this.getStudentTasks();
+      }
+    });
+  }
+
+  public taskSelectionChange(event: MatSelectionListChange) {
+    console.log(event);
+    console.log('selecting task...');
+  }
+
+  public setSelectedTasksStatus(status: TaskStatusEnum) {
+    const selectedTasks = this.tasksList.selectedOptions.selected;
+    for (const taskOption of selectedTasks) {
+      const task = taskOption.value as Task;
+      task.updateTaskStatus(status);
+    }
+  }
+
+  private getUnit(): Promise<Unit> {
+    return new Promise((resolve, reject) => {
+      this.unitService.get({id: this.unitId}).subscribe({
+        next: (unit) => {
+          resolve(unit);
+        },
+        error: (err) => {
+          reject(err);
+        },
+      });
+    });
+  }
+
+  private loadStudents(unit: Unit): Promise<Project> {
+    return new Promise((resolve, reject) => {
+      this.projectService.loadStudents(unit, false).subscribe((projects) => {
+        const project = projects.find((p) => p.student.username === this.username);
+        if (!project) {
+          reject('Student is not a part of this unit');
+        }
+        resolve(project);
+      });
+    });
+  }
+
+  private getProject(unit: Unit, projectId: number): Promise<Project> {
+    return new Promise((resolve, reject) => {
+      this.projectService.loadProject(projectId, unit, true).subscribe((project) => {
+        if (!project) {
+          reject('No project found');
+        }
+        resolve(project);
+      });
+    });
+  }
+
+  public getTargetTradeString(grade: number) {
+    return this.gradeService.grades[grade];
+  }
+
+  public refresh() {
+    // this.getStudentTasks();
+    const newRoute = `tutor/marking?unitId=${this.unitId}&username=x&projectId=${Math.floor(Math.random() * 26) + 5}`;
+    // this.router.stateService.go(newRoute);
+
+    this.router.stateService.go('tutor-marking', {
+      unitId: this.unitId,
+      username: `student_${Math.floor(Math.random() * 26)}`,
+      // projectId: ,
+    });
+    console.log(newRoute);
+  }
+
+  public loadAllTasks() {
+    // TODO: filter out tasks higher than student's target grade
+    // TODO: filter out tasks with no submissions
+    this.filteredTasks = [...this.project.tasks];
+  }
+
+  public async getStudentTasks(): Promise<void> {
+    console.time('getStudentTasks()');
+    // this.student = null;
+    this.project = null;
+    this.filteredTasks = [];
+    try {
+      const unit = await this.getUnit();
+      const student = await this.loadStudents(unit);
+      this.student = student.student;
+      // const project = await this.getProject(unit);
+      const project = await this.getProject(unit, student.id);
+      console.log(project);
+      // this.student = project.student;
+      this.project = project;
+
+      const statusesToFetch: TaskStatusEnum[] = [
+        'demonstrate',
+        'ready_for_feedback',
+        'discuss',
+        'need_help',
+        // 'complete',
+        'fix_and_resubmit',
+        'redo',
+      ];
+
+      const discussionTasks = project.tasks.filter((task) => statusesToFetch.includes(task.status));
+      console.log(discussionTasks);
+      this.selectedTask = discussionTasks[0];
+      this.filteredTasks = [...discussionTasks];
+
+      setTimeout(() => this.tasksList.selectAll());
+
+      console.timeEnd('getStudentTasks()');
+    } catch (err) {
+      console.error('Failed to fetch tasks');
+      console.error(err);
+    }
+  }
+}

From 5efb68cbbc21187b584b2795765de03152025685 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 1 Jul 2025 17:10:56 +1000
Subject: [PATCH 315/776] chore: enable task selection

---
 .../tutor-marking.component.html              | 138 +++++-------------
 .../tutor-marking/tutor-marking.component.ts  |  12 +-
 2 files changed, 42 insertions(+), 108 deletions(-)

diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-marking/tutor-marking.component.html
index e2f9db51b3..16c9a99962 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.html
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.html
@@ -2,9 +2,11 @@
   <div class="task-inbox flex flex-col flex-1 justify-normal items-center full-width">
     <!-- Get list of tutorials for student that are either submitted or ready for discussion -->
     <!-- <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60"> -->
-    <div class="w-full">
+    <div class="w-full flex justify-between items-center">
       <button mat-raised-button color="primary" (click)="refresh()">Refresh</button>
-      <button mat-raised-button color="primary" (click)="loadAllTasks()">Load all tasks</button>
+      <button mat-icon-button color="primary">
+        <mat-icon>qr_code</mat-icon>
+      </button>
     </div>
 
     @if (project) {
@@ -18,7 +20,7 @@
       </div>
     }
 
-    <mat-selection-list class="m-0 p-0" #tasks (selectionChange)="(taskSelectionChange)">
+    <mat-selection-list class="m-0 p-0" #tasks>
       @for (task of filteredTasks; track task) {
         <mat-list-option
           [value]="task"
@@ -27,7 +29,7 @@
           togglePosition="before"
         >
           @if (task) {
-            <div class="w-full" id="{{ task.id }}">
+            <div (click)="selectTask(task)" class="w-full" id="{{ task.id }}">
               <div
                 class="inbox-entry flex items-center"
                 [ngClass]="{hover: task.hover}"
@@ -109,109 +111,39 @@ <h4 class="student-name">{{ task.definition.name }}</h4>
 
       <!--/task-->
     </mat-selection-list>
+    <div class="w-full flex justify-center mt-4">
+      <button mat-raised-button color="primary" (click)="loadAllTasks()">Load all tasks</button>
+    </div>
     <!-- </cdk-virtual-scroll-viewport> -->
   </div>
 
-  <div class="mt-2">
-    <div class="w-full flex justify-center items-center my-3 gap-3">
-      <button
-        class="bg-gray-100 large-icon-button"
-        mat-fab
-        color="secondary"
-        [disabled]="!tasks.selectedOptions.selected.length"
-        (click)="setSelectedTasksStatus('redo')"
-      >
-        <!-- Redo -->
-        <mat-icon>undo</mat-icon>
-      </button>
-      <button
-        class="bg-green-400 large-icon-button"
-        mat-fab
-        [disabled]="!tasks.selectedOptions.selected.length"
-        (click)="setSelectedTasksStatus('complete')"
-      >
-        <!-- Mark as Complete -->
-        <mat-icon>done</mat-icon>
-        <!-- <mat-icon class="text-2xl leading-none m-0">done</mat-icon> -->
-      </button>
-
-      <!-- <button
-        [disabled]="selectedTask === undefined"
-        mat-icon-button
-        matTooltip="Mark as Resubmit"
-        matTooltipPosition="above"
-        aria-label=""
-        class="button large-button"
-        (click)="selectedTask?.updateTaskStatus('fix')"
-      >
-        <mat-icon>construction</mat-icon>
-      </button> -->
+  @if (project) {
+    <div class="mt-2">
+      <div class="w-full flex justify-center items-center my-3 gap-3">
+        <button
+          class="bg-gray-100 large-icon-button"
+          mat-fab
+          color="secondary"
+          [disabled]="!tasks.selectedOptions.selected.length"
+          (click)="setSelectedTasksStatus('redo')"
+        >
+          <!-- Redo -->
+          <mat-icon>undo</mat-icon>
+        </button>
+        <button
+          class="bg-green-400 large-icon-button"
+          mat-fab
+          [disabled]="!tasks.selectedOptions.selected.length"
+          (click)="setSelectedTasksStatus('complete')"
+        >
+          <!-- Mark as Complete -->
+          <mat-icon>done</mat-icon>
+          <!-- <mat-icon class="text-2xl leading-none m-0">done</mat-icon> -->
+        </button>
+      </div>
+      <div class="w-full text-center py-4">{{ selectedTask?.definition.name }}</div>
     </div>
-
-    <!-- <span class="center-buttons flex justify-center">
-    <button
-      [disabled]="selectedTask === undefined"
-      mat-icon-button
-      matTooltip="Mark as Redo"
-      matTooltipPosition="above"
-      aria-label=""
-      class="button"
-      (click)="selectedTask?.updateTaskStatus('redo')"
-    >
-      <mat-icon>undo</mat-icon>
-    </button> -->
-    <!-- <button
-      [disabled]="selectedTask === undefined"
-      mat-icon-button
-      matTooltip="Mark as Resubmit"
-      matTooltipPosition="above"
-      aria-label=""
-      class="button large-button"
-      (click)="selectedTask?.updateTaskStatus('fix')"
-    >
-      <mat-icon>construction</mat-icon>
-    </button> -->
-    <!-- <span class="w-3"></span>
-    @if (selectedTask && selectedTask.suggestedTaskStatus) {
-      <button
-        mat-icon-button
-        matTooltip="Recommended: Mark as {{
-          taskService.statusData(selectedTask.suggestedTaskStatus).label
-        }}"
-        matTooltipPosition="above"
-        aria-label=""
-        class="my-2 rounded-full scale-90 pt-2 status-chip"
-        (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
-        [ngClass]="taskService.statusData(selectedTask.suggestedTaskStatus).class"
-      >
-        <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
-      </button>
-      <span class="w-3"></span>
-    }
-    <button
-      [disabled]="selectedTask === undefined"
-      mat-icon-button
-      matTooltip="Mark as Complete"
-      matTooltipPosition="above"
-      aria-label=""
-      class="button large-button"
-      (click)="selectedTask?.updateTaskStatus('complete')"
-    >
-      <mat-icon>done</mat-icon>
-    </button> -->
-    <!-- <button
-      [disabled]="selectedTask === undefined"
-      mat-icon-button
-      matTooltip="Mark as Discuss"
-      matTooltipPosition="above"
-      aria-label=""
-      class="button"
-      (click)="selectedTask?.updateTaskStatus('discuss')"
-    >
-      <mat-icon>question_answer</mat-icon>
-    </button> -->
-    <!-- </span> -->
-  </div>
+  }
 
   @if (selectedTask && project) {
     <div #commentspanel class="task-comment-panel inbox-panel w-full flex-1">
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
index 4f1306e85f..1f51fcc0a2 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -56,9 +56,8 @@ export class TutorMarkingComponent implements OnInit {
     });
   }
 
-  public taskSelectionChange(event: MatSelectionListChange) {
-    console.log(event);
-    console.log('selecting task...');
+  public selectTask(task: Task) {
+    this.selectedTask = task;
   }
 
   public setSelectedTasksStatus(status: TaskStatusEnum) {
@@ -110,13 +109,15 @@ export class TutorMarkingComponent implements OnInit {
   }
 
   public refresh() {
+    const projectIds = [10, 13, 8, 11, 17, 0, 6, 14, 16, 5]; // debug list of valid projectIds
     // this.getStudentTasks();
-    const newRoute = `tutor/marking?unitId=${this.unitId}&username=x&projectId=${Math.floor(Math.random() * 26) + 5}`;
+    const randomId = projectIds[Math.floor(Math.random() * projectIds.length)];
+    const newRoute = `tutor/marking?unitId=${this.unitId}&username=x&projectId=${randomId}`;
     // this.router.stateService.go(newRoute);
 
     this.router.stateService.go('tutor-marking', {
       unitId: this.unitId,
-      username: `student_${Math.floor(Math.random() * 26)}`,
+      username: `student_${randomId}`,
       // projectId: ,
     });
     console.log(newRoute);
@@ -133,6 +134,7 @@ export class TutorMarkingComponent implements OnInit {
     // this.student = null;
     this.project = null;
     this.filteredTasks = [];
+    this.selectedTask = null;
     try {
       const unit = await this.getUnit();
       const student = await this.loadStudents(unit);

From c76612438b5c99f9c1e3df12f7a1cf25daf33ac2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 1 Jul 2025 17:44:43 +1000
Subject: [PATCH 316/776] chore: update resubmit button

---
 .../tutor-marking/tutor-marking.component.html | 18 ++++++++++--------
 .../tutor-marking/tutor-marking.component.ts   |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-marking/tutor-marking.component.html
index 16c9a99962..a8a3cddefc 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.html
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.html
@@ -3,6 +3,7 @@
     <!-- Get list of tutorials for student that are either submitted or ready for discussion -->
     <!-- <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60"> -->
     <div class="w-full flex justify-between items-center">
+      <!-- <div></div> -->
       <button mat-raised-button color="primary" (click)="refresh()">Refresh</button>
       <button mat-icon-button color="primary">
         <mat-icon>qr_code</mat-icon>
@@ -20,7 +21,7 @@
       </div>
     }
 
-    <mat-selection-list class="m-0 p-0" #tasks>
+    <mat-selection-list class="m-0 p-0 h-min" #tasks>
       @for (task of filteredTasks; track task) {
         <mat-list-option
           [value]="task"
@@ -112,26 +113,26 @@ <h4 class="student-name">{{ task.definition.name }}</h4>
       <!--/task-->
     </mat-selection-list>
     <div class="w-full flex justify-center mt-4">
-      <button mat-raised-button color="primary" (click)="loadAllTasks()">Load all tasks</button>
+      <button mat-button color="primary" (click)="loadAllTasks()">Load all tasks</button>
     </div>
     <!-- </cdk-virtual-scroll-viewport> -->
   </div>
 
   @if (project) {
     <div class="mt-2">
-      <div class="w-full flex justify-center items-center my-3 gap-3">
+      <div class="w-full flex justify-center items-center my-3 gap-5">
         <button
-          class="bg-gray-100 large-icon-button"
+          class="bg-gray-100 medium-icon-button"
           mat-fab
           color="secondary"
           [disabled]="!tasks.selectedOptions.selected.length"
-          (click)="setSelectedTasksStatus('redo')"
+          (click)="setSelectedTasksStatus('fix_and_resubmit')"
         >
           <!-- Redo -->
-          <mat-icon>undo</mat-icon>
+          <mat-icon>construction</mat-icon>
         </button>
         <button
-          class="bg-green-400 large-icon-button"
+          class="bg-green-400 medium-icon-button"
           mat-fab
           [disabled]="!tasks.selectedOptions.selected.length"
           (click)="setSelectedTasksStatus('complete')"
@@ -141,12 +142,13 @@ <h4 class="student-name">{{ task.definition.name }}</h4>
           <!-- <mat-icon class="text-2xl leading-none m-0">done</mat-icon> -->
         </button>
       </div>
-      <div class="w-full text-center py-4">{{ selectedTask?.definition.name }}</div>
     </div>
   }
 
   @if (selectedTask && project) {
     <div #commentspanel class="task-comment-panel inbox-panel w-full flex-1">
+      <!-- <div class="w-full text-center py-4">{{ selectedTask?.definition.name }}</div> -->
+
       <task-comments-viewer
         style="background: white; border-radius: 12px"
         [task]="selectedTask"
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
index 1f51fcc0a2..1de71a7ff6 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -83,7 +83,7 @@ export class TutorMarkingComponent implements OnInit {
 
   private loadStudents(unit: Unit): Promise<Project> {
     return new Promise((resolve, reject) => {
-      this.projectService.loadStudents(unit, false).subscribe((projects) => {
+      this.projectService.loadStudents(unit, false, false).subscribe((projects) => {
         const project = projects.find((p) => p.student.username === this.username);
         if (!project) {
           reject('Student is not a part of this unit');

From 9aa74697255ce40adef74fb43e8f8e791d551095 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 2 Jul 2025 11:34:47 +1000
Subject: [PATCH 317/776] chore: import component

---
 src/app/doubtfire.states.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 08bd8148f6..fa54aa7c0c 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -11,6 +11,7 @@ import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
 import { SuccessCloseComponent } from './common/success-close/success-close.component';
 import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
+import {TutorMarkingComponent} from './projects/states/tutor-marking/tutor-marking.component';
 
 /*
  * Use this file to store any states that are sourced by angular components.

From e549c4e0ac9377bd864c81122cffce004681c845 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 2 Jul 2025 11:36:20 +1000
Subject: [PATCH 318/776] feat: add tutor discussion qr scanning

---
 package-lock.json                             | 16 ++++
 package.json                                  |  3 +-
 .../tutor-marking.component.html              | 12 ++-
 .../tutor-marking/tutor-marking.component.ts  | 74 ++++++++++++++++---
 4 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c4049fc672..b0e807f3c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,6 +66,7 @@
         "ngx-entity-service": "^0.0.41",
         "ngx-lottie": "^11.0.2",
         "nvd3": "1.8.6",
+        "qr-scanner": "^1.4.2",
         "rxjs": "~7.4.0",
         "ts-md5": "^1.3.1",
         "tslib": "^2.6.2",
@@ -5697,6 +5698,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/offscreencanvas": {
+      "version": "2019.7.3",
+      "resolved": "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.7.3.tgz",
+      "integrity": "sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==",
+      "license": "MIT"
+    },
     "node_modules/@types/parse-json": {
       "version": "4.0.2",
       "dev": true,
@@ -18631,6 +18638,15 @@
         "node": ">=0.9"
       }
     },
+    "node_modules/qr-scanner": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/qr-scanner/-/qr-scanner-1.4.2.tgz",
+      "integrity": "sha512-kV1yQUe2FENvn59tMZW6mOVfpq9mGxGf8l6+EGaXUOd4RBOLg7tRC83OrirM5AtDvZRpdjdlXURsHreAOSPOUw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/offscreencanvas": "^2019.6.4"
+      }
+    },
     "node_modules/qs": {
       "version": "6.11.0",
       "dev": true,
diff --git a/package.json b/package.json
index b2a1341790..8daabd9a1c 100644
--- a/package.json
+++ b/package.json
@@ -85,6 +85,7 @@
     "ngx-entity-service": "^0.0.41",
     "ngx-lottie": "^11.0.2",
     "nvd3": "1.8.6",
+    "qr-scanner": "^1.4.2",
     "rxjs": "~7.4.0",
     "ts-md5": "^1.3.1",
     "tslib": "^2.6.2",
@@ -164,8 +165,8 @@
   "optionalDependencies": {
     "@nx/nx-darwin-arm64": "^18.0",
     "@nx/nx-darwin-x64": "^18.0",
-    "@nx/nx-linux-x64-gnu": "^18.0",
     "@nx/nx-linux-arm64-gnu": "^18.0",
+    "@nx/nx-linux-x64-gnu": "^18.0",
     "@nx/nx-win32-x64-msvc": "^18.0",
     "@rollup/rollup-linux-arm64-gnu": "*",
     "@rollup/rollup-linux-x64-gnu": "*"
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-marking/tutor-marking.component.html
index a8a3cddefc..6137641577 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.html
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.html
@@ -1,11 +1,19 @@
-<div class="w-full flex flex-col h-[calc(100vh-140px)]">
+@if (scanningQr) {
+  <div
+    class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-screen h-screen"
+  >
+    <video #qrScanner class="w-full h-full"></video>
+  </div>
+}
+
+<div [hidden]="scanningQr" class="w-full flex flex-col h-[calc(100vh-140px)]">
   <div class="task-inbox flex flex-col flex-1 justify-normal items-center full-width">
     <!-- Get list of tutorials for student that are either submitted or ready for discussion -->
     <!-- <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60"> -->
     <div class="w-full flex justify-between items-center">
       <!-- <div></div> -->
       <button mat-raised-button color="primary" (click)="refresh()">Refresh</button>
-      <button mat-icon-button color="primary">
+      <button mat-icon-button color="primary" (click)="scanQrCode()">
         <mat-icon>qr_code</mat-icon>
       </button>
     </div>
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
index 1de71a7ff6..415ff4353b 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -1,7 +1,7 @@
-import {Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
-import {MatListOption, MatSelectionList, MatSelectionListChange} from '@angular/material/list';
-import {Router} from '@angular/router';
+import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core';
+import {MatSelectionList} from '@angular/material/list';
 import {StateService, UIRouter} from '@uirouter/core';
+import QrScanner from 'qr-scanner';
 import {
   AuthenticationService,
   Project,
@@ -25,15 +25,18 @@ import {GradeService} from 'src/app/common/services/grade.service';
 export class TutorMarkingComponent implements OnInit {
   @Input() unitId: number;
   @Input() projectId: number;
-  @Input() username: string;
 
   @ViewChild('tasks') tasksList: MatSelectionList;
+  @ViewChild('qrScanner') qrScannerElement: ElementRef<HTMLVideoElement>;
 
-  filteredTasks: Task[] = [];
-  project: Project | null;
-  student: User | null;
+  public filteredTasks: Task[] = [];
+  public project: Project | null;
+  public student: User | null;
 
-  selectedTask: Task | null;
+  public selectedTask: Task | null;
+
+  public scanningQr: boolean = false;
+  private qrScanner: QrScanner = null;
 
   constructor(
     private userService: UserService,
@@ -47,15 +50,66 @@ export class TutorMarkingComponent implements OnInit {
   ) {}
 
   public ngOnInit(): void {
+    this.projectId = Number(this.projectId);
+    this.unitId = Number(this.unitId);
+
     this.authService.afterAuthCall((result) => {
       if (!result) {
-        // return this.state.go('sign_in');
+        return this.state.go('sign_in');
       } else {
         this.getStudentTasks();
       }
     });
   }
 
+  private decodeQrCode(data: string) {
+    try {
+      const qrData = JSON.parse(data);
+      if (qrData && 'unitId' in qrData && 'projectId' in qrData) {
+        this.qrScanner.stop();
+        this.scanningQr = false;
+        this.router.stateService.go('tutor-marking', {
+          unitId: qrData.unitId,
+          projectId: qrData.projectId,
+        });
+      }
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
+  public scanQrCode() {
+    this.scanningQr = true;
+
+    setTimeout(() => {
+      this.qrScanner = new QrScanner(
+        this.qrScannerElement.nativeElement,
+        (result) => {
+          if (result && result.data) {
+            this.decodeQrCode(result.data);
+          }
+        },
+        {
+          highlightScanRegion: true,
+          maxScansPerSecond: 10,
+          preferredCamera: 'environment',
+          onDecodeError: (error) => {
+            console.error(error);
+          },
+        },
+      );
+      this.qrScanner
+        .start()
+        .then(() => {
+          console.log('starting scan');
+        })
+        .catch((err) => {
+          console.log('could not start qr scanner...', err);
+          this.scanningQr = false;
+        });
+    });
+  }
+
   public selectTask(task: Task) {
     this.selectedTask = task;
   }
@@ -84,7 +138,7 @@ export class TutorMarkingComponent implements OnInit {
   private loadStudents(unit: Unit): Promise<Project> {
     return new Promise((resolve, reject) => {
       this.projectService.loadStudents(unit, false, false).subscribe((projects) => {
-        const project = projects.find((p) => p.student.username === this.username);
+        const project = projects.find((p) => p.id === this.projectId);
         if (!project) {
           reject('Student is not a part of this unit');
         }

From 4533eca1c05327caa38f46398610daf1c91e7cd8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 2 Jul 2025 16:42:30 +1000
Subject: [PATCH 319/776] refactor: replace qrcode package

---
 package-lock.json                             | 153 +++++++++++--
 package.json                                  |   3 +-
 src/app/doubtfire.states.ts                   |   6 -
 .../tutor-marking.component.html              |  85 ++++---
 .../tutor-marking.component.scss              |  18 ++
 .../tutor-marking/tutor-marking.component.ts  | 214 +++++++++---------
 6 files changed, 327 insertions(+), 152 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b0e807f3c8..fd959caf30 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,6 +53,7 @@
         "es5-shim": "^4.5.12",
         "file-saver": "^2.0.5",
         "font-awesome": "~4.7.0",
+        "html5-qrcode": "^2.3.8",
         "jquery": "2.1.4",
         "lodash": "~4.17",
         "lottie-web": "^5.12.2",
@@ -66,7 +67,7 @@
         "ngx-entity-service": "^0.0.41",
         "ngx-lottie": "^11.0.2",
         "nvd3": "1.8.6",
-        "qr-scanner": "^1.4.2",
+        "qrcode": "^1.5.4",
         "rxjs": "~7.4.0",
         "ts-md5": "^1.3.1",
         "tslib": "^2.6.2",
@@ -5698,12 +5699,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/offscreencanvas": {
-      "version": "2019.7.3",
-      "resolved": "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.7.3.tgz",
-      "integrity": "sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==",
-      "license": "MIT"
-    },
     "node_modules/@types/parse-json": {
       "version": "4.0.2",
       "dev": true,
@@ -9087,6 +9082,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
+    "node_modules/dijkstrajs": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
+      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==",
+      "license": "MIT"
+    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "dev": true,
@@ -12773,6 +12774,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/html5-qrcode": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/html5-qrcode/-/html5-qrcode-2.3.8.tgz",
+      "integrity": "sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ==",
+      "license": "Apache-2.0"
+    },
     "node_modules/htmlparser2": {
       "version": "8.0.2",
       "dev": true,
@@ -17320,7 +17327,6 @@
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -17642,6 +17648,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/pngjs": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
+      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/portscanner": {
       "version": "1.2.0",
       "dev": true,
@@ -18638,13 +18653,125 @@
         "node": ">=0.9"
       }
     },
-    "node_modules/qr-scanner": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/qr-scanner/-/qr-scanner-1.4.2.tgz",
-      "integrity": "sha512-kV1yQUe2FENvn59tMZW6mOVfpq9mGxGf8l6+EGaXUOd4RBOLg7tRC83OrirM5AtDvZRpdjdlXURsHreAOSPOUw==",
+    "node_modules/qrcode": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
+      "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
+      "license": "MIT",
+      "dependencies": {
+        "dijkstrajs": "^1.0.1",
+        "pngjs": "^5.0.0",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "qrcode": "bin/qrcode"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/qrcode/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/qrcode/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "license": "MIT",
       "dependencies": {
-        "@types/offscreencanvas": "^2019.6.4"
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/qrcode/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "license": "ISC"
+    },
+    "node_modules/qrcode/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/qs": {
diff --git a/package.json b/package.json
index 8daabd9a1c..27d2605514 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "es5-shim": "^4.5.12",
     "file-saver": "^2.0.5",
     "font-awesome": "~4.7.0",
+    "html5-qrcode": "^2.3.8",
     "jquery": "2.1.4",
     "lodash": "~4.17",
     "lottie-web": "^5.12.2",
@@ -85,7 +86,7 @@
     "ngx-entity-service": "^0.0.41",
     "ngx-lottie": "^11.0.2",
     "nvd3": "1.8.6",
-    "qr-scanner": "^1.4.2",
+    "qrcode": "^1.5.4",
     "rxjs": "~7.4.0",
     "ts-md5": "^1.3.1",
     "tslib": "^2.6.2",
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index fa54aa7c0c..6838490ce2 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -457,12 +457,6 @@ const TutorMarkingState: NgHybridStateDeclaration = {
         return $stateParams.unitId;
       },
     ],
-    username: [
-      '$stateParams',
-      function ($stateParams) {
-        return $stateParams.username;
-      },
-    ],
     projectId: [
       '$stateParams',
       function ($stateParams) {
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-marking/tutor-marking.component.html
index 6137641577..fa51dcb009 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.html
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.html
@@ -1,41 +1,60 @@
-@if (scanningQr) {
-  <div
-    class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-screen h-screen"
-  >
-    <video #qrScanner class="w-full h-full"></video>
+<div
+  [hidden]="!scanningQr"
+  class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-screen h-screen z-40 bg-gray-500/50 backdrop-blur"
+>
+  <!-- bg-gray-500 -->
+  <!-- <video id="qr-reader" class="w-full h-full"></video> -->
+  @if (loadingStudentData) {
+    <mat-spinner
+      color="blue"
+      class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50"
+    ></mat-spinner>
+  }
+  <div class="w-full h-full flex flex-col justify-around">
+    <div class="w-full text-center text-white px-10 py-5 text-md font-bold">
+      Scan a student's QR code to instantly load their project and mark submissions.
+    </div>
+    <div id="qr-reader" class=""></div>
+    <button
+      mat-raised-button
+      color="secondary"
+      (click)="scanningQr = false"
+      class="max-w-md my-5 mx-auto"
+    >
+      <!-- TODO: if user clicks on 'Exit', take them back to Home.-->
+      <!-- TODO: 'Cancel' closes the camera and displays the previously scanned project  -->
+      {{ project ? 'Cancel' : 'Exit' }}
+    </button>
   </div>
-}
+</div>
 
-<div [hidden]="scanningQr" class="w-full flex flex-col h-[calc(100vh-140px)]">
+<div class="w-full flex flex-col h-[calc(100vh-140px)]">
   <div class="task-inbox flex flex-col flex-1 justify-normal items-center full-width">
-    <!-- Get list of tutorials for student that are either submitted or ready for discussion -->
-    <!-- <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60"> -->
-    <div class="w-full flex justify-between items-center">
-      <!-- <div></div> -->
-      <button mat-raised-button color="primary" (click)="refresh()">Refresh</button>
-      <button mat-icon-button color="primary" (click)="scanQrCode()">
-        <mat-icon>qr_code</mat-icon>
-      </button>
+    <div class="flex justify-between w-full relative">
+      @if (project && project?.student) {
+        <div></div>
+        <div class="absolute left-1/2 transform -translate-x-1/2 text-center">
+          <div class="text-center">
+            {{ project?.student?.firstName }} {{ project?.student?.lastName }}
+          </div>
+          <div class="text-center">
+            Target Grade: {{ getTargetTradeString(project?.targetGrade) }}
+          </div>
+        </div>
+        <button mat-icon-button color="primary" (click)="scanQrCode()">
+          <mat-icon>qr_code</mat-icon>
+        </button>
+      }
     </div>
 
-    @if (project) {
-      <div class="text-center">{{ student?.firstName }} {{ student?.lastName }}</div>
-      <!-- <div class="text-center">{{ username }}</div>s -->
-      <div class="text-center">Target Grade: {{ getTargetTradeString(project?.targetGrade) }}</div>
-    } @else {
-      <div class="w-full flex justify-center z-50">
-        <!-- <mat-spinner color="blue"></mat-spinner> -->
-        Loading...
-      </div>
-    }
-
     <mat-selection-list class="m-0 p-0 h-min" #tasks>
       @for (task of filteredTasks; track task) {
         <mat-list-option
           [value]="task"
-          class="clearfix"
+          class="clearfix w-full"
           style="padding: 0; height: 60px"
           togglePosition="before"
+          [selected]="true"
         >
           @if (task) {
             <div (click)="selectTask(task)" class="w-full" id="{{ task.id }}">
@@ -52,7 +71,7 @@
                     similarities: task.similaritiesDetected
                   }"
                 ></span>
-                <user-icon class="self-center" [user]="student" [size]="30"> </user-icon>
+                <user-icon class="self-center" [user]="project?.student" [size]="30"> </user-icon>
                 <div class="task-list-data truncate flex-1" [hidden]="isNarrow">
                   <h4 class="student-name">{{ task.definition.name }}</h4>
                   <div class="task-details truncate">
@@ -120,9 +139,13 @@ <h4 class="student-name">{{ task.definition.name }}</h4>
 
       <!--/task-->
     </mat-selection-list>
-    <div class="w-full flex justify-center mt-4">
-      <button mat-button color="primary" (click)="loadAllTasks()">Load all tasks</button>
-    </div>
+    @if (project && filteredTasks.length) {
+      <!-- TODO: if filteredtasks && there are more tasks to load.. -->
+      <div class="w-full flex justify-center mt-4">
+        <button mat-button color="primary" (click)="loadAllTasks()">Load all tasks</button>
+      </div>
+    }
+
     <!-- </cdk-virtual-scroll-viewport> -->
   </div>
 
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.scss b/src/app/projects/states/tutor-marking/tutor-marking.component.scss
index bb31b035a8..3abfc479c7 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.scss
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.scss
@@ -266,3 +266,21 @@ user-icon {
     height: 100px !important;
   }
 }
+
+// Hide auto-injected QR scanner elements that are not needed in the UI
+#html5-qrcode-button-camera-stop,
+#qr-reader__header_message,
+#qr-reader img,
+#qr-reader__dashboard_section,
+#html5-qrcode-anchor-scan-type-change,
+#qr-reader > div:not([id]):not([class]),
+#qr-reader__scan_region > div:not([id]):not([class]) {
+  display: none !important;
+}
+
+#html5-qrcode-button-camera-permission {
+  @apply bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded shadow w-full uppercase;
+  width: 100%;
+  max-width: 250px;
+  height: 60px;
+}
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
index 415ff4353b..03503bd2a8 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -1,112 +1,130 @@
-import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core';
+import {Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
 import {MatSelectionList} from '@angular/material/list';
-import {StateService, UIRouter} from '@uirouter/core';
-import QrScanner from 'qr-scanner';
+import {StateService} from '@uirouter/core';
+import {Html5QrcodeScanner} from 'html5-qrcode';
 import {
   AuthenticationService,
   Project,
   ProjectService,
   Task,
-  TaskService,
   TaskStatusEnum,
   Unit,
   UnitService,
-  User,
 } from 'src/app/api/models/doubtfire-model';
-import {UserService} from 'src/app/api/services/user.service';
+import {AlertService} from 'src/app/common/services/alert.service';
 import {GradeService} from 'src/app/common/services/grade.service';
 
 @Component({
   selector: 'f-tutor-marking',
   templateUrl: './tutor-marking.component.html',
   styleUrl: './tutor-marking.component.scss',
-  // encapsulation: ViewEncapsulation.None, // enables custom material-ui css
+  encapsulation: ViewEncapsulation.None, // enables custom material-ui css
 })
 export class TutorMarkingComponent implements OnInit {
   @Input() unitId: number;
   @Input() projectId: number;
 
   @ViewChild('tasks') tasksList: MatSelectionList;
-  @ViewChild('qrScanner') qrScannerElement: ElementRef<HTMLVideoElement>;
 
   public filteredTasks: Task[] = [];
   public project: Project | null;
-  public student: User | null;
 
   public selectedTask: Task | null;
 
   public scanningQr: boolean = false;
-  private qrScanner: QrScanner = null;
+  public loadingStudentData: boolean = false;
+
+  private html5QrcodeScanner: Html5QrcodeScanner;
+
+  private _unitId: number;
+  private _projectId: number;
 
   constructor(
-    private userService: UserService,
+    // private userService: UserService,
     private unitService: UnitService,
     private authService: AuthenticationService,
     private projectService: ProjectService,
-    private taskService: TaskService,
+    // private taskService: TaskService,
     private gradeService: GradeService,
     private state: StateService,
-    private router: UIRouter,
+    private alertService: AlertService,
+    // private router: UIRouter,
   ) {}
 
   public ngOnInit(): void {
-    this.projectId = Number(this.projectId);
-    this.unitId = Number(this.unitId);
-
     this.authService.afterAuthCall((result) => {
       if (!result) {
         return this.state.go('sign_in');
       } else {
-        this.getStudentTasks();
+        if (!this.project) {
+          if (this.unitId && this.projectId) {
+            this._projectId = Number(this.projectId);
+            this._unitId = Number(this.unitId);
+            this.getStudentTasks();
+          } else {
+            this.scanQrCode();
+          }
+        }
       }
     });
   }
 
   private decodeQrCode(data: string) {
+    if (!this.scanningQr || this.loadingStudentData) {
+      return;
+    }
     try {
       const qrData = JSON.parse(data);
       if (qrData && 'unitId' in qrData && 'projectId' in qrData) {
-        this.qrScanner.stop();
-        this.scanningQr = false;
-        this.router.stateService.go('tutor-marking', {
-          unitId: qrData.unitId,
-          projectId: qrData.projectId,
-        });
+        this.changeProject(qrData.unitId, qrData.projectId);
+      } else {
+        const params = new URL(data).searchParams;
+        const unitId = Number(params.get('unitId'));
+        const projectId = Number(params.get('projectId'));
+        this.changeProject(unitId, projectId);
       }
     } catch (e) {
       console.log(e);
     }
   }
 
+  private changeProject(unitId: number, projectId: number) {
+    this._unitId = unitId;
+    this._projectId = projectId;
+    this.html5QrcodeScanner.pause(true);
+    this.loadingStudentData = true;
+    setTimeout(() => {
+      this.getStudentTasks();
+    });
+  }
+
   public scanQrCode() {
     this.scanningQr = true;
-
-    setTimeout(() => {
-      this.qrScanner = new QrScanner(
-        this.qrScannerElement.nativeElement,
-        (result) => {
-          if (result && result.data) {
-            this.decodeQrCode(result.data);
-          }
-        },
-        {
-          highlightScanRegion: true,
-          maxScansPerSecond: 10,
-          preferredCamera: 'environment',
-          onDecodeError: (error) => {
-            console.error(error);
-          },
-        },
-      );
-      this.qrScanner
-        .start()
-        .then(() => {
-          console.log('starting scan');
-        })
-        .catch((err) => {
-          console.log('could not start qr scanner...', err);
-          this.scanningQr = false;
-        });
+    this.loadingStudentData = false;
+
+    // Trigger permission
+    navigator.mediaDevices.getUserMedia({video: true}).then(() => {
+      setTimeout(() => {
+        if (!this.html5QrcodeScanner) {
+          this.html5QrcodeScanner = new Html5QrcodeScanner(
+            'qr-reader',
+            {fps: 10, qrbox: 250},
+            false,
+          );
+
+          this.html5QrcodeScanner.render(
+            (data) => {
+              console.log(data);
+              this.decodeQrCode(data);
+            },
+            (_error) => {
+              // console.error(error);
+            },
+          );
+        } else {
+          this.html5QrcodeScanner.resume();
+        }
+      });
     });
   }
 
@@ -124,7 +142,7 @@ export class TutorMarkingComponent implements OnInit {
 
   private getUnit(): Promise<Unit> {
     return new Promise((resolve, reject) => {
-      this.unitService.get({id: this.unitId}).subscribe({
+      this.unitService.get({id: this._unitId}).subscribe({
         next: (unit) => {
           resolve(unit);
         },
@@ -138,7 +156,7 @@ export class TutorMarkingComponent implements OnInit {
   private loadStudents(unit: Unit): Promise<Project> {
     return new Promise((resolve, reject) => {
       this.projectService.loadStudents(unit, false, false).subscribe((projects) => {
-        const project = projects.find((p) => p.id === this.projectId);
+        const project = projects.find((p) => p.id === this._projectId);
         if (!project) {
           reject('Student is not a part of this unit');
         }
@@ -163,18 +181,7 @@ export class TutorMarkingComponent implements OnInit {
   }
 
   public refresh() {
-    const projectIds = [10, 13, 8, 11, 17, 0, 6, 14, 16, 5]; // debug list of valid projectIds
-    // this.getStudentTasks();
-    const randomId = projectIds[Math.floor(Math.random() * projectIds.length)];
-    const newRoute = `tutor/marking?unitId=${this.unitId}&username=x&projectId=${randomId}`;
-    // this.router.stateService.go(newRoute);
-
-    this.router.stateService.go('tutor-marking', {
-      unitId: this.unitId,
-      username: `student_${randomId}`,
-      // projectId: ,
-    });
-    console.log(newRoute);
+    this.decodeQrCode('{"unitId":2,"projectId":20}');
   }
 
   public loadAllTasks() {
@@ -183,43 +190,48 @@ export class TutorMarkingComponent implements OnInit {
     this.filteredTasks = [...this.project.tasks];
   }
 
-  public async getStudentTasks(): Promise<void> {
+  statusesToFetch: TaskStatusEnum[] = [
+    'demonstrate',
+    'ready_for_feedback',
+    'discuss',
+    'need_help',
+    // 'complete',
+    'fix_and_resubmit',
+    'redo',
+  ];
+
+  public getStudentTasks(): void {
     console.time('getStudentTasks()');
-    // this.student = null;
-    this.project = null;
-    this.filteredTasks = [];
-    this.selectedTask = null;
-    try {
-      const unit = await this.getUnit();
-      const student = await this.loadStudents(unit);
-      this.student = student.student;
-      // const project = await this.getProject(unit);
-      const project = await this.getProject(unit, student.id);
-      console.log(project);
-      // this.student = project.student;
-      this.project = project;
-
-      const statusesToFetch: TaskStatusEnum[] = [
-        'demonstrate',
-        'ready_for_feedback',
-        'discuss',
-        'need_help',
-        // 'complete',
-        'fix_and_resubmit',
-        'redo',
-      ];
-
-      const discussionTasks = project.tasks.filter((task) => statusesToFetch.includes(task.status));
-      console.log(discussionTasks);
-      this.selectedTask = discussionTasks[0];
-      this.filteredTasks = [...discussionTasks];
-
-      setTimeout(() => this.tasksList.selectAll());
-
-      console.timeEnd('getStudentTasks()');
-    } catch (err) {
-      console.error('Failed to fetch tasks');
-      console.error(err);
-    }
+    // this.project = null;
+    // this.filteredTasks = [];
+    // this.selectedTask = null;
+
+    let unit: Unit;
+    this.getUnit()
+      .then((_unit) => {
+        unit = _unit;
+        return this.loadStudents(unit);
+      })
+      .then((student) => {
+        return this.getProject(unit, student.id);
+      })
+      .then((project) => {
+        const discussionTasks = project.tasks.filter((task) =>
+          this.statusesToFetch.includes(task.status),
+        );
+        this.filteredTasks = [...discussionTasks];
+        this.selectedTask = discussionTasks[0];
+        this.project = project;
+        this.scanningQr = false;
+        this.loadingStudentData = false;
+      })
+      .catch((e) => {
+        console.error(e);
+        this.alertService.error(e, 5000);
+        this.scanQrCode();
+      })
+      .finally(() => {
+        console.timeEnd('getStudentTasks()');
+      });
   }
 }

From 6f8b94f7c0b48d292dfe28871ff7ae7fda86b2b9 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 2 Jul 2025 17:15:05 +1000
Subject: [PATCH 320/776] feat: qr code generation for student projects

---
 .../modals/qr-modal/qr-modal.component.html   |  7 ++++++
 .../modals/qr-modal/qr-modal.component.scss   |  0
 .../modals/qr-modal/qr-modal.component.ts     | 22 +++++++++++++++++++
 .../modals/qr-modal/qr-modal.service.ts       | 16 ++++++++++++++
 src/app/doubtfire-angular.module.ts           |  2 ++
 .../task-status-card.component.html           |  3 +++
 .../task-status-card.component.ts             | 11 +++++++++-
 7 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 src/app/common/modals/qr-modal/qr-modal.component.html
 create mode 100644 src/app/common/modals/qr-modal/qr-modal.component.scss
 create mode 100644 src/app/common/modals/qr-modal/qr-modal.component.ts
 create mode 100644 src/app/common/modals/qr-modal/qr-modal.service.ts

diff --git a/src/app/common/modals/qr-modal/qr-modal.component.html b/src/app/common/modals/qr-modal/qr-modal.component.html
new file mode 100644
index 0000000000..7b3f559645
--- /dev/null
+++ b/src/app/common/modals/qr-modal/qr-modal.component.html
@@ -0,0 +1,7 @@
+<div class="p-10 w-full max-w-[500px]">
+  <div class="text-center">
+    Display this QR code during your class so your tutor can scan it to view your submissions and
+    mark your tasks as complete.
+  </div>
+  <img [src]="qrCodeImage" alt="QR Code for tutor assessment" class="w-full" />
+</div>
diff --git a/src/app/common/modals/qr-modal/qr-modal.component.scss b/src/app/common/modals/qr-modal/qr-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/common/modals/qr-modal/qr-modal.component.ts b/src/app/common/modals/qr-modal/qr-modal.component.ts
new file mode 100644
index 0000000000..d59b72b778
--- /dev/null
+++ b/src/app/common/modals/qr-modal/qr-modal.component.ts
@@ -0,0 +1,22 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {MAT_DIALOG_DATA} from '@angular/material/dialog';
+import QRCode from 'qrcode';
+
+@Component({
+  selector: 'f-qr-modal',
+  templateUrl: './qr-modal.component.html',
+  styleUrls: ['./qr-modal.component.scss'],
+})
+export class QrModalComponent implements OnInit {
+  constructor(@Inject(MAT_DIALOG_DATA) public data: string) {}
+
+  qrCodeImage: string;
+
+  ngOnInit() {
+    if (this.data) {
+      QRCode.toDataURL(this.data).then((url) => {
+        this.qrCodeImage = url;
+      });
+    }
+  }
+}
diff --git a/src/app/common/modals/qr-modal/qr-modal.service.ts b/src/app/common/modals/qr-modal/qr-modal.service.ts
new file mode 100644
index 0000000000..7017f2c92b
--- /dev/null
+++ b/src/app/common/modals/qr-modal/qr-modal.service.ts
@@ -0,0 +1,16 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {QrModalComponent} from './qr-modal.component';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class QrModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(qrText: string) {
+    const _dialogRef = this.dialog.open(QrModalComponent, {
+      data: qrText,
+    });
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 5eb012cbed..e4b0b00682 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -256,6 +256,7 @@ import { SpecConModalComponent } from './common/modals/spec-con-modal/spec-con-m
 import { SpecConModalService } from './common/modals/spec-con-modal/spec-con-modal.service';
 import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
 import {TutorMarkingComponent} from './projects/states/tutor-marking/tutor-marking.component';
+import { QrModalComponent } from './common/modals/qr-modal/qr-modal.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -472,6 +473,7 @@ const MY_DATE_FORMAT = {
     }),
     FeedbackTemplateService,
     NestedCsvDownloadModalService,
+    QrModalComponent,
   ],
   imports: [
     FlexLayoutModule,
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
index e1d81c95e2..1406bd672e 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
@@ -42,6 +42,9 @@ <h5>{{ task?.statusLabel() }}</h5>
     }
     @if (task?.inSubmittedState() && task?.requiresFileUpload()) {
       <button mat-stroked-button (click)="updateFilesInSubmission()">Upload new files</button>
+      <button mat-raised-button color="primary" (click)="openDiscussionQrCode()">
+        Show Discussion QR
+      </button>
     }
   </mat-card-actions>
 </mat-card>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index a8970aec50..ce98073f59 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -5,7 +5,8 @@ import { Task } from 'src/app/api/models/task';
 import { TaskStatusEnum } from 'src/app/api/models/task-status';
 import { TaskService } from 'src/app/api/services/task.service';
 import { ExtensionModalService } from 'src/app/common/modals/extension-modal/extension-modal.service';
-
+import { QrModalService } from 'src/app/common/modals/qr-modal/qr-modal.service';
+import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
 @Component({
   selector: 'f-task-status-card',
   templateUrl: './task-status-card.component.html',
@@ -19,6 +20,8 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     private extensions: ExtensionModalService,
     private taskService: TaskService,
     private router: UIRouter,
+    private qrModalService: QrModalService,
+    private doubtfireConstants: DoubtfireConstants,
   ) {}
 
   @Input() task: Task;
@@ -65,6 +68,12 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     this.task.presentTaskSubmissionModal(this.task.status, true);
   }
 
+  openDiscussionQrCode(): void {
+    const url = `${this.doubtfireConstants.API_URL}/tutor/marking?unitId=${this.task.unit.id}&projectId=${this.task.project.id}`;
+    console.log(url);
+    this.qrModalService.show(url);
+  }
+
   applyForExtension(): void {
     this.extensions.show(this.task, () => {
       this.task.refresh();

From 31822abaa4c66e2dcbc3ab74c71fe0f6e9b5861d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 2 Jul 2025 17:19:47 +1000
Subject: [PATCH 321/776] fix: decode url from qr code

---
 .../tutor-marking/tutor-marking.component.ts  | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
index 03503bd2a8..bfeb014b28 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -40,15 +40,12 @@ export class TutorMarkingComponent implements OnInit {
   private _projectId: number;
 
   constructor(
-    // private userService: UserService,
     private unitService: UnitService,
     private authService: AuthenticationService,
     private projectService: ProjectService,
-    // private taskService: TaskService,
     private gradeService: GradeService,
     private state: StateService,
     private alertService: AlertService,
-    // private router: UIRouter,
   ) {}
 
   public ngOnInit(): void {
@@ -73,18 +70,16 @@ export class TutorMarkingComponent implements OnInit {
     if (!this.scanningQr || this.loadingStudentData) {
       return;
     }
+
     try {
-      const qrData = JSON.parse(data);
-      if (qrData && 'unitId' in qrData && 'projectId' in qrData) {
-        this.changeProject(qrData.unitId, qrData.projectId);
-      } else {
-        const params = new URL(data).searchParams;
-        const unitId = Number(params.get('unitId'));
-        const projectId = Number(params.get('projectId'));
+      const params = new URL(data).searchParams;
+      const unitId = Number(params.get('unitId'));
+      const projectId = Number(params.get('projectId'));
+      if (!isNaN(unitId) && !isNaN(projectId)) {
         this.changeProject(unitId, projectId);
       }
-    } catch (e) {
-      console.log(e);
+    } catch {
+      // QR code data is invalid
     }
   }
 

From 71f09ae77da6f0a2f5ed135071c92c110940c2f5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 2 Jul 2025 17:28:27 +1000
Subject: [PATCH 322/776] feat: redirect back to home if exiting the scanner

---
 .../tutor-marking.component.html              |  4 +---
 .../tutor-marking/tutor-marking.component.ts  | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-marking/tutor-marking.component.html
index fa51dcb009..f46b277461 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.html
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.html
@@ -18,11 +18,9 @@
     <button
       mat-raised-button
       color="secondary"
-      (click)="scanningQr = false"
+      (click)="closeQrReader()"
       class="max-w-md my-5 mx-auto"
     >
-      <!-- TODO: if user clicks on 'Exit', take them back to Home.-->
-      <!-- TODO: 'Cancel' closes the camera and displays the previously scanned project  -->
       {{ project ? 'Cancel' : 'Exit' }}
     </button>
   </div>
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
index bfeb014b28..03288665d2 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -1,6 +1,6 @@
 import {Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
 import {MatSelectionList} from '@angular/material/list';
-import {StateService} from '@uirouter/core';
+import {StateService, UIRouter} from '@uirouter/core';
 import {Html5QrcodeScanner} from 'html5-qrcode';
 import {
   AuthenticationService,
@@ -46,6 +46,7 @@ export class TutorMarkingComponent implements OnInit {
     private gradeService: GradeService,
     private state: StateService,
     private alertService: AlertService,
+    private route: UIRouter,
   ) {}
 
   public ngOnInit(): void {
@@ -83,6 +84,16 @@ export class TutorMarkingComponent implements OnInit {
     }
   }
 
+  public closeQrReader(): void {
+    if (!this.project) {
+      // Exiting the route entirely
+      this.route.stateService.go('home');
+    } else {
+      // Close the camera view
+      this.scanningQr = false;
+    }
+  }
+
   private changeProject(unitId: number, projectId: number) {
     this._unitId = unitId;
     this._projectId = projectId;
@@ -97,19 +108,19 @@ export class TutorMarkingComponent implements OnInit {
     this.scanningQr = true;
     this.loadingStudentData = false;
 
-    // Trigger permission
+    // Trigger video permissions
     navigator.mediaDevices.getUserMedia({video: true}).then(() => {
       setTimeout(() => {
+        // Only init the scanner once and let it run in the background
         if (!this.html5QrcodeScanner) {
           this.html5QrcodeScanner = new Html5QrcodeScanner(
-            'qr-reader',
+            'qr-reader', // id of the div in the html
             {fps: 10, qrbox: 250},
             false,
           );
 
           this.html5QrcodeScanner.render(
             (data) => {
-              console.log(data);
               this.decodeQrCode(data);
             },
             (_error) => {
@@ -117,6 +128,7 @@ export class TutorMarkingComponent implements OnInit {
             },
           );
         } else {
+          // Resume scanner if we've already set it up
           this.html5QrcodeScanner.resume();
         }
       });

From a639e380701e5b056b2cfe108d57c0c41f754bf5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 2 Jul 2025 17:36:57 +1000
Subject: [PATCH 323/776] chore: filter out tasks with no submissions

---
 .../tutor-marking/tutor-marking.component.html       |  5 +++--
 .../states/tutor-marking/tutor-marking.component.ts  | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-marking/tutor-marking.component.html
index f46b277461..36c96b4476 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.html
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.html
@@ -138,9 +138,10 @@ <h4 class="student-name">{{ task.definition.name }}</h4>
       <!--/task-->
     </mat-selection-list>
     @if (project && filteredTasks.length) {
-      <!-- TODO: if filteredtasks && there are more tasks to load.. -->
       <div class="w-full flex justify-center mt-4">
-        <button mat-button color="primary" (click)="loadAllTasks()">Load all tasks</button>
+        <button mat-button color="primary" (click)="loadAllSubmittedtasks()">
+          Load all submitted tasks
+        </button>
       </div>
     }
 
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
index 03288665d2..2c8a2dc2ff 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -191,10 +191,14 @@ export class TutorMarkingComponent implements OnInit {
     this.decodeQrCode('{"unitId":2,"projectId":20}');
   }
 
-  public loadAllTasks() {
-    // TODO: filter out tasks higher than student's target grade
-    // TODO: filter out tasks with no submissions
-    this.filteredTasks = [...this.project.tasks];
+  public loadAllSubmittedtasks() {
+    this.filteredTasks = [
+      ...this.project.tasks.filter(
+        (task) =>
+          task.status !== 'not_started' && // Filter out tasks with no submissions yet
+          task.definition.targetGrade <= this.project.targetGrade, // Filter out tasks that are higher than student's target grade
+      ),
+    ];
   }
 
   statusesToFetch: TaskStatusEnum[] = [

From 59b49b8d60dc62f71ff163960fdf31a0955307fd Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 2 Jul 2025 17:41:59 +1000
Subject: [PATCH 324/776] chore: display label when task list is empty

---
 .../states/tutor-marking/tutor-marking.component.html      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-marking/tutor-marking.component.html
index 36c96b4476..dfc48b1220 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.html
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.html
@@ -45,6 +45,9 @@
       }
     </div>
 
+    @if (project && !filteredTasks.length) {
+      <div class="italic text-gray-400 py-10">No tasks to discuss.</div>
+    }
     <mat-selection-list class="m-0 p-0 h-min" #tasks>
       @for (task of filteredTasks; track task) {
         <mat-list-option
@@ -137,7 +140,7 @@ <h4 class="student-name">{{ task.definition.name }}</h4>
 
       <!--/task-->
     </mat-selection-list>
-    @if (project && filteredTasks.length) {
+    @if (project) {
       <div class="w-full flex justify-center mt-4">
         <button mat-button color="primary" (click)="loadAllSubmittedtasks()">
           Load all submitted tasks
@@ -148,7 +151,7 @@ <h4 class="student-name">{{ task.definition.name }}</h4>
     <!-- </cdk-virtual-scroll-viewport> -->
   </div>
 
-  @if (project) {
+  @if (project && filteredTasks.length) {
     <div class="mt-2">
       <div class="w-full flex justify-center items-center my-3 gap-5">
         <button

From a0b010ef31161b6cf2ab1038deb82c199ffb9ecb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 3 Jul 2025 10:26:38 +1000
Subject: [PATCH 325/776] fix: ensure scanner doesn't break on ios

---
 .../tutor-marking.component.scss              | 18 ++++++------
 .../tutor-marking/tutor-marking.component.ts  | 29 +++++++++++--------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.scss b/src/app/projects/states/tutor-marking/tutor-marking.component.scss
index 3abfc479c7..b520b62188 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.scss
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.scss
@@ -268,15 +268,15 @@ user-icon {
 }
 
 // Hide auto-injected QR scanner elements that are not needed in the UI
-#html5-qrcode-button-camera-stop,
-#qr-reader__header_message,
-#qr-reader img,
-#qr-reader__dashboard_section,
-#html5-qrcode-anchor-scan-type-change,
-#qr-reader > div:not([id]):not([class]),
-#qr-reader__scan_region > div:not([id]):not([class]) {
-  display: none !important;
-}
+// #html5-qrcode-button-camera-stop,
+// #qr-reader__header_message,
+// #qr-reader img,
+// #qr-reader__dashboard_section,
+// #html5-qrcode-anchor-scan-type-change,
+// #qr-reader > div:not([id]):not([class]),
+// #qr-reader__scan_region > div:not([id]):not([class]) {
+//   display: none !important;
+// }
 
 #html5-qrcode-button-camera-permission {
   @apply bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded shadow w-full uppercase;
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
index 2c8a2dc2ff..3807af521f 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -1,7 +1,7 @@
 import {Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
 import {MatSelectionList} from '@angular/material/list';
 import {StateService, UIRouter} from '@uirouter/core';
-import {Html5QrcodeScanner} from 'html5-qrcode';
+import {Html5QrcodeScanner, Html5QrcodeScannerState} from 'html5-qrcode';
 import {
   AuthenticationService,
   Project,
@@ -108,11 +108,19 @@ export class TutorMarkingComponent implements OnInit {
     this.scanningQr = true;
     this.loadingStudentData = false;
 
-    // Trigger video permissions
-    navigator.mediaDevices.getUserMedia({video: true}).then(() => {
-      setTimeout(() => {
-        // Only init the scanner once and let it run in the background
-        if (!this.html5QrcodeScanner) {
+    if (
+      this.html5QrcodeScanner &&
+      this.html5QrcodeScanner.getState() === Html5QrcodeScannerState.PAUSED
+    ) {
+      this.html5QrcodeScanner.resume();
+    } else {
+      this.html5QrcodeScanner?.clear();
+
+      // Trigger video permissions
+      // If we call getUserMedia when html5QrcodeScanner is already active, the scanner will break on iOS
+      navigator.mediaDevices.getUserMedia({video: true}).then(() => {
+        setTimeout(() => {
+          // Only init the scanner once and let it run in the background
           this.html5QrcodeScanner = new Html5QrcodeScanner(
             'qr-reader', // id of the div in the html
             {fps: 10, qrbox: 250},
@@ -124,15 +132,12 @@ export class TutorMarkingComponent implements OnInit {
               this.decodeQrCode(data);
             },
             (_error) => {
-              // console.error(error);
+              // console.error(_error);
             },
           );
-        } else {
-          // Resume scanner if we've already set it up
-          this.html5QrcodeScanner.resume();
-        }
+        });
       });
-    });
+    }
   }
 
   public selectTask(task: Task) {

From e5799b18ec0603123b6a99b3733919d2611b4fbd Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 3 Jul 2025 11:12:50 +1000
Subject: [PATCH 326/776] feat: force scanner to use back camera, enhance ux

---
 .../tutor-marking.component.html              | 10 ++--
 .../tutor-marking.component.scss              | 32 +++++++----
 .../tutor-marking/tutor-marking.component.ts  | 54 +++++++++++++------
 3 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-marking/tutor-marking.component.html
index dfc48b1220..3946c8b251 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.html
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.html
@@ -10,11 +10,15 @@
       class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50"
     ></mat-spinner>
   }
-  <div class="w-full h-full flex flex-col justify-around">
-    <div class="w-full text-center text-white px-10 py-5 text-md font-bold">
+  <div class="w-full h-full flex flex-col justify-around relative">
+    <div [ngClass]="{'qr-reader-hide-bloat': hideQrScannerBloat}">
+      <div id="qr-reader" class="w-full h-[calc(100%-50px)]"></div>
+    </div>
+    <div
+      class="absolute top-[50px] left-1/2 transform -translate-x-1/2 w-full text-center text-white px-10 py-5 text-md font-bold pointer-events-none z-10"
+    >
       Scan a student's QR code to instantly load their project and mark submissions.
     </div>
-    <div id="qr-reader" class=""></div>
     <button
       mat-raised-button
       color="secondary"
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.scss b/src/app/projects/states/tutor-marking/tutor-marking.component.scss
index b520b62188..6a42f71f1a 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.scss
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.scss
@@ -268,15 +268,29 @@ user-icon {
 }
 
 // Hide auto-injected QR scanner elements that are not needed in the UI
-// #html5-qrcode-button-camera-stop,
-// #qr-reader__header_message,
-// #qr-reader img,
-// #qr-reader__dashboard_section,
-// #html5-qrcode-anchor-scan-type-change,
-// #qr-reader > div:not([id]):not([class]),
-// #qr-reader__scan_region > div:not([id]):not([class]) {
-//   display: none !important;
-// }
+// We only hide this if we found a "back camera" on user's device
+.qr-reader-hide-bloat #qr-reader__header_message,
+.qr-reader-hide-bloat #qr-reader__dashboard_section,
+.qr-reader-hide-bloat #qr-reader__dashboard_section_csr,
+.qr-reader-hide-bloat #qr-reader > div:not([id]):not([class]),
+.qr-reader-hide-bloat #qr-reader__scan_region > div:not([id]):not([class]),
+.qr-reader-hide-bloat #html5-qrcode-button-camera-stop,
+.qr-reader-hide-bloat #html5-qrcode-button-camera-start {
+  display: none !important;
+}
+
+#qr-reader img,
+#html5-qrcode-anchor-scan-type-change {
+  display: none !important;
+}
+
+#html5-qrcode-button-camera-stop,
+#html5-qrcode-button-camera-start {
+  @apply bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded shadow w-full uppercase;
+  max-width: 1000px;
+  height: 45px;
+  margin-top: 15px;
+}
 
 #html5-qrcode-button-camera-permission {
   @apply bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded shadow w-full uppercase;
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
index 3807af521f..44720358c8 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-marking/tutor-marking.component.ts
@@ -104,6 +104,8 @@ export class TutorMarkingComponent implements OnInit {
     });
   }
 
+  hideQrScannerBloat: boolean = true;
+
   public scanQrCode() {
     this.scanningQr = true;
     this.loadingStudentData = false;
@@ -118,25 +120,45 @@ export class TutorMarkingComponent implements OnInit {
 
       // Trigger video permissions
       // If we call getUserMedia when html5QrcodeScanner is already active, the scanner will break on iOS
-      navigator.mediaDevices.getUserMedia({video: true}).then(() => {
-        setTimeout(() => {
-          // Only init the scanner once and let it run in the background
-          this.html5QrcodeScanner = new Html5QrcodeScanner(
-            'qr-reader', // id of the div in the html
-            {fps: 10, qrbox: 250},
-            false,
+      navigator.mediaDevices
+        .getUserMedia({video: true})
+        .then(() => {
+          return navigator.mediaDevices.enumerateDevices();
+        })
+        .then((devices) => {
+          // Find the deviceId of the back camera
+          const backCameras = devices.filter(
+            (d) => d.kind === 'videoinput' && d.label.toLowerCase().includes('back camera'),
           );
 
-          this.html5QrcodeScanner.render(
-            (data) => {
-              this.decodeQrCode(data);
-            },
-            (_error) => {
-              // console.error(_error);
-            },
-          );
+          const html5QrcodeData = {
+            hasPermission: true,
+            lastUsedCameraId: backCameras[0]?.deviceId ?? null,
+          };
+          localStorage.setItem('HTML5_QRCODE_DATA', JSON.stringify(html5QrcodeData));
+
+          // Hide most of the UI if we found and set the back camera
+          // Otherwise, we need to reveal the UI so that the user can select which camera to use
+          this.hideQrScannerBloat = html5QrcodeData.lastUsedCameraId ? true : false;
+
+          setTimeout(() => {
+            // Only init the scanner once and let it run in the background
+            this.html5QrcodeScanner = new Html5QrcodeScanner(
+              'qr-reader', // id of the div in the html
+              {fps: 10, qrbox: 250},
+              false,
+            );
+
+            this.html5QrcodeScanner.render(
+              (data) => {
+                this.decodeQrCode(data);
+              },
+              (_error) => {
+                // console.error(_error);
+              },
+            );
+          });
         });
-      });
     }
   }
 

From 7ae6466e6586ceaf58edec8a741c9e2f8a737c0c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 3 Jul 2025 13:57:19 +1000
Subject: [PATCH 327/776] fix: ensure jplag iframe extends to full height

---
 .../projects/states/jplag/jplag-report-viewer.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/jplag/jplag-report-viewer.component.html b/src/app/projects/states/jplag/jplag-report-viewer.component.html
index 9ea58d88b2..c5c52c229e 100644
--- a/src/app/projects/states/jplag/jplag-report-viewer.component.html
+++ b/src/app/projects/states/jplag/jplag-report-viewer.component.html
@@ -4,6 +4,6 @@
   src="/JPlag/"
   frameborder="0"
   style="overflow: hidden"
-  class="w-full h-[750px] overflow-hidden"
+  class="w-full h-screen overflow-hidden"
   [scrolling]="false"
 ></iframe>

From 686ee007e99b87ece6c50243a865b3cafeb07615 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 4 Jul 2025 15:04:46 +1000
Subject: [PATCH 328/776] chore: move unit ilos below target grade selection

---
 .../progress-dashboard/progress-dashboard.tpl.html          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
index e9b847af42..93069ef71b 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
@@ -19,6 +19,9 @@ <h4>Target Grade</h4>
             ng-change="updateTargetGrade(project.targetGrade)"></select>
         </div><!--/target-grade-body-->
       </div><!--/target-grade-card-->
+      <div class="card">
+        <f-task-ilos-card [unit]="project.unit" [ilo-context-type]="'Unit'"></f-task-ilos-card>
+      </div>
       <div class="card card-default card-lg card-burndown">
         <div class="card-heading">
           <h4>Progress Burndown</h4>
@@ -39,9 +42,6 @@ <h4>Progress Burndown</h4>
       </div><!--/burndown-card-->
     </div><!--/burndown-column-->
     <div class="col-sm-12 col-xl-6">
-      <div class="card">
-        <f-task-ilos-card [unit]="project.unit" [ilo-context-type]="'Unit'"></f-task-ilos-card>
-      </div>
       <div class="card card-default card-lg card-pie-chart">
         <div class="card-heading">
           <h4>Task Statuses</h4>

From 1e5915297d6a82ffc6995d062b2331c759761427 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 10:35:16 +1000
Subject: [PATCH 329/776] refactor: rename discussion route

---
 src/app/doubtfire-angular.module.ts           |  4 ++--
 src/app/doubtfire.states.ts                   | 16 +++++++-------
 .../tutor-discussion.component.html}          |  0
 .../tutor-discussion.component.scss}          |  0
 .../tutor-discussion.component.spec.ts        | 22 +++++++++++++++++++
 .../tutor-discussion.component.ts}            |  8 +++----
 .../tutor-marking.component.spec.ts           | 22 -------------------
 7 files changed, 36 insertions(+), 36 deletions(-)
 rename src/app/projects/states/{tutor-marking/tutor-marking.component.html => tutor-discussion/tutor-discussion.component.html} (100%)
 rename src/app/projects/states/{tutor-marking/tutor-marking.component.scss => tutor-discussion/tutor-discussion.component.scss} (100%)
 create mode 100644 src/app/projects/states/tutor-discussion/tutor-discussion.component.spec.ts
 rename src/app/projects/states/{tutor-marking/tutor-marking.component.ts => tutor-discussion/tutor-discussion.component.ts} (97%)
 delete mode 100644 src/app/projects/states/tutor-marking/tutor-marking.component.spec.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index e4b0b00682..782fdc02cc 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -255,7 +255,7 @@ import { TaskDateSliderComponent } from './common/modals/date-change-modal/task-
 import { SpecConModalComponent } from './common/modals/spec-con-modal/spec-con-modal.component';
 import { SpecConModalService } from './common/modals/spec-con-modal/spec-con-modal.service';
 import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
-import {TutorMarkingComponent} from './projects/states/tutor-marking/tutor-marking.component';
+import {TutorDiscussionComponent} from './projects/states/tutor-discussion/tutor-discussion.component';
 import { QrModalComponent } from './common/modals/qr-modal/qr-modal.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
@@ -388,7 +388,7 @@ const MY_DATE_FORMAT = {
     LearningOutcomeEditorComponent,
     TaskFeedbackTemplatesComponent,
     NestedCsvDownloadModalComponent,
-    TutorMarkingComponent
+    TutorDiscussionComponent
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 6838490ce2..c3adf86242 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -11,7 +11,7 @@ import {FUnitsComponent} from './admin/states/f-units/f-units.component';
 import {ScormPlayerComponent} from './common/scorm-player/scorm-player.component';
 import { SuccessCloseComponent } from './common/success-close/success-close.component';
 import { ProjectPlanComponent } from './projects/states/plan/project-plan.component';
-import {TutorMarkingComponent} from './projects/states/tutor-marking/tutor-marking.component';
+import {TutorDiscussionComponent} from './projects/states/tutor-discussion/tutor-discussion.component';
 
 /*
  * Use this file to store any states that are sourced by angular components.
@@ -442,12 +442,12 @@ const projectPlanState: NgHybridStateDeclaration = {
   },
 };
 
-const TutorMarkingState: NgHybridStateDeclaration = {
-  name: 'tutor-marking',
-  url: '/tutor/marking?unitId&username&projectId',
+const TutorDiscussionState: NgHybridStateDeclaration = {
+  name: 'tutor-discussion',
+  url: '/tutor-discussion?unitId&projectId',
   views: {
     main: {
-      component: TutorMarkingComponent,
+      component: TutorDiscussionComponent,
     },
   },
   resolve: {
@@ -465,8 +465,8 @@ const TutorMarkingState: NgHybridStateDeclaration = {
     ],
   },
   data: {
-    pageTitle: 'Tutor Marking',
-    task: 'Tutor Marking',
+    pageTitle: 'Tutor Discussion',
+    task: 'Tutor Discussion',
     roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
   },
 };
@@ -491,5 +491,5 @@ export const doubtfireStates = [
   ScormPlayerStudentReviewState,
   SuccessCloseState,
   projectPlanState,
-  TutorMarkingState,
+  TutorDiscussionState,
 ];
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
similarity index 100%
rename from src/app/projects/states/tutor-marking/tutor-marking.component.html
rename to src/app/projects/states/tutor-discussion/tutor-discussion.component.html
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.scss b/src/app/projects/states/tutor-discussion/tutor-discussion.component.scss
similarity index 100%
rename from src/app/projects/states/tutor-marking/tutor-marking.component.scss
rename to src/app/projects/states/tutor-discussion/tutor-discussion.component.scss
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.spec.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.spec.ts
new file mode 100644
index 0000000000..25f6e0711e
--- /dev/null
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.spec.ts
@@ -0,0 +1,22 @@
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {TutorDiscussionComponent} from './tutor-discussion.component';
+
+describe('TutorDiscussionComponent', () => {
+  let component: TutorDiscussionComponent;
+  let fixture: ComponentFixture<TutorDiscussionComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TutorDiscussionComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TutorDiscussionComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
similarity index 97%
rename from src/app/projects/states/tutor-marking/tutor-marking.component.ts
rename to src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 44720358c8..7132e7be38 100644
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -15,12 +15,12 @@ import {AlertService} from 'src/app/common/services/alert.service';
 import {GradeService} from 'src/app/common/services/grade.service';
 
 @Component({
-  selector: 'f-tutor-marking',
-  templateUrl: './tutor-marking.component.html',
-  styleUrl: './tutor-marking.component.scss',
+  selector: 'f-tutor-discussion',
+  templateUrl: './tutor-discussion.component.html',
+  styleUrl: './tutor-discussion.component.scss',
   encapsulation: ViewEncapsulation.None, // enables custom material-ui css
 })
-export class TutorMarkingComponent implements OnInit {
+export class TutorDiscussionComponent implements OnInit {
   @Input() unitId: number;
   @Input() projectId: number;
 
diff --git a/src/app/projects/states/tutor-marking/tutor-marking.component.spec.ts b/src/app/projects/states/tutor-marking/tutor-marking.component.spec.ts
deleted file mode 100644
index 4ffb9bb2c3..0000000000
--- a/src/app/projects/states/tutor-marking/tutor-marking.component.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {ComponentFixture, TestBed} from '@angular/core/testing';
-
-import {TutorMarkingComponent} from './tutor-marking.component';
-
-describe('TutorMarkingComponent', () => {
-  let component: TutorMarkingComponent;
-  let fixture: ComponentFixture<TutorMarkingComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [TutorMarkingComponent],
-    }).compileComponents();
-
-    fixture = TestBed.createComponent(TutorMarkingComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

From 7d2fca2b674a3f2116b61b7c08d0f09e48013a74 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 10:56:54 +1000
Subject: [PATCH 330/776] refactor: improve qr scanner overlay layout

---
 .../tutor-discussion.component.html           | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 3946c8b251..bbb6fc70e5 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -2,35 +2,32 @@
   [hidden]="!scanningQr"
   class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-screen h-screen z-40 bg-gray-500/50 backdrop-blur"
 >
-  <!-- bg-gray-500 -->
-  <!-- <video id="qr-reader" class="w-full h-full"></video> -->
   @if (loadingStudentData) {
     <mat-spinner
       color="blue"
-      class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50"
+      class="absolute top-1/2 left-1/2 transform -translate-x-1/2 z-50"
     ></mat-spinner>
   }
-  <div class="w-full h-full flex flex-col justify-around relative">
-    <div [ngClass]="{'qr-reader-hide-bloat': hideQrScannerBloat}">
-      <div id="qr-reader" class="w-full h-[calc(100%-50px)]"></div>
-    </div>
-    <div
-      class="absolute top-[50px] left-1/2 transform -translate-x-1/2 w-full text-center text-white px-10 py-5 text-md font-bold pointer-events-none z-10"
-    >
-      Scan a student's QR code to instantly load their project and mark submissions.
-    </div>
-    <button
-      mat-raised-button
-      color="secondary"
-      (click)="closeQrReader()"
-      class="max-w-md my-5 mx-auto"
-    >
-      {{ project ? 'Cancel' : 'Exit' }}
-    </button>
+  <div [ngClass]="{'qr-reader-hide-bloat': hideQrScannerBloat}">
+    <div id="qr-reader" class="absolute top-1/2 transform -translate-y-1/2 w-full"></div>
+  </div>
+  <div
+    class="absolute top-[150px] left-1/2 transform -translate-x-1/2 w-full text-center text-white px-10 py-5 text-md font-bold pointer-events-none z-10"
+  >
+    Scan a student's QR code to instantly load their project and mark submissions.
   </div>
+  <button
+    mat-raised-button
+    color="secondary"
+    (click)="closeQrReader()"
+    class="max-w-md my-5 absolute bottom-[150px] left-1/2 transform -translate-x-1/2"
+  >
+    {{ project ? 'Cancel' : 'Exit' }}
+  </button>
 </div>
 
-<div class="w-full flex flex-col h-[calc(100vh-140px)]">
+<!-- We offset the height by 145px to compensate for the header -->
+<div class="w-full flex flex-col h-[calc(100vh-145px)]">
   <div class="task-inbox flex flex-col flex-1 justify-normal items-center full-width">
     <div class="flex justify-between w-full relative">
       @if (project && project?.student) {

From 2df0fc94815bdc2b8407c6661769520780248047 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:11:57 +1000
Subject: [PATCH 331/776] refactor: add button to load task comments

---
 .../tutor-discussion.component.html           | 42 ++++---------------
 .../tutor-discussion.component.ts             |  3 +-
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index bbb6fc70e5..85c9161563 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -96,42 +96,14 @@ <h4 class="student-name">{{ task.definition.name }}</h4>
                   [status]="task.status"
                   class="ml-3"
                 ></status-icon>
-                @if (!isTaskDefMode) {
-                  <div class="overflow" [hidden]="isNarrow">
-                    <button [hidden]="task.hover" mat-icon-button aria-label="task-overflow">
-                      <!-- <mat-icon class="warn-icon" *ngIf="task.similaritiesDetected">remove_red_eye</mat-icon> -->
 
-                      @if (task.pinned) {
-                        <div class="pin-container">
-                          <mat-icon>push_pin</mat-icon>
-                        </div>
-                      }
-                    </button>
-                    <button
-                      [hidden]="!task.hover"
-                      mat-icon-button
-                      aria-label="task overflow"
-                      [matMenuTriggerFor]="overflowMenu"
-                      (menuOpened)="setSelectedTask(task); task.optionsOpened = true"
-                      (menuClosed)="task.hover = false; task.optionsOpened = false"
-                      matTooltip="Submission options"
-                      matTooltipPosition="right"
-                      matTooltipShowDelay="400"
-                    >
-                      <mat-icon>more_horiz</mat-icon>
-                    </button>
-                    <mat-menu #overflowMenu="matMenu" yPosition="below">
-                      <button mat-menu-item (click)="togglePin(task)" class="flex items-center">
-                        <mat-icon class="mr-0">
-                          {{ task.pinned ? 'remove_circle' : 'add_alert' }}
-                        </mat-icon>
-                        <span class="ml-5"
-                          >{{ task.pinned ? 'Unpin from inbox' : 'Pin to inbox' }}
-                        </span>
-                      </button>
-                    </mat-menu>
-                  </div>
-                }
+                <button
+                  mat-icon-button
+                  aria-label="task-comments"
+                  (click)="loadTaskComments($event, task)"
+                >
+                  <mat-icon>chat-bubble</mat-icon>
+                </button>
               </div>
               <!--/badges-->
             </div>
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 7132e7be38..433e12a619 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -162,7 +162,8 @@ export class TutorDiscussionComponent implements OnInit {
     }
   }
 
-  public selectTask(task: Task) {
+  public loadTaskComments(event: MouseEvent, task: Task) {
+    event.stopPropagation();
     this.selectedTask = task;
   }
 

From 515077d0ac76fdf257efd45bba602e6dc4e3ea1f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:17:00 +1000
Subject: [PATCH 332/776] refactor: comment out unused css

---
 .../tutor-discussion.component.html           |  10 +-
 .../tutor-discussion.component.scss           | 304 +++++++++---------
 2 files changed, 159 insertions(+), 155 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 85c9161563..db823137bc 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -28,7 +28,7 @@
 
 <!-- We offset the height by 145px to compensate for the header -->
 <div class="w-full flex flex-col h-[calc(100vh-145px)]">
-  <div class="task-inbox flex flex-col flex-1 justify-normal items-center full-width">
+  <div class="task-inbox flex flex-col flex-1 justify-normal items-center w-full">
     <div class="flex justify-between w-full relative">
       @if (project && project?.student) {
         <div></div>
@@ -59,7 +59,7 @@
           [selected]="true"
         >
           @if (task) {
-            <div (click)="selectTask(task)" class="w-full" id="{{ task.id }}">
+            <div class="w-full" id="{{ task.id }}">
               <div
                 class="inbox-entry flex items-center"
                 [ngClass]="{hover: task.hover}"
@@ -74,9 +74,9 @@
                   }"
                 ></span>
                 <user-icon class="self-center" [user]="project?.student" [size]="30"> </user-icon>
-                <div class="task-list-data truncate flex-1" [hidden]="isNarrow">
-                  <h4 class="student-name">{{ task.definition.name }}</h4>
-                  <div class="task-details truncate">
+                <div class="truncate flex-1 mt-0" [hidden]="isNarrow">
+                  <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
+                  <div class="truncate mb-0 text-[12px]">
                     {{ task.definition.abbreviation }} -
                     {{ getTargetTradeString(task.definition.targetGrade) }} Task
                   </div>
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.scss b/src/app/projects/states/tutor-discussion/tutor-discussion.component.scss
index 6a42f71f1a..63b738af9c 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.scss
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.scss
@@ -16,85 +16,85 @@ $my-palette: mat.define-palette($md-formatif);
   border-right-width: 1px;
 }
 
-::ng-deep .cdk-virtual-scroll-content-wrapper {
-  width: 100%;
-}
-
-.task-inbox.full-width {
-  .inbox-entry {
-    padding-right: 8px;
-    padding-left: 6px;
-    width: 100%;
-    height: 100%;
-  }
-}
+// ::ng-deep .cdk-virtual-scroll-content-wrapper {
+//   width: 100%;
+// }
+
+// .task-inbox.full-width {
+//   .inbox-entry {
+//     padding-right: 8px;
+//     padding-left: 6px;
+//     width: 100%;
+//     height: 100%;
+//   }
+// }
 
 $warn-color: #f44336;
 
-.pin-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  .mat-icon {
-    color: #bcc0c4;
-  }
-}
-
-.task-inbox {
-  height: 100%;
-  overflow-x: hidden;
-}
-
-.task-inbox.narrow-width {
-  max-width: 60px;
-  width: 60px;
-  min-width: 60px;
-  margin: 0;
-
-  .inbox-entry {
-    padding-right: 0px;
-    width: 45px;
-    height: 100%;
-    padding-left: 5px;
-  }
-}
-
-.scrollable {
-  height: 100%;
-  @include scrollable();
-}
-
-.openSearchDialog {
-  border-radius: 40px;
-  width: 40px;
-  height: 40px;
-  background-color: var(--background-gray);
-}
-
-.omnisearch {
-  background-color: var(--background-gray);
-  font-size: 15px;
-  padding-right: 10px;
-  text-align: left;
-
-  &.expanded {
-    height: 100%;
-  }
-
-  &.mobile {
-  }
-
-  .search {
-    background-color: transparent;
-    border: hidden;
-    outline: none;
-  }
-
-  .mdc-icon-button {
-    display: flex;
-  }
-}
+// .pin-container {
+//   display: flex;
+//   justify-content: center;
+//   align-items: center;
+
+//   .mat-icon {
+//     color: #bcc0c4;
+//   }
+// }
+
+// .task-inbox {
+//   height: 100%;
+//   overflow-x: hidden;
+// }
+
+// .task-inbox.narrow-width {
+//   max-width: 60px;
+//   width: 60px;
+//   min-width: 60px;
+//   margin: 0;
+
+//   .inbox-entry {
+//     padding-right: 0px;
+//     width: 45px;
+//     height: 100%;
+//     padding-left: 5px;
+//   }
+// }
+
+// .scrollable {
+//   height: 100%;
+//   @include scrollable();
+// }
+
+// .openSearchDialog {
+//   border-radius: 40px;
+//   width: 40px;
+//   height: 40px;
+//   background-color: var(--background-gray);
+// }
+
+// .omnisearch {
+//   background-color: var(--background-gray);
+//   font-size: 15px;
+//   padding-right: 10px;
+//   text-align: left;
+
+//   &.expanded {
+//     height: 100%;
+//   }
+
+//   &.mobile {
+//   }
+
+//   .search {
+//     background-color: transparent;
+//     border: hidden;
+//     outline: none;
+//   }
+
+//   .mdc-icon-button {
+//     display: flex;
+//   }
+// }
 
 .new_comments {
   font-size: 10px;
@@ -116,14 +116,14 @@ $warn-color: #f44336;
   box-sizing: content-box;
 }
 
-.task-badges {
-  width: 50px;
-  height: 35px;
-}
+// .task-badges {
+//   width: 50px;
+//   height: 35px;
+// }
 
-.full-width {
-  width: 100%;
-}
+// .full-width {
+//   width: 100%;
+// }
 
 .search-settings-panel {
   background-color: transparent;
@@ -137,30 +137,30 @@ user-icon {
   margin-right: 10px;
 }
 
-.muted {
-  color: rgba(0, 0, 0, 0.5);
-}
+// .muted {
+//   color: rgba(0, 0, 0, 0.5);
+// }
 
-.task-list-data {
-  margin-top: 0px;
-  .student-name {
-    font-size: 15px;
-    margin-bottom: -2px;
-    margin-top: 8px;
-  }
+// .task-list-data {
+//   margin-top: 0px;
+//   .student-name {
+//     font-size: 15px;
+//     margin-bottom: -2px;
+//     margin-top: 8px;
+//   }
 
-  .task-details {
-    margin-bottom: 0px;
-    font-size: 12px;
-  }
-}
+//   .task-details {
+//     margin-bottom: 0px;
+//     font-size: 12px;
+//   }
+// }
 
-.overflow {
-  min-width: 40px;
-  width: 40px;
-  margin-right: -10px;
-  margin-left: -10px;
-}
+// .overflow {
+//   min-width: 40px;
+//   width: 40px;
+//   margin-right: -10px;
+//   margin-left: -10px;
+// }
 
 .mat-mdc-list-item {
   border: none;
@@ -194,19 +194,19 @@ user-icon {
   cursor: pointer;
 }
 
-.mat-mdc-list-item .item-content.selected {
-  background-color: var(--background-gray);
-}
+// .mat-mdc-list-item .item-content.selected {
+//   background-color: var(--background-gray);
+// }
 
-.task-inbox.narrow-width .mat-mdc-list-item .item-content.selected {
-  margin-right: 12px;
-}
+// .task-inbox.narrow-width .mat-mdc-list-item .item-content.selected {
+//   margin-right: 12px;
+// }
 
-:host {
-  ::ng-deep.mat-pseudo-checkbox {
-    display: none !important;
-  }
-}
+// :host {
+//   ::ng-deep.mat-pseudo-checkbox {
+//     display: none !important;
+//   }
+// }
 
 .tasks-viewport.list-group-item-text-extended {
   margin-top: 0.5em;
@@ -219,20 +219,20 @@ user-icon {
   }
 }
 
-.tasks-viewport {
-  height: 100%;
-}
+// .tasks-viewport {
+//   height: 100%;
+// }
 
-.center-task-list {
-  align-self: center;
-  position: absolute;
-  top: calc(50% + 40px);
+// .center-task-list {
+//   align-self: center;
+//   position: absolute;
+//   top: calc(50% + 40px);
 
-  .mat-icon {
-    // font-size: 50px;
-    color: rgba(0, 0, 0, 0.2);
-  }
-}
+//   .mat-icon {
+//     // font-size: 50px;
+//     color: rgba(0, 0, 0, 0.2);
+//   }
+// }
 
 .mdc-list-item__start.mat-mdc-list-option-checkbox-before {
   margin-right: 0 !important;
@@ -243,29 +243,29 @@ user-icon {
   width: 75px !important;
   height: 75px !important;
 }
-.large-icon-button {
-  width: 100px !important;
-  height: 100px !important;
-  padding: 0px !important;
-  // display: inline-flex !important;
-  // align-items: center;
-  // justify-content: center;
-
-  font-size: 35px;
-  // & > *[role='img'] {
-  //   width: 75px;
-  //   height: 75px;
-  //   font-size: 35px;
-  //   svg {
-  //     width: 75px;
-  //     height: 75px;
-  //   }
-  // }
-  .mat-mdc-button-touch-target {
-    width: 100px !important;
-    height: 100px !important;
-  }
-}
+// .large-icon-button {
+//   width: 100px !important;
+//   height: 100px !important;
+//   padding: 0px !important;
+//   // display: inline-flex !important;
+//   // align-items: center;
+//   // justify-content: center;
+
+//   font-size: 35px;
+//   // & > *[role='img'] {
+//   //   width: 75px;
+//   //   height: 75px;
+//   //   font-size: 35px;
+//   //   svg {
+//   //     width: 75px;
+//   //     height: 75px;
+//   //   }
+//   // }
+//   .mat-mdc-button-touch-target {
+//     width: 100px !important;
+//     height: 100px !important;
+//   }
+// }
 
 // Hide auto-injected QR scanner elements that are not needed in the UI
 // We only hide this if we found a "back camera" on user's device
@@ -298,3 +298,7 @@ user-icon {
   max-width: 250px;
   height: 60px;
 }
+
+.comment-user-icon-wrapper.ng-star-inserted {
+  width: auto !important;
+}

From 25b361f699ad54e45c32167ccae230635a6b2758 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:27:17 +1000
Subject: [PATCH 333/776] feat: highlight selected task

---
 .../states/tutor-discussion/tutor-discussion.component.html      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index db823137bc..9d9ab154f6 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -100,6 +100,7 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
                 <button
                   mat-icon-button
                   aria-label="task-comments"
+                  [ngClass]="task.id === selectedTask.id ? 'text-blue-500' : 'text-gray-400'"
                   (click)="loadTaskComments($event, task)"
                 >
                   <mat-icon>chat-bubble</mat-icon>

From a4e422dcf3dfa329b83cd7e3d521fc3665c9c45f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 11:42:27 +1000
Subject: [PATCH 334/776] feat: view filtered tasks only button

---
 .../tutor-discussion.component.html           | 14 ++++++---
 .../tutor-discussion.component.ts             | 31 ++++++++++++-------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 9d9ab154f6..db92307c8c 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -100,7 +100,7 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
                 <button
                   mat-icon-button
                   aria-label="task-comments"
-                  [ngClass]="task.id === selectedTask.id ? 'text-blue-500' : 'text-gray-400'"
+                  [ngClass]="task.id === selectedTask?.id ? 'text-blue-500' : 'text-gray-400'"
                   (click)="loadTaskComments($event, task)"
                 >
                   <mat-icon>chat-bubble</mat-icon>
@@ -116,9 +116,15 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
     </mat-selection-list>
     @if (project) {
       <div class="w-full flex justify-center mt-4">
-        <button mat-button color="primary" (click)="loadAllSubmittedtasks()">
-          Load all submitted tasks
-        </button>
+        @if (this.filteredTasks?.length !== this.allTasks?.length && this.allTasks?.length > 0) {
+          <button mat-button color="primary" (click)="viewAllSubmittedTasks()">
+            Load all submitted tasks
+          </button>
+        } @else {
+          <button mat-button color="primary" (click)="viewAllFilteredTasks()">
+            Hide all submitted tasks
+          </button>
+        }
       </div>
     }
 
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 433e12a619..d58157322f 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -27,6 +27,7 @@ export class TutorDiscussionComponent implements OnInit {
   @ViewChild('tasks') tasksList: MatSelectionList;
 
   public filteredTasks: Task[] = [];
+  public allTasks: Task[] = [];
   public project: Project | null;
 
   public selectedTask: Task | null;
@@ -219,16 +220,6 @@ export class TutorDiscussionComponent implements OnInit {
     this.decodeQrCode('{"unitId":2,"projectId":20}');
   }
 
-  public loadAllSubmittedtasks() {
-    this.filteredTasks = [
-      ...this.project.tasks.filter(
-        (task) =>
-          task.status !== 'not_started' && // Filter out tasks with no submissions yet
-          task.definition.targetGrade <= this.project.targetGrade, // Filter out tasks that are higher than student's target grade
-      ),
-    ];
-  }
-
   statusesToFetch: TaskStatusEnum[] = [
     'demonstrate',
     'ready_for_feedback',
@@ -239,6 +230,17 @@ export class TutorDiscussionComponent implements OnInit {
     'redo',
   ];
 
+  public viewAllSubmittedTasks() {
+    this.filteredTasks = [...this.allTasks];
+  }
+
+  public viewAllFilteredTasks() {
+    const discussionTasks = this.project?.tasks.filter((task) =>
+      this.statusesToFetch.includes(task.status),
+    );
+    this.filteredTasks = [...discussionTasks];
+  }
+
   public getStudentTasks(): void {
     console.time('getStudentTasks()');
     // this.project = null;
@@ -259,7 +261,14 @@ export class TutorDiscussionComponent implements OnInit {
           this.statusesToFetch.includes(task.status),
         );
         this.filteredTasks = [...discussionTasks];
-        this.selectedTask = discussionTasks[0];
+        this.allTasks = [
+          ...project.tasks.filter(
+            (task) =>
+              task.status !== 'not_started' && // Filter out tasks with no submissions yet
+              task.definition.targetGrade <= project.targetGrade, // Filter out tasks that are higher than student's target grade
+          ),
+        ];
+        this.selectedTask = discussionTasks[0] ?? null;
         this.project = project;
         this.scanningQr = false;
         this.loadingStudentData = false;

From 84d5bcaa4f6329ed34f30a58d88e18fce9c3a76d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 12:13:04 +1000
Subject: [PATCH 335/776] fix: display load more button only if there are more
 tasks

---
 .../tutor-discussion.component.html           | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index db92307c8c..670b0a7b74 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -1,6 +1,6 @@
 <div
   [hidden]="!scanningQr"
-  class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-screen h-screen z-40 bg-gray-500/50 backdrop-blur"
+  class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-screen h-screen z-40 bg-gray-500/50 backdrop-blur overflow-hidden"
 >
   @if (loadingStudentData) {
     <mat-spinner
@@ -116,14 +116,16 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
     </mat-selection-list>
     @if (project) {
       <div class="w-full flex justify-center mt-4">
-        @if (this.filteredTasks?.length !== this.allTasks?.length && this.allTasks?.length > 0) {
-          <button mat-button color="primary" (click)="viewAllSubmittedTasks()">
-            Load all submitted tasks
-          </button>
-        } @else {
-          <button mat-button color="primary" (click)="viewAllFilteredTasks()">
-            Hide all submitted tasks
-          </button>
+        @if (this.allTasks?.length > 0) {
+          @if (this.filteredTasks?.length < this.allTasks?.length) {
+            <button mat-button color="primary" (click)="viewAllSubmittedTasks()">
+              Load all submitted tasks
+            </button>
+          } @else {
+            <button mat-button color="primary" (click)="viewAllFilteredTasks()">
+              Hide all submitted tasks
+            </button>
+          }
         }
       </div>
     }
@@ -159,6 +161,11 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
   }
 
   @if (selectedTask && project) {
+    <mat-tab-group dynamicHeight>
+      <mat-tab label="Task Comments"></mat-tab>
+      <mat-tab label="Staff Notes"></mat-tab>
+    </mat-tab-group>
+
     <div #commentspanel class="task-comment-panel inbox-panel w-full flex-1">
       <!-- <div class="w-full text-center py-4">{{ selectedTask?.definition.name }}</div> -->
 

From e599fe35ec338cfd7f5ffc419a3379d3f3160312 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 14:47:49 +1000
Subject: [PATCH 336/776] fix: merge conflict

---
 .../task-comment-composer/task-comment-composer.component.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index 8529ef15b1..bc34586eec 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -83,9 +83,6 @@ export class TaskCommentComposerComponent
   @Input() task: Task;
   @Input() sharedData: TaskCommentComposerData;
 
-  ngOnChanges(changes: SimpleChanges): void {
-    this.showFeedbackTemplatePicker = false;
-  }
 
   public $userIsTyping = new BehaviorSubject<boolean>(false);
   private draftSaveSubscription = new Subscription();
@@ -152,6 +149,8 @@ export class TaskCommentComposerComponent
   }
 
   ngOnChanges(changes: SimpleChanges) {
+    this.showFeedbackTemplatePicker = false;
+
     if (changes.task && changes.task.currentValue !== changes.task.previousValue) {
       const newTask = changes.task.currentValue as Task;
       // Check if the task has changed

From 873923a145ae4a134bba14e9cee2dd6227a50b22 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 15:26:20 +1000
Subject: [PATCH 337/776] chore: use new comments modal service

---
 .../task-comments-viewer/task-comments-viewer.component.ts   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 0ab1081955..5f26df7d11 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -5,6 +5,7 @@ import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants
 import { TaskCommentComposerData } from '../task-comment-composer/task-comment-composer.component';
 import { AlertService } from 'src/app/common/services/alert.service';
 import { FeedbackTemplateService } from 'src/app/api/services/feedback-template.service';
+import { CommentsModalService } from 'src/app/common/modals/comments-modal/comments-modal.service';
 
 @Component({
   selector: 'task-comments-viewer',
@@ -32,7 +33,7 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
     private feedbackTemplateService: FeedbackTemplateService,
     private userService: UserService,
     private constants: DoubtfireConstants,
-    @Inject(commentsModal) private commentsModalRef: any,
+    @Inject(commentsModal) private commentsModalRef: CommentsModalService,
     private alerts: AlertService,
   ) {
     const self = this;
@@ -161,7 +162,7 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
 
   openCommentsModal(comment: TaskComment) {
     const resourceUrl = comment.attachmentUrl;
-    this.commentsModalRef.show(resourceUrl, comment.commentType);
+    this.commentsModalRef.show(resourceUrl, comment);
   }
 
   shouldShowAuthorIcon(commentType: string) {

From fbf90c7fdfa440f565e2c8abae4ae62bc1fe70eb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 7 Jul 2025 16:05:01 +1000
Subject: [PATCH 338/776] feat: auto send dicussed in class comment

---
 .../tutor-discussion.component.html           | 28 +++++++++---------
 .../tutor-discussion.component.ts             | 29 +++++++++++++++----
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 670b0a7b74..95f700bb1f 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -166,19 +166,21 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
       <mat-tab label="Staff Notes"></mat-tab>
     </mat-tab-group>
 
-    <div #commentspanel class="task-comment-panel inbox-panel w-full flex-1">
-      <!-- <div class="w-full text-center py-4">{{ selectedTask?.definition.name }}</div> -->
+    @if (showComments) {
+      <div #commentspanel class="task-comment-panel inbox-panel w-full flex-1">
+        <!-- <div class="w-full text-center py-4">{{ selectedTask?.definition.name }}</div> -->
 
-      <task-comments-viewer
-        style="background: white; border-radius: 12px"
-        [task]="selectedTask"
-        [project]="project"
-        class="h-full"
-        refocus-on-task-change="true"
-        ng-if="selectedTask"
-        style="padding: 0 8px 0 12px"
-      >
-      </task-comments-viewer>
-    </div>
+        <task-comments-viewer
+          style="background: white; border-radius: 12px"
+          [task]="selectedTask"
+          [project]="project"
+          class="h-full"
+          refocus-on-task-change="true"
+          ng-if="selectedTask"
+          style="padding: 0 8px 0 12px"
+        >
+        </task-comments-viewer>
+      </div>
+    }
   }
 </div>
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index d58157322f..4ee9ed154e 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -7,6 +7,7 @@ import {
   Project,
   ProjectService,
   Task,
+  TaskCommentService,
   TaskStatusEnum,
   Unit,
   UnitService,
@@ -28,6 +29,8 @@ export class TutorDiscussionComponent implements OnInit {
 
   public filteredTasks: Task[] = [];
   public allTasks: Task[] = [];
+
+  public unit: Unit | null;
   public project: Project | null;
 
   public selectedTask: Task | null;
@@ -40,6 +43,8 @@ export class TutorDiscussionComponent implements OnInit {
   private _unitId: number;
   private _projectId: number;
 
+  private showComments: boolean = true;
+
   constructor(
     private unitService: UnitService,
     private authService: AuthenticationService,
@@ -48,6 +53,7 @@ export class TutorDiscussionComponent implements OnInit {
     private state: StateService,
     private alertService: AlertService,
     private route: UIRouter,
+    private taskCommentService: TaskCommentService,
   ) {}
 
   public ngOnInit(): void {
@@ -172,7 +178,21 @@ export class TutorDiscussionComponent implements OnInit {
     const selectedTasks = this.tasksList.selectedOptions.selected;
     for (const taskOption of selectedTasks) {
       const task = taskOption.value as Task;
-      task.updateTaskStatus(status);
+      this.taskCommentService
+        .addComment(task, `**Automated Comment**: Discussed in class.`, 'text')
+        .subscribe(() => {
+          task.updateTaskStatus(status);
+          task.commentCache.clear(); // force fetch of new comments (with the new status update)
+          if (this.selectedTask.id === task.id) {
+            // reload task-comments-viewer
+            setTimeout(() => {
+              this.showComments = false;
+              setTimeout(() => {
+                this.showComments = true;
+              });
+            }, 1000);
+          }
+        });
     }
   }
 
@@ -247,14 +267,13 @@ export class TutorDiscussionComponent implements OnInit {
     // this.filteredTasks = [];
     // this.selectedTask = null;
 
-    let unit: Unit;
     this.getUnit()
       .then((_unit) => {
-        unit = _unit;
-        return this.loadStudents(unit);
+        this.unit = _unit;
+        return this.loadStudents(this.unit);
       })
       .then((student) => {
-        return this.getProject(unit, student.id);
+        return this.getProject(this.unit, student.id);
       })
       .then((project) => {
         const discussionTasks = project.tasks.filter((task) =>

From 1b7da692423acaf53b96229b665b971360bacc89 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 8 Jul 2025 12:16:50 +1000
Subject: [PATCH 339/776] feat: fetch new comments on task switching and status
 updates

- Comments are initially loaded from cache
- New comments are then fetched and appended to the cache
- Comments in the cache are also updated if the read receipt has been updated
---
 src/app/api/models/task.ts                    |   1 +
 src/app/api/services/task.service.ts          |  16 +-
 .../tutor-discussion.component.ts             |  10 --
 .../task-comments-viewer.component.ts         | 139 ++++++++++++------
 4 files changed, 109 insertions(+), 57 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index c1fd8d2a3b..8dd5b8d70f 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -722,6 +722,7 @@ export class Task extends Entity {
               this.project.taskCache.add(this);
             }
             this.processTaskStatusChange(status, alerts);
+            taskService.notifyStatusChange(this);
           },
           error: (error) => {
             this.status = oldStatus;
diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index aa77cf1b3c..3a7fa66c99 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -7,15 +7,17 @@ import {
   TaskStatusUiData,
   Unit,
 } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { CachedEntityService, EntityCache, RequestOptions } from 'ngx-entity-service';
-import { HttpClient } from '@angular/common/http';
+import {EventEmitter, Injectable} from '@angular/core';
+import {CachedEntityService, EntityCache, RequestOptions} from 'ngx-entity-service';
+import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiURL';
-import { MappingFunctions } from './mapping-fn';
-import { Observable, map, tap } from 'rxjs';
+import {MappingFunctions} from './mapping-fn';
+import {Observable, map, tap} from 'rxjs';
 
 @Injectable()
 export class TaskService extends CachedEntityService<Task> {
+  public readonly taskStatusUpdated$: EventEmitter<Task> = new EventEmitter();
+
   protected readonly endpointFormat = '/projects/:projectId:/task_def_id/:taskDefId:';
 
   private readonly taskInboxEndpoint = '/units/:id:/tasks/inbox';
@@ -175,6 +177,10 @@ export class TaskService extends CachedEntityService<Task> {
     return TaskStatus.statusClass(status);
   }
 
+  public notifyStatusChange(task: Task): void {
+    this.taskStatusUpdated$.emit(task);
+  }
+
   public readonly statusColors: Map<string, string> = TaskStatus.STATUS_COLORS;
   public readonly switchableStates = TaskStatus.SWITCHABLE_STATES;
 
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 4ee9ed154e..002712ea03 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -182,16 +182,6 @@ export class TutorDiscussionComponent implements OnInit {
         .addComment(task, `**Automated Comment**: Discussed in class.`, 'text')
         .subscribe(() => {
           task.updateTaskStatus(status);
-          task.commentCache.clear(); // force fetch of new comments (with the new status update)
-          if (this.selectedTask.id === task.id) {
-            // reload task-comments-viewer
-            setTimeout(() => {
-              this.showComments = false;
-              setTimeout(() => {
-                this.showComments = true;
-              });
-            }, 1000);
-          }
         });
     }
   }
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 5f26df7d11..74ecde6698 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -1,11 +1,27 @@
-import { Component, OnInit, Input, Inject, OnChanges, SimpleChanges, ViewChild, ElementRef } from '@angular/core';
-import { commentsModal } from 'src/app/ajs-upgraded-providers';
-import { Task, Project, TaskComment, TaskCommentService, UserService } from 'src/app/api/models/doubtfire-model';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { TaskCommentComposerData } from '../task-comment-composer/task-comment-composer.component';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { FeedbackTemplateService } from 'src/app/api/services/feedback-template.service';
-import { CommentsModalService } from 'src/app/common/modals/comments-modal/comments-modal.service';
+import {
+  Component,
+  OnInit,
+  Input,
+  Inject,
+  OnChanges,
+  SimpleChanges,
+  ViewChild,
+  ElementRef,
+} from '@angular/core';
+import {commentsModal} from 'src/app/ajs-upgraded-providers';
+import {
+  Task,
+  Project,
+  TaskComment,
+  TaskCommentService,
+  UserService,
+  TaskService,
+} from 'src/app/api/models/doubtfire-model';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {TaskCommentComposerData} from '../task-comment-composer/task-comment-composer.component';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
+import {CommentsModalService} from 'src/app/common/modals/comments-modal/comments-modal.service';
 
 @Component({
   selector: 'task-comments-viewer',
@@ -32,6 +48,7 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
     private taskCommentService: TaskCommentService,
     private feedbackTemplateService: FeedbackTemplateService,
     private userService: UserService,
+    private taskService: TaskService,
     private constants: DoubtfireConstants,
     @Inject(commentsModal) private commentsModalRef: CommentsModalService,
     private alerts: AlertService,
@@ -40,57 +57,95 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
     this.taskCommentService.commentAdded$.subscribe((tc: TaskComment) => {
       self.scrollDown();
     });
+    this.taskService.taskStatusUpdated$.subscribe((task) => {
+      this.fetchComments(task, false);
+    });
   }
 
   ngOnInit(): void {}
 
   ngOnChanges(changes: SimpleChanges) {
-    this.loading = true;
-
     // Must have project for task to be mapped
     if (changes.task?.currentValue?.project != null) {
       this.project = changes.task.currentValue.project;
-      this.taskCommentService
-        .query(
+      this.fetchComments(this.task, true, true);
+    } else {
+      this.loading = false;
+    }
+  }
+
+  fetchComments(task: Task, useCache: boolean = true, fetchAfterCache: boolean = false) {
+    const request$ = !useCache
+      ? this.taskCommentService.fetchAll({
+          projectId: this.project.id,
+          taskDefinitionId: task.definition.id,
+        })
+      : this.taskCommentService.query(
           {
             projectId: this.project.id,
-            taskDefinitionId: this.task.definition.id,
+            taskDefinitionId: task.definition.id,
           },
-          this.task,
+          task,
           {
-            cache: this.task.commentCache,
-            constructorParams: this.task,
+            cache: task.commentCache,
+            constructorParams: task,
           },
-        )
-        .subscribe((comments) => {
-          // this.task.comments = comments;
-
-          this.task.refreshCommentData();
+        );
+
+    request$.subscribe((comments) => {
+      for (const comment of comments) {
+        const existingComment = task.commentCache.get(comment.id);
+        comment.task = task;
+        if (!existingComment) {
+          // Update the cache with any new comments
+          task.commentCache.add(comment);
+        } else if (
+          existingComment.recipientReadTime !== comment.recipientReadTime ||
+          existingComment.text !== comment.text
+        ) {
+          // Update cached read receipts or edited messages
+          task.commentCache.set(comment.id, comment);
+        }
+      }
 
-          const lastReadComment: TaskComment = this.task.comments
-            .slice()
-            .reverse()
-            .find((comment: TaskComment) => comment.recipientReadTime != null && !comment.recipientIsMe);
+      for (const cachedComment of task.comments) {
+        if (!comments.find((c) => c.id === cachedComment.id)) {
+          // This comment is in cache but not in the latest comments list
+          task.commentCache.delete(cachedComment.id);
+        }
+      }
 
-          setTimeout(() => {
-            this.loading = false;
-            this.scrollDown();
-          }, 1000);
+      task.refreshCommentData();
+
+      const lastReadComment: TaskComment = task.comments
+        .slice()
+        .reverse()
+        .find(
+          (comment: TaskComment) => comment.recipientReadTime != null && !comment.recipientIsMe,
+        );
+
+      setTimeout(() => {
+        this.loading = false;
+        this.scrollDown();
+        if (useCache && fetchAfterCache) {
+          this.fetchComments(task, false, false);
+        }
+      }, 100);
+
+      if (lastReadComment) {
+        for (const comment of task.comments) {
+          comment.lastRead = false;
+        }
+        lastReadComment.lastRead = true;
+      }
+    });
 
-          if (lastReadComment) {
-            lastReadComment.lastRead = true;
-          }
+    if (this.project.unit.currentUserIsStaff) {
+      this.feedbackTemplateService
+        .query({contextType: 'task_definitions', contextId: task.definition.id}, {})
+        .subscribe({
+          error: () => this.alerts.error('Error loading task feedback templates.'),
         });
-
-      if (this.project.unit.currentUserIsStaff) {
-        this.feedbackTemplateService
-          .query({contextType: 'task_definitions', contextId: this.task.definition.id}, {})
-          .subscribe({
-            error: () => this.alerts.error('Error loading task feedback templates.'),
-          });
-      }
-    } else {
-      this.loading = false;
     }
   }
 

From 2d79007c033d56218326f55dd8d6821e17fec74f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 8 Jul 2025 14:41:22 +1000
Subject: [PATCH 340/776] feat: message tooltip timestamps

---
 .../task-comments-viewer.component.html          | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index c9423fe9e3..c131c7a25d 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -60,7 +60,13 @@
               fxLayoutAlign="start center"
               [ngSwitch]="comment.commentType"
             >
-              <div *ngSwitchCase="'status'" class="comment-status">
+              <div
+                *ngSwitchCase="'status'"
+                class="comment-status"
+                [matTooltip]="comment.createdAt | humanizedDate"
+                matTooltipPosition="above"
+                matTooltipShowDelay="1000"
+              >
                 <hr class="hr-text" [attr.data-content]="comment.text" />
               </div>
 
@@ -104,7 +110,13 @@
                   </f-scorm-extension-comment>
                 </div>
 
-                <div *ngSwitchCase="'text'" class="comment-text">
+               <div
+                  *ngSwitchCase="'text'"
+                  class="comment-text"
+                  [matTooltip]="comment.createdAt | humanizedDate"
+                  matTooltipPosition="above"
+                  matTooltipShowDelay="1000"
+                >
                   <div class="markdown-to-html" [innerHTML]="comment.text | marked"></div>
                 </div>
 

From a54f94f045b4280d0f13304a6b5728b62fc4107e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 8 Jul 2025 14:49:08 +1000
Subject: [PATCH 341/776] feat: mark task as discussed

---
 src/app/api/models/task.ts                    | 37 ++++++++++++++++++-
 src/app/common/footer/footer.component.html   | 11 ++++++
 .../tutor-discussion.component.ts             |  2 +-
 .../task-comments-viewer.component.html       |  4 ++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 8dd5b8d70f..30cf636977 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -690,7 +690,37 @@ export class Task extends Entity {
     }
   }
 
-  public updateTaskStatus(status: TaskStatusEnum) {
+  public markAsDiscussed() {
+    const alerts: AlertService = AppInjector.get(AlertService);
+    const taskService: TaskService = AppInjector.get(TaskService);
+
+    const options: RequestOptions<Task> = {
+      entity: this,
+      cache: this.project.taskCache,
+      body: {
+        discussed: true,
+      },
+    };
+
+    taskService
+      .update(
+        {
+          projectId: this.project.id,
+          taskDefId: this.definition.id,
+        },
+        options,
+      )
+      .subscribe({
+        next: (response) => {
+          taskService.notifyStatusChange(this);
+        },
+        error: (error) => {
+          alerts.error(error, 6000);
+        },
+      });
+  }
+
+  public updateTaskStatus(status: TaskStatusEnum, markAsDiscussed?: boolean) {
     const oldStatus = this.status;
     const alerts: AlertService = AppInjector.get(AlertService);
 
@@ -705,6 +735,11 @@ export class Task extends Entity {
           quality_pts: this.qualityPts,
         },
       };
+
+      if (markAsDiscussed === true) {
+        options.body['discussed'] = true;
+      }
+
       const hasId: boolean = this.id > 0;
 
       taskService
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index cd70a28ecd..79e91489fb 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -76,6 +76,17 @@
       >
         <mat-icon>question_answer</mat-icon>
       </button>
+      <button
+        [disabled]="selectedTask === undefined"
+        mat-icon-button
+        matTooltip="Discussed in class"
+        matTooltipPosition="above"
+        aria-label=""
+        class="button"
+        (click)="selectedTask?.markAsDiscussed()"
+      >
+        <mat-icon>group</mat-icon>
+      </button>
     </span>
 
     <div fxFlex fxFlexAlign="end start" fxLayout="row" fxLayoutAlign="end center">
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 002712ea03..000a7d27aa 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -181,7 +181,7 @@ export class TutorDiscussionComponent implements OnInit {
       this.taskCommentService
         .addComment(task, `**Automated Comment**: Discussed in class.`, 'text')
         .subscribe(() => {
-          task.updateTaskStatus(status);
+          task.updateTaskStatus(status, true);
         });
     }
   }
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index c131c7a25d..8adbc26ceb 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -70,6 +70,10 @@
                 <hr class="hr-text" [attr.data-content]="comment.text" />
               </div>
 
+              <div *ngSwitchCase="'discussed'" class="comment-status">
+                <hr class="hr-text" [attr.data-content]="comment.text" />
+              </div>
+
               <div *ngSwitchCase="'plan'" class="comment-status">
                 <hr class="hr-text" [attr.data-content]="comment.text" />
               </div>

From d87e620ab54aa75f03d8295f0319798214ad39f0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:10:50 +1000
Subject: [PATCH 342/776] fix: discussed context type

---
 .../task-comments-viewer.component.html                   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index 8adbc26ceb..534b03ec8d 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -70,7 +70,13 @@
                 <hr class="hr-text" [attr.data-content]="comment.text" />
               </div>
 
-              <div *ngSwitchCase="'discussed'" class="comment-status">
+              <div
+                *ngSwitchCase="'discussed_in_class'"
+                class="comment-status"
+                [matTooltip]="comment.createdAt | humanizedDate"
+                matTooltipPosition="above"
+                matTooltipShowDelay="1000"
+              >
                 <hr class="hr-text" [attr.data-content]="comment.text" />
               </div>
 

From c2d866b8c7dd0bc30030967c1921f4d17575be32 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 8 Jul 2025 15:22:15 +1000
Subject: [PATCH 343/776] chore: remove automated comment

---
 .../states/tutor-discussion/tutor-discussion.component.ts   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 000a7d27aa..7570464462 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -178,11 +178,7 @@ export class TutorDiscussionComponent implements OnInit {
     const selectedTasks = this.tasksList.selectedOptions.selected;
     for (const taskOption of selectedTasks) {
       const task = taskOption.value as Task;
-      this.taskCommentService
-        .addComment(task, `**Automated Comment**: Discussed in class.`, 'text')
-        .subscribe(() => {
-          task.updateTaskStatus(status, true);
-        });
+      task.updateTaskStatus(status, true);
     }
   }
 

From fb3de4ba1f125ce65cc2c0c9efa812fd4d030c25 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 8 Jul 2025 16:22:33 +1000
Subject: [PATCH 344/776] chore: remove debug logs

---
 .../task-comment-composer.component.ts        | 40 ++-----------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index bc34586eec..e9bc679323 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -141,12 +141,7 @@ export class TaskCommentComposerComponent
     }
   }
 
-  ngOnInit() {
-    window.addEventListener('storage', (event) => {
-      console.log('[STORAGE-EVENT]', event);
-    });
-    this.testLocalStorage();
-  }
+  ngOnInit() {}
 
   ngOnChanges(changes: SimpleChanges) {
     this.showFeedbackTemplatePicker = false;
@@ -183,9 +178,6 @@ export class TaskCommentComposerComponent
         const inputElement = this.input?.first?.nativeElement;
         if (inputElement) {
           const text = inputElement.innerText.trim();
-          console.log('text to save:',
-            { taskId: this.task.id, length: text.length, preview: text.substring(0, 20) });
-
           if (text && !this.hasSubmittedComment) {
             localStorage.setItem(this.getDraftKey(this.task), text);
           } else {
@@ -196,22 +188,6 @@ export class TaskCommentComposerComponent
     }
   }
 
-  private testLocalStorage() {
-    try {
-      const testKey = 'test_draft_' + Date.now();
-      localStorage.setItem(testKey, 'test_value');
-      const value = localStorage.getItem(testKey);
-      console.log('LocalStorage test:', value === 'test_value' ? 'Working' : 'Not working');
-      localStorage.removeItem(testKey);
-    } catch (e) {
-      console.error('LocalStorage error:', e);
-    }
-  }
-
-
-
-
-
   // Update onInputChange to reset submitted status
   onInputChange(event: Event) {
     const target = event.target as HTMLElement;
@@ -281,18 +257,16 @@ export class TaskCommentComposerComponent
 
 
       if (!this.hasContent(raw)) {
-        console.log('No text to save for task', task.id ?? 'without ID');
-        console.log('Removing draft from localStorage, key:', draftKey);
+        // No text to save, removing draft from localStorage
         this.taskDraftContents.delete(draftKey);
         localStorage.removeItem(draftKey);
         return;
       }
 
       const text = raw.trim();
-      console.log('Saving draft for', draftKey, 'preview:', text);
+      // Save comment draf
       this.taskDraftContents.set(draftKey, text);
       localStorage.setItem(draftKey, text);
-
     } catch (error) {
       console.error('saveDraftForTask error:', error);
     }
@@ -313,11 +287,8 @@ export class TaskCommentComposerComponent
     const draftKey = this.getDraftKey(task);
     try {
       const draft = localStorage.getItem(draftKey);
-      console.log('Draft found?', draft ? 'Yes' : 'No',
-        draft ? { length: draft.length, preview: draft.substring(0, 20) } : '');
 
       if (!draft) {
-        console.log('No draft found for task', task.id || 'without ID');
         return;
       }
 
@@ -570,28 +541,23 @@ export class TaskCommentComposerComponent
 
     this.taskCommentService.addComment(this.task, text, 'text', originalComment).subscribe({
       next: (tc: TaskComment) => {
-
         const inputEl = this.input.first.nativeElement;
         const originalOnInput = inputEl.oninput;
         inputEl.oninput = null;
 
         this.input.first.nativeElement.innerText = '';
-        console.log('[DRAFT-DEBUG] Cleared input field');
 
         setTimeout(() => {
           inputEl.oninput = originalOnInput;
         }, 100);
 
-
         if (this.task?.id) {
           localStorage.removeItem(this.getDraftKey(this.task));
-          console.log('[DRAFT-DEBUG] Double-checked draft removal from localStorage');
         }
       },
       error: (error: ApiError) => {
         console.log('[DRAFT-DEBUG] Error submitting comment:', error);
         this.hasSubmittedComment = false;
-        console.log('[DRAFT-DEBUG] Reset hasSubmittedComment flag due to error');
 
         this.alerts.error(error.error || error.message || 'Failed to add comment', 2000);
 

From 1ed5a7a78b89c61f2357128b7a27875a8402d310 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 8 Jul 2025 17:12:58 +1000
Subject: [PATCH 345/776] chore: separate discussed button from status update
 buttons

---
 src/app/common/footer/footer.component.html | 25 ++++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 79e91489fb..d573575ba4 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -76,17 +76,20 @@
       >
         <mat-icon>question_answer</mat-icon>
       </button>
-      <button
-        [disabled]="selectedTask === undefined"
-        mat-icon-button
-        matTooltip="Discussed in class"
-        matTooltipPosition="above"
-        aria-label=""
-        class="button"
-        (click)="selectedTask?.markAsDiscussed()"
-      >
-        <mat-icon>group</mat-icon>
-      </button>
+
+      <div class="ml-5 border-l-2 border-gray-300">
+        <button
+          [disabled]="selectedTask === undefined"
+          mat-icon-button
+          matTooltip="Discussed in class"
+          matTooltipPosition="above"
+          aria-label=""
+          class="button ml-5"
+          (click)="selectedTask?.markAsDiscussed()"
+        >
+          <mat-icon>group</mat-icon>
+        </button>
+      </div>
     </span>
 
     <div fxFlex fxFlexAlign="end start" fxLayout="row" fxLayoutAlign="end center">

From 494ded15edf26c40c21dcf120a01bc58985a07c8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 8 Jul 2025 17:15:49 +1000
Subject: [PATCH 346/776] chore: alert on task discussed

---
 src/app/api/models/task.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 30cf636977..2df069d3fd 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -713,6 +713,7 @@ export class Task extends Entity {
       .subscribe({
         next: (response) => {
           taskService.notifyStatusChange(this);
+          alerts.success('Task successfully marked as discussed in class.', 4000);
         },
         error: (error) => {
           alerts.error(error, 6000);

From d219d49ca6457119084d4c3d2cb39343dece5aa0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 9 Jul 2025 09:55:06 +1000
Subject: [PATCH 347/776] fix: avoid fetching twice if no comments are cached
 yet

---
 .../task-comments-viewer/task-comments-viewer.component.ts  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 74ecde6698..b466c38780 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -75,6 +75,12 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
   }
 
   fetchComments(task: Task, useCache: boolean = true, fetchAfterCache: boolean = false) {
+    if (!task.comments.length) {
+      // If the cache is empty we know the query will attempt to fetch, so we can avoid fetching a second time
+      useCache = false;
+      fetchAfterCache = false;
+    }
+
     const request$ = !useCache
       ? this.taskCommentService.fetchAll({
           projectId: this.project.id,

From c7eed9903bcc4463f4d0b52889e0d3d9045b03ba Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 9 Jul 2025 15:56:39 +1000
Subject: [PATCH 348/776] feat: init staff notes

---
 src/app/api/models/project.ts                 |  2 +
 src/app/api/models/staff-note.ts              | 43 +++++++++
 src/app/api/services/staff-note.service.ts    | 87 +++++++++++++++++++
 src/app/common/footer/footer.component.html   | 15 ++++
 src/app/common/footer/footer.component.ts     |  4 +
 src/app/doubtfire-angular.module.ts           |  6 +-
 .../task-dashboard.component.html             |  4 +
 .../states/dashboard/selected-task.service.ts |  5 ++
 .../staff-notes/staff-notes.component.html    | 57 ++++++++++++
 .../staff-notes/staff-notes.component.scss    |  0
 .../staff-notes/staff-notes.component.spec.ts | 22 +++++
 .../staff-notes/staff-notes.component.ts      | 64 ++++++++++++++
 12 files changed, 308 insertions(+), 1 deletion(-)
 create mode 100644 src/app/api/models/staff-note.ts
 create mode 100644 src/app/api/services/staff-note.service.ts
 create mode 100644 src/app/projects/states/staff-notes/staff-notes.component.html
 create mode 100644 src/app/projects/states/staff-notes/staff-notes.component.scss
 create mode 100644 src/app/projects/states/staff-notes/staff-notes.component.spec.ts
 create mode 100644 src/app/projects/states/staff-notes/staff-notes.component.ts

diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index a1b7743428..42baa3f125 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -23,6 +23,7 @@ import {
 } from './doubtfire-model';
 import { TaskOutcomeAlignment } from './task-outcome-alignment';
 import { AlertService } from 'src/app/common/services/alert.service';
+import { StaffNote } from './staff-note';
 
 export class Project extends Entity {
   public id: number;
@@ -52,6 +53,7 @@ export class Project extends Entity {
 
   public burndownChartData: { key: string; values: number[] }[];
   public readonly taskCache: EntityCache<Task> = new EntityCache<Task>();
+  public readonly staffNoteCache: EntityCache<StaffNote> = new EntityCache<StaffNote>();
   public readonly tutorialEnrolmentsCache: EntityCache<Tutorial> = new EntityCache<Tutorial>();
   public readonly groupCache: EntityCache<Group> = new EntityCache<Group>();
   public readonly taskOutcomeAlignmentsCache: EntityCache<TaskOutcomeAlignment> =
diff --git a/src/app/api/models/staff-note.ts b/src/app/api/models/staff-note.ts
new file mode 100644
index 0000000000..0240f2eb28
--- /dev/null
+++ b/src/app/api/models/staff-note.ts
@@ -0,0 +1,43 @@
+import {Entity} from 'ngx-entity-service';
+import {Project, Unit, User} from './doubtfire-model';
+import {AppInjector} from 'src/app/app-injector';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {StaffNoteService} from '../services/staff-note.service';
+
+export class StaffNote extends Entity {
+  id: number;
+
+  project: Project;
+  author: User;
+  replyTo: StaffNote;
+  createdAt: Date;
+  updatedAt: Date;
+
+  constructor(data?: Project) {
+    super();
+    if (data instanceof Project) {
+      this.project = data as Project;
+    }
+  }
+
+  /**
+   * Provide the project id to allow mapping in service.
+   */
+  public get projectId(): number {
+    return this.project.id;
+  }
+
+  // public delete() {
+  //   const staffNoteService: StaffNoteService = AppInjector.get(StaffNoteService);
+  //   staffNoteService
+  //     .delete({projectId: this.project.id, id: this.id}, {cache: this.project.staffNoteCache})
+  //     .subscribe({
+  //       next: (response: object) => {
+  //         console.log('deleted staff note');
+  //       },
+  //       error: (error: any) => {
+  //         AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
+  //       },
+  //     });
+  // }
+}
diff --git a/src/app/api/services/staff-note.service.ts b/src/app/api/services/staff-note.service.ts
new file mode 100644
index 0000000000..eca6f3c517
--- /dev/null
+++ b/src/app/api/services/staff-note.service.ts
@@ -0,0 +1,87 @@
+import {HttpClient} from '@angular/common/http';
+import {EventEmitter, Injectable} from '@angular/core';
+import {CachedEntityService, RequestOptions} from 'ngx-entity-service';
+import {Project, ProjectService, UserService} from 'src/app/api/models/doubtfire-model';
+import API_URL from 'src/app/config/constants/apiURL';
+import {StaffNote} from '../models/staff-note';
+import {Observable, tap} from 'rxjs';
+
+@Injectable()
+export class StaffNoteService extends CachedEntityService<StaffNote> {
+  public readonly staffNoteAdded$: EventEmitter<StaffNote> = new EventEmitter();
+
+  protected readonly endpointFormat = 'projects/:projectId:/staff_notes';
+
+  constructor(
+    httpClient: HttpClient,
+    private userService: UserService,
+    private projectService: ProjectService,
+  ) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys('id', 'note', 'createdAt', 'updatedAt', {
+      keys: 'author',
+      toEntityFn: (data: object, key: string, _staffNote: StaffNote) => {
+        const user = this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
+        return user;
+      },
+    });
+
+    this.mapping.addJsonKey('note', 'createdAt', 'updatedAt');
+  }
+
+  public createInstanceFrom(json: object, other?: Project): StaffNote {
+    return new StaffNote(other);
+  }
+
+  // TODO: use originalNote for replies
+  public addNote(project: Project, text: string, originalNote: StaffNote): Observable<StaffNote> {
+    const pathId = {
+      projectId: project.id,
+    };
+
+    const body: FormData = new FormData();
+    if (originalNote) {
+      body.append('reply_to_id', originalNote?.id.toString());
+    }
+
+    body.append('note', text);
+
+    const opts: RequestOptions<StaffNote> = {endpointFormat: this.endpointFormat};
+    opts.cache = project.staffNoteCache;
+    opts.body = body;
+    // opts.constructorParams = task;
+
+    return this.create(pathId, opts).pipe(
+      tap((note: StaffNote) => {
+        this.staffNoteAdded$.emit(note);
+      }),
+    );
+  }
+
+  public loadStaffNotes(project: Project, useFetch: boolean = false): Observable<StaffNote[]> {
+    console.log(project);
+    const options: RequestOptions<StaffNote> = {
+      endpointFormat: this.endpointFormat,
+      cache: project.staffNoteCache,
+      sourceCache: project.staffNoteCache,
+      cacheBehaviourOnGet: 'cacheQuery',
+    };
+
+    if (useFetch) {
+      return super.fetchAll(
+        {
+          projectId: project.id,
+        },
+        options,
+      );
+    } else {
+      return super.query(
+        {
+          projectId: project.id,
+        },
+        options,
+      );
+    }
+  }
+}
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index d573575ba4..00f86899aa 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -112,6 +112,21 @@
           </button>
         </div>
       }
+      <div class="relative inline-block">
+        <div matBadge="3"></div>
+        <!-- TODO: fetch number of staff notes from project -->
+        <button
+          #similaritiesButton
+          mat-icon-button
+          matTooltip="There are 3 staff notes for this student"
+          matTooltipPosition="above"
+          aria-label="View detected similarities"
+          class="button small-button"
+          (click)="viewStaffNotes()"
+        >
+          <mat-icon class="small-icon">comment</mat-icon>
+        </button>
+      </div>
       <button
         [disabled]="selectedTask === undefined"
         mat-icon-button
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 6c3871d0e1..4c8098e06c 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -85,6 +85,10 @@ export class FooterComponent implements OnInit {
     this.selectedTaskService.showSimilarity();
   }
 
+  viewStaffNotes() {
+    this.selectedTaskService.showStaffNotes();
+  }
+
   getJplagReport() {
     if (!this.selectedTask?.definition) {
       return;
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 87ddea0d3c..657c8397da 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -267,6 +267,8 @@ import {SpecConModalComponent} from './common/modals/spec-con-modal/spec-con-mod
 import {SpecConModalService} from './common/modals/spec-con-modal/spec-con-modal.service';
 import {ProjectPlanComponent} from './projects/states/plan/project-plan.component';
 import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-viewer.component';
+import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.component';
+import {StaffNoteService} from './api/services/staff-note.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -402,6 +404,8 @@ const MY_DATE_FORMAT = {
     TutorDiscussionComponent,
     TaskIlosCardComponent,
     JplagReportViewerComponent,
+    StaffNotesComponent,
+    QrModalComponent,
   ],
   // Services we provide
   providers: [
@@ -486,7 +490,7 @@ const MY_DATE_FORMAT = {
     }),
     FeedbackTemplateService,
     NestedCsvDownloadModalService,
-    QrModalComponent,
+    StaffNoteService,
   ],
   imports: [
     FlexLayoutModule,
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
index 835fead6ca..8aa130cadb 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
@@ -15,6 +15,10 @@
     <ng-template [ngSwitchCase]="DashboardViews.similarity">
       <f-task-similarity-view [task]="task"></f-task-similarity-view>
     </ng-template>
+
+    <ng-template [ngSwitchCase]="DashboardViews.staff_notes">
+      <f-staff-notes [project]="task.project"></f-staff-notes>
+    </ng-template>
   </ng-container>
 
   <!-- The PDF Viewer -->
diff --git a/src/app/projects/states/dashboard/selected-task.service.ts b/src/app/projects/states/dashboard/selected-task.service.ts
index 6a6684c81c..31b5dd8716 100644
--- a/src/app/projects/states/dashboard/selected-task.service.ts
+++ b/src/app/projects/states/dashboard/selected-task.service.ts
@@ -8,6 +8,7 @@ export enum DashboardViews {
   submission,
   task,
   similarity,
+  staff_notes,
 }
 
 @Injectable({
@@ -61,6 +62,10 @@ export class SelectedTaskService {
     this.currentView$.next(DashboardViews.similarity);
   }
 
+  public showStaffNotes() {
+    this.currentView$.next(DashboardViews.staff_notes);
+  }
+
   public showSubmission() {
     if (!this.task$.value) return;
     this.currentPdfUrl$.next(this.task$.value.submissionUrl(false));
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
new file mode 100644
index 0000000000..a582731d79
--- /dev/null
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -0,0 +1,57 @@
+<div class="p-4 h-[calc(100%-50px)]">
+  <div class="flex items-center">
+    <mat-icon class="mr-2">comment</mat-icon>
+    <h1 class="mat-headline m-0">Staff Notes</h1>
+    <span class="grow"></span>
+    <div class="example-action-buttons">
+      <button mat-button>Collapse All</button>
+    </div>
+  </div>
+
+  <div class="flex flex-col h-full">
+    <div #staffNotesContainer class="flex-1 overflow-auto p-4">
+      @if (!loadingStaffNotes) {
+        @for (note of project?.staffNoteCache?.currentValues; track note) {
+          <mat-card class="mb-4 p-4">
+            <div class="flex justify-between">
+              <mat-card-title class="flex items-center">
+                <user-icon size="25" [user]="note.author" style="margin-right: 8px"></user-icon>
+                {{ note.author?.firstName }} {{ note.author?.lastName }}</mat-card-title
+              >
+              <mat-card-subtitle
+                [matTooltip]="note.createdAt"
+                matTooltipPosition="above"
+                matTooltipShowDelay="1000"
+                >{{ note.createdAt | humanizedDate }}</mat-card-subtitle
+              >
+            </div>
+
+            <mat-card-content class="py-4">
+              <p class="">{{ note.note }}</p>
+            </mat-card-content>
+          </mat-card>
+        }
+      } @else {
+        <!-- <div id="spinner">
+          <mat-spinner
+            class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50"
+          ></mat-spinner>
+        </div> -->
+      }
+    </div>
+
+    <div class="h-[150px] border-t border-gray-300 p-4 flex">
+      <mat-form-field appearance="outline" class="flex items-center w-full">
+        <mat-label>Staff Note</mat-label>
+        <textarea
+          matInput
+          [(ngModel)]="noteText"
+          class="resize-none w-full px-2 py-1 placeholder:px-2 placeholder:py-1"
+        ></textarea>
+        <div class="flex justify-end">
+          <button mat-raised-button color="primary" (click)="submitNote()">Submit</button>
+        </div>
+      </mat-form-field>
+    </div>
+  </div>
+</div>
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.scss b/src/app/projects/states/staff-notes/staff-notes.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.spec.ts b/src/app/projects/states/staff-notes/staff-notes.component.spec.ts
new file mode 100644
index 0000000000..fcd374cbfe
--- /dev/null
+++ b/src/app/projects/states/staff-notes/staff-notes.component.spec.ts
@@ -0,0 +1,22 @@
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {StaffNotesComponent} from './staff-notes.component';
+
+describe('StaffNotesComponent', () => {
+  let component: StaffNotesComponent;
+  let fixture: ComponentFixture<StaffNotesComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [StaffNotesComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(StaffNotesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
new file mode 100644
index 0000000000..7e1a7283bd
--- /dev/null
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -0,0 +1,64 @@
+import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core';
+import {Project, User, UserService} from 'src/app/api/models/doubtfire-model';
+import {StaffNote} from 'src/app/api/models/staff-note';
+import {StaffNoteService} from 'src/app/api/services/staff-note.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-staff-notes',
+  templateUrl: './staff-notes.component.html',
+  styleUrl: './staff-notes.component.scss',
+})
+export class StaffNotesComponent implements OnInit {
+  // TODO: markdown support / new lines
+  @ViewChild('staffNotesContainer') staffNotesContainer!: ElementRef;
+
+  @Input() project: Project;
+  // staffNotes: StaffNote[];
+  user: User;
+
+  loadingStaffNotes: boolean = true;
+
+  noteText: string = '';
+
+  constructor(
+    private userService: UserService,
+    private staffNoteService: StaffNoteService,
+    private alertService: AlertService,
+  ) {}
+  ngOnInit(): void {
+    this.loadingStaffNotes = true;
+    this.staffNoteService.loadStaffNotes(this.project).subscribe((notes) => {
+      console.log(notes);
+      this.loadingStaffNotes = false;
+      this.scrollDown();
+    });
+  }
+
+  scrollToComment(commentID: number) {
+    document.querySelector(`#comment-${commentID}`).scrollIntoView();
+  }
+
+  scrollDown() {
+    setTimeout(() => {
+      const el = this.staffNotesContainer.nativeElement;
+      el.scrollTop = el.scrollHeight;
+    }, 50);
+  }
+
+  public submitNote() {
+    const noteText = this.noteText.trim();
+    if (noteText === '') {
+      return;
+    }
+
+    this.noteText = '';
+
+    this.staffNoteService.addNote(this.project, noteText, null).subscribe((note) => {
+      console.log(note);
+      this.alertService.success('Succesfully submitted note', 4000);
+      this.scrollDown();
+      // TODO: if it errors restore the note into the textarea
+    });
+  }
+}

From a5f5c3865fb4867ae44adb9ba658f211fa81a9bc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 9 Jul 2025 17:50:03 +1000
Subject: [PATCH 349/776] refactor: map project and user

---
 src/app/api/models/staff-note.ts                    |  8 +++++---
 src/app/api/services/staff-note.service.ts          | 13 ++++++++-----
 .../states/staff-notes/staff-notes.component.html   |  4 ++--
 .../states/staff-notes/staff-notes.component.ts     |  2 --
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/app/api/models/staff-note.ts b/src/app/api/models/staff-note.ts
index 0240f2eb28..a2394ebba2 100644
--- a/src/app/api/models/staff-note.ts
+++ b/src/app/api/models/staff-note.ts
@@ -8,15 +8,17 @@ export class StaffNote extends Entity {
   id: number;
 
   project: Project;
-  author: User;
+  user: User;
   replyTo: StaffNote;
   createdAt: Date;
   updatedAt: Date;
 
   constructor(data?: Project) {
     super();
-    if (data instanceof Project) {
-      this.project = data as Project;
+    if (data) {
+      this.project = data;
+    } else {
+      console.error('Failed to get project');
     }
   }
 
diff --git a/src/app/api/services/staff-note.service.ts b/src/app/api/services/staff-note.service.ts
index eca6f3c517..51b7c733bc 100644
--- a/src/app/api/services/staff-note.service.ts
+++ b/src/app/api/services/staff-note.service.ts
@@ -20,10 +20,12 @@ export class StaffNoteService extends CachedEntityService<StaffNote> {
     super(httpClient, API_URL);
 
     this.mapping.addKeys('id', 'note', 'createdAt', 'updatedAt', {
-      keys: 'author',
-      toEntityFn: (data: object, key: string, _staffNote: StaffNote) => {
-        const user = this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
-        return user;
+      keys: ['user', 'user_id'],
+      toEntityFn: (data: object, key: string, staffNote: StaffNote) => {
+        const userRole = staffNote.project.unit.staff.find((s) => s.user.id === data['user_id']);
+
+        // const user = this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
+        return userRole.user;
       },
     });
 
@@ -50,7 +52,7 @@ export class StaffNoteService extends CachedEntityService<StaffNote> {
     const opts: RequestOptions<StaffNote> = {endpointFormat: this.endpointFormat};
     opts.cache = project.staffNoteCache;
     opts.body = body;
-    // opts.constructorParams = task;
+    opts.constructorParams = project;
 
     return this.create(pathId, opts).pipe(
       tap((note: StaffNote) => {
@@ -66,6 +68,7 @@ export class StaffNoteService extends CachedEntityService<StaffNote> {
       cache: project.staffNoteCache,
       sourceCache: project.staffNoteCache,
       cacheBehaviourOnGet: 'cacheQuery',
+      constructorParams: project,
     };
 
     if (useFetch) {
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index a582731d79..5a5b70f798 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -15,8 +15,8 @@ <h1 class="mat-headline m-0">Staff Notes</h1>
           <mat-card class="mb-4 p-4">
             <div class="flex justify-between">
               <mat-card-title class="flex items-center">
-                <user-icon size="25" [user]="note.author" style="margin-right: 8px"></user-icon>
-                {{ note.author?.firstName }} {{ note.author?.lastName }}</mat-card-title
+                <user-icon size="25" [user]="note.user" style="margin-right: 8px"></user-icon>
+                {{ note.user?.firstName }} {{ note.user?.lastName }}</mat-card-title
               >
               <mat-card-subtitle
                 [matTooltip]="note.createdAt"
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index 7e1a7283bd..a1f777579b 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -14,8 +14,6 @@ export class StaffNotesComponent implements OnInit {
   @ViewChild('staffNotesContainer') staffNotesContainer!: ElementRef;
 
   @Input() project: Project;
-  // staffNotes: StaffNote[];
-  user: User;
 
   loadingStaffNotes: boolean = true;
 

From 0ab1ebff3964d8665d9560bf3007a2d30109ee37 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 9 Jul 2025 17:51:19 +1000
Subject: [PATCH 350/776] feat: staff note deletion

---
 src/app/api/models/staff-note.ts              | 27 ++++++++++---------
 src/app/api/services/staff-note.service.ts    |  2 +-
 .../staff-notes/staff-notes.component.html    | 18 ++++++++-----
 .../staff-notes/staff-notes.component.ts      |  4 +++
 4 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/app/api/models/staff-note.ts b/src/app/api/models/staff-note.ts
index a2394ebba2..226d41bcb3 100644
--- a/src/app/api/models/staff-note.ts
+++ b/src/app/api/models/staff-note.ts
@@ -29,17 +29,18 @@ export class StaffNote extends Entity {
     return this.project.id;
   }
 
-  // public delete() {
-  //   const staffNoteService: StaffNoteService = AppInjector.get(StaffNoteService);
-  //   staffNoteService
-  //     .delete({projectId: this.project.id, id: this.id}, {cache: this.project.staffNoteCache})
-  //     .subscribe({
-  //       next: (response: object) => {
-  //         console.log('deleted staff note');
-  //       },
-  //       error: (error: any) => {
-  //         AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
-  //       },
-  //     });
-  // }
+  public delete() {
+    const staffNoteService: StaffNoteService = AppInjector.get(StaffNoteService);
+    staffNoteService
+      .delete({projectId: this.project.id, id: this.id}, {cache: this.project.staffNoteCache})
+      .subscribe({
+        next: (response: object) => {
+          console.log('deleted staff note');
+          AppInjector.get(AlertService).error('Successfully deleted staff note', 4000);
+        },
+        error: (error: any) => {
+          AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
+        },
+      });
+  }
 }
diff --git a/src/app/api/services/staff-note.service.ts b/src/app/api/services/staff-note.service.ts
index 51b7c733bc..01a2513dbb 100644
--- a/src/app/api/services/staff-note.service.ts
+++ b/src/app/api/services/staff-note.service.ts
@@ -10,7 +10,7 @@ import {Observable, tap} from 'rxjs';
 export class StaffNoteService extends CachedEntityService<StaffNote> {
   public readonly staffNoteAdded$: EventEmitter<StaffNote> = new EventEmitter();
 
-  protected readonly endpointFormat = 'projects/:projectId:/staff_notes';
+  protected readonly endpointFormat = 'projects/:projectId:/staff_notes/:id:';
 
   constructor(
     httpClient: HttpClient,
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 5a5b70f798..8f8e43b6c3 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -18,12 +18,18 @@ <h1 class="mat-headline m-0">Staff Notes</h1>
                 <user-icon size="25" [user]="note.user" style="margin-right: 8px"></user-icon>
                 {{ note.user?.firstName }} {{ note.user?.lastName }}</mat-card-title
               >
-              <mat-card-subtitle
-                [matTooltip]="note.createdAt"
-                matTooltipPosition="above"
-                matTooltipShowDelay="1000"
-                >{{ note.createdAt | humanizedDate }}</mat-card-subtitle
-              >
+              <div class="flex">
+                <mat-card-subtitle
+                  [matTooltip]="note.createdAt"
+                  matTooltipPosition="above"
+                  matTooltipShowDelay="1000"
+                  >{{ note.createdAt | humanizedDate }}</mat-card-subtitle
+                >
+                <!-- TODO: only show delete if we're allowed to -->
+                <button mat-button (click)="deleteNote(note)">
+                  <mat-icon>delete</mat-icon>
+                </button>
+              </div>
             </div>
 
             <mat-card-content class="py-4">
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index a1f777579b..c1f890a308 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -59,4 +59,8 @@ export class StaffNotesComponent implements OnInit {
       // TODO: if it errors restore the note into the textarea
     });
   }
+
+  public deleteNote(note: StaffNote) {
+    note.delete();
+  }
 }

From f3d4c4c00128ca00dec18ea9950c01df25b75b61 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 11:07:18 +1000
Subject: [PATCH 351/776] feat: show number of notes project has

---
 src/app/api/models/project.ts                 |  2 +
 src/app/api/models/staff-note.ts              |  2 +-
 src/app/api/services/project.service.ts       |  1 +
 src/app/common/footer/footer.component.html   | 39 ++++++++++++-------
 .../staff-notes/staff-notes.component.ts      |  1 +
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index 42baa3f125..76cc26bb9e 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -64,6 +64,8 @@ export class Project extends Entity {
 
   public similarityFlag: boolean = false;
 
+  public staffNotes: number;
+
   public constructor(unit?: Unit) {
     super();
     this.unit = unit;
diff --git a/src/app/api/models/staff-note.ts b/src/app/api/models/staff-note.ts
index 226d41bcb3..a2e90df49f 100644
--- a/src/app/api/models/staff-note.ts
+++ b/src/app/api/models/staff-note.ts
@@ -35,8 +35,8 @@ export class StaffNote extends Entity {
       .delete({projectId: this.project.id, id: this.id}, {cache: this.project.staffNoteCache})
       .subscribe({
         next: (response: object) => {
-          console.log('deleted staff note');
           AppInjector.get(AlertService).error('Successfully deleted staff note', 4000);
+          this.project.staffNotes--;
         },
         error: (error: any) => {
           AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
diff --git a/src/app/api/services/project.service.ts b/src/app/api/services/project.service.ts
index 3ae0f4c7ec..f796649bc5 100644
--- a/src/app/api/services/project.service.ts
+++ b/src/app/api/services/project.service.ts
@@ -67,6 +67,7 @@ export class ProjectService extends CachedEntityService<Project> {
       'compilePortfolio',
       'similarityFlag',
       'specConDays',
+      'staffNotes',
       {
         keys: 'hasPortfolio',
         toEntityFn: (data: object, key: string, entity: Project, params?: any) => {
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 00f86899aa..a3315cde41 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -112,21 +112,30 @@
           </button>
         </div>
       }
-      <div class="relative inline-block">
-        <div matBadge="3"></div>
-        <!-- TODO: fetch number of staff notes from project -->
-        <button
-          #similaritiesButton
-          mat-icon-button
-          matTooltip="There are 3 staff notes for this student"
-          matTooltipPosition="above"
-          aria-label="View detected similarities"
-          class="button small-button"
-          (click)="viewStaffNotes()"
-        >
-          <mat-icon class="small-icon">comment</mat-icon>
-        </button>
-      </div>
+      @if (selectedTask?.project) {
+        <div class="relative inline-block">
+          @if (selectedTask.project.staffNotes > 0) {
+            <div [matBadge]="selectedTask.project.staffNotes"></div>
+          }
+          <button
+            #similaritiesButton
+            mat-icon-button
+            [matTooltip]="
+              'Student has ' +
+              (selectedTask.project.staffNotes || 'no') +
+              ' staff note' +
+              (selectedTask.project.staffNotes !== 1 ? 's' : '')
+            "
+            matTooltipPosition="above"
+            aria-label="View detected similarities"
+            class="button small-button"
+            (click)="viewStaffNotes()"
+          >
+            <mat-icon class="small-icon">comment</mat-icon>
+          </button>
+        </div>
+      }
+
       <button
         [disabled]="selectedTask === undefined"
         mat-icon-button
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index c1f890a308..a7ea29fee5 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -56,6 +56,7 @@ export class StaffNotesComponent implements OnInit {
       console.log(note);
       this.alertService.success('Succesfully submitted note', 4000);
       this.scrollDown();
+      this.project.staffNotes++;
       // TODO: if it errors restore the note into the textarea
     });
   }

From 5cf752baf1b9de6105ea2a951ec75818ce1e0cfc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 12:12:58 +1000
Subject: [PATCH 352/776] feat: localized date time pipe

---
 src/app/common/pipes/localized-date.pipe.ts            | 10 ++++++++++
 src/app/doubtfire-angular.module.ts                    |  2 ++
 .../states/staff-notes/staff-notes.component.html      |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/app/common/pipes/localized-date.pipe.ts

diff --git a/src/app/common/pipes/localized-date.pipe.ts b/src/app/common/pipes/localized-date.pipe.ts
new file mode 100644
index 0000000000..e7eceb2baf
--- /dev/null
+++ b/src/app/common/pipes/localized-date.pipe.ts
@@ -0,0 +1,10 @@
+import {Pipe, PipeTransform} from '@angular/core';
+
+@Pipe({
+  name: 'localizedDateTime',
+})
+export class LocalizedDatePipe implements PipeTransform {
+  transform(value: string | Date): string {
+    return new Date(value).toLocaleString();
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 657c8397da..ec2ae8da88 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -269,6 +269,7 @@ import {ProjectPlanComponent} from './projects/states/plan/project-plan.componen
 import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-viewer.component';
 import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.component';
 import {StaffNoteService} from './api/services/staff-note.service';
+import {LocalizedDatePipe} from './common/pipes/localized-date.pipe';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -406,6 +407,7 @@ const MY_DATE_FORMAT = {
     JplagReportViewerComponent,
     StaffNotesComponent,
     QrModalComponent,
+    LocalizedDatePipe,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 8f8e43b6c3..418ec79b5d 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -20,7 +20,7 @@ <h1 class="mat-headline m-0">Staff Notes</h1>
               >
               <div class="flex">
                 <mat-card-subtitle
-                  [matTooltip]="note.createdAt"
+                  [matTooltip]="note.createdAt | localizedDateTime"
                   matTooltipPosition="above"
                   matTooltipShowDelay="1000"
                   >{{ note.createdAt | humanizedDate }}</mat-card-subtitle

From 3ac10f6cab39dab42ce19f61029488d220786703 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 12:17:21 +1000
Subject: [PATCH 353/776] fix: support markdown

---
 src/app/projects/states/staff-notes/staff-notes.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 418ec79b5d..6ab8670f09 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -33,7 +33,7 @@ <h1 class="mat-headline m-0">Staff Notes</h1>
             </div>
 
             <mat-card-content class="py-4">
-              <p class="">{{ note.note }}</p>
+              <div class="markdown-to-html" [innerHTML]="note.note | marked"></div>
             </mat-card-content>
           </mat-card>
         }

From 100a5335aa7f37f4477b9d9b8f43806ca32c640b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 12:39:40 +1000
Subject: [PATCH 354/776] feat: init reply to button

---
 .../staff-notes/staff-notes.component.html       | 16 ++++++++++------
 .../staff-notes/staff-notes.component.scss       | 14 ++++++++++++++
 .../states/staff-notes/staff-notes.component.ts  |  4 ++++
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 6ab8670f09..c31c514b8d 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -12,23 +12,27 @@ <h1 class="mat-headline m-0">Staff Notes</h1>
     <div #staffNotesContainer class="flex-1 overflow-auto p-4">
       @if (!loadingStaffNotes) {
         @for (note of project?.staffNoteCache?.currentValues; track note) {
-          <mat-card class="mb-4 p-4">
+          <mat-card
+            class="mb-4 p-5"
+            (mouseover)="note.hover = true"
+            (mouseout)="note.hover = false"
+          >
+            <div [hidden]="!note.hover" class="flex absolute right-5 bottom-5">
+              <mat-icon type="button" (click)="replyToNote(note)">reply</mat-icon>
+              <mat-icon type="button" (click)="deleteNote(note)">delete</mat-icon>
+            </div>
             <div class="flex justify-between">
               <mat-card-title class="flex items-center">
                 <user-icon size="25" [user]="note.user" style="margin-right: 8px"></user-icon>
                 {{ note.user?.firstName }} {{ note.user?.lastName }}</mat-card-title
               >
-              <div class="flex">
+              <div class="flex items-center">
                 <mat-card-subtitle
                   [matTooltip]="note.createdAt | localizedDateTime"
                   matTooltipPosition="above"
                   matTooltipShowDelay="1000"
                   >{{ note.createdAt | humanizedDate }}</mat-card-subtitle
                 >
-                <!-- TODO: only show delete if we're allowed to -->
-                <button mat-button (click)="deleteNote(note)">
-                  <mat-icon>delete</mat-icon>
-                </button>
               </div>
             </div>
 
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.scss b/src/app/projects/states/staff-notes/staff-notes.component.scss
index e69de29bb2..ad36534972 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.scss
+++ b/src/app/projects/states/staff-notes/staff-notes.component.scss
@@ -0,0 +1,14 @@
+.mat-icon {
+  color: #9696969d;
+  font-size: 20px;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+  vertical-align: middle;
+  text-align: center;
+  margin-left: 0.3em;
+}
+
+.mat-icon:hover {
+  color: black;
+}
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index a7ea29fee5..6f0edec70b 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -64,4 +64,8 @@ export class StaffNotesComponent implements OnInit {
   public deleteNote(note: StaffNote) {
     note.delete();
   }
+
+  public replyToNote(note: StaffNote) {
+    console.log('replying to note...');
+  }
 }

From b2d8ba41b1dc467a03728d5df4ede6ac6fb3c9a1 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:42:10 +1000
Subject: [PATCH 355/776] feat: edit staff note

---
 src/app/api/models/staff-note.ts              |  1 +
 src/app/api/services/staff-note.service.ts    | 21 +++++++
 .../staff-notes/staff-notes.component.html    | 21 ++++++-
 .../staff-notes/staff-notes.component.ts      | 62 ++++++++++++++++---
 4 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/src/app/api/models/staff-note.ts b/src/app/api/models/staff-note.ts
index a2e90df49f..7b40755a61 100644
--- a/src/app/api/models/staff-note.ts
+++ b/src/app/api/models/staff-note.ts
@@ -9,6 +9,7 @@ export class StaffNote extends Entity {
 
   project: Project;
   user: User;
+  note: string;
   replyTo: StaffNote;
   createdAt: Date;
   updatedAt: Date;
diff --git a/src/app/api/services/staff-note.service.ts b/src/app/api/services/staff-note.service.ts
index 01a2513dbb..0dba7837d0 100644
--- a/src/app/api/services/staff-note.service.ts
+++ b/src/app/api/services/staff-note.service.ts
@@ -61,6 +61,27 @@ export class StaffNoteService extends CachedEntityService<StaffNote> {
     );
   }
 
+  public updateNote(project: Project, note: StaffNote, text: string): Observable<StaffNote> {
+    const pathId = {
+      projectId: project.id,
+      id: note.id,
+    };
+
+    const body: FormData = new FormData();
+    body.append('note', text);
+
+    const opts: RequestOptions<StaffNote> = {endpointFormat: this.endpointFormat};
+    opts.cache = project.staffNoteCache;
+    opts.body = body;
+    opts.constructorParams = project;
+
+    return this.put(pathId, opts).pipe(
+      tap((_note: StaffNote) => {
+        note.note = text;
+      }),
+    );
+  }
+
   public loadStaffNotes(project: Project, useFetch: boolean = false): Observable<StaffNote[]> {
     console.log(project);
     const options: RequestOptions<StaffNote> = {
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index c31c514b8d..15fede437d 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -18,6 +18,7 @@ <h1 class="mat-headline m-0">Staff Notes</h1>
             (mouseout)="note.hover = false"
           >
             <div [hidden]="!note.hover" class="flex absolute right-5 bottom-5">
+              <mat-icon type="button" (click)="editNote(note)">edit</mat-icon>
               <mat-icon type="button" (click)="replyToNote(note)">reply</mat-icon>
               <mat-icon type="button" (click)="deleteNote(note)">delete</mat-icon>
             </div>
@@ -37,7 +38,25 @@ <h1 class="mat-headline m-0">Staff Notes</h1>
             </div>
 
             <mat-card-content class="py-4">
-              <div class="markdown-to-html" [innerHTML]="note.note | marked"></div>
+              @if (editingNote && editingNote.id === note.id) {
+                <mat-form-field appearance="outline" class="flex items-center w-full">
+                  <mat-label>Update Note</mat-label>
+                  <textarea
+                    #staffNoteEditor
+                    matInput
+                    [(ngModel)]="editingNoteText"
+                    class="resize-none w-full px-2 py-1 placeholder:px-2 placeholder:py-1 overflow-hidden"
+                  ></textarea>
+                  <div class="flex justify-end gap-2">
+                    <button mat-raised-button color="" (click)="cancelEditingNote()">Cancel</button>
+                    <button mat-raised-button color="primary" (click)="updateNote(note)">
+                      Update Note
+                    </button>
+                  </div>
+                </mat-form-field>
+              } @else {
+                <div class="markdown-to-html" [innerHTML]="note.note | marked"></div>
+              }
             </mat-card-content>
           </mat-card>
         }
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index 6f0edec70b..84a297b2df 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -10,8 +10,8 @@ import {AlertService} from 'src/app/common/services/alert.service';
   styleUrl: './staff-notes.component.scss',
 })
 export class StaffNotesComponent implements OnInit {
-  // TODO: markdown support / new lines
   @ViewChild('staffNotesContainer') staffNotesContainer!: ElementRef;
+  @ViewChild('staffNoteEditor', {static: false}) staffNoteEditor!: ElementRef<HTMLTextAreaElement>;
 
   @Input() project: Project;
 
@@ -19,6 +19,9 @@ export class StaffNotesComponent implements OnInit {
 
   noteText: string = '';
 
+  editingNote?: StaffNote;
+  editingNoteText?: string = '';
+
   constructor(
     private userService: UserService,
     private staffNoteService: StaffNoteService,
@@ -52,12 +55,35 @@ export class StaffNotesComponent implements OnInit {
 
     this.noteText = '';
 
-    this.staffNoteService.addNote(this.project, noteText, null).subscribe((note) => {
-      console.log(note);
-      this.alertService.success('Succesfully submitted note', 4000);
-      this.scrollDown();
-      this.project.staffNotes++;
-      // TODO: if it errors restore the note into the textarea
+    this.staffNoteService.addNote(this.project, noteText, null).subscribe({
+      next: (note) => {
+        console.log(note);
+        this.alertService.success('Succesfully submitted note', 4000);
+        this.scrollDown();
+        this.project.staffNotes++;
+      },
+      error: (error) => {
+        this.alertService.error(`Failed to create note: ${error}`, 4000);
+        this.noteText = noteText;
+      },
+    });
+  }
+
+  public updateNote() {
+    const noteText = this.editingNoteText.trim();
+    if (noteText === '' || !this.editingNote) {
+      return;
+    }
+
+    this.staffNoteService.updateNote(this.project, this.editingNote, noteText).subscribe({
+      next: (note) => {
+        this.alertService.success('Succesfully updated note', 4000);
+        this.editingNote = null;
+        this.editingNoteText = '';
+      },
+      error: (error) => {
+        this.alertService.error(`Failed to update note: ${error}`, 4000);
+      },
     });
   }
 
@@ -68,4 +94,26 @@ export class StaffNotesComponent implements OnInit {
   public replyToNote(note: StaffNote) {
     console.log('replying to note...');
   }
+
+  public editNote(note: StaffNote) {
+    this.editingNote = note;
+    this.editingNoteText = note.note;
+    setTimeout(() => {
+      this.autoResizeStaffNoteEditor();
+      this.staffNoteEditor?.nativeElement.focus();
+    });
+  }
+
+  public cancelEditingNote() {
+    this.editingNote = null;
+    this.editingNoteText = '';
+  }
+
+  private autoResizeStaffNoteEditor() {
+    const el = this.staffNoteEditor.nativeElement;
+    console.log(el);
+    el.style.height = 'auto';
+    el.offsetHeight;
+    el.style.height = el.scrollHeight + 'px';
+  }
 }

From 159f9f31322503102ec9d70ed10f59b29a9a64f0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:51:01 +1000
Subject: [PATCH 356/776] chore: confirm deleting staff note

---
 .../states/staff-notes/staff-notes.component.ts        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index 84a297b2df..e39f159d3a 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -2,6 +2,7 @@ import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core';
 import {Project, User, UserService} from 'src/app/api/models/doubtfire-model';
 import {StaffNote} from 'src/app/api/models/staff-note';
 import {StaffNoteService} from 'src/app/api/services/staff-note.service';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
@@ -26,6 +27,7 @@ export class StaffNotesComponent implements OnInit {
     private userService: UserService,
     private staffNoteService: StaffNoteService,
     private alertService: AlertService,
+    private confirmationModalService: ConfirmationModalService,
   ) {}
   ngOnInit(): void {
     this.loadingStaffNotes = true;
@@ -88,7 +90,13 @@ export class StaffNotesComponent implements OnInit {
   }
 
   public deleteNote(note: StaffNote) {
-    note.delete();
+    this.confirmationModalService.show(
+      'Delete note',
+      'Are you sure want to delete this staff note?',
+      () => {
+        note.delete();
+      },
+    );
   }
 
   public replyToNote(note: StaffNote) {

From 40078df477bd300c9b8897976d10658fb91a6d04 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 15:17:31 +1000
Subject: [PATCH 357/776] feat: reply to ui

---
 .../staff-notes/staff-notes.component.html    | 38 +++++++++++++------
 .../staff-notes/staff-notes.component.ts      |  9 ++++-
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 15fede437d..a10f7a79de 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -69,18 +69,32 @@ <h1 class="mat-headline m-0">Staff Notes</h1>
       }
     </div>
 
-    <div class="h-[150px] border-t border-gray-300 p-4 flex">
-      <mat-form-field appearance="outline" class="flex items-center w-full">
-        <mat-label>Staff Note</mat-label>
-        <textarea
-          matInput
-          [(ngModel)]="noteText"
-          class="resize-none w-full px-2 py-1 placeholder:px-2 placeholder:py-1"
-        ></textarea>
-        <div class="flex justify-end">
-          <button mat-raised-button color="primary" (click)="submitNote()">Submit</button>
+  <div class="h-[150px] border-t border-gray-300 p-4">
+    @if (replyingToNote) {
+      <div
+        class="text-base px-2 py-2 select-none rounded-t-md border border-b-0 border-gray-300 flex justify-between items-center"
+      >
+        <div>
+          <mat-icon class="mr-4">reply</mat-icon>
+          <span>
+            Replying to {{ replyingToNote.user.firstName }} {{ replyingToNote.user.lastName }}:
+            {{ replyingToNote.note }}</span
+          >
         </div>
-      </mat-form-field>
-    </div>
+        <mat-icon (click)="cancelReplyingToNote()">close</mat-icon>
+      </div>
+    }
+
+    <mat-form-field appearance="outline" class="flex items-center w-full">
+      <mat-label>Staff Note</mat-label>
+      <textarea
+        matInput
+        [(ngModel)]="noteText"
+        class="resize-none w-full px-2 py-1 placeholder:px-2 placeholder:py-1"
+      ></textarea>
+      <div class="flex justify-end">
+        <button mat-raised-button color="primary" (click)="submitNote()">Submit</button>
+      </div>
+    </mat-form-field>
   </div>
 </div>
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index e39f159d3a..52054d3eac 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -23,6 +23,8 @@ export class StaffNotesComponent implements OnInit {
   editingNote?: StaffNote;
   editingNoteText?: string = '';
 
+  replyingToNote?: StaffNote;
+
   constructor(
     private userService: UserService,
     private staffNoteService: StaffNoteService,
@@ -57,12 +59,13 @@ export class StaffNotesComponent implements OnInit {
 
     this.noteText = '';
 
-    this.staffNoteService.addNote(this.project, noteText, null).subscribe({
+    this.staffNoteService.addNote(this.project, noteText, this.replyingToNote).subscribe({
       next: (note) => {
         console.log(note);
         this.alertService.success('Succesfully submitted note', 4000);
         this.scrollDown();
         this.project.staffNotes++;
+        this.replyingToNote = null;
       },
       error: (error) => {
         this.alertService.error(`Failed to create note: ${error}`, 4000);
@@ -100,8 +103,12 @@ export class StaffNotesComponent implements OnInit {
   }
 
   public replyToNote(note: StaffNote) {
+    this.replyingToNote = note;
     console.log('replying to note...');
   }
+  public cancelReplyingToNote() {
+    this.replyingToNote = null;
+  }
 
   public editNote(note: StaffNote) {
     this.editingNote = note;

From 65f8c71bd37ef71481bd14f591af263470987a6e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 15:18:59 +1000
Subject: [PATCH 358/776] feat: switch to staff note tab view

---
 src/app/doubtfire-angular.module.ts           |   2 +
 .../staff-notes-view.component.html           |  12 ++
 .../staff-notes-view.component.scss           |   0
 .../staff-notes-view.component.ts             |  10 ++
 .../task-dashboard.component.html             |   2 +-
 .../staff-notes/staff-notes.component.html    | 116 ++++++++----------
 .../tutor-discussion.component.html           |   8 +-
 .../tutor-discussion.component.ts             |  25 +++-
 8 files changed, 108 insertions(+), 67 deletions(-)
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.scss
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index ec2ae8da88..0ac33d30b7 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -270,6 +270,7 @@ import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-v
 import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.component';
 import {StaffNoteService} from './api/services/staff-note.service';
 import {LocalizedDatePipe} from './common/pipes/localized-date.pipe';
+import {StaffNotesViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -406,6 +407,7 @@ const MY_DATE_FORMAT = {
     TaskIlosCardComponent,
     JplagReportViewerComponent,
     StaffNotesComponent,
+    StaffNotesViewComponent,
     QrModalComponent,
     LocalizedDatePipe,
   ],
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html
new file mode 100644
index 0000000000..f1ed80aecf
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html
@@ -0,0 +1,12 @@
+<div class="p-4 h-[calc(100%-50px)]">
+  <div class="flex items-center">
+    <mat-icon class="mr-2">comment</mat-icon>
+    <h1 class="mat-headline m-0">Staff Notes</h1>
+    <span class="grow"></span>
+    <div class="example-action-buttons">
+      <button mat-button>Collapse All</button>
+    </div>
+  </div>
+
+  <f-staff-notes [project]="project"></f-staff-notes>
+</div>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.scss b/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.ts
new file mode 100644
index 0000000000..45e4e76048
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.ts
@@ -0,0 +1,10 @@
+import {Component, Input} from '@angular/core';
+
+@Component({
+  selector: 'f-staff-notes-view',
+  templateUrl: './staff-notes-view.component.html',
+  styleUrls: ['./staff-notes-view.component.scss'],
+})
+export class StaffNotesViewComponent {
+  @Input() project;
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
index 8aa130cadb..705ab5b6d3 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
@@ -17,7 +17,7 @@
     </ng-template>
 
     <ng-template [ngSwitchCase]="DashboardViews.staff_notes">
-      <f-staff-notes [project]="task.project"></f-staff-notes>
+      <f-staff-notes-view [project]="task.project"></f-staff-notes-view>
     </ng-template>
   </ng-container>
 
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index a10f7a79de..3bcf7d88d1 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -1,73 +1,65 @@
-<div class="p-4 h-[calc(100%-50px)]">
-  <div class="flex items-center">
-    <mat-icon class="mr-2">comment</mat-icon>
-    <h1 class="mat-headline m-0">Staff Notes</h1>
-    <span class="grow"></span>
-    <div class="example-action-buttons">
-      <button mat-button>Collapse All</button>
+<div class="flex flex-col h-full">
+  @if (!loadingStaffNotes && project?.staffNotes === 0) {
+    <div class="flex justify-center items-center w-full h-full text-gray-300">
+      No staff notes for {{ project.student.firstName }} {{ project.student.lastName }}
     </div>
-  </div>
-
-  <div class="flex flex-col h-full">
-    <div #staffNotesContainer class="flex-1 overflow-auto p-4">
-      @if (!loadingStaffNotes) {
-        @for (note of project?.staffNoteCache?.currentValues; track note) {
-          <mat-card
-            class="mb-4 p-5"
-            (mouseover)="note.hover = true"
-            (mouseout)="note.hover = false"
-          >
-            <div [hidden]="!note.hover" class="flex absolute right-5 bottom-5">
-              <mat-icon type="button" (click)="editNote(note)">edit</mat-icon>
-              <mat-icon type="button" (click)="replyToNote(note)">reply</mat-icon>
-              <mat-icon type="button" (click)="deleteNote(note)">delete</mat-icon>
-            </div>
-            <div class="flex justify-between">
-              <mat-card-title class="flex items-center">
-                <user-icon size="25" [user]="note.user" style="margin-right: 8px"></user-icon>
-                {{ note.user?.firstName }} {{ note.user?.lastName }}</mat-card-title
+  }
+  <div #staffNotesContainer class="flex-1 overflow-auto p-4">
+    @if (!loadingStaffNotes) {
+      @for (note of project?.staffNoteCache?.currentValues; track note) {
+        <mat-card class="mb-4 p-5" (mouseover)="note.hover = true" (mouseout)="note.hover = false">
+          <div [hidden]="!note.hover" class="flex absolute right-5 bottom-5">
+            <mat-icon type="button" (click)="editNote(note)">edit</mat-icon>
+            <mat-icon type="button" (click)="replyToNote(note)">reply</mat-icon>
+            <mat-icon type="button" (click)="deleteNote(note)">delete</mat-icon>
+          </div>
+          <div class="flex justify-between">
+            <mat-card-title class="flex items-center">
+              <user-icon size="25" [user]="note.user" style="margin-right: 8px"></user-icon>
+              {{ note.user?.firstName }} {{ note.user?.lastName }}</mat-card-title
+            >
+            <div class="flex items-center">
+              <mat-card-subtitle
+                [matTooltip]="note.createdAt | localizedDateTime"
+                matTooltipPosition="above"
+                matTooltipShowDelay="1000"
+                >{{ note.createdAt | humanizedDate }}</mat-card-subtitle
               >
-              <div class="flex items-center">
-                <mat-card-subtitle
-                  [matTooltip]="note.createdAt | localizedDateTime"
-                  matTooltipPosition="above"
-                  matTooltipShowDelay="1000"
-                  >{{ note.createdAt | humanizedDate }}</mat-card-subtitle
-                >
-              </div>
             </div>
+          </div>
 
-            <mat-card-content class="py-4">
-              @if (editingNote && editingNote.id === note.id) {
-                <mat-form-field appearance="outline" class="flex items-center w-full">
-                  <mat-label>Update Note</mat-label>
-                  <textarea
-                    #staffNoteEditor
-                    matInput
-                    [(ngModel)]="editingNoteText"
-                    class="resize-none w-full px-2 py-1 placeholder:px-2 placeholder:py-1 overflow-hidden"
-                  ></textarea>
-                  <div class="flex justify-end gap-2">
-                    <button mat-raised-button color="" (click)="cancelEditingNote()">Cancel</button>
-                    <button mat-raised-button color="primary" (click)="updateNote(note)">
-                      Update Note
-                    </button>
-                  </div>
-                </mat-form-field>
-              } @else {
-                <div class="markdown-to-html" [innerHTML]="note.note | marked"></div>
-              }
-            </mat-card-content>
-          </mat-card>
-        }
-      } @else {
-        <!-- <div id="spinner">
+          <mat-card-content class="py-4">
+            @if (editingNote && editingNote.id === note.id) {
+              <mat-form-field appearance="outline" class="flex items-center w-full">
+                <mat-label>Update Note</mat-label>
+                <textarea
+                  (input)="autoResizeStaffNoteEditor()"
+                  #staffNoteEditor
+                  matInput
+                  [(ngModel)]="editingNoteText"
+                  class="resize-none w-full px-2 py-1 placeholder:px-2 placeholder:py-1 overflow-hidden"
+                ></textarea>
+                <div class="flex justify-end gap-2">
+                  <button mat-raised-button color="" (click)="cancelEditingNote()">Cancel</button>
+                  <button mat-raised-button color="primary" (click)="updateNote(note)">
+                    Update Note
+                  </button>
+                </div>
+              </mat-form-field>
+            } @else {
+              <div class="markdown-to-html" [innerHTML]="note.note | marked"></div>
+            }
+          </mat-card-content>
+        </mat-card>
+      }
+    } @else {
+      <!-- <div id="spinner">
           <mat-spinner
             class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50"
           ></mat-spinner>
         </div> -->
-      }
-    </div>
+    }
+  </div>
 
   <div class="h-[150px] border-t border-gray-300 p-4">
     @if (replyingToNote) {
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 95f700bb1f..2666384b41 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -70,7 +70,7 @@
                   class="notification"
                   [ngClass]="{
                     active: task.numNewComments > 0 || task.similaritiesDetected,
-                    similarities: task.similaritiesDetected
+                    similarities: task.similaritiesDetected,
                   }"
                 ></span>
                 <user-icon class="self-center" [user]="project?.student" [size]="30"> </user-icon>
@@ -161,12 +161,12 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
   }
 
   @if (selectedTask && project) {
-    <mat-tab-group dynamicHeight>
+    <mat-tab-group dynamicHeight (selectedTabChange)="onTabChange($event)">
       <mat-tab label="Task Comments"></mat-tab>
       <mat-tab label="Staff Notes"></mat-tab>
     </mat-tab-group>
 
-    @if (showComments) {
+    @if (footerTabView === TutorDiscussionTabView.SHOW_COMMENTS) {
       <div #commentspanel class="task-comment-panel inbox-panel w-full flex-1">
         <!-- <div class="w-full text-center py-4">{{ selectedTask?.definition.name }}</div> -->
 
@@ -181,6 +181,8 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
         >
         </task-comments-viewer>
       </div>
+    } @else if (footerTabView === TutorDiscussionTabView.SHOW_STAFF_NOTES) {
+      <f-staff-notes class="min-h-[350px]" [project]="project"></f-staff-notes>
     }
   }
 </div>
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 7570464462..07e5d5c3fe 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -1,5 +1,6 @@
 import {Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
 import {MatSelectionList} from '@angular/material/list';
+import {MatTabChangeEvent} from '@angular/material/tabs';
 import {StateService, UIRouter} from '@uirouter/core';
 import {Html5QrcodeScanner, Html5QrcodeScannerState} from 'html5-qrcode';
 import {
@@ -15,6 +16,10 @@ import {
 import {AlertService} from 'src/app/common/services/alert.service';
 import {GradeService} from 'src/app/common/services/grade.service';
 
+enum TutorDiscussionTabView {
+  SHOW_COMMENTS,
+  SHOW_STAFF_NOTES,
+}
 @Component({
   selector: 'f-tutor-discussion',
   templateUrl: './tutor-discussion.component.html',
@@ -43,7 +48,8 @@ export class TutorDiscussionComponent implements OnInit {
   private _unitId: number;
   private _projectId: number;
 
-  private showComments: boolean = true;
+  public TutorDiscussionTabView = TutorDiscussionTabView;
+  public footerTabView: TutorDiscussionTabView = TutorDiscussionTabView.SHOW_COMMENTS;
 
   constructor(
     private unitService: UnitService,
@@ -56,6 +62,23 @@ export class TutorDiscussionComponent implements OnInit {
     private taskCommentService: TaskCommentService,
   ) {}
 
+  onTabChange(event: MatTabChangeEvent): void {
+    if (event.index === 0) {
+      this.showComments();
+    } else if (event.index === 1) {
+      this.showStaffNotes();
+    }
+  }
+
+  public showComments() {
+    this.footerTabView = TutorDiscussionTabView.SHOW_COMMENTS;
+  }
+
+  public showStaffNotes() {
+    console.log('showing staff notes:)');
+    this.footerTabView = TutorDiscussionTabView.SHOW_STAFF_NOTES;
+  }
+
   public ngOnInit(): void {
     this.authService.afterAuthCall((result) => {
       if (!result) {

From 27726b3f1368031c24bf069bde4f930dd02c1e80 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 16:17:48 +1000
Subject: [PATCH 359/776] feat: link note that is being replied to

---
 src/app/api/models/staff-note.ts              |  3 +-
 src/app/api/services/staff-note.service.ts    | 14 +++++-
 .../staff-notes/staff-notes.component.html    | 49 +++++++++++++++----
 .../staff-notes/staff-notes.component.scss    | 13 +++++
 .../staff-notes/staff-notes.component.ts      | 15 +++++-
 5 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/src/app/api/models/staff-note.ts b/src/app/api/models/staff-note.ts
index 7b40755a61..f29cb3d749 100644
--- a/src/app/api/models/staff-note.ts
+++ b/src/app/api/models/staff-note.ts
@@ -10,7 +10,8 @@ export class StaffNote extends Entity {
   project: Project;
   user: User;
   note: string;
-  replyTo: StaffNote;
+  replyTo?: StaffNote;
+  replyToId: number;
   createdAt: Date;
   updatedAt: Date;
 
diff --git a/src/app/api/services/staff-note.service.ts b/src/app/api/services/staff-note.service.ts
index 0dba7837d0..7020798d46 100644
--- a/src/app/api/services/staff-note.service.ts
+++ b/src/app/api/services/staff-note.service.ts
@@ -19,7 +19,7 @@ export class StaffNoteService extends CachedEntityService<StaffNote> {
   ) {
     super(httpClient, API_URL);
 
-    this.mapping.addKeys('id', 'note', 'createdAt', 'updatedAt', {
+    this.mapping.addKeys('id', 'note', 'createdAt', 'updatedAt', 'replyToId', {
       keys: ['user', 'user_id'],
       toEntityFn: (data: object, key: string, staffNote: StaffNote) => {
         const userRole = staffNote.project.unit.staff.find((s) => s.user.id === data['user_id']);
@@ -61,6 +61,18 @@ export class StaffNoteService extends CachedEntityService<StaffNote> {
     );
   }
 
+  public updateStaffNoteReplies(staffNotes: readonly StaffNote[]) {
+    for (const note of staffNotes) {
+      if (note.replyToId) {
+        const repliedTo = staffNotes.find((n) => n.id === note.replyToId);
+        if (repliedTo) {
+          note.replyTo = repliedTo;
+          console.log(note, repliedTo);
+        }
+      }
+    }
+  }
+
   public updateNote(project: Project, note: StaffNote, text: string): Observable<StaffNote> {
     const pathId = {
       projectId: project.id,
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 3bcf7d88d1..25af49586f 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -7,8 +7,33 @@
   <div #staffNotesContainer class="flex-1 overflow-auto p-4">
     @if (!loadingStaffNotes) {
       @for (note of project?.staffNoteCache?.currentValues; track note) {
-        <mat-card class="mb-4 p-5" (mouseover)="note.hover = true" (mouseout)="note.hover = false">
-          <div [hidden]="!note.hover" class="flex absolute right-5 bottom-5">
+        @if (note.replyTo) {
+          <div
+            class="text-md px-2 py-2 select-none rounded-t-md border border-gray-300 flex items-center justify-between"
+          >
+            <div
+              class="flex items-center hover:text-blue-500 hover:underline cursor-pointer"
+              (click)="scrollToNote(note.replyTo)"
+            >
+              <mat-icon class="mr-3 mt-1">reply</mat-icon>
+              <div class="flex flex-col">
+                <span class="font-medium">
+                  Replying to {{ note.replyTo.user.firstName }} {{ note.replyTo.user.lastName }} ({{
+                    note.replyTo.user.nickname
+                  }})
+                </span>
+                <span class="text-base text-gray-600">{{ note.replyTo.note }}</span>
+              </div>
+            </div>
+          </div>
+        }
+        <mat-card
+          [id]="'note-' + note.id"
+          class="mb-4 p-5"
+          (mouseover)="hoveredNoteId = note.id"
+          (mouseout)="hoveredNoteId = null"
+        >
+          <div [hidden]="hoveredNoteId !== note.id" class="flex absolute right-5 bottom-5">
             <mat-icon type="button" (click)="editNote(note)">edit</mat-icon>
             <mat-icon type="button" (click)="replyToNote(note)">reply</mat-icon>
             <mat-icon type="button" (click)="deleteNote(note)">delete</mat-icon>
@@ -64,16 +89,20 @@
   <div class="h-[150px] border-t border-gray-300 p-4">
     @if (replyingToNote) {
       <div
-        class="text-base px-2 py-2 select-none rounded-t-md border border-b-0 border-gray-300 flex justify-between items-center"
+        class="text-md px-2 py-2 select-none rounded-t-md border border-b-0 border-gray-300 flex items-center justify-between"
       >
-        <div>
-          <mat-icon class="mr-4">reply</mat-icon>
-          <span>
-            Replying to {{ replyingToNote.user.firstName }} {{ replyingToNote.user.lastName }}:
-            {{ replyingToNote.note }}</span
-          >
+        <div class="flex items-center">
+          <mat-icon class="mr-3 mt-1">reply</mat-icon>
+          <div class="flex flex-col">
+            <span class="font-medium">
+              Replying to {{ replyingToNote.user.firstName }} {{ replyingToNote.user.lastName }} ({{
+                replyingToNote.user.nickname
+              }})
+            </span>
+            <span class="text-base text-gray-600">{{ replyingToNote.note }}</span>
+          </div>
         </div>
-        <mat-icon (click)="cancelReplyingToNote()">close</mat-icon>
+        <mat-icon class="cursor-pointer" (click)="cancelReplyingToNote()">close</mat-icon>
       </div>
     }
 
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.scss b/src/app/projects/states/staff-notes/staff-notes.component.scss
index ad36534972..a6d41ed2d2 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.scss
+++ b/src/app/projects/states/staff-notes/staff-notes.component.scss
@@ -12,3 +12,16 @@
 .mat-icon:hover {
   color: black;
 }
+
+@keyframes blueGlowFade {
+  0% {
+    background-color: rgba(66, 133, 244, 0.6);
+  }
+  100% {
+    background-color: transparent;
+  }
+}
+
+.flash-highlight {
+  animation: blueGlowFade 1s ease-out;
+}
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index 52054d3eac..42c2c54e5f 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -25,6 +25,8 @@ export class StaffNotesComponent implements OnInit {
 
   replyingToNote?: StaffNote;
 
+  hoveredNoteId: number | null = null;
+
   constructor(
     private userService: UserService,
     private staffNoteService: StaffNoteService,
@@ -36,6 +38,7 @@ export class StaffNotesComponent implements OnInit {
     this.staffNoteService.loadStaffNotes(this.project).subscribe((notes) => {
       console.log(notes);
       this.loadingStaffNotes = false;
+      this.staffNoteService.updateStaffNoteReplies(this.project?.staffNoteCache.currentValues);
       this.scrollDown();
     });
   }
@@ -66,6 +69,7 @@ export class StaffNotesComponent implements OnInit {
         this.scrollDown();
         this.project.staffNotes++;
         this.replyingToNote = null;
+        this.staffNoteService.updateStaffNoteReplies(this.project?.staffNoteCache.currentValues);
       },
       error: (error) => {
         this.alertService.error(`Failed to create note: ${error}`, 4000);
@@ -124,11 +128,20 @@ export class StaffNotesComponent implements OnInit {
     this.editingNoteText = '';
   }
 
-  private autoResizeStaffNoteEditor() {
+  public autoResizeStaffNoteEditor() {
     const el = this.staffNoteEditor.nativeElement;
     console.log(el);
     el.style.height = 'auto';
     el.offsetHeight;
     el.style.height = el.scrollHeight + 'px';
   }
+
+  scrollToNote(note: StaffNote): void {
+    const el = document.getElementById(`note-${note.id}`);
+    if (el) {
+      el.scrollIntoView({behavior: 'smooth', block: 'center'});
+      el.classList.add('flash-highlight');
+      setTimeout(() => el.classList.remove('flash-highlight'), 1000);
+    }
+  }
 }

From c11cec02ece3b6bf7c2e36998ee2fa2a3572bc58 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 16:35:40 +1000
Subject: [PATCH 360/776] feat: add icon to discussed in class update

---
 .../task-comments-viewer.component.html                    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index 534b03ec8d..7f4a87e8d1 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -72,12 +72,15 @@
 
               <div
                 *ngSwitchCase="'discussed_in_class'"
-                class="comment-status"
+                class="w-full flex flex-col items-center"
                 [matTooltip]="comment.createdAt | humanizedDate"
                 matTooltipPosition="above"
                 matTooltipShowDelay="1000"
               >
-                <hr class="hr-text" [attr.data-content]="comment.text" />
+                <mat-icon class="m-auto" style="color: #9696969d">group</mat-icon>
+                <div class="comment-status">
+                  <hr class="hr-text" [attr.data-content]="comment.text" />
+                </div>
               </div>
 
               <div *ngSwitchCase="'plan'" class="comment-status">

From c3e288ae95e2fa5fd43bdf3922e81501f26e1baf Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 16:43:42 +1000
Subject: [PATCH 361/776] feat: indicate reply has been deleted

---
 src/app/api/models/staff-note.ts              |  1 +
 src/app/api/services/staff-note.service.ts    |  4 +++-
 .../staff-notes/staff-notes.component.html    | 22 +++++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/app/api/models/staff-note.ts b/src/app/api/models/staff-note.ts
index f29cb3d749..6831c6fe1c 100644
--- a/src/app/api/models/staff-note.ts
+++ b/src/app/api/models/staff-note.ts
@@ -39,6 +39,7 @@ export class StaffNote extends Entity {
         next: (response: object) => {
           AppInjector.get(AlertService).error('Successfully deleted staff note', 4000);
           this.project.staffNotes--;
+          staffNoteService.updateStaffNoteReplies(this.project.staffNoteCache.currentValues);
         },
         error: (error: any) => {
           AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
diff --git a/src/app/api/services/staff-note.service.ts b/src/app/api/services/staff-note.service.ts
index 7020798d46..ad730b5be9 100644
--- a/src/app/api/services/staff-note.service.ts
+++ b/src/app/api/services/staff-note.service.ts
@@ -67,7 +67,9 @@ export class StaffNoteService extends CachedEntityService<StaffNote> {
         const repliedTo = staffNotes.find((n) => n.id === note.replyToId);
         if (repliedTo) {
           note.replyTo = repliedTo;
-          console.log(note, repliedTo);
+        } else {
+          // Remove deleted replies
+          note.replyTo = null;
         }
       }
     }
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 25af49586f..1bc085e1c0 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -7,22 +7,26 @@
   <div #staffNotesContainer class="flex-1 overflow-auto p-4">
     @if (!loadingStaffNotes) {
       @for (note of project?.staffNoteCache?.currentValues; track note) {
-        @if (note.replyTo) {
+        @if (note.replyToId) {
           <div
             class="text-md px-2 py-2 select-none rounded-t-md border border-gray-300 flex items-center justify-between"
           >
             <div
-              class="flex items-center hover:text-blue-500 hover:underline cursor-pointer"
+              class="flex items-center"
+              [ngClass]="note.replyTo && 'hover:text-blue-500 hover:underline cursor-pointer'"
               (click)="scrollToNote(note.replyTo)"
             >
-              <mat-icon class="mr-3 mt-1">reply</mat-icon>
+              <mat-icon class="mr-3">reply</mat-icon>
               <div class="flex flex-col">
-                <span class="font-medium">
-                  Replying to {{ note.replyTo.user.firstName }} {{ note.replyTo.user.lastName }} ({{
-                    note.replyTo.user.nickname
-                  }})
-                </span>
-                <span class="text-base text-gray-600">{{ note.replyTo.note }}</span>
+                @if (note.replyTo) {
+                  <span class="font-medium">
+                    Replying to {{ note.replyTo.user.firstName }}
+                    {{ note.replyTo.user.lastName }} ({{ note.replyTo.user.nickname }})
+                  </span>
+                  <span class="text-base text-gray-600">{{ note.replyTo.note }}</span>
+                } @else {
+                  <span class="text-base text-gray-400 italic">Replying to: Deleted note</span>
+                }
               </div>
             </div>
           </div>

From a83a875f25efbe9297fe76d773ef4ff55456bcf8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 17:22:42 +1000
Subject: [PATCH 362/776] fix: show edit icon for authors only

---
 src/app/api/models/staff-note.ts                       |  7 ++++++-
 src/app/api/services/staff-note.service.ts             |  1 -
 .../states/staff-notes/staff-notes.component.html      |  4 +++-
 .../states/staff-notes/staff-notes.component.ts        | 10 +++++-----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/app/api/models/staff-note.ts b/src/app/api/models/staff-note.ts
index 6831c6fe1c..d83980c8bd 100644
--- a/src/app/api/models/staff-note.ts
+++ b/src/app/api/models/staff-note.ts
@@ -1,5 +1,5 @@
 import {Entity} from 'ngx-entity-service';
-import {Project, Unit, User} from './doubtfire-model';
+import {Project, Unit, User, UserService} from './doubtfire-model';
 import {AppInjector} from 'src/app/app-injector';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {StaffNoteService} from '../services/staff-note.service';
@@ -31,6 +31,11 @@ export class StaffNote extends Entity {
     return this.project.id;
   }
 
+  public get authorIsMe(): boolean {
+    const userService: UserService = AppInjector.get(UserService);
+    return this.user.id === userService.currentUser.id;
+  }
+
   public delete() {
     const staffNoteService: StaffNoteService = AppInjector.get(StaffNoteService);
     staffNoteService
diff --git a/src/app/api/services/staff-note.service.ts b/src/app/api/services/staff-note.service.ts
index ad730b5be9..dab14f1fb3 100644
--- a/src/app/api/services/staff-note.service.ts
+++ b/src/app/api/services/staff-note.service.ts
@@ -36,7 +36,6 @@ export class StaffNoteService extends CachedEntityService<StaffNote> {
     return new StaffNote(other);
   }
 
-  // TODO: use originalNote for replies
   public addNote(project: Project, text: string, originalNote: StaffNote): Observable<StaffNote> {
     const pathId = {
       projectId: project.id,
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 1bc085e1c0..59ef109cd6 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -38,7 +38,9 @@
           (mouseout)="hoveredNoteId = null"
         >
           <div [hidden]="hoveredNoteId !== note.id" class="flex absolute right-5 bottom-5">
-            <mat-icon type="button" (click)="editNote(note)">edit</mat-icon>
+            @if (note.authorIsMe) {
+              <mat-icon type="button" (click)="editNote(note)">edit</mat-icon>
+            }
             <mat-icon type="button" (click)="replyToNote(note)">reply</mat-icon>
             <mat-icon type="button" (click)="deleteNote(note)">delete</mat-icon>
           </div>
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index 42c2c54e5f..43731d3643 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -1,5 +1,5 @@
 import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core';
-import {Project, User, UserService} from 'src/app/api/models/doubtfire-model';
+import {Project, UserService} from 'src/app/api/models/doubtfire-model';
 import {StaffNote} from 'src/app/api/models/staff-note';
 import {StaffNoteService} from 'src/app/api/services/staff-note.service';
 import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
@@ -36,7 +36,6 @@ export class StaffNotesComponent implements OnInit {
   ngOnInit(): void {
     this.loadingStaffNotes = true;
     this.staffNoteService.loadStaffNotes(this.project).subscribe((notes) => {
-      console.log(notes);
       this.loadingStaffNotes = false;
       this.staffNoteService.updateStaffNoteReplies(this.project?.staffNoteCache.currentValues);
       this.scrollDown();
@@ -64,7 +63,6 @@ export class StaffNotesComponent implements OnInit {
 
     this.staffNoteService.addNote(this.project, noteText, this.replyingToNote).subscribe({
       next: (note) => {
-        console.log(note);
         this.alertService.success('Succesfully submitted note', 4000);
         this.scrollDown();
         this.project.staffNotes++;
@@ -108,13 +106,16 @@ export class StaffNotesComponent implements OnInit {
 
   public replyToNote(note: StaffNote) {
     this.replyingToNote = note;
-    console.log('replying to note...');
   }
   public cancelReplyingToNote() {
     this.replyingToNote = null;
   }
 
   public editNote(note: StaffNote) {
+    if (!note.authorIsMe) {
+      return;
+    }
+
     this.editingNote = note;
     this.editingNoteText = note.note;
     setTimeout(() => {
@@ -130,7 +131,6 @@ export class StaffNotesComponent implements OnInit {
 
   public autoResizeStaffNoteEditor() {
     const el = this.staffNoteEditor.nativeElement;
-    console.log(el);
     el.style.height = 'auto';
     el.offsetHeight;
     el.style.height = el.scrollHeight + 'px';

From 020ab5b9a98a401835e41bee7abc3dee70978c07 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 17:38:50 +1000
Subject: [PATCH 363/776] feat: view staff notes in portfolio assessment

---
 src/app/doubtfire-angularjs.module.ts               |  5 +++++
 src/app/units/states/portfolios/portfolios.coffee   |  8 ++++++--
 src/app/units/states/portfolios/portfolios.tpl.html | 12 ++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 9f50a9a293..3f3afb544c 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -225,6 +225,7 @@ import {D2lUnitDetailsModal} from './units/states/edit/directives/unit-details-e
 import {D2lTransferModal} from './units/states/portfolios/d2l-transfer-modal/d2l-transfer.component';
 import {LearningOutcomeEditorComponent} from './common/learning-outcome-editor/learning-outcome-editor.component';
 import {FeedbackTemplateService} from './api/services/feedback-template.service';
+import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.component';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -484,6 +485,10 @@ DoubtfireAngularJSModule.directive(
   'fTaskIlosCard',
   downgradeComponent({component: TaskIlosCardComponent}),
 );
+DoubtfireAngularJSModule.directive(
+  'fStaffNotes',
+  downgradeComponent({component: StaffNotesComponent}),
+);
 
 // Global configuration
 
diff --git a/src/app/units/states/portfolios/portfolios.coffee b/src/app/units/states/portfolios/portfolios.coffee
index 42bebca567..362a3fc365 100644
--- a/src/app/units/states/portfolios/portfolios.coffee
+++ b/src/app/units/states/portfolios/portfolios.coffee
@@ -55,14 +55,18 @@ angular.module('doubtfire.units.states.portfolios', [])
       title: "View Progress"
       subtitle: "See the progress of the student"
       seq: 1
+    viewStaffNotes:
+      title: "View Staff Notes"
+      subtitle: "See notes of the student add by staff"
+      seq: 2
     viewPortfolio:
       title: "View Portfolio"
       subtitle: "See the portfolio of the student"
-      seq: 2
+      seq: 3
     assessPortfolio:
       title: "Assess Portfolio"
       subtitle: "Enter a grade for the student"
-      seq: 3
+      seq: 4
 
   $scope.setActiveTab($scope.tabs.selectStudent)
 
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index e43941ec2c..eb0d20f7b5 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -267,6 +267,18 @@ <h3 class="panel-title">Review Progress of {{selectedStudent.student.name}}</h3>
       </div>
     </div>
 
+    <div class="panel panel-primary" ng-show="activeTab == tabs.viewStaffNotes">
+      <div class="panel-heading clearfix">
+        <div class="pull-left">
+          <h3 class="panel-title">Review Staff Notes for {{selectedStudent.student.name}}</h3>
+          View internal notes recorded by staff about the student.
+        </div>
+      </div>
+      <div class="panel-body">
+        <f-staff-notes ng-if="project" [project]="project"></f-staff-notes>
+      </div>
+    </div>
+
     <div class="panel panel-primary" ng-show="activeTab == tabs.viewPortfolio">
       <div class="panel-heading clearfix">
         <div class="pull-left">

From 5c018b650338fbc1628d30e9a08e7b45ac8b40f2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 17:45:26 +1000
Subject: [PATCH 364/776] chore: display students name

---
 .../directives/staff-notes-view/staff-notes-view.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html
index f1ed80aecf..c1882ac917 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html
@@ -1,7 +1,7 @@
 <div class="p-4 h-[calc(100%-50px)]">
   <div class="flex items-center">
     <mat-icon class="mr-2">comment</mat-icon>
-    <h1 class="mat-headline m-0">Staff Notes</h1>
+    <h1 class="mat-headline m-0">Staff Notes for {{ project?.student?.name }}</h1>
     <span class="grow"></span>
     <div class="example-action-buttons">
       <button mat-button>Collapse All</button>

From 55f3351b19b912424a7aaeec656f871f67d12cf8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 10 Jul 2025 17:57:20 +1000
Subject: [PATCH 365/776] chore: remove action button

---
 .../staff-notes-view/staff-notes-view.component.html          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html
index c1882ac917..8b57557240 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component.html
@@ -2,10 +2,6 @@
   <div class="flex items-center">
     <mat-icon class="mr-2">comment</mat-icon>
     <h1 class="mat-headline m-0">Staff Notes for {{ project?.student?.name }}</h1>
-    <span class="grow"></span>
-    <div class="example-action-buttons">
-      <button mat-button>Collapse All</button>
-    </div>
   </div>
 
   <f-staff-notes [project]="project"></f-staff-notes>

From b49960c055c43ceba4666683ed4220eee45655ca Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 14 Jul 2025 09:52:07 +1000
Subject: [PATCH 366/776] chore: rename staff note count property

---
 src/app/api/models/project.ts                             | 2 +-
 src/app/api/models/staff-note.ts                          | 2 +-
 src/app/api/services/project.service.ts                   | 2 +-
 src/app/api/services/staff-note.service.ts                | 1 -
 src/app/common/footer/footer.component.html               | 8 ++++----
 .../states/staff-notes/staff-notes.component.html         | 2 +-
 .../projects/states/staff-notes/staff-notes.component.ts  | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index 76cc26bb9e..167aeb1ec5 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -64,7 +64,7 @@ export class Project extends Entity {
 
   public similarityFlag: boolean = false;
 
-  public staffNotes: number;
+  public staffNoteCount: number;
 
   public constructor(unit?: Unit) {
     super();
diff --git a/src/app/api/models/staff-note.ts b/src/app/api/models/staff-note.ts
index d83980c8bd..bcd1b00e34 100644
--- a/src/app/api/models/staff-note.ts
+++ b/src/app/api/models/staff-note.ts
@@ -43,7 +43,7 @@ export class StaffNote extends Entity {
       .subscribe({
         next: (response: object) => {
           AppInjector.get(AlertService).error('Successfully deleted staff note', 4000);
-          this.project.staffNotes--;
+          this.project.staffNoteCount--;
           staffNoteService.updateStaffNoteReplies(this.project.staffNoteCache.currentValues);
         },
         error: (error: any) => {
diff --git a/src/app/api/services/project.service.ts b/src/app/api/services/project.service.ts
index f796649bc5..eaa661b1ce 100644
--- a/src/app/api/services/project.service.ts
+++ b/src/app/api/services/project.service.ts
@@ -67,7 +67,7 @@ export class ProjectService extends CachedEntityService<Project> {
       'compilePortfolio',
       'similarityFlag',
       'specConDays',
-      'staffNotes',
+      'staffNoteCount',
       {
         keys: 'hasPortfolio',
         toEntityFn: (data: object, key: string, entity: Project, params?: any) => {
diff --git a/src/app/api/services/staff-note.service.ts b/src/app/api/services/staff-note.service.ts
index dab14f1fb3..c025dcd932 100644
--- a/src/app/api/services/staff-note.service.ts
+++ b/src/app/api/services/staff-note.service.ts
@@ -96,7 +96,6 @@ export class StaffNoteService extends CachedEntityService<StaffNote> {
   }
 
   public loadStaffNotes(project: Project, useFetch: boolean = false): Observable<StaffNote[]> {
-    console.log(project);
     const options: RequestOptions<StaffNote> = {
       endpointFormat: this.endpointFormat,
       cache: project.staffNoteCache,
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index a3315cde41..1d7166ca35 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -114,17 +114,17 @@
       }
       @if (selectedTask?.project) {
         <div class="relative inline-block">
-          @if (selectedTask.project.staffNotes > 0) {
-            <div [matBadge]="selectedTask.project.staffNotes"></div>
+          @if (selectedTask.project.staffNoteCount > 0) {
+            <div [matBadge]="selectedTask.project.staffNoteCount"></div>
           }
           <button
             #similaritiesButton
             mat-icon-button
             [matTooltip]="
               'Student has ' +
-              (selectedTask.project.staffNotes || 'no') +
+              (selectedTask.project.staffNoteCount || 'no') +
               ' staff note' +
-              (selectedTask.project.staffNotes !== 1 ? 's' : '')
+              (selectedTask.project.staffNoteCount !== 1 ? 's' : '')
             "
             matTooltipPosition="above"
             aria-label="View detected similarities"
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 59ef109cd6..4d1b6fb978 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -1,5 +1,5 @@
 <div class="flex flex-col h-full">
-  @if (!loadingStaffNotes && project?.staffNotes === 0) {
+  @if (!loadingStaffNotes && project?.staffNoteCount === 0) {
     <div class="flex justify-center items-center w-full h-full text-gray-300">
       No staff notes for {{ project.student.firstName }} {{ project.student.lastName }}
     </div>
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.ts b/src/app/projects/states/staff-notes/staff-notes.component.ts
index 43731d3643..78821277a5 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.ts
+++ b/src/app/projects/states/staff-notes/staff-notes.component.ts
@@ -65,7 +65,7 @@ export class StaffNotesComponent implements OnInit {
       next: (note) => {
         this.alertService.success('Succesfully submitted note', 4000);
         this.scrollDown();
-        this.project.staffNotes++;
+        this.project.staffNoteCount++;
         this.replyingToNote = null;
         this.staffNoteService.updateStaffNoteReplies(this.project?.staffNoteCache.currentValues);
       },

From baaca11cfd1c483d572f3e98ea1f53035fccc321 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 14 Jul 2025 10:09:23 +1000
Subject: [PATCH 367/776] chore: rename statuses to include

---
 .../states/tutor-discussion/tutor-discussion.component.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 07e5d5c3fe..321d3d2160 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -24,7 +24,7 @@ enum TutorDiscussionTabView {
   selector: 'f-tutor-discussion',
   templateUrl: './tutor-discussion.component.html',
   styleUrl: './tutor-discussion.component.scss',
-  encapsulation: ViewEncapsulation.None, // enables custom material-ui css
+  // encapsulation: ViewEncapsulation.None, // enables custom material-ui css
 })
 export class TutorDiscussionComponent implements OnInit {
   @Input() unitId: number;
@@ -249,7 +249,7 @@ export class TutorDiscussionComponent implements OnInit {
     this.decodeQrCode('{"unitId":2,"projectId":20}');
   }
 
-  statusesToFetch: TaskStatusEnum[] = [
+  statusesToInclude: TaskStatusEnum[] = [
     'demonstrate',
     'ready_for_feedback',
     'discuss',
@@ -265,7 +265,7 @@ export class TutorDiscussionComponent implements OnInit {
 
   public viewAllFilteredTasks() {
     const discussionTasks = this.project?.tasks.filter((task) =>
-      this.statusesToFetch.includes(task.status),
+      this.statusesToInclude.includes(task.status),
     );
     this.filteredTasks = [...discussionTasks];
   }
@@ -286,7 +286,7 @@ export class TutorDiscussionComponent implements OnInit {
       })
       .then((project) => {
         const discussionTasks = project.tasks.filter((task) =>
-          this.statusesToFetch.includes(task.status),
+          this.statusesToInclude.includes(task.status),
         );
         this.filteredTasks = [...discussionTasks];
         this.allTasks = [

From c3a6450c135081d6d5669fd294386e8d21e49271 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 14 Jul 2025 10:17:34 +1000
Subject: [PATCH 368/776] chore: avoid prompting students for camera
 permissions

---
 .../tutor-discussion.component.ts                 | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 321d3d2160..d16e40a46b 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
+import {AfterViewInit, Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
 import {MatSelectionList} from '@angular/material/list';
 import {MatTabChangeEvent} from '@angular/material/tabs';
 import {StateService, UIRouter} from '@uirouter/core';
@@ -12,6 +12,7 @@ import {
   TaskStatusEnum,
   Unit,
   UnitService,
+  UserService,
 } from 'src/app/api/models/doubtfire-model';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {GradeService} from 'src/app/common/services/grade.service';
@@ -24,9 +25,9 @@ enum TutorDiscussionTabView {
   selector: 'f-tutor-discussion',
   templateUrl: './tutor-discussion.component.html',
   styleUrl: './tutor-discussion.component.scss',
-  // encapsulation: ViewEncapsulation.None, // enables custom material-ui css
+  encapsulation: ViewEncapsulation.None, // enables custom material-ui css
 })
-export class TutorDiscussionComponent implements OnInit {
+export class TutorDiscussionComponent implements AfterViewInit {
   @Input() unitId: number;
   @Input() projectId: number;
 
@@ -54,6 +55,7 @@ export class TutorDiscussionComponent implements OnInit {
   constructor(
     private unitService: UnitService,
     private authService: AuthenticationService,
+    private userService: UserService,
     private projectService: ProjectService,
     private gradeService: GradeService,
     private state: StateService,
@@ -75,15 +77,18 @@ export class TutorDiscussionComponent implements OnInit {
   }
 
   public showStaffNotes() {
-    console.log('showing staff notes:)');
     this.footerTabView = TutorDiscussionTabView.SHOW_STAFF_NOTES;
   }
 
-  public ngOnInit(): void {
+  public ngAfterViewInit(): void {
     this.authService.afterAuthCall((result) => {
       if (!result) {
         return this.state.go('sign_in');
       } else {
+        if (this.userService.currentUser.systemRole === 'Student') {
+          // Avoid prompting students for camera permissions before redirecting to unauthorised state
+          return;
+        }
         if (!this.project) {
           if (this.unitId && this.projectId) {
             this._projectId = Number(this.projectId);

From b5c35d9cb0be11a6c6cbd49d9e6aee37bb5b83cd Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 14 Jul 2025 10:35:40 +1000
Subject: [PATCH 369/776] fix: update discussion route

---
 .../directives/task-status-card/task-status-card.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index ce98073f59..c2b7992cd1 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -69,8 +69,8 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
   }
 
   openDiscussionQrCode(): void {
-    const url = `${this.doubtfireConstants.API_URL}/tutor/marking?unitId=${this.task.unit.id}&projectId=${this.task.project.id}`;
-    console.log(url);
+    const hostName = this.doubtfireConstants.API_URL.replace('/api', '');
+    const url = `${hostName}/tutor-discussion?unitId=${this.task.unit.id}&projectId=${this.task.project.id}`;
     this.qrModalService.show(url);
   }
 

From 0fc87310129ac54290622b7fea39ca14a2d9ccd2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 14 Jul 2025 10:35:57 +1000
Subject: [PATCH 370/776] chore: remove unused css

---
 .../tutor-discussion.component.scss           | 204 +-----------------
 1 file changed, 7 insertions(+), 197 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.scss b/src/app/projects/states/tutor-discussion/tutor-discussion.component.scss
index 63b738af9c..37fe08fe84 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.scss
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.scss
@@ -16,119 +16,6 @@ $my-palette: mat.define-palette($md-formatif);
   border-right-width: 1px;
 }
 
-// ::ng-deep .cdk-virtual-scroll-content-wrapper {
-//   width: 100%;
-// }
-
-// .task-inbox.full-width {
-//   .inbox-entry {
-//     padding-right: 8px;
-//     padding-left: 6px;
-//     width: 100%;
-//     height: 100%;
-//   }
-// }
-
-$warn-color: #f44336;
-
-// .pin-container {
-//   display: flex;
-//   justify-content: center;
-//   align-items: center;
-
-//   .mat-icon {
-//     color: #bcc0c4;
-//   }
-// }
-
-// .task-inbox {
-//   height: 100%;
-//   overflow-x: hidden;
-// }
-
-// .task-inbox.narrow-width {
-//   max-width: 60px;
-//   width: 60px;
-//   min-width: 60px;
-//   margin: 0;
-
-//   .inbox-entry {
-//     padding-right: 0px;
-//     width: 45px;
-//     height: 100%;
-//     padding-left: 5px;
-//   }
-// }
-
-// .scrollable {
-//   height: 100%;
-//   @include scrollable();
-// }
-
-// .openSearchDialog {
-//   border-radius: 40px;
-//   width: 40px;
-//   height: 40px;
-//   background-color: var(--background-gray);
-// }
-
-// .omnisearch {
-//   background-color: var(--background-gray);
-//   font-size: 15px;
-//   padding-right: 10px;
-//   text-align: left;
-
-//   &.expanded {
-//     height: 100%;
-//   }
-
-//   &.mobile {
-//   }
-
-//   .search {
-//     background-color: transparent;
-//     border: hidden;
-//     outline: none;
-//   }
-
-//   .mdc-icon-button {
-//     display: flex;
-//   }
-// }
-
-.new_comments {
-  font-size: 10px;
-  font-weight: 700;
-
-  width: 2em;
-  height: 2em;
-
-  margin-left: 10px;
-  box-sizing: initial;
-
-  background: $warn-color;
-  -webkit-font-smoothing: antialiased;
-  color: #fff;
-  text-align: center;
-  border-radius: 50%;
-
-  line-height: 2em;
-  box-sizing: content-box;
-}
-
-// .task-badges {
-//   width: 50px;
-//   height: 35px;
-// }
-
-// .full-width {
-//   width: 100%;
-// }
-
-.search-settings-panel {
-  background-color: transparent;
-}
-
 :host ::ng-deep div.mat-expansion-panel-body {
   padding-right: 0 !important;
 }
@@ -137,31 +24,6 @@ user-icon {
   margin-right: 10px;
 }
 
-// .muted {
-//   color: rgba(0, 0, 0, 0.5);
-// }
-
-// .task-list-data {
-//   margin-top: 0px;
-//   .student-name {
-//     font-size: 15px;
-//     margin-bottom: -2px;
-//     margin-top: 8px;
-//   }
-
-//   .task-details {
-//     margin-bottom: 0px;
-//     font-size: 12px;
-//   }
-// }
-
-// .overflow {
-//   min-width: 40px;
-//   width: 40px;
-//   margin-right: -10px;
-//   margin-left: -10px;
-// }
-
 .mat-mdc-list-item {
   border: none;
 }
@@ -194,43 +56,14 @@ user-icon {
   cursor: pointer;
 }
 
-// .mat-mdc-list-item .item-content.selected {
-//   background-color: var(--background-gray);
-// }
+// .tasks-viewport.list-group-item-text-extended {
+//   margin-top: 0.5em;
+//   line-height: 1.3;
 
-// .task-inbox.narrow-width .mat-mdc-list-item .item-content.selected {
-//   margin-right: 12px;
-// }
-
-// :host {
-//   ::ng-deep.mat-pseudo-checkbox {
-//     display: none !important;
-//   }
-// }
-
-.tasks-viewport.list-group-item-text-extended {
-  margin-top: 0.5em;
-  line-height: 1.3;
-
-  p {
-    margin-bottom: 0;
-    padding: 0;
-    color: gray;
-  }
-}
-
-// .tasks-viewport {
-//   height: 100%;
-// }
-
-// .center-task-list {
-//   align-self: center;
-//   position: absolute;
-//   top: calc(50% + 40px);
-
-//   .mat-icon {
-//     // font-size: 50px;
-//     color: rgba(0, 0, 0, 0.2);
+//   p {
+//     margin-bottom: 0;
+//     padding: 0;
+//     color: gray;
 //   }
 // }
 
@@ -243,29 +76,6 @@ user-icon {
   width: 75px !important;
   height: 75px !important;
 }
-// .large-icon-button {
-//   width: 100px !important;
-//   height: 100px !important;
-//   padding: 0px !important;
-//   // display: inline-flex !important;
-//   // align-items: center;
-//   // justify-content: center;
-
-//   font-size: 35px;
-//   // & > *[role='img'] {
-//   //   width: 75px;
-//   //   height: 75px;
-//   //   font-size: 35px;
-//   //   svg {
-//   //     width: 75px;
-//   //     height: 75px;
-//   //   }
-//   // }
-//   .mat-mdc-button-touch-target {
-//     width: 100px !important;
-//     height: 100px !important;
-//   }
-// }
 
 // Hide auto-injected QR scanner elements that are not needed in the UI
 // We only hide this if we found a "back camera" on user's device

From 89fef431fae29b3c4c5a68ef7336f29534f640da Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 14 Jul 2025 14:27:34 +1000
Subject: [PATCH 371/776] chore: show discussion qr button

---
 src/app/api/models/task.ts                                  | 2 +-
 src/app/common/header/header.component.html                 | 6 ++++++
 .../task-status-card/task-status-card.component.html        | 6 +++---
 .../task-comments-viewer/task-comments-viewer.component.ts  | 3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2df069d3fd..2e9fe84256 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -711,7 +711,7 @@ export class Task extends Entity {
         options,
       )
       .subscribe({
-        next: (response) => {
+        next: (_response) => {
           taskService.notifyStatusChange(this);
           alerts.success('Task successfully marked as discussed in class.', 4000);
         },
diff --git a/src/app/common/header/header.component.html b/src/app/common/header/header.component.html
index 185a818593..a1682ce608 100644
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
@@ -79,6 +79,12 @@
         <mat-icon matListItemIcon aria-label="Edit profile">person</mat-icon>
         Edit Profile
       </button>
+      @if (currentUser.role !== 'Student') {
+        <button mat-menu-item uiSref="tutor-discussion">
+          <mat-icon matListItemIcon aria-label="Tutor Discussion">qr_code_scanner</mat-icon>
+          Discussion
+        </button>
+      }
       <button mat-menu-item (click)="openCalendar()">
         <mat-icon matListItemIcon aria-label="Edit calendar">calendar_month</mat-icon>
         Calendar
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
index 1406bd672e..24700b3b52 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
@@ -42,9 +42,9 @@ <h5>{{ task?.statusLabel() }}</h5>
     }
     @if (task?.inSubmittedState() && task?.requiresFileUpload()) {
       <button mat-stroked-button (click)="updateFilesInSubmission()">Upload new files</button>
-      <button mat-raised-button color="primary" (click)="openDiscussionQrCode()">
-        Show Discussion QR
-      </button>
     }
+    <button mat-raised-button color="primary" (click)="openDiscussionQrCode()">
+      Show Discussion QR
+    </button>
   </mat-card-actions>
 </mat-card>
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index b466c38780..f07b717db4 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -232,7 +232,8 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
       commentType === 'status' ||
       commentType == 'assessment' ||
       commentType === 'scorm' ||
-      commentType === 'scorm_extension'
+      commentType === 'scorm_extension' ||
+      commentType === 'discussed_in_class'
     );
   }
 

From 23e3bfd44dd1dbfde124e674f49548590a3b8b5c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 14 Jul 2025 14:27:57 +1000
Subject: [PATCH 372/776] chore: only check tasks ready to discuss

---
 .../states/tutor-discussion/tutor-discussion.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 2666384b41..00eeacfdb5 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -56,7 +56,7 @@
           class="clearfix w-full"
           style="padding: 0; height: 60px"
           togglePosition="before"
-          [selected]="true"
+          [selected]="task.status === 'discuss'"
         >
           @if (task) {
             <div class="w-full" id="{{ task.id }}">

From bf662d3e8f9302e2709c6951fde9f1417eba18b3 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 09:41:48 +1000
Subject: [PATCH 373/776] chore(release): 10.0.0-7

---
 CHANGELOG.md      | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a357c2d911..83cfec51ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,62 @@
 
 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.
 
+## [10.0.0-7](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-6...v10.0.0-7) (2025-07-14)
+
+
+### Features
+
+* add icon to discussed in class update ([c11cec0](https://github.com/macite/doubtfire-deploy/commit/c11cec02ece3b6bf7c2e36998ee2fa2a3572bc58))
+* add jplag report download button to student submission tutor teacher footer view ([2ec1b06](https://github.com/macite/doubtfire-deploy/commit/2ec1b06b5330c5e142cc3fc01c49c2aded5411cb))
+* add tutor discussion qr scanning ([e549c4e](https://github.com/macite/doubtfire-deploy/commit/e549c4e0ac9377bd864c81122cffce004681c845))
+* auto send dicussed in class comment ([fbf90c7](https://github.com/macite/doubtfire-deploy/commit/fbf90c7fdfa440f565e2c8abae4ae62bc1fe70eb))
+* **comments:** enhanced drafting for messages using localStorage ([f331734](https://github.com/macite/doubtfire-deploy/commit/f33173409f0804da4de24e1e6ec53971896b28e9))
+* **comments:** enhanced drafting for messages using localStorage ([b6f6831](https://github.com/macite/doubtfire-deploy/commit/b6f683175db6ab9549b8b4481ab54bb89700016a))
+* edit staff note ([b2d8ba4](https://github.com/macite/doubtfire-deploy/commit/b2d8ba41b1dc467a03728d5df4ede6ac6fb3c9a1))
+* fetch new comments on task switching and status updates ([1b7da69](https://github.com/macite/doubtfire-deploy/commit/1b7da692423acaf53b96229b665b971360bacc89))
+* force scanner to use back camera, enhance ux ([e5799b1](https://github.com/macite/doubtfire-deploy/commit/e5799b18ec0603123b6a99b3733919d2611b4fbd))
+* highlight selected task ([25b361f](https://github.com/macite/doubtfire-deploy/commit/25b361f699ad54e45c32167ccae230635a6b2758))
+* indicate reply has been deleted ([c3e288a](https://github.com/macite/doubtfire-deploy/commit/c3e288ae95e2fa5fd43bdf3922e81501f26e1baf))
+* init qr tutor marking state ([41d1d61](https://github.com/macite/doubtfire-deploy/commit/41d1d61a417573e33c4344898ae6d7562c459004))
+* init reply to button ([100a533](https://github.com/macite/doubtfire-deploy/commit/100a5335aa7f37f4477b9d9b8f43806ca32c640b))
+* init staff notes ([c7eed99](https://github.com/macite/doubtfire-deploy/commit/c7eed9903bcc4463f4d0b52889e0d3d9045b03ba))
+* jplag report download button in task explorer view ([16670a2](https://github.com/macite/doubtfire-deploy/commit/16670a27d5dc544ae828da85cda48358cab4d75e))
+* link note that is being replied to ([27726b3](https://github.com/macite/doubtfire-deploy/commit/27726b3f1368031c24bf069bde4f930dd02c1e80))
+* load jplag report viewer into iframe ([1360438](https://github.com/macite/doubtfire-deploy/commit/13604383b403dbf82b013786127a72fab08ac895))
+* localized date time pipe ([5cf752b](https://github.com/macite/doubtfire-deploy/commit/5cf752baf1b9de6105ea2a951ec75818ce1e0cfc))
+* mark task as discussed ([a54f94f](https://github.com/macite/doubtfire-deploy/commit/a54f94f045b4280d0f13304a6b5728b62fc4107e))
+* message tooltip timestamps ([2d79007](https://github.com/macite/doubtfire-deploy/commit/2d79007c033d56218326f55dd8d6821e17fec74f))
+* native jplag report viewer state ([8f6bc6a](https://github.com/macite/doubtfire-deploy/commit/8f6bc6ae5b80502b5d81b65bab2be3aaa56ce42f))
+* qr code generation for student projects ([6f8b94f](https://github.com/macite/doubtfire-deploy/commit/6f8b94f7c0b48d292dfe28871ff7ae7fda86b2b9))
+* redirect back to home if exiting the scanner ([71f09ae](https://github.com/macite/doubtfire-deploy/commit/71f09ae77da6f0a2f5ed135071c92c110940c2f5))
+* reply to ui ([40078df](https://github.com/macite/doubtfire-deploy/commit/40078df477bd300c9b8897976d10658fb91a6d04))
+* show number of notes project has ([f3d4c4c](https://github.com/macite/doubtfire-deploy/commit/f3d4c4c00128ca00dec18ea9950c01df25b75b61))
+* staff note deletion ([0ab1ebf](https://github.com/macite/doubtfire-deploy/commit/0ab1ebff3964d8665d9560bf3007a2d30109ee37))
+* switch to staff note tab view ([65f8c71](https://github.com/macite/doubtfire-deploy/commit/65f8c71bd37ef71481bd14f591af263470987a6e))
+* task and unit ilos ui ([1cef438](https://github.com/macite/doubtfire-deploy/commit/1cef438b458efcee4adce01cc81648d32bb97f35))
+* view filtered tasks only button ([a4e422d](https://github.com/macite/doubtfire-deploy/commit/a4e422dcf3dfa329b83cd7e3d521fc3665c9c45f))
+* view staff notes in portfolio assessment ([020ab5b](https://github.com/macite/doubtfire-deploy/commit/020ab5b9a98a401835e41bee7abc3dee70978c07))
+
+
+### Bug Fixes
+
+* allow oversized images to be scrollable ([8ff67d2](https://github.com/macite/doubtfire-deploy/commit/8ff67d2f8e483813bc3af0dc2429b58fe16f8f2b))
+* avoid fetching twice if no comments are cached yet ([d219d49](https://github.com/macite/doubtfire-deploy/commit/d219d49ca6457119084d4c3d2cb39343dece5aa0))
+* decode url from qr code ([31822ab](https://github.com/macite/doubtfire-deploy/commit/31822abaa4c66e2dcbc3ab74c71fe0f6e9b5861d))
+* discussed context type ([d87e620](https://github.com/macite/doubtfire-deploy/commit/d87e620ab54aa75f03d8295f0319798214ad39f0))
+* display load more button only if there are more tasks ([84d5bca](https://github.com/macite/doubtfire-deploy/commit/84d5bcaa4f6329ed34f30a58d88e18fce9c3a76d))
+* enable unit name text wrapping ([5f779b8](https://github.com/macite/doubtfire-deploy/commit/5f779b8cb626ada2e8b6488812424813cc5e9913))
+* ensure jplag iframe extends to full height ([7ae6466](https://github.com/macite/doubtfire-deploy/commit/7ae6466e6586ceaf58edec8a741c9e2f8a737c0c))
+* ensure scanner doesn't break on ios ([a0b010e](https://github.com/macite/doubtfire-deploy/commit/a0b010ef31161b6cf2ab1038deb82c199ffb9ecb))
+* improve task similarity notice ui ([ba26841](https://github.com/macite/doubtfire-deploy/commit/ba2684192c2a8a139237affc4c0702af901f1808))
+* match comments-modals's original max width ([7edb445](https://github.com/macite/doubtfire-deploy/commit/7edb445d7bc5f61daba1b47a3a36b633b551267e))
+* merge conflict ([e599fe3](https://github.com/macite/doubtfire-deploy/commit/e599fe35ec338cfd7f5ffc419a3379d3f3160312))
+* show edit icon for authors only ([a83a875](https://github.com/macite/doubtfire-deploy/commit/a83a875f25efbe9297fe76d773ef4ff55456bcf8))
+* support markdown ([3ac10f6](https://github.com/macite/doubtfire-deploy/commit/3ac10f6cab39dab42ce19f61029488d220786703))
+* **task-comment-composer:** deleting the key when text is empty ([6ef91e0](https://github.com/macite/doubtfire-deploy/commit/6ef91e0ddb119e03dbaf2b6e53e450e5bcc58b8b))
+* update discussion route ([b5c35d9](https://github.com/macite/doubtfire-deploy/commit/b5c35d9cb0be11a6c6cbd49d9e6aee37bb5b83cd))
+* welcome page redirect issues ([14ad26e](https://github.com/macite/doubtfire-deploy/commit/14ad26e8ed4acf6f77043447a2691360fd62ce51))
+
 ## [10.0.0-6](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-5...v10.0.0-6) (2025-06-13)
 
 
diff --git a/package-lock.json b/package-lock.json
index fd959caf30..61e3cd180e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-6",
+  "version": "10.0.0-7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-6",
+      "version": "10.0.0-7",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 27d2605514..a37c6edd3b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-6",
+  "version": "10.0.0-7",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 782ac542a8a17a8732ea1cec08583decd8fa8d0c Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 12:30:18 +1000
Subject: [PATCH 374/776] chore: ensure web build has access to jplag

---
 .github/workflows/deployment.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 124fe4c2ae..13a3b6046d 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -17,6 +17,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub

From 1e42eddde03796834177bb33a86f0c39119daffb Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 12:30:26 +1000
Subject: [PATCH 375/776] chore(release): 10.0.0-8

---
 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 83cfec51ef..21bbf937b3 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.
 
+## [10.0.0-8](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-7...v10.0.0-8) (2025-07-15)
+
 ## [10.0.0-7](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-6...v10.0.0-7) (2025-07-14)
 
 
diff --git a/package-lock.json b/package-lock.json
index 61e3cd180e..146aff4aba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-7",
+  "version": "10.0.0-8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-7",
+      "version": "10.0.0-8",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index a37c6edd3b..a8f19f584e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-7",
+  "version": "10.0.0-8",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 566f3f17b8f54fe43129cb3d402bf843386a337f Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 12:39:09 +1000
Subject: [PATCH 376/776] chore: add submodule checkout to web gitaction

---
 .github/workflows/deployment.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 13a3b6046d..853e33956e 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -51,6 +51,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub

From 76665229a11f911bfe26a46189bc6de2284c8b12 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 12:39:15 +1000
Subject: [PATCH 377/776] chore(release): 10.0.0-9

---
 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 21bbf937b3..d0a3983bc8 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.
 
+## [10.0.0-9](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-8...v10.0.0-9) (2025-07-15)
+
 ## [10.0.0-8](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-7...v10.0.0-8) (2025-07-15)
 
 ## [10.0.0-7](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-6...v10.0.0-7) (2025-07-14)
diff --git a/package-lock.json b/package-lock.json
index 146aff4aba..f13ac1eae6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-8",
+  "version": "10.0.0-9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-8",
+      "version": "10.0.0-9",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index a8f19f584e..9935356392 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-8",
+  "version": "10.0.0-9",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From eb1dc844db87b710e8238304c7baa07959bc3165 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 14:24:33 +1000
Subject: [PATCH 378/776] chore: remove web dev container and update nginx
 version

---
 .github/workflows/deployment.yml | 68 ++++++++++++++++----------------
 deploy.Dockerfile                |  2 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 853e33956e..40d35b9eee 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -10,40 +10,40 @@ on:
   # deployment:
   # workflow_dispatch:
 jobs:
-  docker-deploy-development-image:
-    if: github.repository_owner == 'doubtfire-lms'
-    environment: deployment-secrets
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        if: github.event_name != 'pull_request'
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Setup meta for development image
-        id: docker_meta
-        uses: docker/metadata-action@v5
-        with:
-          images: lmsdoubtfire/doubtfire-web
-          tags: |
-            type=semver,pattern={{major}}.{{minor}}.x-dev
-      - name: Build and push web server
-        id: docker_build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+  # docker-deploy-development-image:
+  #   if: github.repository_owner == 'doubtfire-lms'
+  #   environment: deployment-secrets
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v4
+  #       with:
+  #         submodules: recursive
+  #     - name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v3
+  #     - name: Login to DockerHub
+  #       uses: docker/login-action@v3
+  #       if: github.event_name != 'pull_request'
+  #       with:
+  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
+  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
+  #     - name: Setup meta for development image
+  #       id: docker_meta
+  #       uses: docker/metadata-action@v5
+  #       with:
+  #         images: lmsdoubtfire/doubtfire-web
+  #         tags: |
+  #           type=semver,pattern={{major}}.{{minor}}.x-dev
+  #     - name: Build and push web server
+  #       id: docker_build
+  #       uses: docker/build-push-action@v5
+  #       with:
+  #         context: .
+  #         push: ${{ github.event_name != 'pull_request' }}
+  #         tags: ${{ steps.docker_meta.outputs.tags }}
+  #         labels: ${{ steps.meta.outputs.labels }}
+  #     - name: Image digest
+  #       run: echo ${{ steps.docker_build.outputs.digest }}
   docker-web-server:
     if: github.repository_owner == 'doubtfire-lms'
     environment: deployment-secrets
diff --git a/deploy.Dockerfile b/deploy.Dockerfile
index 2326fca4ec..9aa69355e3 100644
--- a/deploy.Dockerfile
+++ b/deploy.Dockerfile
@@ -17,7 +17,7 @@ RUN npm run-script deploy
 
 
 ## STAGE 2: Host ###
-FROM nginx:1.21.5-alpine
+FROM nginx:1.29.0-alpine
 
 # Remove the default Nginx configuration file
 RUN rm -v /etc/nginx/nginx.conf

From f36e97b4c70059b47dc4363d242d017216dc08d2 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 14:24:40 +1000
Subject: [PATCH 379/776] chore(release): 10.0.0-10

---
 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 d0a3983bc8..5fa473bd72 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.
 
+## [10.0.0-10](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-9...v10.0.0-10) (2025-07-15)
+
 ## [10.0.0-9](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-8...v10.0.0-9) (2025-07-15)
 
 ## [10.0.0-8](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-7...v10.0.0-8) (2025-07-15)
diff --git a/package-lock.json b/package-lock.json
index f13ac1eae6..f629961613 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-9",
+  "version": "10.0.0-10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-9",
+      "version": "10.0.0-10",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 9935356392..2237d3f40b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-9",
+  "version": "10.0.0-10",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 81d0548b0a0192f740a8c585666889e48d3624c5 Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 14:37:57 +1000
Subject: [PATCH 380/776] chore: ensure nginx serves index.html files in
 folders

---
 nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index 2c812d87e0..679f2082fc 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -16,7 +16,7 @@ http {
         add_header Permissions-Policy "microphone=(self),speaker=(self),fullscreen=(self),payment=(none)" always;
 
         location / {
-          try_files $uri $uri/ /index.html;
+          try_files $uri $uri/ $uri/index.html /index.html;
         }
     }
 

From 62ce89cc6e22e2e83eee1c7ced4328cfc101c56f Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 14:38:03 +1000
Subject: [PATCH 381/776] chore(release): 10.0.0-11

---
 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 5fa473bd72..8d047afa85 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.
 
+## [10.0.0-11](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-10...v10.0.0-11) (2025-07-15)
+
 ## [10.0.0-10](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-9...v10.0.0-10) (2025-07-15)
 
 ## [10.0.0-9](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-8...v10.0.0-9) (2025-07-15)
diff --git a/package-lock.json b/package-lock.json
index f629961613..4cda2ce16f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-10",
+  "version": "10.0.0-11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-10",
+      "version": "10.0.0-11",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 2237d3f40b..5cb8a3332b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-10",
+  "version": "10.0.0-11",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 69b55bb85d8583b6935e08c91aad63e98e6ce887 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 15 Jul 2025 16:55:15 +1000
Subject: [PATCH 382/776] fix: exclude jplag route from ngsw cache

---
 ngsw-config.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ngsw-config.json b/ngsw-config.json
index a72a88ca4e..8c80cd0891 100644
--- a/ngsw-config.json
+++ b/ngsw-config.json
@@ -46,5 +46,6 @@
         ]
       }
     }
-  ]
+  ],
+  "navigationUrls": ["/**", "!/**/*.*", "!/**/*__*", "!/**/*__*/**", "!/JPlag/**", "!/JPlag"]
 }

From d64029a9765ca7100c29e9a10345ea408f53f9f7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 15 Jul 2025 16:55:32 +1000
Subject: [PATCH 383/776] build: ignore .git file

---
 angular.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/angular.json b/angular.json
index 38069805ec..178af4749b 100644
--- a/angular.json
+++ b/angular.json
@@ -28,7 +28,7 @@
               {
                 "input": "./JPlag-Report-Viewer",
                 "output": "/JPlag",
-                "glob": "**/!(*.gitignore|README.md)"
+                "glob": "**/!(*.gitignore|README.md|.git)"
               }
             ],
             "styles": [

From e97f7996d87e979a9a3f27beb14a9aa8062a498f Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Tue, 15 Jul 2025 17:02:18 +1000
Subject: [PATCH 384/776] chore(release): 10.0.0-12

---
 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 8d047afa85..38ce4d69b8 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.
 
+## [10.0.0-12](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-11...v10.0.0-12) (2025-07-15)
+
+
+### Bug Fixes
+
+* exclude jplag route from ngsw cache ([69b55bb](https://github.com/macite/doubtfire-deploy/commit/69b55bb85d8583b6935e08c91aad63e98e6ce887))
+
 ## [10.0.0-11](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-10...v10.0.0-11) (2025-07-15)
 
 ## [10.0.0-10](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-9...v10.0.0-10) (2025-07-15)
diff --git a/package-lock.json b/package-lock.json
index 4cda2ce16f..6df34d1831 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-11",
+  "version": "10.0.0-12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-11",
+      "version": "10.0.0-12",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 5cb8a3332b..a622cd5c99 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-11",
+  "version": "10.0.0-12",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From c886034d4bf69851f4b06599a45bd1b135c3fff2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:38:22 +1000
Subject: [PATCH 385/776] fix: display task-date-slider only when task exists

---
 .../task-description-card.component.html                      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html
index 48f76aaa7c..aa8601876a 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html
@@ -7,7 +7,9 @@
   </mat-card-header>
   <mat-card-content>
     <div class="markdown-to-pdf" [innerHTML]="taskDef?.description | marked"></div>
-    <f-task-date-slider [task]="task" />
+    @if (task) {
+      <f-task-date-slider [task]="task" />
+    }
     <ul>
       <li>{{ grades.names[taskDef?.targetGrade] }} Task</li>
       <li>Start Date &mdash; Aim to start this task by {{ startDate() | date: 'EEE d MMM' }}.</li>

From 53912939df5255ca4a2e44392c9ddf7ee99062db Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 16 Jul 2025 16:03:52 +1000
Subject: [PATCH 386/776] refactor: use mat card for discussed in class status

---
 .../task-comments-viewer.component.html        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index 7f4a87e8d1..8201eb6d01 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -72,15 +72,23 @@
 
               <div
                 *ngSwitchCase="'discussed_in_class'"
-                class="w-full flex flex-col items-center"
+                class="w-full flex flex-col items-center my-2"
                 [matTooltip]="comment.createdAt | humanizedDate"
                 matTooltipPosition="above"
                 matTooltipShowDelay="1000"
               >
-                <mat-icon class="m-auto" style="color: #9696969d">group</mat-icon>
-                <div class="comment-status">
-                  <hr class="hr-text" [attr.data-content]="comment.text" />
-                </div>
+                <mat-card class="w-full self-end" appearance="outlined">
+                  <mat-card-header>
+                    <mat-icon class="m-auto" style="color: #9696969d">group</mat-icon>
+                  </mat-card-header>
+
+                  <mat-card-content
+                    style="color: #9696969d"
+                    class="flex flex-col justify-center items-center"
+                  >
+                    {{ comment.text }}
+                  </mat-card-content>
+                </mat-card>
               </div>
 
               <div *ngSwitchCase="'plan'" class="comment-status">

From f7d70b526da7e9ff2988150fab783003b0ab2ab9 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 16 Jul 2025 17:16:23 +1000
Subject: [PATCH 387/776] refactor: optional param to fetch tutor's student's
 tasks only

---
 src/app/api/services/task.service.ts          | 11 +++++--
 .../staff-task-list.component.ts              | 30 +++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 3a7fa66c99..9c83e0ba6e 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -98,7 +98,11 @@ export class TaskService extends CachedEntityService<Task> {
     return new Task(other as Project);
   }
 
-  public queryTasksForTaskInbox(unit: Unit, taskDef?: TaskDefinition | number): Observable<Task[]> {
+  public queryTasksForTaskInbox(
+    unit: Unit,
+    taskDef?: TaskDefinition | number,
+    fetchMyStudentsOnly?: boolean,
+  ): Observable<Task[]> {
     const cache: EntityCache<Task> = new EntityCache<Task>();
 
     return this.query(
@@ -109,7 +113,10 @@ export class TaskService extends CachedEntityService<Task> {
         endpointFormat: this.taskInboxEndpoint,
         cache: cache,
         constructorParams: unit,
-      }
+        params: {
+          my_students_only: fetchMyStudentsOnly,
+        },
+      },
     ).pipe(
       tap((tasks: Task[]) => {
         unit.incorporateTasks(tasks);
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index df7a490bd1..a9ef8af1d4 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -45,7 +45,11 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
   @Input() project: Project;
 
   @Input() taskData: {
-    source: (unit: Unit, taskDef: TaskDefinition | number) => Observable<Task[]>;
+    source: (
+      unit: Unit,
+      taskDef: TaskDefinition | number,
+      fetchMyStudentsOnly?: boolean,
+    ) => Observable<Task[]>;
     selectedTask: Task;
     taskKey: string;
     onSelectedTaskChange: (task: Task) => void;
@@ -103,6 +107,10 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
   originalFilteredTasks: any[] = null;
   allowHover = true;
 
+  // Track if all tasks have already been fetched
+  // Avoids redundant API calls when changing tutorial filters
+  fetchedAllTasks: boolean = false;
+
   constructor(
     private selectedTaskService: SelectedTaskService,
     private alertService: AlertService,
@@ -303,6 +311,10 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     this.applyFilters();
+
+    if (tutorialId === 'all' && !this.fetchedAllTasks) {
+      this.refreshData();
+    }
   }
 
   //  Task definition options
@@ -341,13 +353,19 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
 
   // Callback to refresh data from the task source
   private refreshData() {
+    const fetchMyStudentsOnly = this.filters.tutorialIdSelected === 'mine';
+
     this.loading = true;
     // Tasks for feedback or tasks for task, depending on the data source
-    this.taskData.source(this.unit, this.filters?.taskDefinitionIdSelected).subscribe({
-      next: (response) => {
-        this.tasks = response;
-        this.applyFilters();
-        this.loading = false;
+    this.taskData
+      .source(this.unit, this.filters?.taskDefinitionIdSelected, fetchMyStudentsOnly)
+      .subscribe({
+        next: (response) => {
+          this.tasks = response;
+          this.applyFilters();
+          this.loading = false;
+
+          this.fetchedAllTasks = !fetchMyStudentsOnly;
 
         // Load initial set task, either the one provided (by the URL)
         // then load actual task in now or the first task that applies

From 3c71eec1856b85b7e91702e58c1f8fc19bfe18ce Mon Sep 17 00:00:00 2001
From: Andrew Cain <macite@gmail.com>
Date: Wed, 16 Jul 2025 22:00:47 +1000
Subject: [PATCH 388/776] chore(release): 10.0.0-13

---
 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 38ce4d69b8..03a705ff44 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.
 
+## [10.0.0-13](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-12...v10.0.0-13) (2025-07-16)
+
+
+### Bug Fixes
+
+* display task-date-slider only when task exists ([c886034](https://github.com/macite/doubtfire-deploy/commit/c886034d4bf69851f4b06599a45bd1b135c3fff2))
+
 ## [10.0.0-12](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-11...v10.0.0-12) (2025-07-15)
 
 
diff --git a/package-lock.json b/package-lock.json
index 6df34d1831..3285e0664a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-12",
+  "version": "10.0.0-13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-12",
+      "version": "10.0.0-13",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index a622cd5c99..9de3c1a9a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-12",
+  "version": "10.0.0-13",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From b9691e793204e84fae323610a7b555b15e065514 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 17 Jul 2025 17:57:07 +1000
Subject: [PATCH 389/776] feat: sidekiq progress modal component

---
 src/app/api/models/sidekiq-job.ts             |  19 +++
 src/app/api/services/sidekiq-job.service.ts   |  71 ++++++++
 .../sidekiq-progress-modal.component.html     |  21 +++
 .../sidekiq-progress-modal.component.scss     |   0
 .../sidekiq-progress-modal.component.spec.ts  |  22 +++
 .../sidekiq-progress-modal.component.ts       | 152 ++++++++++++++++++
 .../sidekiq-progress-modal.service.ts         |  35 ++++
 src/app/doubtfire-angular.module.ts           |   4 +
 .../unit-students-editor.component.ts         |  83 ++++++----
 9 files changed, 379 insertions(+), 28 deletions(-)
 create mode 100644 src/app/api/models/sidekiq-job.ts
 create mode 100644 src/app/api/services/sidekiq-job.service.ts
 create mode 100644 src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html
 create mode 100644 src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.scss
 create mode 100644 src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.spec.ts
 create mode 100644 src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
 create mode 100644 src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts

diff --git a/src/app/api/models/sidekiq-job.ts b/src/app/api/models/sidekiq-job.ts
new file mode 100644
index 0000000000..644b907438
--- /dev/null
+++ b/src/app/api/models/sidekiq-job.ts
@@ -0,0 +1,19 @@
+import {Entity} from 'ngx-entity-service';
+
+export class SidekiqJob extends Entity {
+  id: string;
+  status: 'working' | 'queued' | 'complete' | 'retrying' | 'failed';
+  message?: string;
+
+  pctComplete: number;
+  processedCount?: number;
+  totalCount?: number;
+
+  jobClass: string; // name of the job, eg "StudentImportJob"
+
+  // Custom data unique to each job
+  result?: string;
+
+  createdAt: Date;
+  updatedAt: Date;
+}
diff --git a/src/app/api/services/sidekiq-job.service.ts b/src/app/api/services/sidekiq-job.service.ts
new file mode 100644
index 0000000000..b41b929925
--- /dev/null
+++ b/src/app/api/services/sidekiq-job.service.ts
@@ -0,0 +1,71 @@
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import {Observable} from 'rxjs';
+import API_URL from 'src/app/config/constants/apiURL';
+import {SidekiqJob} from '../models/sidekiq-job';
+
+@Injectable()
+export class SidekiqJobService extends CachedEntityService<SidekiqJob> {
+  protected readonly endpointFormat = 'sidekiq/:id:';
+
+  constructor(httpClient: HttpClient) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys(
+      'id',
+      'jobClass',
+      'status',
+      {
+        keys: 'pctComplete',
+        toEntityOp: (data: object, jsonKey: string, job: SidekiqJob, _params?) => {
+          job.pctComplete = Number(data[jsonKey]);
+        },
+      },
+      'message',
+      {
+        keys: 'processedCount',
+        toEntityOp: (data: object, jsonKey: string, job: SidekiqJob, _params?) => {
+          job.processedCount = Number(data[jsonKey]);
+        },
+      },
+      {
+        keys: 'totalCount',
+        toEntityOp: (data: object, jsonKey: string, job: SidekiqJob, _params?) => {
+          job.totalCount = Number(data[jsonKey]);
+        },
+      },
+      'result',
+      'createdAt',
+      'updatedAt',
+    );
+
+    this.mapping.addJsonKey(
+      'id',
+      'jobClass',
+      'status',
+      'message',
+      'result',
+      'createdAt',
+      'updatedAt',
+    );
+  }
+
+  public createInstanceFrom(_json: object): SidekiqJob {
+    return new SidekiqJob();
+  }
+
+  public getSidekiqJob(jobId: string): Observable<SidekiqJob> {
+    // TODO: cache the response to avoid fetching the same result data when the job is complete
+    return this.fetch(
+      {
+        id: jobId,
+      },
+      {
+        endpointFormat: this.endpointFormat,
+      },
+    );
+  }
+
+  // TODO: we could create endpoints to cancel/retry sidekiq jobs
+}
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html
new file mode 100644
index 0000000000..87ba0479c4
--- /dev/null
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html
@@ -0,0 +1,21 @@
+<div>
+  <h3 mat-dialog-title>
+    {{ data.title }}
+  </h3>
+  <mat-dialog-content>
+    <div>
+      This job is running in the background. You can close this dialog and monitor progress anytime.
+    </div>
+    <div class="flex justify-between w-full mt-5 mb-2">
+      <div>{{ job?.status === 'complete' ? 'Complete' : job?.message }}</div>
+      <div>{{ job?.processedCount }}/{{ job?.totalCount }} ({{ job?.pctComplete }}%)</div>
+    </div>
+    <mat-progress-bar mode="determinate" [value]="job?.pctComplete ?? 0"></mat-progress-bar>
+  </mat-dialog-content>
+  <mat-dialog-actions class="flex justify-between">
+    <button mat-raised-button (click)="dismissModal()">Dismiss</button>
+    @if (job?.status !== 'working' && job?.result) {
+      <button mat-raised-button color="primary" (click)="viewResult()">View Result</button>
+    }
+  </mat-dialog-actions>
+</div>
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.scss b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.spec.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.spec.ts
new file mode 100644
index 0000000000..f30dd067d3
--- /dev/null
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.spec.ts
@@ -0,0 +1,22 @@
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {SidekiqProgressModalComponent} from './sidekiq-progress-modal.component';
+
+describe('SidekiqProgressModalComponent', () => {
+  let component: SidekiqProgressModalComponent;
+  let fixture: ComponentFixture<SidekiqProgressModalComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SidekiqProgressModalComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SidekiqProgressModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
new file mode 100644
index 0000000000..890fdccb33
--- /dev/null
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
@@ -0,0 +1,152 @@
+import {Component, Inject, OnDestroy, OnInit} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {MatSnackBar} from '@angular/material/snack-bar';
+import {Subject} from 'rxjs';
+import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
+import {SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
+import {AlertService} from '../../services/alert.service';
+import {SidekiqProgressModalService} from './sidekiq-progress-modal.service';
+
+export interface SidekiqProgressModalData {
+  title: string;
+  jobId: string;
+  subject: Subject<SidekiqJob>;
+  pollFailureLimit?: number;
+}
+
+@Component({
+  selector: 'f-sidekiq-progress-modal',
+  templateUrl: './sidekiq-progress-modal.component.html',
+  styleUrl: './sidekiq-progress-modal.component.scss',
+})
+export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
+  private jobPollingInterval; // NodeJS.timeout
+
+  pollFailureCount: number = 0;
+  pollFailureLimit: number = 3;
+
+  public job?: SidekiqJob;
+
+  constructor(
+    @Inject(AlertService) private alertService: AlertService,
+    @Inject(MAT_DIALOG_DATA) public data: SidekiqProgressModalData,
+
+    public dialogRef: MatDialogRef<SidekiqProgressModalComponent, SidekiqProgressModalData>,
+    private sidekiqJobService: SidekiqJobService,
+    private sidekiqProgressModalService: SidekiqProgressModalService,
+    private snackBar: MatSnackBar,
+  ) {}
+
+  private shouldDisplayJobInProgressBar: boolean = true;
+
+  ngOnInit(): void {
+    this.pollFailureLimit = this.data.pollFailureLimit ?? 3;
+    this.pollFailureCount = 0;
+
+    this.getSidekiqJob();
+    this.jobPollingInterval = setInterval(() => {
+      this.getSidekiqJob();
+    }, 1000);
+
+    this.dialogRef.afterClosed().subscribe(() => {
+      clearInterval(this.jobPollingInterval);
+      this.displayJobInProgressBar();
+    });
+  }
+
+  private readonly JOBS_KEY = 'ontrack_background_jobs';
+
+  private storeJobId(jobId: string) {
+    // TODO: move jobId storage into its own service, we can later use it to render ui in the header
+    // TODO: this would allow the user to close their browser, wait for the job to complete, then view results after loading it up again
+    try {
+      const jobs: string[] = JSON.parse(localStorage.getItem(this.JOBS_KEY)) ?? [];
+      if (!jobs.includes(jobId)) {
+        jobs.push(jobId);
+      }
+      localStorage.setItem(this.JOBS_KEY, JSON.stringify(jobs));
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  private removeJobId(jobId: string) {
+    try {
+      const jobs: string[] = JSON.parse(localStorage.getItem(this.JOBS_KEY)) ?? [];
+      const updatedJobs = jobs.filter((job) => job !== jobId);
+      localStorage.setItem(this.JOBS_KEY, JSON.stringify(updatedJobs));
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  private getSidekiqJob() {
+    this.sidekiqJobService.getSidekiqJob(this.data.jobId).subscribe({
+      next: (job) => {
+        this.storeJobId(job.id);
+        this.job = job;
+        this.pollFailureCount = 0;
+
+        // TODO: update UI to indicate if its being queued, and not being worked yet
+        if (job.status === 'complete' || job.status === 'failed') {
+          clearInterval(this.jobPollingInterval);
+        }
+      },
+      error: (error) => {
+        console.error(error);
+        this.pollFailureCount += 1;
+
+        if (this.pollFailureCount >= this.pollFailureLimit) {
+          this.alertService.error(error, 6000);
+          clearInterval(this.jobPollingInterval);
+        }
+      },
+    });
+  }
+
+  ngOnDestroy(): void {
+    clearInterval(this.jobPollingInterval);
+  }
+
+  public viewResult() {
+    this.data.subject.next(this.job);
+
+    this.shouldDisplayJobInProgressBar = false;
+    this.dialogRef.close();
+    this.removeJobId(this.data.jobId);
+  }
+
+  public dismissModal() {
+    this.dialogRef.close();
+  }
+
+  public displayJobInProgressBar() {
+    if (!this.job) {
+      return;
+    }
+
+    if (!this.shouldDisplayJobInProgressBar) {
+      return;
+    }
+    this.shouldDisplayJobInProgressBar = false;
+
+    this.snackBar
+      .open(`Job in progress: ${this.data.title}`, 'View', {
+        verticalPosition: 'bottom',
+        horizontalPosition: 'center',
+      })
+      .afterDismissed()
+      .subscribe(() => {
+        // TODO: if we know we have more than 1 in progress job, we could display a modal of a list of jobs to view
+        // TODO: replace snack bar with an icon in the header?
+        this.sidekiqProgressModalService.show(this.data.title, this.data.jobId).subscribe({
+          next: (job) => {
+            this.data.subject.next(job);
+          },
+          error: (error) => {
+            console.error(error);
+          },
+        });
+      });
+  }
+}
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
new file mode 100644
index 0000000000..bb5ef27865
--- /dev/null
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
@@ -0,0 +1,35 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {
+  SidekiqProgressModalComponent,
+  SidekiqProgressModalData,
+} from './sidekiq-progress-modal.component';
+import {Subject} from 'rxjs';
+import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SidekiqProgressModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(title: string, jobId: string) {
+    const subject = new Subject<SidekiqJob>();
+
+    this.dialog.open<SidekiqProgressModalComponent, SidekiqProgressModalData>(
+      SidekiqProgressModalComponent,
+      {
+        data: {
+          title,
+          jobId,
+          subject: subject,
+          pollFailureLimit: 3,
+        },
+        position: {top: '2.5%'},
+        width: '100%',
+        maxWidth: '650px',
+      },
+    );
+    return subject;
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 0ac33d30b7..b552fd1167 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -271,6 +271,8 @@ import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.com
 import {StaffNoteService} from './api/services/staff-note.service';
 import {LocalizedDatePipe} from './common/pipes/localized-date.pipe';
 import {StaffNotesViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component';
+import {SidekiqProgressModalComponent} from './common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component';
+import {SidekiqJobService} from './api/services/sidekiq-job.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -410,6 +412,7 @@ const MY_DATE_FORMAT = {
     StaffNotesViewComponent,
     QrModalComponent,
     LocalizedDatePipe,
+    SidekiqProgressModalComponent,
   ],
   // Services we provide
   providers: [
@@ -495,6 +498,7 @@ const MY_DATE_FORMAT = {
     FeedbackTemplateService,
     NestedCsvDownloadModalService,
     StaffNoteService,
+    SidekiqJobService,
   ],
   imports: [
     FlexLayoutModule,
diff --git a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
index 0db5d3b722..bee6b65837 100644
--- a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
@@ -3,17 +3,18 @@ import {
   csvResultModalService,
   unitStudentEnrolmentModal,
 } from './../../../../../ajs-upgraded-providers';
-import { ViewChild, Component, Input, Inject, AfterViewInit, OnDestroy } from '@angular/core';
-import { MatTable, MatTableDataSource } from '@angular/material/table';
-import { MatSort, Sort } from '@angular/material/sort';
-import { MatPaginator } from '@angular/material/paginator';
-import { HttpClient } from '@angular/common/http';
-import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
-import { Project, ProjectService, Unit } from 'src/app/api/models/doubtfire-model';
-import { UIRouter } from '@uirouter/angular';
-import { Subscription } from 'rxjs';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { SpecConModalService } from 'src/app/common/modals/spec-con-modal/spec-con-modal.service';
+import {ViewChild, Component, Input, Inject, AfterViewInit, OnDestroy} from '@angular/core';
+import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {MatSort, Sort} from '@angular/material/sort';
+import {MatPaginator} from '@angular/material/paginator';
+import {HttpClient} from '@angular/common/http';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import {Project, ProjectService, Unit} from 'src/app/api/models/doubtfire-model';
+import {UIRouter} from '@uirouter/angular';
+import {Subscription} from 'rxjs';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {SpecConModalService} from 'src/app/common/modals/spec-con-modal/spec-con-modal.service';
+import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 
 @Component({
   selector: 'unit-students-editor',
@@ -21,15 +22,24 @@ import { SpecConModalService } from 'src/app/common/modals/spec-con-modal/spec-c
   styleUrls: ['unit-students-editor.component.scss'],
 })
 export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
-  @ViewChild(MatTable, { static: false }) table: MatTable<Project>;
-  @ViewChild(MatSort, { static: false }) sort: MatSort;
-  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
+  @ViewChild(MatTable, {static: false}) table: MatTable<Project>;
+  @ViewChild(MatSort, {static: false}) sort: MatSort;
+  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
 
   @Input() unit: Unit;
 
   private subscriptions: Subscription[] = [];
 
-  columns: string[] = ['username', 'firstName', 'lastName', 'email', 'campus', 'tutorial', 'enrolled', 'goto'];
+  columns: string[] = [
+    'username',
+    'firstName',
+    'lastName',
+    'email',
+    'campus',
+    'tutorial',
+    'enrolled',
+    'goto',
+  ];
   dataSource: MatTableDataSource<Project>;
 
   // Calls the parent's constructor, passing in an object
@@ -43,7 +53,8 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
     private fileDownloader: FileDownloaderService,
     private router: UIRouter,
     private projectService: ProjectService,
-    private specConModalService: SpecConModalService
+    private specConModalService: SpecConModalService,
+    private sidekiqProgressModalService: SidekiqProgressModalService,
   ) {}
 
   // The paginator is inside the table
@@ -56,13 +67,13 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
     this.subscriptions.push(
       this.unit.studentCache.values.subscribe((students) => {
         this.dataSource.data = students;
-      })
+      }),
     );
 
     this.subscriptions.push(
       this.projectService.loadStudents(this.unit, true).subscribe(() => {
         // projects included in unit...
-      })
+      }),
     );
   }
 
@@ -106,7 +117,11 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
   }
 
   public gotoStudent(student: Project) {
-    this.router.stateService.go('projects/dashboard', { projectId: student.id, tutor: true, taskAbbr: '' });
+    this.router.stateService.go('projects/dashboard', {
+      projectId: student.id,
+      tutor: true,
+      taskAbbr: '',
+    });
   }
 
   enrolStudent() {
@@ -117,15 +132,27 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
     this.csvUploadModal.show(
       'Upload Students to Enrol',
       'Test message',
-      { file: { name: 'Enrol CSV Data', type: 'csv' } },
+      {file: {name: 'Enrol CSV Data', type: 'csv'}},
       this.unit.enrolStudentsCSVUrl,
       (response: any) => {
-        // at least one student?
-        this.csvResultModal.show('Enrol Student CSV Results', response);
-        if (response.success.length > 0) {
-          this.unit.refreshStudents(true);
-        }
-      }
+        const jobId = response.job_id;
+        const status = response.status;
+        console.log(jobId, status);
+
+        this.sidekiqProgressModalService.show('Importing Students', jobId).subscribe({
+          next: (job) => {
+            const result = JSON.parse(job.result);
+            this.csvResultModal.show('Enrol Student CSV Results', result);
+            // at least one student?
+            if (result.success.length > 0) {
+              this.unit.refreshStudents(true);
+            }
+          },
+          error: (error) => {
+            console.error(error);
+          },
+        });
+      },
     );
   }
 
@@ -133,7 +160,7 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
     this.csvUploadModal.show(
       'Upload Students to Withdraw',
       'Test message',
-      { file: { name: 'Withdraw CSV Data', type: 'csv' } },
+      {file: {name: 'Withdraw CSV Data', type: 'csv'}},
       this.unit.withdrawStudentsCSVUrl,
       (response: any) => {
         // at least one student?
@@ -141,7 +168,7 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
         if (response.success.length > 0) {
           this.unit.refreshStudents(true);
         }
-      }
+      },
     );
   }
 

From 9000830e5e98bc0b921d618c034471eeddf996b4 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 21 Jul 2025 13:24:15 +1000
Subject: [PATCH 390/776] feat: portfolio zip downloading via sidekiq

---
 src/app/api/models/sidekiq-job.ts               |  2 +-
 src/app/api/services/unit.service.ts            |  8 ++++++++
 .../sidekiq-progress-modal.component.ts         |  6 ++++++
 src/app/doubtfire-angularjs.module.ts           |  6 ++++++
 .../unit-students-editor.component.ts           | 12 ++++++------
 .../units/states/portfolios/portfolios.coffee   | 15 +++++++++++++--
 .../units/states/portfolios/portfolios.tpl.html | 17 ++++++++---------
 7 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/app/api/models/sidekiq-job.ts b/src/app/api/models/sidekiq-job.ts
index 644b907438..fa1e8f1e14 100644
--- a/src/app/api/models/sidekiq-job.ts
+++ b/src/app/api/models/sidekiq-job.ts
@@ -2,7 +2,7 @@ import {Entity} from 'ngx-entity-service';
 
 export class SidekiqJob extends Entity {
   id: string;
-  status: 'working' | 'queued' | 'complete' | 'retrying' | 'failed';
+  status: 'queued' | 'working' | 'retrying' | 'complete' | 'stopped' | 'failed' | 'interrupted';
   message?: string;
 
   pctComplete: number;
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index 7193289049..9d0f33e9b7 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -9,6 +9,7 @@ import { TaskDefinitionService } from './task-definition.service';
 import { GroupService } from './group.service';
 import { Observable } from 'rxjs';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
 
 export type IloStats = {
   median: number;
@@ -299,4 +300,11 @@ export class UnitService extends CachedEntityService<Unit> {
 
     return httpClient.get<any>(url);
   }
+
+  public zipPortfolios(unit: Unit): Observable<SidekiqJob> {
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/submission/units/${unit.id}/portfolio/zip`;
+    const httpClient = AppInjector.get(HttpClient);
+
+    return httpClient.get<SidekiqJob>(url);
+  }
 }
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
index 890fdccb33..43dc98b7cf 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
@@ -81,6 +81,12 @@ export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
   }
 
   private getSidekiqJob() {
+    if (!this.data.jobId) {
+      clearInterval(this.jobPollingInterval);
+      this.shouldDisplayJobInProgressBar = false;
+      this.dialogRef.close();
+    }
+
     this.sidekiqJobService.getSidekiqJob(this.data.jobId).subscribe({
       next: (job) => {
         this.storeJobId(job.id);
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 3f3afb544c..1797da538a 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -226,6 +226,7 @@ import {D2lTransferModal} from './units/states/portfolios/d2l-transfer-modal/d2l
 import {LearningOutcomeEditorComponent} from './common/learning-outcome-editor/learning-outcome-editor.component';
 import {FeedbackTemplateService} from './api/services/feedback-template.service';
 import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.component';
+import {SidekiqProgressModalService} from './common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -316,6 +317,11 @@ DoubtfireAngularJSModule.factory(
   downgradeInjectable(FeedbackTemplateService),
 );
 
+DoubtfireAngularJSModule.factory(
+  'sidekiqProgressModalService',
+  downgradeInjectable(SidekiqProgressModalService),
+);
+
 // directive -> component
 DoubtfireAngularJSModule.directive(
   'taskCommentComposer',
diff --git a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
index bee6b65837..d03f7e8005 100644
--- a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
@@ -15,6 +15,7 @@ import {Subscription} from 'rxjs';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {SpecConModalService} from 'src/app/common/modals/spec-con-modal/spec-con-modal.service';
 import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
+import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
 
 @Component({
   selector: 'unit-students-editor',
@@ -134,12 +135,11 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
       'Test message',
       {file: {name: 'Enrol CSV Data', type: 'csv'}},
       this.unit.enrolStudentsCSVUrl,
-      (response: any) => {
-        const jobId = response.job_id;
-        const status = response.status;
-        console.log(jobId, status);
-
-        this.sidekiqProgressModalService.show('Importing Students', jobId).subscribe({
+      (response: SidekiqJob) => {
+        if (!response || !response.id) {
+          this.alerts.error('Failed to start student import job', 6000);
+        }
+        this.sidekiqProgressModalService.show('Importing Students', response.id).subscribe({
           next: (job) => {
             const result = JSON.parse(job.result);
             this.csvResultModal.show('Enrol Student CSV Results', result);
diff --git a/src/app/units/states/portfolios/portfolios.coffee b/src/app/units/states/portfolios/portfolios.coffee
index 362a3fc365..cad57c8f68 100644
--- a/src/app/units/states/portfolios/portfolios.coffee
+++ b/src/app/units/states/portfolios/portfolios.coffee
@@ -14,13 +14,24 @@ angular.module('doubtfire.units.states.portfolios', [])
       roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor']
    }
 )
-.controller("UnitPortfoliosStateCtrl", ($scope, alertService, analyticsService, gradeService, newProjectService, Visualisation, newTaskService, fileDownloaderService, newUserService, D2lTransferModal) ->
+.controller("UnitPortfoliosStateCtrl", ($scope, alertService, analyticsService, gradeService, newProjectService, Visualisation, newTaskService, fileDownloaderService, newUserService, D2lTransferModal, newUnitService, sidekiqProgressModalService) ->
   # TODO: (@alexcu) Break this down into smaller directives/substates
 
   $scope.unit.loadD2lMapping().subscribe()
 
   $scope.downloadGrades = -> fileDownloaderService.downloadFile($scope.unit.gradesUrl, "#{$scope.unit.code}-grades.csv")
-  $scope.downloadPortfolios = -> fileDownloaderService.downloadFile($scope.unit.portfoliosUrl, "#{$scope.unit.code}-portfolios.zip")
+
+  $scope.downloadPortfolios = ->
+    newUnitService.zipPortfolios($scope.unit).subscribe({
+      next: (newJob) ->
+        sidekiqProgressModalService.show("Download Portfolios", newJob.id).subscribe({
+          next: (job) ->
+            fileDownloaderService.downloadFile($scope.unit.portfoliosUrl, "#{$scope.unit.code}-portfolios.zip")
+          error: (message) -> alertService.error(message, 6000)
+        })
+      error: (message) -> alertService.error(message, 6000)
+    })
+
 
   $scope.studentFilter = 'allStudents'
   $scope.portfolioFilter = 'withPortfolio'
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index eb0d20f7b5..0e8466b9ce 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -229,16 +229,15 @@ <h4 class="panel-title">Mark Portfolios</h4>
         rotate="false"
       ></pagination>
       <div class="pull-right">
-        <!-- <button
-          class="btn btn-info"
-          ng-click="downloadPortfolios()"
-          tooltip-html-unsafe="<i class='fa fa-warning'></i> <strong>WARNING:</strong> Downloading all portfolios may take a long time"
-          tooltip-append-to-body="true"
-        >
+        <button ng-click="downloadPortfolios()" class="mr-3">
           <i class="fa fa-download"></i> Download All Portfolios
-        </button> -->
-        <button ng-click="downloadGrades()" style="padding-right: 1rem"><i class="fa fa-download"></i> Download Grades</button>
-        <button ng-if="hasD2lMapping()" ng-click="transferToD2L()"><i class="fa fa-upload"></i> Transfer Grades to D2L</button>
+        </button>
+        <button ng-click="downloadGrades()" style="padding-right: 1rem">
+          <i class="fa fa-download"></i> Download Grades
+        </button>
+        <button ng-if="hasD2lMapping()" ng-click="transferToD2L()">
+          <i class="fa fa-upload"></i> Transfer Grades to D2L
+        </button>
       </div>
     </div>
   </div>

From aa85665670a23fea556c6420f139e7e7853d16ba Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 21 Jul 2025 17:31:46 +1000
Subject: [PATCH 391/776] feat: show list of active sidekiq jobs

---
 src/app/api/services/sidekiq-job.service.ts   | 30 ++++++++-
 src/app/common/header/header.component.html   |  7 +-
 src/app/common/header/header.component.ts     | 15 +++++
 .../sidekiq-jobs-modal.component.html         | 21 ++++++
 .../sidekiq-jobs-modal.component.scss         |  0
 .../sidekiq-jobs-modal.component.ts           | 50 ++++++++++++++
 .../sidekiq-jobs-modal.service.ts             | 18 +++++
 .../sidekiq-progress-modal.component.html     |  6 +-
 .../sidekiq-progress-modal.component.ts       | 66 +------------------
 .../sidekiq-progress-modal.service.ts         | 11 +++-
 src/app/doubtfire-angular.module.ts           |  2 +
 11 files changed, 159 insertions(+), 67 deletions(-)
 create mode 100644 src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html
 create mode 100644 src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.scss
 create mode 100644 src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts
 create mode 100644 src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.service.ts

diff --git a/src/app/api/services/sidekiq-job.service.ts b/src/app/api/services/sidekiq-job.service.ts
index b41b929925..7c9c3dfd1e 100644
--- a/src/app/api/services/sidekiq-job.service.ts
+++ b/src/app/api/services/sidekiq-job.service.ts
@@ -1,14 +1,42 @@
 import {HttpClient} from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {CachedEntityService} from 'ngx-entity-service';
-import {Observable} from 'rxjs';
+import {BehaviorSubject, Observable, Subject} from 'rxjs';
 import API_URL from 'src/app/config/constants/apiURL';
 import {SidekiqJob} from '../models/sidekiq-job';
 
+export interface SidekiqProgressData {
+  title: string;
+  subject: Subject<SidekiqJob>;
+}
+
 @Injectable()
 export class SidekiqJobService extends CachedEntityService<SidekiqJob> {
   protected readonly endpointFormat = 'sidekiq/:id:';
 
+  public activeSidekiqJobs: Map<string, SidekiqJob> = new Map();
+  public sidekiqJobsSubject: BehaviorSubject<SidekiqJob[]> = new BehaviorSubject<SidekiqJob[]>([]);
+
+  // Track the titles and callbacks for each sidekiqJob
+  public sidekiqJobCallbacks: Map<string, SidekiqProgressData> = new Map<
+    string,
+    SidekiqProgressData
+  >();
+
+  public addJob(job: SidekiqJob) {
+    this.activeSidekiqJobs.set(job.id, job);
+    this.emitJobs();
+  }
+
+  public removeJob(jobId: string) {
+    this.activeSidekiqJobs.delete(jobId);
+    this.emitJobs();
+  }
+
+  private emitJobs() {
+    this.sidekiqJobsSubject.next(Array.from(this.activeSidekiqJobs.values()));
+  }
+
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
 
diff --git a/src/app/common/header/header.component.html b/src/app/common/header/header.component.html
index a1682ce608..27dc650f54 100644
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
@@ -39,7 +39,12 @@
     ></task-dropdown>
 
     <span class="grow"></span>
-
+    @if (sidekiqJobs.length) {
+      <button mat-icon-button (click)="showSidekiqJob()">
+        <div [matBadge]="sidekiqJobs.length" matBadgeSize="small" class="z-50"></div>
+        <mat-icon>cloud_sync_outline</mat-icon>
+      </button>
+    }
     @if (currentUser.role === 'Admin' || currentUser.role === 'Convenor') {
       <button
         #menuState="matMenuTrigger"
diff --git a/src/app/common/header/header.component.ts b/src/app/common/header/header.component.ts
index 0ef0bae956..bc2b04267e 100644
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
@@ -9,6 +9,9 @@ import { AuthenticationService, Project, Task, Unit, UnitRole, User } from 'src/
 import { Subscription } from 'rxjs';
 import { MediaObserver } from 'ng-flex-layout';
 import { DoubtfireConstants, LogoSettings } from 'src/app/config/constants/doubtfire-constants';
+import {SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
+import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
+import {SidekiqJobsModalService} from '../modals/sidekiq-jobs-modal/sidekiq-jobs-modal.service';
 
 @Component({
   selector: 'app-header',
@@ -38,6 +41,8 @@ export class HeaderComponent implements OnInit, OnDestroy {
   };
   private subscriptions: Subscription[] = [];
 
+  sidekiqJobs: SidekiqJob[] = [];
+
   constructor(
     @Inject(calendarModal) private CalendarModal,
     @Inject(aboutDoubtfireModal) private AboutDoubtfireModal,
@@ -48,6 +53,8 @@ export class HeaderComponent implements OnInit, OnDestroy {
     private authService: AuthenticationService,
     protected media: MediaObserver,
     protected doubtfireConstants: DoubtfireConstants,
+    private sidekiqJobService: SidekiqJobService,
+    private sidekiqJobsModalService: SidekiqJobsModalService,
   ) {}
 
   ngOnInit(): void {
@@ -124,6 +131,14 @@ export class HeaderComponent implements OnInit, OnDestroy {
         }
       }),
     );
+
+    this.sidekiqJobService.sidekiqJobsSubject.subscribe((jobs) => {
+      this.sidekiqJobs = [...jobs];
+    });
+  }
+
+  showSidekiqJob() {
+    this.sidekiqJobsModalService.show();
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html
new file mode 100644
index 0000000000..adf106b889
--- /dev/null
+++ b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html
@@ -0,0 +1,21 @@
+<div>
+  <h3 mat-dialog-title>Active jobs in progress</h3>
+  <mat-dialog-content>
+    <div>
+      @for (job of sidekiqJobs; track job) {
+        <div class="flex justify-between items-center p-2">
+          <div>{{ job.jobClass }}</div>
+          <div>{{ job.status.toUpperCase() }}</div>
+
+          <div class="flex gap-4">
+            <button mat-raised-button color="primary" (click)="viewJob(job)">View</button>
+            <button mat-raised-button color="red" (click)="removeJob(job)">Clear</button>
+          </div>
+        </div>
+      }
+    </div>
+  </mat-dialog-content>
+  <mat-dialog-actions class="flex justify-between">
+    <button mat-raised-button (click)="dismissModal()">Close</button>
+  </mat-dialog-actions>
+</div>
diff --git a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.scss b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts
new file mode 100644
index 0000000000..1064e8a966
--- /dev/null
+++ b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts
@@ -0,0 +1,50 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {MatDialogRef} from '@angular/material/dialog';
+import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
+import {SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
+import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
+import {AlertService} from '../../services/alert.service';
+
+@Component({
+  selector: 'f-sidekiq-jobs-modal',
+  templateUrl: './sidekiq-jobs-modal.component.html',
+  styleUrl: './sidekiq-jobs-modal.component.scss',
+})
+export class SidekiqJobsModalComponent implements OnInit {
+  constructor(
+    @Inject(AlertService) private alertService: AlertService,
+
+    public dialogRef: MatDialogRef<SidekiqJobsModalComponent>,
+    private sidekiqJobService: SidekiqJobService,
+    private sidekiqProgressModalService: SidekiqProgressModalService,
+  ) {}
+
+  sidekiqJobs: SidekiqJob[] = [];
+  ngOnInit(): void {
+    this.sidekiqJobService.sidekiqJobsSubject.subscribe((jobs) => {
+      this.sidekiqJobs = jobs;
+      if (jobs.length === 0) {
+        this.dismissModal();
+      }
+    });
+  }
+
+  viewJob(job: SidekiqJob) {
+    const jobData = this.sidekiqJobService.sidekiqJobCallbacks.get(job.id);
+    this.sidekiqProgressModalService.show(jobData.title, job.id).subscribe({
+      next: (job) => {
+        jobData.subject.next(job);
+      },
+    });
+
+    this.dismissModal();
+  }
+
+  removeJob(job: SidekiqJob) {
+    this.sidekiqJobService.removeJob(job.id);
+  }
+
+  public dismissModal() {
+    this.dialogRef.close();
+  }
+}
diff --git a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.service.ts b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.service.ts
new file mode 100644
index 0000000000..8bff4123ff
--- /dev/null
+++ b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.service.ts
@@ -0,0 +1,18 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {SidekiqJobsModalComponent} from './sidekiq-jobs-modal.component';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SidekiqJobsModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show() {
+    this.dialog.open<SidekiqJobsModalComponent>(SidekiqJobsModalComponent, {
+      position: {top: '2.5%'},
+      width: '100%',
+      maxWidth: '650px',
+    });
+  }
+}
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html
index 87ba0479c4..99afb9712e 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html
@@ -7,7 +7,11 @@ <h3 mat-dialog-title>
       This job is running in the background. You can close this dialog and monitor progress anytime.
     </div>
     <div class="flex justify-between w-full mt-5 mb-2">
-      <div>{{ job?.status === 'complete' ? 'Complete' : job?.message }}</div>
+      @if (job?.status === 'complete') {
+        <div>COMPLETE</div>
+      } @else {
+        <div>{{ job?.status.toUpperCase() }}{{ job?.message ? ': ' + job.message : '' }}</div>
+      }
       <div>{{ job?.processedCount }}/{{ job?.totalCount }} ({{ job?.pctComplete }}%)</div>
     </div>
     <mat-progress-bar mode="determinate" [value]="job?.pctComplete ?? 0"></mat-progress-bar>
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
index 43dc98b7cf..90abc9b0fd 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
@@ -37,8 +37,6 @@ export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
     private snackBar: MatSnackBar,
   ) {}
 
-  private shouldDisplayJobInProgressBar: boolean = true;
-
   ngOnInit(): void {
     this.pollFailureLimit = this.data.pollFailureLimit ?? 3;
     this.pollFailureCount = 0;
@@ -50,46 +48,19 @@ export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
 
     this.dialogRef.afterClosed().subscribe(() => {
       clearInterval(this.jobPollingInterval);
-      this.displayJobInProgressBar();
     });
   }
 
-  private readonly JOBS_KEY = 'ontrack_background_jobs';
-
-  private storeJobId(jobId: string) {
-    // TODO: move jobId storage into its own service, we can later use it to render ui in the header
-    // TODO: this would allow the user to close their browser, wait for the job to complete, then view results after loading it up again
-    try {
-      const jobs: string[] = JSON.parse(localStorage.getItem(this.JOBS_KEY)) ?? [];
-      if (!jobs.includes(jobId)) {
-        jobs.push(jobId);
-      }
-      localStorage.setItem(this.JOBS_KEY, JSON.stringify(jobs));
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  private removeJobId(jobId: string) {
-    try {
-      const jobs: string[] = JSON.parse(localStorage.getItem(this.JOBS_KEY)) ?? [];
-      const updatedJobs = jobs.filter((job) => job !== jobId);
-      localStorage.setItem(this.JOBS_KEY, JSON.stringify(updatedJobs));
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
   private getSidekiqJob() {
     if (!this.data.jobId) {
       clearInterval(this.jobPollingInterval);
-      this.shouldDisplayJobInProgressBar = false;
       this.dialogRef.close();
     }
 
     this.sidekiqJobService.getSidekiqJob(this.data.jobId).subscribe({
       next: (job) => {
-        this.storeJobId(job.id);
+        this.sidekiqJobService.sidekiqJobsSubject;
+        this.sidekiqJobService.addJob(job);
         this.job = job;
         this.pollFailureCount = 0;
 
@@ -117,42 +88,11 @@ export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
   public viewResult() {
     this.data.subject.next(this.job);
 
-    this.shouldDisplayJobInProgressBar = false;
     this.dialogRef.close();
-    this.removeJobId(this.data.jobId);
+    this.sidekiqJobService.removeJob(this.data.jobId);
   }
 
   public dismissModal() {
     this.dialogRef.close();
   }
-
-  public displayJobInProgressBar() {
-    if (!this.job) {
-      return;
-    }
-
-    if (!this.shouldDisplayJobInProgressBar) {
-      return;
-    }
-    this.shouldDisplayJobInProgressBar = false;
-
-    this.snackBar
-      .open(`Job in progress: ${this.data.title}`, 'View', {
-        verticalPosition: 'bottom',
-        horizontalPosition: 'center',
-      })
-      .afterDismissed()
-      .subscribe(() => {
-        // TODO: if we know we have more than 1 in progress job, we could display a modal of a list of jobs to view
-        // TODO: replace snack bar with an icon in the header?
-        this.sidekiqProgressModalService.show(this.data.title, this.data.jobId).subscribe({
-          next: (job) => {
-            this.data.subject.next(job);
-          },
-          error: (error) => {
-            console.error(error);
-          },
-        });
-      });
-  }
 }
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
index bb5ef27865..f66ce9fb41 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
@@ -6,16 +6,25 @@ import {
 } from './sidekiq-progress-modal.component';
 import {Subject} from 'rxjs';
 import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
+import {SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
 
 @Injectable({
   providedIn: 'root',
 })
 export class SidekiqProgressModalService {
-  constructor(public dialog: MatDialog) {}
+  constructor(
+    public dialog: MatDialog,
+    private sidekiqJobService: SidekiqJobService,
+  ) {}
 
   public show(title: string, jobId: string) {
     const subject = new Subject<SidekiqJob>();
 
+    this.sidekiqJobService.sidekiqJobCallbacks.set(jobId, {
+      title,
+      subject,
+    });
+
     this.dialog.open<SidekiqProgressModalComponent, SidekiqProgressModalData>(
       SidekiqProgressModalComponent,
       {
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index b552fd1167..5391f2103b 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -272,6 +272,7 @@ import {StaffNoteService} from './api/services/staff-note.service';
 import {LocalizedDatePipe} from './common/pipes/localized-date.pipe';
 import {StaffNotesViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component';
 import {SidekiqProgressModalComponent} from './common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component';
+import {SidekiqJobsModalComponent} from './common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component';
 import {SidekiqJobService} from './api/services/sidekiq-job.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
@@ -413,6 +414,7 @@ const MY_DATE_FORMAT = {
     QrModalComponent,
     LocalizedDatePipe,
     SidekiqProgressModalComponent,
+    SidekiqJobsModalComponent,
   ],
   // Services we provide
   providers: [

From 09c33c065337e0ca5e60b32a568cab1cb075d775 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 22 Jul 2025 12:44:23 +1000
Subject: [PATCH 392/776] chore: correct timestamp type

---
 src/app/api/models/sidekiq-job.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/api/models/sidekiq-job.ts b/src/app/api/models/sidekiq-job.ts
index fa1e8f1e14..127db2062e 100644
--- a/src/app/api/models/sidekiq-job.ts
+++ b/src/app/api/models/sidekiq-job.ts
@@ -14,6 +14,6 @@ export class SidekiqJob extends Entity {
   // Custom data unique to each job
   result?: string;
 
-  createdAt: Date;
-  updatedAt: Date;
+  createdAt: number;
+  updatedAt: number;
 }

From f7f36214546f7a6dbdc13e7d05f25c600f5d5d64 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 22 Jul 2025 12:46:01 +1000
Subject: [PATCH 393/776] refactor: display original modal title

---
 .../sidekiq-jobs-modal.component.html         | 13 +++++----
 .../sidekiq-jobs-modal.component.ts           |  5 ++++
 .../unit-students-editor.component.ts         | 28 ++++++++++---------
 .../units/states/portfolios/portfolios.coffee |  2 +-
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html
index adf106b889..57dac5fd44 100644
--- a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html
+++ b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html
@@ -4,12 +4,13 @@ <h3 mat-dialog-title>Active jobs in progress</h3>
     <div>
       @for (job of sidekiqJobs; track job) {
         <div class="flex justify-between items-center p-2">
-          <div>{{ job.jobClass }}</div>
-          <div>{{ job.status.toUpperCase() }}</div>
-
-          <div class="flex gap-4">
-            <button mat-raised-button color="primary" (click)="viewJob(job)">View</button>
-            <button mat-raised-button color="red" (click)="removeJob(job)">Clear</button>
+          <div>{{ getJobTitle(job) }}</div>
+          <div class="flex items-center">
+            <div class="mr-10 text-center">{{ job.status.toUpperCase() }}</div>
+            <div class="flex gap-4">
+              <button mat-raised-button color="primary" (click)="viewJob(job)">View</button>
+              <button mat-raised-button color="red" (click)="removeJob(job)">Clear</button>
+            </div>
           </div>
         </div>
       }
diff --git a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts
index 1064e8a966..7901956296 100644
--- a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts
+++ b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts
@@ -40,6 +40,11 @@ export class SidekiqJobsModalComponent implements OnInit {
     this.dismissModal();
   }
 
+  getJobTitle(job: SidekiqJob) {
+    const jobData = this.sidekiqJobService.sidekiqJobCallbacks.get(job.id);
+    return jobData.title;
+  }
+
   removeJob(job: SidekiqJob) {
     this.sidekiqJobService.removeJob(job.id);
   }
diff --git a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
index d03f7e8005..d0bed342f8 100644
--- a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
@@ -139,19 +139,21 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
         if (!response || !response.id) {
           this.alerts.error('Failed to start student import job', 6000);
         }
-        this.sidekiqProgressModalService.show('Importing Students', response.id).subscribe({
-          next: (job) => {
-            const result = JSON.parse(job.result);
-            this.csvResultModal.show('Enrol Student CSV Results', result);
-            // at least one student?
-            if (result.success.length > 0) {
-              this.unit.refreshStudents(true);
-            }
-          },
-          error: (error) => {
-            console.error(error);
-          },
-        });
+        this.sidekiqProgressModalService
+          .show(`Importing Students: ${this.unit.code}`, response.id)
+          .subscribe({
+            next: (job) => {
+              const result = JSON.parse(job.result);
+              this.csvResultModal.show('Enrol Student CSV Results', result);
+              // at least one student?
+              if (result.success.length > 0) {
+                this.unit.refreshStudents(true);
+              }
+            },
+            error: (error) => {
+              console.error(error);
+            },
+          });
       },
     );
   }
diff --git a/src/app/units/states/portfolios/portfolios.coffee b/src/app/units/states/portfolios/portfolios.coffee
index cad57c8f68..e87a17027d 100644
--- a/src/app/units/states/portfolios/portfolios.coffee
+++ b/src/app/units/states/portfolios/portfolios.coffee
@@ -24,7 +24,7 @@ angular.module('doubtfire.units.states.portfolios', [])
   $scope.downloadPortfolios = ->
     newUnitService.zipPortfolios($scope.unit).subscribe({
       next: (newJob) ->
-        sidekiqProgressModalService.show("Download Portfolios", newJob.id).subscribe({
+        sidekiqProgressModalService.show("Downloading Portfolios: " + $scope.unit.code, newJob.id).subscribe({
           next: (job) ->
             fileDownloaderService.downloadFile($scope.unit.portfoliosUrl, "#{$scope.unit.code}-portfolios.zip")
           error: (message) -> alertService.error(message, 6000)

From bef0a9cbfefc58407f851d3ca73b90af6b81151f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 22 Jul 2025 14:34:21 +1000
Subject: [PATCH 394/776] fix: fallback to task definition due date

---
 .../task-description-card/task-description-card.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
index 765d67766d..4b85d05a06 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
@@ -53,7 +53,7 @@ export class TaskDescriptionCardComponent {
   }
 
   public startDate(): Date {
-    return this.task?.startDate;
+    return this.task?.startDate ?? this.taskDef?.startDate;
   }
 
   public shouldShowDeadline(): boolean {

From 106894e2c7d2b5914c7c25d31165172f28b44f38 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 23 Jul 2025 10:05:41 +1000
Subject: [PATCH 395/776] refactor: clean up sidekiq job state management

---
 src/app/api/services/sidekiq-job.service.ts   | 27 ++++++++++---------
 src/app/common/header/header.component.ts     |  5 ++--
 .../sidekiq-jobs-modal.component.html         | 10 +++----
 .../sidekiq-jobs-modal.component.ts           | 21 +++++----------
 .../sidekiq-progress-modal.component.ts       |  2 +-
 .../sidekiq-progress-modal.service.ts         |  5 +---
 6 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/app/api/services/sidekiq-job.service.ts b/src/app/api/services/sidekiq-job.service.ts
index 7c9c3dfd1e..c13ea41299 100644
--- a/src/app/api/services/sidekiq-job.service.ts
+++ b/src/app/api/services/sidekiq-job.service.ts
@@ -5,36 +5,37 @@ import {BehaviorSubject, Observable, Subject} from 'rxjs';
 import API_URL from 'src/app/config/constants/apiURL';
 import {SidekiqJob} from '../models/sidekiq-job';
 
-export interface SidekiqProgressData {
+export interface SidekiqJobEntry {
+  job?: SidekiqJob;
   title: string;
-  subject: Subject<SidekiqJob>;
+  resultSubject: Subject<SidekiqJob>;
 }
 
 @Injectable()
 export class SidekiqJobService extends CachedEntityService<SidekiqJob> {
   protected readonly endpointFormat = 'sidekiq/:id:';
 
-  public activeSidekiqJobs: Map<string, SidekiqJob> = new Map();
-  public sidekiqJobsSubject: BehaviorSubject<SidekiqJob[]> = new BehaviorSubject<SidekiqJob[]>([]);
+  public jobEntries: Map<string, SidekiqJobEntry> = new Map();
 
-  // Track the titles and callbacks for each sidekiqJob
-  public sidekiqJobCallbacks: Map<string, SidekiqProgressData> = new Map<
-    string,
-    SidekiqProgressData
-  >();
+  // Allow components to track changes to jobEntries
+  public sidekiqJobsSubject = new BehaviorSubject<SidekiqJobEntry[]>([]);
 
-  public addJob(job: SidekiqJob) {
-    this.activeSidekiqJobs.set(job.id, job);
+  public addJob(jobId: string, title: string, subject: Subject<SidekiqJob>, job?: SidekiqJob) {
+    this.jobEntries.set(jobId, {
+      job,
+      title,
+      resultSubject: subject,
+    });
     this.emitJobs();
   }
 
   public removeJob(jobId: string) {
-    this.activeSidekiqJobs.delete(jobId);
+    this.jobEntries.delete(jobId);
     this.emitJobs();
   }
 
   private emitJobs() {
-    this.sidekiqJobsSubject.next(Array.from(this.activeSidekiqJobs.values()));
+    this.sidekiqJobsSubject.next(Array.from(this.jobEntries.values()));
   }
 
   constructor(httpClient: HttpClient) {
diff --git a/src/app/common/header/header.component.ts b/src/app/common/header/header.component.ts
index bc2b04267e..a1956c015c 100644
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
@@ -9,8 +9,7 @@ import { AuthenticationService, Project, Task, Unit, UnitRole, User } from 'src/
 import { Subscription } from 'rxjs';
 import { MediaObserver } from 'ng-flex-layout';
 import { DoubtfireConstants, LogoSettings } from 'src/app/config/constants/doubtfire-constants';
-import {SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
-import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
+import {SidekiqJobEntry, SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
 import {SidekiqJobsModalService} from '../modals/sidekiq-jobs-modal/sidekiq-jobs-modal.service';
 
 @Component({
@@ -41,7 +40,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
   };
   private subscriptions: Subscription[] = [];
 
-  sidekiqJobs: SidekiqJob[] = [];
+  sidekiqJobs: SidekiqJobEntry[] = [];
 
   constructor(
     @Inject(calendarModal) private CalendarModal,
diff --git a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html
index 57dac5fd44..60bc7fc73f 100644
--- a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html
+++ b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.html
@@ -2,14 +2,14 @@
   <h3 mat-dialog-title>Active jobs in progress</h3>
   <mat-dialog-content>
     <div>
-      @for (job of sidekiqJobs; track job) {
+      @for (jobEntry of sidekiqJobs; track jobEntry) {
         <div class="flex justify-between items-center p-2">
-          <div>{{ getJobTitle(job) }}</div>
+          <div>{{ jobEntry.title }}</div>
           <div class="flex items-center">
-            <div class="mr-10 text-center">{{ job.status.toUpperCase() }}</div>
+            <div class="mr-10 text-center">{{ jobEntry.job?.status?.toUpperCase() }}</div>
             <div class="flex gap-4">
-              <button mat-raised-button color="primary" (click)="viewJob(job)">View</button>
-              <button mat-raised-button color="red" (click)="removeJob(job)">Clear</button>
+              <button mat-raised-button color="primary" (click)="viewJob(jobEntry)">View</button>
+              <button mat-raised-button color="red" (click)="removeJob(jobEntry)">Clear</button>
             </div>
           </div>
         </div>
diff --git a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts
index 7901956296..f2f2ea7596 100644
--- a/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts
+++ b/src/app/common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component.ts
@@ -1,7 +1,6 @@
 import {Component, Inject, OnInit} from '@angular/core';
 import {MatDialogRef} from '@angular/material/dialog';
-import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
-import {SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
+import {SidekiqJobEntry, SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
 import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 import {AlertService} from '../../services/alert.service';
 
@@ -19,7 +18,7 @@ export class SidekiqJobsModalComponent implements OnInit {
     private sidekiqProgressModalService: SidekiqProgressModalService,
   ) {}
 
-  sidekiqJobs: SidekiqJob[] = [];
+  sidekiqJobs: SidekiqJobEntry[] = [];
   ngOnInit(): void {
     this.sidekiqJobService.sidekiqJobsSubject.subscribe((jobs) => {
       this.sidekiqJobs = jobs;
@@ -29,24 +28,18 @@ export class SidekiqJobsModalComponent implements OnInit {
     });
   }
 
-  viewJob(job: SidekiqJob) {
-    const jobData = this.sidekiqJobService.sidekiqJobCallbacks.get(job.id);
-    this.sidekiqProgressModalService.show(jobData.title, job.id).subscribe({
+  viewJob(jobEntry: SidekiqJobEntry) {
+    this.sidekiqProgressModalService.show(jobEntry.title, jobEntry.job.id).subscribe({
       next: (job) => {
-        jobData.subject.next(job);
+        jobEntry.resultSubject.next(job);
       },
     });
 
     this.dismissModal();
   }
 
-  getJobTitle(job: SidekiqJob) {
-    const jobData = this.sidekiqJobService.sidekiqJobCallbacks.get(job.id);
-    return jobData.title;
-  }
-
-  removeJob(job: SidekiqJob) {
-    this.sidekiqJobService.removeJob(job.id);
+  removeJob(jobEntry: SidekiqJobEntry) {
+    this.sidekiqJobService.removeJob(jobEntry.job.id);
   }
 
   public dismissModal() {
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
index 90abc9b0fd..9b9f9c3b33 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
@@ -60,7 +60,7 @@ export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
     this.sidekiqJobService.getSidekiqJob(this.data.jobId).subscribe({
       next: (job) => {
         this.sidekiqJobService.sidekiqJobsSubject;
-        this.sidekiqJobService.addJob(job);
+        this.sidekiqJobService.addJob(job.id, this.data.title, this.data.subject, job);
         this.job = job;
         this.pollFailureCount = 0;
 
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
index f66ce9fb41..681cf1edd5 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
@@ -20,10 +20,7 @@ export class SidekiqProgressModalService {
   public show(title: string, jobId: string) {
     const subject = new Subject<SidekiqJob>();
 
-    this.sidekiqJobService.sidekiqJobCallbacks.set(jobId, {
-      title,
-      subject,
-    });
+    this.sidekiqJobService.addJob(jobId, title, subject);
 
     this.dialog.open<SidekiqProgressModalComponent, SidekiqProgressModalData>(
       SidekiqProgressModalComponent,

From 1fcd649b03e2c8644974b7c8163f5893f666e142 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 23 Jul 2025 10:06:35 +1000
Subject: [PATCH 396/776] refactor: rename to set job

---
 src/app/api/services/sidekiq-job.service.ts                     | 2 +-
 .../sidekiq-progress-modal/sidekiq-progress-modal.component.ts  | 2 +-
 .../sidekiq-progress-modal/sidekiq-progress-modal.service.ts    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/api/services/sidekiq-job.service.ts b/src/app/api/services/sidekiq-job.service.ts
index c13ea41299..ea7c204cf2 100644
--- a/src/app/api/services/sidekiq-job.service.ts
+++ b/src/app/api/services/sidekiq-job.service.ts
@@ -20,7 +20,7 @@ export class SidekiqJobService extends CachedEntityService<SidekiqJob> {
   // Allow components to track changes to jobEntries
   public sidekiqJobsSubject = new BehaviorSubject<SidekiqJobEntry[]>([]);
 
-  public addJob(jobId: string, title: string, subject: Subject<SidekiqJob>, job?: SidekiqJob) {
+  public setJob(jobId: string, title: string, subject: Subject<SidekiqJob>, job?: SidekiqJob) {
     this.jobEntries.set(jobId, {
       job,
       title,
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
index 9b9f9c3b33..076933bbe9 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
@@ -60,7 +60,7 @@ export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
     this.sidekiqJobService.getSidekiqJob(this.data.jobId).subscribe({
       next: (job) => {
         this.sidekiqJobService.sidekiqJobsSubject;
-        this.sidekiqJobService.addJob(job.id, this.data.title, this.data.subject, job);
+        this.sidekiqJobService.setJob(job.id, this.data.title, this.data.subject, job);
         this.job = job;
         this.pollFailureCount = 0;
 
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
index 681cf1edd5..328b5bf95d 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
@@ -20,7 +20,7 @@ export class SidekiqProgressModalService {
   public show(title: string, jobId: string) {
     const subject = new Subject<SidekiqJob>();
 
-    this.sidekiqJobService.addJob(jobId, title, subject);
+    this.sidekiqJobService.setJob(jobId, title, subject);
 
     this.dialog.open<SidekiqProgressModalComponent, SidekiqProgressModalData>(
       SidekiqProgressModalComponent,

From ada4a21c945018abeb9ca1169e48fdd822a27322 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 23 Jul 2025 15:39:01 +1000
Subject: [PATCH 397/776] feat: assess in portfolio status

---
 src/app/api/models/task-definition.ts         |  1 +
 src/app/api/models/task-status.ts             | 49 +++++++++++++++++--
 src/app/api/models/unit.ts                    |  1 +
 .../api/services/task-definition.service.ts   |  1 +
 src/app/api/services/unit.service.ts          |  2 +
 src/app/common/footer/footer.component.html   | 43 +++++++++++-----
 src/app/common/footer/footer.component.scss   |  3 ++
 .../status-icon/status-icon.component.scss    |  3 ++
 .../unit-details-editor.tpl.html              | 37 +++++++++++++-
 .../task-definition-options.component.html    | 40 +++++++++------
 src/styles/common/task-status-colors.scss     |  8 ++-
 src/styles/mixins/task-list.scss              |  6 +++
 .../mixins/task-status-colors-generator.scss  |  3 ++
 src/styles/modules/task-status.scss           | 14 ++++++
 14 files changed, 178 insertions(+), 33 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 8f3fce78ac..8b12a6ba69 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -51,6 +51,7 @@ export class TaskDefinition extends Entity {
   assessmentEnabled: boolean;
   similarityLanguage: string = 'c';
   hasJplagReport: boolean;
+  assessInPortfolioOnly: boolean;
 
   public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
     new EntityCache<LearningOutcome>();
diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts
index 8cd95b2404..741e62a9ef 100644
--- a/src/app/api/models/task-status.ts
+++ b/src/app/api/models/task-status.ts
@@ -12,7 +12,8 @@ export type TaskStatusEnum =
   | 'demonstrate'
   | 'complete'
   | 'fail'
-  | 'time_exceeded';
+  | 'time_exceeded'
+  | 'assess_in_portfolio';
 
 export type TaskStatusUiData = {
   status: TaskStatusEnum;
@@ -36,6 +37,7 @@ export class TaskStatus {
     'complete',
     'fail',
     'time_exceeded',
+    'assess_in_portfolio',
   ];
 
   public static readonly VALID_TOP_TASKS: TaskStatusEnum[] = [
@@ -57,9 +59,16 @@ export class TaskStatus {
     'complete',
     'fail',
     'time_exceeded',
+    'assess_in_portfolio',
   ];
 
-  public static readonly FINAL_STATUSES: TaskStatusEnum[] = ['complete', 'fail', 'feedback_exceeded', 'time_exceeded'];
+  public static readonly FINAL_STATUSES: TaskStatusEnum[] = [
+    'complete',
+    'fail',
+    'feedback_exceeded',
+    'time_exceeded',
+    'assess_in_portfolio',
+  ];
 
   public static readonly GRADEABLE_STATUSES: TaskStatusEnum[] = ['fail', 'discuss', 'demonstrate', 'complete'];
 
@@ -122,6 +131,7 @@ export class TaskStatus {
     ['demonstrate', 0.8],
     ['complete', 1.0],
     ['time_exceeded', 0.3],
+    ['assess_in_portfolio', 0.0],
   ]);
 
   public static readonly STATUS_ACRONYM: Map<TaskStatusEnum, string> = new Map<TaskStatusEnum, string>([
@@ -137,6 +147,7 @@ export class TaskStatus {
     ['complete', 'COM'],
     ['fail', 'FAL'],
     ['time_exceeded', 'TIE'],
+    ['assess_in_portfolio', 'AIP'],
   ]);
 
   // Which status should not show up in the task status drop down... for students
@@ -156,6 +167,7 @@ export class TaskStatus {
     ['feedback_exceeded', ['ready_for_feedback', 'not_started', 'working_on_it', 'need_help']],
     ['time_exceeded', ['ready_for_feedback', 'not_started', 'working_on_it', 'need_help']],
     ['fail', ['ready_for_feedback', 'not_started', 'working_on_it', 'need_help']],
+    ['assess_in_portfolio', ['not_started']],
   ]);
 
   public static readonly STATUS_LABELS = new Map<TaskStatusEnum, string>([
@@ -171,6 +183,7 @@ export class TaskStatus {
     ['complete', 'Complete'],
     ['fail', 'Fail'],
     ['time_exceeded', 'Time Exceeded'],
+    ['assess_in_portfolio', 'Assess in Portfolio'],
   ]);
 
   public static readonly STATUS_ICONS = new Map<TaskStatusEnum, string>([
@@ -186,6 +199,7 @@ export class TaskStatus {
     ['complete', 'fa fa-check'],
     ['fail', 'fa fa-times'],
     ['time_exceeded', 'fa fa-clock-o'],
+    ['assess_in_portfolio', 'fa fa-folder-open'],
   ]);
 
   // Please make sure this matches task-status-colors.less
@@ -202,6 +216,7 @@ export class TaskStatus {
     ['complete', '#5BB75B'],
     ['fail', '#d93713'],
     ['time_exceeded', '#d93713'],
+    ['assess_in_portfolio', '#91b891'],
   ]);
 
   public static readonly STATUS_SEQ = new Map<TaskStatusEnum, number>([
@@ -217,11 +232,27 @@ export class TaskStatus {
     ['discuss', 10],
     ['demonstrate', 11],
     ['complete', 12],
+    ['assess_in_portfolio', 13],
   ]);
 
   public static readonly SWITCHABLE_STATES = {
-    student: ['not_started', 'working_on_it', 'need_help', 'ready_for_feedback'],
-    tutor: ['complete', 'discuss', 'demonstrate', 'fix_and_resubmit', 'redo', 'feedback_exceeded', 'fail'],
+    student: [
+      'not_started',
+      'working_on_it',
+      'need_help',
+      'ready_for_feedback',
+      'assess_in_portfolio',
+    ],
+    tutor: [
+      'complete',
+      'discuss',
+      'demonstrate',
+      'fix_and_resubmit',
+      'redo',
+      'feedback_exceeded',
+      'fail',
+      'assess_in_portfolio',
+    ],
   };
 
   // detail = in a brief context to the student
@@ -335,6 +366,16 @@ export class TaskStatus {
           'Work submitted after the feedback deadline will not be checked by tutors prior to the portfolio assessment. You will need to ensure this task is at an adequate standard in your portfolio.',
       },
     ],
+    [
+      'assess_in_portfolio',
+      {
+        detail: 'Your submission will be assessed in your portfolio',
+        reason:
+          'This task will not be signed off as complete and will be assessed directly in your final portfolio submission.',
+        action:
+          'Tutors may offer feedback before the feedback deadline, but this task will only be assessed in your final portfolio. You can make changes before the portfolio due date, but you must manually set the status back to "assess in portfolio".',
+      },
+    ],
     // [
     //   "awaiting_extension",
     //   {
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index df07d32d04..5e57a463d3 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -68,6 +68,7 @@ export class Unit extends Entity {
   allowFlexibleDates: boolean = false;
   extensionWeeksOnResubmitRequest: number;
   allowStudentChangeTutorial: boolean;
+  markLateSubmissionsAsAssessInPortfolio: boolean;
 
   d2lMapping: D2lAssessmentMapping;
 
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index c71adaffbe..95eb3efb0c 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -26,6 +26,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'targetGrade',
       'similarityLanguage',
       'hasJplagReport',
+      'assessInPortfolioOnly',
       {
         keys: 'targetDate',
         toEntityFn: MappingFunctions.mapDateToEndOfDay,
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index 7193289049..94427c6367 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -151,6 +151,7 @@ export class UnitService extends CachedEntityService<Unit> {
       'allowFlexibleDates',
       'extensionWeeksOnResubmitRequest',
       'allowStudentChangeTutorial',
+      'markLateSubmissionsAsAssessInPortfolio',
       {
         keys: 'ilos',
         toEntityOp: (data: object, key: string, unit: Unit) => {
@@ -249,6 +250,7 @@ export class UnitService extends CachedEntityService<Unit> {
       'overseerImageId',
 
       'autoApplyExtensionBeforeDeadline',
+      'markLateSubmissionsAsAssessInPortfolio',
       'sendNotifications',
       'enableSyncEnrolments',
       'enableSyncTimetable',
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 1d7166ca35..58b7b13c90 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -54,17 +54,32 @@
         </button>
         <span class="w-3"></span>
       }
-      <button
-        [disabled]="selectedTask === undefined"
-        mat-icon-button
-        matTooltip="Mark as Complete"
-        matTooltipPosition="above"
-        aria-label=""
-        class="button large-button"
-        (click)="selectedTask?.updateTaskStatus('complete')"
-      >
-        <mat-icon>done</mat-icon>
-      </button>
+      @if (selectedTask?.definition?.assessInPortfolioOnly) {
+        <button
+          [disabled]="selectedTask === undefined"
+          mat-icon-button
+          matTooltip="Mark as Working On It"
+          matTooltipPosition="above"
+          aria-label="Mark as Working On It"
+          class="button large-button"
+          (click)="selectedTask?.updateTaskStatus('working_on_it')"
+        >
+          <mat-icon>bolt</mat-icon>
+        </button>
+      } @else {
+        <button
+          [disabled]="selectedTask === undefined"
+          mat-icon-button
+          matTooltip="Mark as Complete"
+          matTooltipPosition="above"
+          aria-label="Mark as Complete"
+          class="button large-button"
+          (click)="selectedTask?.updateTaskStatus('complete')"
+        >
+          <mat-icon>done</mat-icon>
+        </button>
+      }
+
       <button
         [disabled]="selectedTask === undefined"
         mat-icon-button
@@ -174,6 +189,12 @@
           View similarities
         </button>
         <mat-divider></mat-divider>
+        <button mat-menu-item (click)="selectedTask?.updateTaskStatus('assess_in_portfolio')">
+          <mat-icon matListItemIcon aria-label="Switch to Assess in Portfolio"
+            >folder_open</mat-icon
+          >
+          Mark as Assess in Portfolio
+        </button>
         <button mat-menu-item (click)="selectedTask?.updateTaskStatus('feedback_exceeded')">
           <mat-icon matListItemIcon aria-label="Switch to Feedback Exceeded"
             >running_with_errors</mat-icon
diff --git a/src/app/common/footer/footer.component.scss b/src/app/common/footer/footer.component.scss
index 59ea2367d3..77929ba541 100644
--- a/src/app/common/footer/footer.component.scss
+++ b/src/app/common/footer/footer.component.scss
@@ -72,4 +72,7 @@
   &.complete {
     @include status-icon('complete');
   }
+  &.assess-in-portfolio {
+    @include status-icon('assess-in-portfolio');
+  }
 }
diff --git a/src/app/common/status-icon/status-icon.component.scss b/src/app/common/status-icon/status-icon.component.scss
index 169fd24de6..687ebb7ed0 100644
--- a/src/app/common/status-icon/status-icon.component.scss
+++ b/src/app/common/status-icon/status-icon.component.scss
@@ -32,6 +32,9 @@
   &.time-exceeded {
     @include status-icon('time-exceeded');
   }
+  &.assess-in-portfolio {
+    @include status-icon('assess-in-portfolio');
+  }
   &.redo {
     @include status-icon('redo');
   }
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
index 124f2662e5..5de919ee03 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
@@ -268,7 +268,42 @@ <h3 class="panel-title">Update Unit</h3>
         <!--/auto apply extension-->
 
         <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate">Allow students to change tutorial</label>
+          <label class="col-sm-2 control-label" for="enddate"
+            >Has tasks assessed in portfolio</label
+          >
+          <div class="col-sm-9">
+            <div class="btn-group">
+              <label
+                class="btn btn-{{unit.markLateSubmissionsAsAssessInPortfolio ? 'success' : 'default'}}"
+                ng-model="unit.markLateSubmissionsAsAssessInPortfolio"
+                btn-radio="true"
+                uncheckable
+              >
+                <i class="fa fa-check"></i>
+              </label>
+              <label
+                class="btn btn-{{unit.markLateSubmissionsAsAssessInPortfolio ? 'default' : 'danger'}}"
+                ng-model="unit.markLateSubmissionsAsAssessInPortfolio"
+                btn-radio="false"
+                uncheckable
+              >
+                <i class="fa fa-times"></i>
+              </label>
+            </div>
+            <span class="help-block">
+              When enabled, late submissions will not be automatically marked as "Time Exceeded" or
+              "Feedback Exceeded", and will instead appear as "Assess in Portfolio". Tutors can
+              still sign off tasks as complete unless the task definition has the "Assess in
+              Portfolio Only" option enabled.
+            </span>
+          </div>
+        </div>
+        <!--/mark-late-submissions-as-assess-in-portfolio-status-->
+
+        <div class="form-group">
+          <label class="col-sm-2 control-label" for="enddate"
+            >Allow students to change tutorial</label
+          >
           <div class="col-sm-9">
             <div class="btn-group">
               <label
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
index 634c71a98c..b846a681a5 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
@@ -1,33 +1,41 @@
-<div class="flex flex-col gap-4">
-  <div class="flex-grow flex flex-row gap-4">
+<div class="flex flex-col gap-5">
+  <div class="flex-grow flex flex-row gap-5 items-center">
     <mat-checkbox class="basis-1/2" matInput [(ngModel)]="taskDefinition.restrictStatusUpdates">
       Restrict updates
     </mat-checkbox>
     <span class="basis-1/2">
-      This task will be locked once it goes into a staff-allocated status. Students will not be able to resubmit, even
-      if placed on the fix status.
+      This task will be locked once it goes into a staff-allocated status. Students will not be able
+      to resubmit, even if placed on the fix status.
     </span>
   </div>
 
-  <div class="flex-grow flex flex-row gap-4">
-    <mat-checkbox class="basis-1/2" matInput [(ngModel)]="taskDefinition.isGraded">Graded</mat-checkbox>
+  <div class="flex-grow flex flex-row gap-5 items-center">
+    <mat-checkbox class="basis-1/2" matInput [(ngModel)]="taskDefinition.assessInPortfolioOnly"
+      >Assess in Portfolio Only</mat-checkbox
+    >
+    <span class="basis-1/2">
+      This task cannot be signed off as complete and will only be assessed in the final portfolio.
+      Tutors can leave feedback and return it to the "Working on it" state. Students must then
+      update the status to "Assess in Portfolio" to ensure it's included in their portfolio.
+    </span>
+  </div>
+
+  <div class="flex-grow flex flex-row gap-5 items-center">
+    <mat-checkbox class="basis-1/2" matInput [(ngModel)]="taskDefinition.isGraded"
+      >Graded</mat-checkbox
+    >
     <span class="basis-1/2">
-      Provide a grade along with the complete or discuss status. We recommend avoiding this practice.
+      Provide a grade along with the complete or discuss status. We recommend avoiding this
+      practice.
     </span>
   </div>
 
-  <div class="flex-grow flex flex-row gap-4">
+  <div class="flex-grow flex flex-row gap-5 items-center">
     <mat-form-field appearance="outline" class="basis-1/2">
       <mat-label>Quality Stars</mat-label>
-      <input
-        matInput
-        min="0"
-        max="100"
-        type="number"
-        [(ngModel)]="taskDefinition.maxQualityPts"
-      />
+      <input matInput min="0" max="100" type="number" [(ngModel)]="taskDefinition.maxQualityPts" />
     </mat-form-field>
-    <span class="basis-1/2"
+    <span class="basis-1/2 mb-[22px]"
       >Provide a number of stars alongside the task status. Make sure you have a clear reason for
       each star within your task description.</span
     >
diff --git a/src/styles/common/task-status-colors.scss b/src/styles/common/task-status-colors.scss
index 82320d524b..563e2cf038 100644
--- a/src/styles/common/task-status-colors.scss
+++ b/src/styles/common/task-status-colors.scss
@@ -3,7 +3,7 @@
 //
 // ********************************************************
 // IMPORTANT: Task status colours must also be matched
-// in the task-service.coffee file
+// in the task-status.ts file
 // ********************************************************
 //
 
@@ -84,4 +84,10 @@ $task-status-colors: (
     light: lighten(#d93713, 15%),
     fore: $task-status-foreground-color-light,
   ),
+  assess-in-portfolio: (
+    base: #91b891,
+    dark: darken(#91b891, 15%),
+    light: lighten(#91b891, 15%),
+    fore: $task-status-foreground-color-light,
+  ),
 );
diff --git a/src/styles/mixins/task-list.scss b/src/styles/mixins/task-list.scss
index 7709d87fea..5684822871 100644
--- a/src/styles/mixins/task-list.scss
+++ b/src/styles/mixins/task-list.scss
@@ -78,6 +78,9 @@
       &.time-exceeded {
         @include custom-box-shadow(lighten(task-status-color('time-exceeded'), 15%));
       }
+      &.assess-in-portfolio {
+        @include custom-box-shadow(lighten(task-status-color('assess-in-portfolio'), 15%));
+      }
     }
     &.selected {
       &.ready-for-feedback {
@@ -116,6 +119,9 @@
       &.time-exceeded {
         @include custom-box-shadow(task-status-color('time-exceeded'));
       }
+      &.assess-in-portfolio {
+        @include custom-box-shadow(task-status-color('assess-in-portfolio'));
+      }
     }
     .task-badges {
       width: 50px;
diff --git a/src/styles/mixins/task-status-colors-generator.scss b/src/styles/mixins/task-status-colors-generator.scss
index e37542874a..4d0646ecd6 100644
--- a/src/styles/mixins/task-status-colors-generator.scss
+++ b/src/styles/mixins/task-status-colors-generator.scss
@@ -59,3 +59,6 @@
 @mixin task-status-color-time-exceeded {
   @include task-status-color('time-exceeded');
 }
+@mixin task-status-color-assess-in-portfolio {
+  @include task-status-color('assess-in-portfolio');
+}
diff --git a/src/styles/modules/task-status.scss b/src/styles/modules/task-status.scss
index 74d5963f48..ba7252f899 100644
--- a/src/styles/modules/task-status.scss
+++ b/src/styles/modules/task-status.scss
@@ -38,6 +38,9 @@
   &.time-exceeded {
     @include task-status-color-time-exceeded;
   }
+  &.assess-in-portfolio {
+    @include task-status-color-assess-in-portfolio;
+  }
 
   &.ready-for-feedback:hover {
     background-color: task-status-color('ready-for-feedback');
@@ -75,6 +78,9 @@
   &.time-exceeded:hover {
     background-color: task-status-color('time-exceeded');
   }
+  &.assess-in-portfolio:hover {
+    background-color: task-status-color('assess-in-portfolio');
+  }
 }
 
 .task-status > .btn-default {
@@ -138,6 +144,11 @@
   &.time-exceeded:hover {
     @include task-status-color-time-exceeded;
   }
+  &.assess-in-portfolio,
+  &.assess-in-portfolio.active,
+  &.assess-in-portfolio:hover {
+    @include task-status-color-assess-in-portfolio;
+  }
 
   &.ready-for-feedback {
     background-color: lighten(task-status-color('ready-for-feedback'), 15%);
@@ -175,6 +186,9 @@
   &.time-exceeded {
     background-color: lighten(task-status-color('time-exceeded'), 15%);
   }
+  &.assess-in-portfolio {
+    background-color: lighten(task-status-color('assess-in-portfolio'), 15%);
+  }
 }
 
 i.task-status-icon {

From c8dd020a5e572765f7710c266ae2b20563ab05c2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 23 Jul 2025 15:53:42 +1000
Subject: [PATCH 398/776] feat: ensure complete button updates aip only tasks
 to working on it

---
 .../tutor-discussion/tutor-discussion.component.html      | 3 +--
 .../states/tutor-discussion/tutor-discussion.component.ts | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 00eeacfdb5..1a2440b3fb 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -70,7 +70,7 @@
                   class="notification"
                   [ngClass]="{
                     active: task.numNewComments > 0 || task.similaritiesDetected,
-                    similarities: task.similaritiesDetected,
+                    similarities: task.similaritiesDetected
                   }"
                 ></span>
                 <user-icon class="self-center" [user]="project?.student" [size]="30"> </user-icon>
@@ -154,7 +154,6 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
         >
           <!-- Mark as Complete -->
           <mat-icon>done</mat-icon>
-          <!-- <mat-icon class="text-2xl leading-none m-0">done</mat-icon> -->
         </button>
       </div>
     </div>
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index d16e40a46b..705913b8b6 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -1,4 +1,4 @@
-import {AfterViewInit, Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
+import {AfterViewInit, Component, Input, ViewChild, ViewEncapsulation} from '@angular/core';
 import {MatSelectionList} from '@angular/material/list';
 import {MatTabChangeEvent} from '@angular/material/tabs';
 import {StateService, UIRouter} from '@uirouter/core';
@@ -206,7 +206,11 @@ export class TutorDiscussionComponent implements AfterViewInit {
     const selectedTasks = this.tasksList.selectedOptions.selected;
     for (const taskOption of selectedTasks) {
       const task = taskOption.value as Task;
-      task.updateTaskStatus(status, true);
+      if (task.definition.assessInPortfolioOnly) {
+        task.updateTaskStatus(status === 'complete' ? 'working_on_it' : status, true);
+      } else {
+        task.updateTaskStatus(status, true);
+      }
     }
   }
 

From 9cb22f245e800e363d0d1c9e8c7b1c3621078f8d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 23 Jul 2025 17:03:41 +1000
Subject: [PATCH 399/776] refactor: reword assess in portfolio actions

---
 src/app/api/models/task-status.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts
index 741e62a9ef..6c43183127 100644
--- a/src/app/api/models/task-status.ts
+++ b/src/app/api/models/task-status.ts
@@ -371,9 +371,8 @@ export class TaskStatus {
       {
         detail: 'Your submission will be assessed in your portfolio',
         reason:
-          'This task will not be signed off as complete and will be assessed directly in your final portfolio submission.',
-        action:
-          'Tutors may offer feedback before the feedback deadline, but this task will only be assessed in your final portfolio. You can make changes before the portfolio due date, but you must manually set the status back to "assess in portfolio".',
+          'This task will no longer be checked by tutors, and will be assessed directly in your final portfolio submission.',
+        action: 'You will need to ensure this task is at an adequare standard in your portfolio.',
       },
     ],
     // [

From 74712d59e923b2e3156bda1307772447112a5f69 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 23 Jul 2025 17:40:37 +1000
Subject: [PATCH 400/776] refactor: require file upload on assess in portfolio
 trigger

---
 src/app/api/models/task-status.ts                           | 6 +++++-
 src/app/api/models/task.ts                                  | 3 ++-
 .../task-status-card/task-status-card.component.html        | 6 +++++-
 .../task-status-card/task-status-card.component.ts          | 4 ++++
 .../upload-submission-modal/upload-submission-modal.coffee  | 1 +
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts
index 6c43183127..a994d9414d 100644
--- a/src/app/api/models/task-status.ts
+++ b/src/app/api/models/task-status.ts
@@ -98,7 +98,11 @@ export class TaskStatus {
     'redo',
   ];
 
-  public static readonly SUBMITTABLE_STATUSES: TaskStatusEnum[] = ['ready_for_feedback', 'need_help'];
+  public static readonly SUBMITTABLE_STATUSES: TaskStatusEnum[] = [
+    'ready_for_feedback',
+    'need_help',
+    'assess_in_portfolio',
+  ];
 
   public static readonly MARKED_STATUSES: TaskStatusEnum[] = [
     'redo',
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2e9fe84256..1b907171ec 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -799,7 +799,8 @@ export class Task extends Entity {
     const alerts: AlertService = AppInjector.get(AlertService);
 
     const requiresFileUpload =
-      ['ready_for_feedback', 'need_help'].includes(status) && this.requiresFileUpload();
+      ['ready_for_feedback', 'need_help', 'assess_in_portfolio'].includes(status) &&
+      this.requiresFileUpload();
 
     if (requiresFileUpload && this.isReadyForUpload) {
       this.presentTaskSubmissionModal(status);
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
index 24700b3b52..7c6c5c7a32 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
@@ -33,7 +33,11 @@ <h5>{{ task?.statusLabel() }}</h5>
   </mat-card-content>
 
   <mat-card-actions class="space-x-2">
-    <button mat-stroked-button (click)="triggerTransition('ready_for_feedback')" [disabled]="isReadyForFeedback()">
+    <button
+      mat-stroked-button
+      (click)="triggerTransition('ready_for_feedback')"
+      [disabled]="isReadyForFeedback() || isSubmittedForPortfolio()"
+    >
       Upload Submission
     </button>
 
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index c2b7992cd1..b435593814 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -60,6 +60,10 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     return this.task.status === 'ready_for_feedback';
   }
 
+  public isSubmittedForPortfolio(): boolean {
+    return this.task.status === 'assess_in_portfolio';
+  }
+
   triggerTransition(trigger: TaskStatusEnum): void {
     this.task.triggerTransition(trigger);
   }
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index bd9df32258..d807966396 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -69,6 +69,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
     onBeforeUpload: ->
       $scope.uploader.payload.contributions = mapTeamToPayload() if _.includes(states.shown, 'group')
       $scope.uploader.payload.trigger = 'need_help' if $scope.submissionType == 'need_help'
+      $scope.uploader.payload.trigger = 'assess_in_portfolio' if $scope.submissionType == 'assess_in_portfolio'
     onSuccess: (response) ->
       $scope.uploader.response = response
       if $scope.task.isTestSubmission

From 29bb95f5974dc8f258b204957a212a8399ad2d6e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 23 Jul 2025 17:43:45 +1000
Subject: [PATCH 401/776] feat: show maintenance ui when api fails

---
 .../states/sign-in/sign-in.component.html     | 131 ++++++++++--------
 .../states/sign-in/sign-in.component.scss     |  14 ++
 .../states/sign-in/sign-in.component.ts       |  67 ++++-----
 3 files changed, 123 insertions(+), 89 deletions(-)

diff --git a/src/app/sessions/states/sign-in/sign-in.component.html b/src/app/sessions/states/sign-in/sign-in.component.html
index 0d2b8a58c9..17253132f7 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.html
+++ b/src/app/sessions/states/sign-in/sign-in.component.html
@@ -1,65 +1,82 @@
 <section class="welcome flex flex-row custom-md-h-screen">
   <f-hero-sidebar class="sidebar self-start flex-col h-full"></f-hero-sidebar>
   <section class="content flex flex-col custom-md-h-screen">
-    <div class="container" *ngIf="!isLoading">
-      <div class="subcontainer">
-        <div class="wordmark flex-row place-content-start">
-          <img src="../../../assets/images/logo-bw.svg" width="40px" alt="Homepage Logo" />
-          <p>{{ externalName.value }}</p>
-        </div>
-        <h1 class="welcome-heading flex flex-row place-content-start">
-          Welcome to {{ externalName.value }}
-        </h1>
-        <form
-          #form="ngForm"
-          (ngSubmit)="
-            signIn({
-              username: formData.username,
-              password: formData.password,
-              remember: authService.rememberMe,
-              autoLogin: autoLogin
-            })
-          "
-          class="sign-in-form flex flex-col"
-        >
-          @if (showCredentials) {
-            <mat-form-field appearance="outline" class="flex-1 h-full w-full">
-              <mat-label>Username</mat-label>
-              <input matInput name="username" required [(ngModel)]="formData.username" />
-            </mat-form-field>
-          }
+    @if (!isLoading) {
+      <div class="container" *ngIf="!isLoading">
+        <div class="subcontainer">
+          <div class="wordmark flex-row place-content-start">
+            <img src="../../../assets/images/logo-bw.svg" width="40px" alt="Homepage Logo" />
+            <p>{{ externalName.value }}</p>
+          </div>
+          <h1 class="welcome-heading flex flex-row place-content-start">
+            Welcome to {{ externalName.value }}
+          </h1>
+          <form
+            #form="ngForm"
+            (ngSubmit)="
+              signIn({
+                username: formData.username,
+                password: formData.password,
+                remember: authService.rememberMe,
+                autoLogin: autoLogin
+              })
+            "
+            class="sign-in-form flex flex-col"
+          >
+            @if (showCredentials) {
+              <mat-form-field appearance="outline" class="flex-1 h-full w-full">
+                <mat-label>Username</mat-label>
+                <input matInput name="username" required [(ngModel)]="formData.username" />
+              </mat-form-field>
+            }
 
-          @if (showCredentials) {
-            <mat-form-field appearance="outline" class="flex-1 h-full w-full">
-              <mat-label>Password</mat-label>
-              <input
-                type="password"
-                matInput
-                name="password"
-                required
-                [(ngModel)]="formData.password"
-              />
-            </mat-form-field>
-          }
-          @if (!showCredentials) {
-            <mat-checkbox matInput name="autoLogin" [(ngModel)]="autoLogin">
-              Automatically redirect
+            @if (showCredentials) {
+              <mat-form-field appearance="outline" class="flex-1 h-full w-full">
+                <mat-label>Password</mat-label>
+                <input
+                  type="password"
+                  matInput
+                  name="password"
+                  required
+                  [(ngModel)]="formData.password"
+                />
+              </mat-form-field>
+            }
+            @if (!showCredentials) {
+              <mat-checkbox matInput name="autoLogin" [(ngModel)]="autoLogin">
+                Automatically redirect
+              </mat-checkbox>
+            }
+            <mat-checkbox matInput name="remember" [(ngModel)]="authService.rememberMe">
+              Stay logged in
             </mat-checkbox>
-          }
-          <mat-checkbox matInput name="remember" [(ngModel)]="authService.rememberMe">
-            Stay logged in
-          </mat-checkbox>
-          <button
-            class="w-full"
-            mat-flat-button
-            color="primary"
-            type="form"
-            [disabled]="form.invalid"
-          >
-            Sign In
-          </button>
-        </form>
+            <button
+              class="w-full"
+              mat-flat-button
+              color="primary"
+              type="form"
+              [disabled]="form.invalid"
+            >
+              Sign In
+            </button>
+          </form>
+        </div>
+      </div>
+    } @else if (authMethodFailed) {
+      <div
+        class="maintenance flex-1 flex flex-col items-center justify-center text-center select-none"
+      >
+        <mat-card
+          class="w-full max-w-4xl h-full max-h-6xl flex flex-col justify-center items-center p-10 gap-14 border-none"
+          appearance="outlined"
+        >
+          <div class="font-black text-5xl text-gray-600">Temporarily Unavailable</div>
+          <mat-icon class="icon-size text-gray-300">engineering</mat-icon>
+          <div class="font-bold text-gray-500">
+            We apologise for the inconvenience.<br />Please check back again soon.
+          </div>
+        </mat-card>
       </div>
-    </div>
+    }
   </section>
 </section>
diff --git a/src/app/sessions/states/sign-in/sign-in.component.scss b/src/app/sessions/states/sign-in/sign-in.component.scss
index da91789cc2..6dc0ba5bc5 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.scss
+++ b/src/app/sessions/states/sign-in/sign-in.component.scss
@@ -19,3 +19,17 @@
     height: 100vh !important;
   }
 }
+
+.custom-md-h-screen {
+  height: 100vh !important;
+}
+
+.icon-size {
+  font-size: 100px;
+  height: 100px;
+  width: 100px;
+}
+
+.maintenance {
+  font-family: 'Grotesk';
+}
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index fca3d3ed24..e059c0439d 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -51,6 +51,7 @@ export class SignInComponent implements OnInit {
   public externalName: BehaviorSubject<string>;
   public formData: signInData;
   public isLoading: boolean = true;
+  public authMethodFailed: boolean = false;
 
   // Get query params from the resolve in the router state
   @Input() username: string;
@@ -91,47 +92,49 @@ export class SignInComponent implements OnInit {
 
     // wait 2 seconds with rxjs
     const wait = new Promise((resolve) => setTimeout(resolve, 3000));
-    this.http.get(`${this.constants.API_URL}/auth/method`).subscribe((response: any) => {
-      this.isLoading = false;
-
-      // if there is a string in response.data.redirect_to
-      this.SSOLoginUrl = response.redirect_to || false;
-
-      if (this.authToken) {
-        // We have an auth token - so attempt to convert to access token
-        return this.signIn({
-          auth_token: this.authToken,
-          username: this.username,
-          remember: this.authService.rememberMe,
-        });
-      } else if (this.SSOLoginUrl) {
-        if (this.autoLogin) {
-          return wait.then(() => {
-            // Double check in case changed in the meantime
-            if (this.autoLogin) {
-              this.redirectToSSO();
-            }
+    this.http.get(`${this.constants.API_URL}/auth/method`).subscribe({
+      next: (response: any) => {
+        this.isLoading = false;
+
+        // if there is a string in response.data.redirect_to
+        this.SSOLoginUrl = response.redirect_to || false;
+
+        if (this.authToken) {
+          // We have an auth token - so attempt to convert to access token
+          return this.signIn({
+            auth_token: this.authToken,
+            username: this.username,
+            remember: this.authService.rememberMe,
           });
+        } else if (this.SSOLoginUrl) {
+          if (this.autoLogin) {
+            return wait.then(() => {
+              // Double check in case changed in the meantime
+              if (this.autoLogin) {
+                this.redirectToSSO();
+              }
+            });
+          } else {
+            this.globalState.isLoadingSubject.next(false);
+            // We are SSO and no credentials
+            this.showCredentials = false;
+            return wait.then();
+          }
         } else {
           this.globalState.isLoadingSubject.next(false);
-          // We are SSO and no credentials
-          this.showCredentials = false;
+          this.authMethodLoaded = true;
+          this.showCredentials = true;
           return wait.then();
         }
-      } else {
-        this.globalState.isLoadingSubject.next(false);
-        this.authMethodLoaded = true;
-        this.showCredentials = true;
-        return wait.then();
-      }
-    }),
-      function (err) {
+      },
+      error: (err) => {
         this.authMethodFailed = true;
-        this.error = err;
+        // this.error = err;
 
         // return after waiting with the wait promise
         return wait.then();
-      };
+      },
+    });
   }
 
   public get autoLogin(): boolean {

From 52f7d404ef154ff27c0ba887c8321360df95ddb6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 24 Jul 2025 12:18:49 +1000
Subject: [PATCH 402/776] feat: submission type modal

---
 src/app/doubtfire-angular.module.ts           |  2 ++
 .../task-status-card.component.html           |  2 +-
 .../task-status-card.component.ts             | 11 +++++++
 .../submission-type-modal.component.html      | 31 +++++++++++++++++++
 .../submission-type-modal.component.scss      |  6 ++++
 .../submission-type-modal.component.ts        | 29 +++++++++++++++++
 .../submission-type-modal.service.ts          | 28 +++++++++++++++++
 .../upload-submission-modal.coffee            |  2 +-
 8 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
 create mode 100644 src/app/tasks/modals/submission-type-modal/submission-type-modal.component.scss
 create mode 100644 src/app/tasks/modals/submission-type-modal/submission-type-modal.component.ts
 create mode 100644 src/app/tasks/modals/submission-type-modal/submission-type-modal.service.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 0ac33d30b7..8a2016773f 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -271,6 +271,7 @@ import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.com
 import {StaffNoteService} from './api/services/staff-note.service';
 import {LocalizedDatePipe} from './common/pipes/localized-date.pipe';
 import {StaffNotesViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component';
+import {SubmissionTypeModalComponent} from './tasks/modals/submission-type-modal/submission-type-modal.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -410,6 +411,7 @@ const MY_DATE_FORMAT = {
     StaffNotesViewComponent,
     QrModalComponent,
     LocalizedDatePipe,
+    SubmissionTypeModalComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
index 7c6c5c7a32..f659404793 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
@@ -35,7 +35,7 @@ <h5>{{ task?.statusLabel() }}</h5>
   <mat-card-actions class="space-x-2">
     <button
       mat-stroked-button
-      (click)="triggerTransition('ready_for_feedback')"
+      (click)="uploadSubmission()"
       [disabled]="isReadyForFeedback() || isSubmittedForPortfolio()"
     >
       Upload Submission
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index b435593814..af952df50a 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -7,6 +7,8 @@ import { TaskService } from 'src/app/api/services/task.service';
 import { ExtensionModalService } from 'src/app/common/modals/extension-modal/extension-modal.service';
 import { QrModalService } from 'src/app/common/modals/qr-modal/qr-modal.service';
 import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {SubmissionTypeModalService} from 'src/app/tasks/modals/submission-type-modal/submission-type-modal.service';
+
 @Component({
   selector: 'f-task-status-card',
   templateUrl: './task-status-card.component.html',
@@ -22,6 +24,7 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     private router: UIRouter,
     private qrModalService: QrModalService,
     private doubtfireConstants: DoubtfireConstants,
+    private submissionTypeModalService: SubmissionTypeModalService,
   ) {}
 
   @Input() task: Task;
@@ -68,6 +71,14 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     this.task.triggerTransition(trigger);
   }
 
+  uploadSubmission(): void {
+    if (this.task.definition.assessInPortfolioOnly) {
+      this.submissionTypeModalService.show(this.task);
+    } else {
+      this.task.triggerTransition('ready_for_feedback');
+    }
+  }
+
   updateFilesInSubmission(): void {
     this.task.presentTaskSubmissionModal(this.task.status, true);
   }
diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
new file mode 100644
index 0000000000..ce8bd35e1e
--- /dev/null
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
@@ -0,0 +1,31 @@
+<h2 mat-dialog-title>Select submission type</h2>
+<mat-dialog-content>
+  <p>
+    You can either upload your submission for tutor feedback or submit it directly for your
+    portfolio. Make sure to check if a discussion is required — tutors won’t review tasks submitted
+    to the portfolio or submitted late.
+  </p>
+  <div class="p-5 flex justify-center gap-5">
+    <button
+      mat-raised-button
+      class="h-[175px] w-[175px] flex flex-col text-align p-2 items-center gap-3"
+      color="primary"
+      (click)="triggerTransition('ready_for_feedback')"
+    >
+      <mat-icon class="icon-size">grading</mat-icon>
+      <div class="text-center">Submit for Feedback</div>
+    </button>
+    <button
+      mat-raised-button
+      class="h-[175px] w-[175px] flex flex-col text-align p-2 items-center gap-3"
+      (click)="triggerTransition('assess_in_portfolio')"
+    >
+      <mat-icon class="icon-size">auto_stories</mat-icon>
+
+      <div class="text-center">Skip Feedback</div>
+    </button>
+  </div>
+</mat-dialog-content>
+<mat-dialog-actions class="flex justify-end">
+  <button mat-button [mat-dialog-close]>Cancel</button>
+</mat-dialog-actions>
diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.scss b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.scss
new file mode 100644
index 0000000000..50781aeafa
--- /dev/null
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.scss
@@ -0,0 +1,6 @@
+.icon-size {
+  font-size: 35px;
+  height: 35px;
+  width: 35px;
+  margin: 0;
+}
diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.ts b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.ts
new file mode 100644
index 0000000000..2dfd66e4dd
--- /dev/null
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.ts
@@ -0,0 +1,29 @@
+import {Component, Inject} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {Task} from 'src/app/api/models/task';
+import {TaskStatusEnum} from 'src/app/api/models/task-status';
+
+export interface SubmissionTypeModalData {
+  task: Task;
+}
+
+@Component({
+  selector: 'f-submission-type-modal',
+  templateUrl: './submission-type-modal.component.html',
+  styleUrls: ['./submission-type-modal.component.scss'],
+})
+export class SubmissionTypeModalComponent {
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public data: SubmissionTypeModalData,
+    private dialogRef: MatDialogRef<SubmissionTypeModalComponent>,
+  ) {}
+
+  triggerTransition(status: TaskStatusEnum) {
+    this.data.task.triggerTransition(status);
+    this.dismissModal();
+  }
+
+  private dismissModal() {
+    this.dialogRef.close();
+  }
+}
diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.service.ts b/src/app/tasks/modals/submission-type-modal/submission-type-modal.service.ts
new file mode 100644
index 0000000000..d867ce4ce3
--- /dev/null
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.service.ts
@@ -0,0 +1,28 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {
+  SubmissionTypeModalComponent,
+  SubmissionTypeModalData,
+} from './submission-type-modal.component';
+import {Task} from 'src/app/api/models/task';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SubmissionTypeModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(task: Task) {
+    const _dialogRef = this.dialog.open<SubmissionTypeModalComponent, SubmissionTypeModalData>(
+      SubmissionTypeModalComponent,
+      {
+        data: {
+          task: task,
+        },
+        position: {top: '2.5%'},
+        width: '100%',
+        maxWidth: '650px',
+      },
+    );
+  }
+}
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index d807966396..d1c87f917b 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -69,7 +69,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
     onBeforeUpload: ->
       $scope.uploader.payload.contributions = mapTeamToPayload() if _.includes(states.shown, 'group')
       $scope.uploader.payload.trigger = 'need_help' if $scope.submissionType == 'need_help'
-      $scope.uploader.payload.trigger = 'assess_in_portfolio' if $scope.submissionType == 'assess_in_portfolio'
+      $scope.uploader.payload.trigger = 'assess_in_portfolio' if $scope.submissionType == 'assess_in_portfolio' || $scope.task.status == 'assess_in_portfolio'
     onSuccess: (response) ->
       $scope.uploader.response = response
       if $scope.task.isTestSubmission

From a858d3a7b2f41ac7478d4917d2d2f6c68a167e6e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 24 Jul 2025 15:41:46 +1000
Subject: [PATCH 403/776] feat: send automated message when set back to working
 on it

---
 src/app/common/footer/footer.component.html |  2 +-
 src/app/common/footer/footer.component.ts   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 58b7b13c90..0817be0ff4 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -62,7 +62,7 @@
           matTooltipPosition="above"
           aria-label="Mark as Working On It"
           class="button large-button"
-          (click)="selectedTask?.updateTaskStatus('working_on_it')"
+          (click)="markTaskWorkingOnIt(selectedTask)"
         >
           <mat-icon>bolt</mat-icon>
         </button>
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 4c8098e06c..c7ab14a19b 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -73,6 +73,18 @@ export class FooterComponent implements OnInit {
     );
   }
 
+  markTaskWorkingOnIt(task?: Task) {
+    if (!task || !task.definition?.assessInPortfolioOnly) {
+      return;
+    }
+    task.addComment(
+      `**Automated Message:** Task "${task.definition.abbreviation}" will be graded during portfolio assessment only. You must now submit it for "Assess in Portfolio" before the portfolio deadline.`,
+    );
+    setTimeout(() => {
+      task.updateTaskStatus('working_on_it');
+    }, 500);
+  }
+
   viewTaskSheet() {
     this.selectedTaskService.showTaskSheet();
   }

From 3a9c513ec1fe8eee64282d0ec5aa65eb92e15fa2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 24 Jul 2025 16:05:48 +1000
Subject: [PATCH 404/776] chore: hide assess in portfolio status from dropdown

---
 src/app/api/models/task-status.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts
index a994d9414d..3ac8dea4b2 100644
--- a/src/app/api/models/task-status.ts
+++ b/src/app/api/models/task-status.ts
@@ -240,13 +240,7 @@ export class TaskStatus {
   ]);
 
   public static readonly SWITCHABLE_STATES = {
-    student: [
-      'not_started',
-      'working_on_it',
-      'need_help',
-      'ready_for_feedback',
-      'assess_in_portfolio',
-    ],
+    student: ['not_started', 'working_on_it', 'need_help', 'ready_for_feedback'],
     tutor: [
       'complete',
       'discuss',

From e44e879d35d2e913c69762938ac78027eb6e35d0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 24 Jul 2025 16:06:24 +1000
Subject: [PATCH 405/776] refactor: prompt submission type modal on dropdown
 selection

---
 .../task-status-card/task-status-card.component.ts          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index af952df50a..84c0bdfc44 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -68,7 +68,11 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
   }
 
   triggerTransition(trigger: TaskStatusEnum): void {
-    this.task.triggerTransition(trigger);
+    if (trigger === 'ready_for_feedback') {
+      this.uploadSubmission();
+    } else {
+      this.task.triggerTransition(trigger);
+    }
   }
 
   uploadSubmission(): void {

From 4f560c744e84d97f0319f94f60807eec78d73c4d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 28 Jul 2025 11:05:45 +1000
Subject: [PATCH 406/776] chore: remove comment

---
 .../sidekiq-progress-modal/sidekiq-progress-modal.component.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
index 076933bbe9..caac1b5d80 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
@@ -64,7 +64,6 @@ export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
         this.job = job;
         this.pollFailureCount = 0;
 
-        // TODO: update UI to indicate if its being queued, and not being worked yet
         if (job.status === 'complete' || job.status === 'failed') {
           clearInterval(this.jobPollingInterval);
         }

From 04a40a5668de492a6546f2728d6a9a4904395eb6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 28 Jul 2025 11:14:56 +1000
Subject: [PATCH 407/776] refactor: move unavailable state to component

---
 src/app/doubtfire-angular.module.ts               |  2 ++
 .../unavailable-card.component.html               | 10 ++++++++++
 .../unavailable-card.component.scss               |  9 +++++++++
 .../unavailable-card.component.ts                 |  8 ++++++++
 .../states/sign-in/sign-in.component.html         | 15 ++-------------
 .../states/sign-in/sign-in.component.scss         | 10 ----------
 6 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 src/app/errors/unavailable-card/unavailable-card.component.html
 create mode 100644 src/app/errors/unavailable-card/unavailable-card.component.scss
 create mode 100644 src/app/errors/unavailable-card/unavailable-card.component.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 0ac33d30b7..85a08e408e 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -271,6 +271,7 @@ import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.com
 import {StaffNoteService} from './api/services/staff-note.service';
 import {LocalizedDatePipe} from './common/pipes/localized-date.pipe';
 import {StaffNotesViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/staff-notes-view/staff-notes-view.component';
+import {UnavailableCardComponent} from './errors/unavailable-card/unavailable-card.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -410,6 +411,7 @@ const MY_DATE_FORMAT = {
     StaffNotesViewComponent,
     QrModalComponent,
     LocalizedDatePipe,
+    UnavailableCardComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/errors/unavailable-card/unavailable-card.component.html b/src/app/errors/unavailable-card/unavailable-card.component.html
new file mode 100644
index 0000000000..86b05b2f34
--- /dev/null
+++ b/src/app/errors/unavailable-card/unavailable-card.component.html
@@ -0,0 +1,10 @@
+<mat-card
+  class="maintenance w-full max-w-4xl h-full max-h-6xl flex flex-col justify-center items-center p-10 gap-14 border-none select-none"
+  appearance="outlined"
+>
+  <div class="font-black text-5xl text-gray-600">Temporarily Unavailable</div>
+  <mat-icon class="icon-size text-gray-300">engineering</mat-icon>
+  <div class="font-bold text-gray-500">
+    We apologise for the inconvenience.<br />Please check back again soon.
+  </div>
+</mat-card>
diff --git a/src/app/errors/unavailable-card/unavailable-card.component.scss b/src/app/errors/unavailable-card/unavailable-card.component.scss
new file mode 100644
index 0000000000..d7cc3dcb91
--- /dev/null
+++ b/src/app/errors/unavailable-card/unavailable-card.component.scss
@@ -0,0 +1,9 @@
+.icon-size {
+  font-size: 100px;
+  height: 100px;
+  width: 100px;
+}
+
+.maintenance {
+  font-family: 'Grotesk';
+}
diff --git a/src/app/errors/unavailable-card/unavailable-card.component.ts b/src/app/errors/unavailable-card/unavailable-card.component.ts
new file mode 100644
index 0000000000..a33f38bb90
--- /dev/null
+++ b/src/app/errors/unavailable-card/unavailable-card.component.ts
@@ -0,0 +1,8 @@
+import {Component} from '@angular/core';
+
+@Component({
+  selector: 'f-unavailable-card',
+  templateUrl: './unavailable-card.component.html',
+  styleUrls: ['./unavailable-card.component.scss'],
+})
+export class UnavailableCardComponent {}
diff --git a/src/app/sessions/states/sign-in/sign-in.component.html b/src/app/sessions/states/sign-in/sign-in.component.html
index 17253132f7..74fd6b7b99 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.html
+++ b/src/app/sessions/states/sign-in/sign-in.component.html
@@ -63,19 +63,8 @@ <h1 class="welcome-heading flex flex-row place-content-start">
         </div>
       </div>
     } @else if (authMethodFailed) {
-      <div
-        class="maintenance flex-1 flex flex-col items-center justify-center text-center select-none"
-      >
-        <mat-card
-          class="w-full max-w-4xl h-full max-h-6xl flex flex-col justify-center items-center p-10 gap-14 border-none"
-          appearance="outlined"
-        >
-          <div class="font-black text-5xl text-gray-600">Temporarily Unavailable</div>
-          <mat-icon class="icon-size text-gray-300">engineering</mat-icon>
-          <div class="font-bold text-gray-500">
-            We apologise for the inconvenience.<br />Please check back again soon.
-          </div>
-        </mat-card>
+      <div class="maintenance flex-1 flex flex-col items-center justify-center text-center">
+        <f-unavailable-card></f-unavailable-card>
       </div>
     }
   </section>
diff --git a/src/app/sessions/states/sign-in/sign-in.component.scss b/src/app/sessions/states/sign-in/sign-in.component.scss
index 6dc0ba5bc5..1594f3adc7 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.scss
+++ b/src/app/sessions/states/sign-in/sign-in.component.scss
@@ -23,13 +23,3 @@
 .custom-md-h-screen {
   height: 100vh !important;
 }
-
-.icon-size {
-  font-size: 100px;
-  height: 100px;
-  width: 100px;
-}
-
-.maintenance {
-  font-family: 'Grotesk';
-}

From d843c4a70613e9255917e43a8820dbeea215f645 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 28 Jul 2025 12:22:37 +1000
Subject: [PATCH 408/776] chore: add back tooltip warning

---
 src/app/units/states/portfolios/portfolios.tpl.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index 0e8466b9ce..e57ed2378c 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -229,7 +229,12 @@ <h4 class="panel-title">Mark Portfolios</h4>
         rotate="false"
       ></pagination>
       <div class="pull-right">
-        <button ng-click="downloadPortfolios()" class="mr-3">
+        <button
+          ng-click="downloadPortfolios()"
+          class="mr-3"
+          tooltip-html-unsafe="<i class='fa fa-warning'></i> <strong>WARNING:</strong> Downloading all portfolios may take a long time"
+          tooltip-append-to-body="true"
+        >
           <i class="fa fa-download"></i> Download All Portfolios
         </button>
         <button ng-click="downloadGrades()" style="padding-right: 1rem">

From d26946978d56c74a78991dc79fed01c605ebf2a7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 28 Jul 2025 15:26:50 +1000
Subject: [PATCH 409/776] chore(release): 10.0.0-14

---
 CHANGELOG.md      | 15 +++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03a705ff44..b24d59d4f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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.
 
+## [10.0.0-14](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-13...v10.0.0-14) (2025-07-28)
+
+
+### Features
+
+* portfolio zip downloading via sidekiq ([9000830](https://github.com/b0ink/doubtfire-deploy/commit/9000830e5e98bc0b921d618c034471eeddf996b4))
+* show list of active sidekiq jobs ([aa85665](https://github.com/b0ink/doubtfire-deploy/commit/aa85665670a23fea556c6420f139e7e7853d16ba))
+* show maintenance ui when api fails ([29bb95f](https://github.com/b0ink/doubtfire-deploy/commit/29bb95f5974dc8f258b204957a212a8399ad2d6e))
+* sidekiq progress modal component ([b9691e7](https://github.com/b0ink/doubtfire-deploy/commit/b9691e793204e84fae323610a7b555b15e065514))
+
+
+### Bug Fixes
+
+* fallback to task definition due date ([bef0a9c](https://github.com/b0ink/doubtfire-deploy/commit/bef0a9cbfefc58407f851d3ca73b90af6b81151f))
+
 ## [10.0.0-13](https://github.com/macite/doubtfire-deploy/compare/v10.0.0-12...v10.0.0-13) (2025-07-16)
 
 
diff --git a/package-lock.json b/package-lock.json
index 3285e0664a..4d4c00a015 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-13",
+  "version": "10.0.0-14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-13",
+      "version": "10.0.0-14",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 9de3c1a9a2..685962c57e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-13",
+  "version": "10.0.0-14",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From b180799efd716d802cf83ce08b6df0639d9055b6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 28 Jul 2025 17:48:05 +1000
Subject: [PATCH 410/776] fix: map correct variables

---
 src/app/api/models/task-similarity.ts           | 12 +++++++++---
 src/app/api/services/task-similarity.service.ts |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/api/models/task-similarity.ts b/src/app/api/models/task-similarity.ts
index 00ba0f90ab..cb9640966c 100644
--- a/src/app/api/models/task-similarity.ts
+++ b/src/app/api/models/task-similarity.ts
@@ -12,11 +12,15 @@ export enum TaskSimilarityType {
 
 /**
  * Represents teh format for a part of a similarity report for a task.
- * This is html for moss, and pdf for turn it in.
+ *
+ * HTML for moss
+ * PDF for TurnItIn
+ * jplag for JPlag
  */
 export enum TaskSimilarityPartFormat {
   Html = 'html',
   Pdf = 'pdf',
+  Jplag = 'jplag',
 }
 
 export class TaskSimilarityPart {
@@ -37,8 +41,8 @@ export class TaskSimilarity extends Entity {
   parts: TaskSimilarityPart[];
   task: Task;
   readyForViewer: boolean = false;
-  other_task?: Task;
-  other_student?: User;
+  otherTask?: Task;
+  otherStudent?: User;
 
   constructor(task: Task) {
     super();
@@ -67,6 +71,8 @@ export class TaskSimilarity extends Entity {
     switch (this.type) {
       case TaskSimilarityType.Jplag:
         return 'JPLAG';
+      case TaskSimilarityType.Moss:
+        return 'MOSS';
       case TaskSimilarityType.TurnItIn:
         return 'TurnItIn';
     }
diff --git a/src/app/api/services/task-similarity.service.ts b/src/app/api/services/task-similarity.service.ts
index 1dced47e0a..a3586d677a 100644
--- a/src/app/api/services/task-similarity.service.ts
+++ b/src/app/api/services/task-similarity.service.ts
@@ -21,8 +21,8 @@ export class TaskSimilarityService extends CachedEntityService<TaskSimilarity> {
       'pct',
       'readyForViewer',
       'parts',
-      'other_task',
-      'other_student',
+      'otherTask',
+      'otherStudent',
     );
 
     this.mapping.addJsonKey('flagged');

From e7154157ff1b88817141bae5b1b3de9fd37171f0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 28 Jul 2025 17:50:05 +1000
Subject: [PATCH 411/776] fix: prevent report button from expanding accordion

---
 .../task-similarity-view/task-similarity-view.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index bc5cdb8cff..dfa7a0511c 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -36,7 +36,7 @@ <h1 class="mat-headline"></h1>
                     matTooltip="View JPlag report for this similarity"
                     mat-icon-button
                     aria-label="View Detailed Report"
-                    (click)="viewJplagReport(similarity)"
+                    (click)="viewJplagReport(similarity); $event.stopPropagation()"
                   >
                     <mat-icon>summarize</mat-icon>
                   </button>

From 0b8fd1d1eecebfedae118177428e5c8b5fd5b2b8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 28 Jul 2025 17:50:38 +1000
Subject: [PATCH 412/776] refactor: display correct similarity report

---
 .../task-similarity-view.component.html       | 27 ++++++++++++++-----
 .../task-similarity-view.component.ts         |  2 +-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
index dfa7a0511c..a7f0e0aed0 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.html
@@ -64,13 +64,26 @@ <h1 class="mat-headline"></h1>
                 </button>
               }
             </mat-expansion-panel-header>
-            @if (part.panelOpenState && part.format) {
-              <f-file-viewer
-                [fileType]="part.format"
-                [src]="similarity.fileUrl(part.idx)"
-              ></f-file-viewer>
-            } @else {
-              <p>There is no local similarity file for this.</p>
+            @if (part.panelOpenState) {
+              @if (part.format) {
+                @if (part.format === 'html' || part.format === 'pdf') {
+                  <f-file-viewer
+                    [fileType]="part.format"
+                    [src]="similarity.fileUrl(part.idx)"
+                  ></f-file-viewer>
+                } @else if (part.format === 'jplag') {
+                  <button
+                    mat-raised-button
+                    color="primary"
+                    class="mx-auto block"
+                    (click)="viewJplagReport(similarity)"
+                  >
+                    View JPlag Similarity
+                  </button>
+                }
+              } @else {
+                <p>There is no local similarity file for this.</p>
+              }
             }
           </mat-expansion-panel>
         }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index ed4cd223bb..8026dc45e0 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -80,7 +80,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
             // Open comparison between the two students
             this.jplagViewer.openComparison(
               similarity.task.project.student.username,
-              similarity.other_student.username,
+              similarity.otherStudent.username,
             );
             this.jplagOpenState = true;
           }, 100);

From e297f261e3df19faf11be9fde6515ce75434c320 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:50:11 +1000
Subject: [PATCH 413/776] fix: correctly load start page

- ng2-pdf-viewer on-render callback would fire multiple times as you scroll down the pdf
---
 .../pdf-viewer/pdf-viewer.component.html      |  2 +-
 .../common/pdf-viewer/pdf-viewer.component.ts | 28 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.html b/src/app/common/pdf-viewer/pdf-viewer.component.html
index ed361fecd8..4e1c0e9fb3 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.html
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.html
@@ -58,7 +58,7 @@
         [render-text]="true"
         [original-size]="false"
         (after-load-complete)="onLoaded()"
-        (page-rendered)="onPageRendered()"
+        [page]="getStartPage()"
       ></pdf-viewer>
     }
   } @else {
diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.ts b/src/app/common/pdf-viewer/pdf-viewer.component.ts
index 59bfcaff34..4b0aeb2488 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.ts
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.ts
@@ -9,6 +9,7 @@ import {
   ViewChild,
   AfterViewInit,
 } from '@angular/core';
+import {getDocument} from 'pdfjs-dist';
 import {PdfViewerComponent} from 'ng2-pdf-viewer';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
 import {AlertService} from '../services/alert.service';
@@ -25,6 +26,7 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
   private _pdfUrl: string;
   public pdfBlobUrl: string;
   public useNativePdfViewer = false;
+  public pdfTotalPages: number;
 
   @Input() pdfUrl: string;
   @Input() startPage: number = 1;
@@ -117,7 +119,7 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
     this.fileDownloader.downloadBlob(
       downloadUrl,
       (url: string, _response: HttpResponse<Blob>) => {
-        this.pdfBlobUrl = url;
+        this.setPdfBlob(url);
       },
       (error: unknown) => {
         this.alerts.error(`Error downloading PDF. ${error}`, 6000);
@@ -125,15 +127,31 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
     );
   }
 
+  private async setPdfBlob(url: string) {
+    try {
+      const pdfjs = await import('pdfjs-dist/build/pdf');
+      const pdfjsWorker = await import('pdfjs-dist/build/pdf.worker.entry');
+      pdfjs.GlobalWorkerOptions.workerSrc = pdfjsWorker;
+
+      // Get PDF page count before rendering to validate startPage
+      const pdf = await getDocument(url).promise;
+      this.pdfTotalPages = pdf.numPages;
+    } catch (_error) {
+      console.warn('Could not parse PDF. Defaulting to first page.');
+    } finally {
+      this.pdfBlobUrl = url;
+    }
+  }
+
   onLoaded() {
     this.loaded = true;
     window.dispatchEvent(new Event('resize'));
   }
 
-  onPageRendered() {
-    this.loaded = true;
-    if (this.startPage > 1) {
-      this.scrollToPage(this.startPage);
+  getStartPage(): number {
+    if (this.startPage > 1 && this.startPage <= this.pdfTotalPages) {
+      return this.startPage;
     }
+    return 1;
   }
 }

From 215ad68dcc7cf08c586079e2bd52a99fcc013965 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:54:42 +1000
Subject: [PATCH 414/776] chore: reset total pages variable

---
 src/app/common/pdf-viewer/pdf-viewer.component.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.ts b/src/app/common/pdf-viewer/pdf-viewer.component.ts
index 4b0aeb2488..6d2f9354f8 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.ts
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.ts
@@ -26,7 +26,7 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
   private _pdfUrl: string;
   public pdfBlobUrl: string;
   public useNativePdfViewer = false;
-  public pdfTotalPages: number;
+  public pdfTotalPages?: number | undefined;
 
   @Input() pdfUrl: string;
   @Input() startPage: number = 1;
@@ -138,6 +138,7 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
       this.pdfTotalPages = pdf.numPages;
     } catch (_error) {
       console.warn('Could not parse PDF. Defaulting to first page.');
+      this.pdfTotalPages = undefined;
     } finally {
       this.pdfBlobUrl = url;
     }
@@ -149,7 +150,7 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
   }
 
   getStartPage(): number {
-    if (this.startPage > 1 && this.startPage <= this.pdfTotalPages) {
+    if (this.startPage > 1 && this.pdfTotalPages && this.startPage <= this.pdfTotalPages) {
       return this.startPage;
     }
     return 1;

From 970c9eea6ac896fe96f5718e49c340b118c1a3c4 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 29 Jul 2025 12:12:13 +1000
Subject: [PATCH 415/776] chore(release): 10.0.0-15

---
 CHANGELOG.md      | 9 +++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b24d59d4f4..3cdec7a9f1 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.
 
+## [10.0.0-15](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-14...v10.0.0-15) (2025-07-29)
+
+
+### Bug Fixes
+
+* correctly load start page ([e297f26](https://github.com/b0ink/doubtfire-deploy/commit/e297f261e3df19faf11be9fde6515ce75434c320))
+* map correct variables ([b180799](https://github.com/b0ink/doubtfire-deploy/commit/b180799efd716d802cf83ce08b6df0639d9055b6))
+* prevent report button from expanding accordion ([e715415](https://github.com/b0ink/doubtfire-deploy/commit/e7154157ff1b88817141bae5b1b3de9fd37171f0))
+
 ## [10.0.0-14](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-13...v10.0.0-14) (2025-07-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index 4d4c00a015..88503be013 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-14",
+  "version": "10.0.0-15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-14",
+      "version": "10.0.0-15",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 685962c57e..8fc14e52e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-14",
+  "version": "10.0.0-15",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From ce4450fd0876bd83a08b1849bb7246cc140e739a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 29 Jul 2025 14:49:46 +1000
Subject: [PATCH 416/776] refactor: fix pdf start page

---
 .../pdf-viewer/pdf-viewer.component.html      |  6 ++-
 .../common/pdf-viewer/pdf-viewer.component.ts | 53 +++++++++----------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.html b/src/app/common/pdf-viewer/pdf-viewer.component.html
index 4e1c0e9fb3..268190c700 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.html
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.html
@@ -57,8 +57,10 @@
         [src]="pdfBlobUrl"
         [render-text]="true"
         [original-size]="false"
-        (after-load-complete)="onLoaded()"
-        [page]="getStartPage()"
+        [(page)]="pageNumber"
+        (after-load-complete)="onLoaded($event)"
+        [show-all]="true"
+        (text-layer-rendered)="onTextLayerRendered($event)"
       ></pdf-viewer>
     }
   } @else {
diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.ts b/src/app/common/pdf-viewer/pdf-viewer.component.ts
index 6d2f9354f8..c019c17fc3 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.ts
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.ts
@@ -1,16 +1,15 @@
 import {HttpResponse} from '@angular/common/http';
 import {
+  AfterViewInit,
   Component,
-  Input,
   Inject,
+  Input,
+  OnChanges,
   OnDestroy,
   SimpleChanges,
-  OnChanges,
   ViewChild,
-  AfterViewInit,
 } from '@angular/core';
-import {getDocument} from 'pdfjs-dist';
-import {PdfViewerComponent} from 'ng2-pdf-viewer';
+import {PDFDocumentProxy, PdfViewerComponent} from 'ng2-pdf-viewer';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
 import {AlertService} from '../services/alert.service';
 
@@ -27,10 +26,13 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
   public pdfBlobUrl: string;
   public useNativePdfViewer = false;
   public pdfTotalPages?: number | undefined;
+  public pdfHasRendered: boolean = false;
 
   @Input() pdfUrl: string;
   @Input() startPage: number = 1;
 
+  public pageNumber: number = 1;
+
   @ViewChild(PdfViewerComponent) private pdfComponent: PdfViewerComponent;
   pdfSearchString: string;
   zoomValue = 1;
@@ -70,6 +72,7 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
       // Get the new blob
       this._pdfUrl = value;
       this.loaded = false;
+      this.pdfHasRendered = false;
       this.downloadBlob(value);
     }
   }
@@ -119,7 +122,7 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
     this.fileDownloader.downloadBlob(
       downloadUrl,
       (url: string, _response: HttpResponse<Blob>) => {
-        this.setPdfBlob(url);
+        this.pdfBlobUrl = url;
       },
       (error: unknown) => {
         this.alerts.error(`Error downloading PDF. ${error}`, 6000);
@@ -127,32 +130,26 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
     );
   }
 
-  private async setPdfBlob(url: string) {
-    try {
-      const pdfjs = await import('pdfjs-dist/build/pdf');
-      const pdfjsWorker = await import('pdfjs-dist/build/pdf.worker.entry');
-      pdfjs.GlobalWorkerOptions.workerSrc = pdfjsWorker;
-
-      // Get PDF page count before rendering to validate startPage
-      const pdf = await getDocument(url).promise;
-      this.pdfTotalPages = pdf.numPages;
-    } catch (_error) {
-      console.warn('Could not parse PDF. Defaulting to first page.');
-      this.pdfTotalPages = undefined;
-    } finally {
-      this.pdfBlobUrl = url;
-    }
-  }
-
-  onLoaded() {
+  onLoaded(event: PDFDocumentProxy) {
     this.loaded = true;
     window.dispatchEvent(new Event('resize'));
+    this.pdfTotalPages = event.numPages;
   }
 
-  getStartPage(): number {
-    if (this.startPage > 1 && this.pdfTotalPages && this.startPage <= this.pdfTotalPages) {
-      return this.startPage;
+  onTextLayerRendered() {
+    if (this.pdfHasRendered) {
+      return;
     }
-    return 1;
+    this.pdfHasRendered = true;
+    setTimeout(() => {
+      if (
+        this.startPage &&
+        this.startPage > 1 &&
+        this.pdfTotalPages &&
+        this.startPage <= this.pdfTotalPages
+      ) {
+        this.pageNumber = Number(this.startPage);
+      }
+    });
   }
 }

From 0a9d4eb2078f5335c7caef4458255dad053aff9a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 29 Jul 2025 14:51:04 +1000
Subject: [PATCH 417/776] chore(release): 10.0.0-16

---
 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 3cdec7a9f1..8628722d8c 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.
 
+## [10.0.0-16](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-15...v10.0.0-16) (2025-07-29)
+
 ## [10.0.0-15](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-14...v10.0.0-15) (2025-07-29)
 
 
diff --git a/package-lock.json b/package-lock.json
index 88503be013..d1045572c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-15",
+  "version": "10.0.0-16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-15",
+      "version": "10.0.0-16",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 8fc14e52e8..c455d74a2e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-15",
+  "version": "10.0.0-16",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From fe687df8b035ef851b9d147e01f575187f428a8c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 30 Jul 2025 11:56:41 +1000
Subject: [PATCH 418/776] fix: ensure whitespace is trimmed

- If a user had two first names that were exactly 11 characters the whitespace wouldn't be removed
---
 src/app/api/models/user/user.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/api/models/user/user.ts b/src/app/api/models/user/user.ts
index a613870b28..89abd9df21 100644
--- a/src/app/api/models/user/user.ts
+++ b/src/app/api/models/user/user.ts
@@ -43,10 +43,10 @@ export class User extends Entity {
   }
 
   public get name(): string {
-    const fn = this.firstName.slice(0, 11);
-    const sn = this.lastName.slice(0, 11);
+    const fn = this.firstName.slice(0, 11).trim();
+    const sn = this.lastName.slice(0, 11).trim();
     const nn =
-      this.nickname && this.nickname.trim() ? ` (${this.nickname.trim().slice(0, 11)})` : '';
+      this.nickname && this.nickname.trim() ? ` (${this.nickname.trim().slice(0, 11).trim()})` : '';
     return `${fn} ${sn}${nn}`;
   }
 

From 0d35f7f4ef2e87dd078edf20e509c8f6efc5c216 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:03:16 +1000
Subject: [PATCH 419/776] fix: prevent additional inbox queries

---
 .../staff-task-list/staff-task-list.component.ts         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index a9ef8af1d4..412d2a2053 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -205,7 +205,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
       }),
     ];
 
-    this.tutorialIdChanged();
+    this.tutorialIdChanged(false);
 
     this.setTaskDefFromTaskKey(this.taskData.taskKey);
 
@@ -294,7 +294,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     selectEl.focus();
   }
 
-  tutorialIdChanged(): void {
+  tutorialIdChanged(attemptRefreshData: boolean = true): void {
     const tutorialId = this.filters.tutorialIdSelected;
 
     const filterOption = this.studentFilter.find((f) => f.id === tutorialId);
@@ -312,7 +312,8 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
 
     this.applyFilters();
 
-    if (tutorialId === 'all' && !this.fetchedAllTasks) {
+    const isExplorerView = this.isTaskDefMode;
+    if (attemptRefreshData && !this.fetchedAllTasks && !isExplorerView) {
       this.refreshData();
     }
   }
@@ -365,7 +366,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
           this.applyFilters();
           this.loading = false;
 
-          this.fetchedAllTasks = !fetchMyStudentsOnly;
+          this.fetchedAllTasks = !fetchMyStudentsOnly && !this.isTaskDefMode;
 
         // Load initial set task, either the one provided (by the URL)
         // then load actual task in now or the first task that applies

From 3b0e3877e05f162143fc78065cee9a191d0755f4 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:35:42 +1000
Subject: [PATCH 420/776] fix: ensure new comments are fetched for selected
 project only

---
 .../task-comments-viewer.component.ts         | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index f07b717db4..6736f5d8bd 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -7,6 +7,7 @@ import {
   SimpleChanges,
   ViewChild,
   ElementRef,
+  OnDestroy,
 } from '@angular/core';
 import {commentsModal} from 'src/app/ajs-upgraded-providers';
 import {
@@ -22,13 +23,14 @@ import {TaskCommentComposerData} from '../task-comment-composer/task-comment-com
 import {AlertService} from 'src/app/common/services/alert.service';
 import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
 import {CommentsModalService} from 'src/app/common/modals/comments-modal/comments-modal.service';
+import {Subscription} from 'rxjs';
 
 @Component({
   selector: 'task-comments-viewer',
   templateUrl: './task-comments-viewer.component.html',
   styleUrls: ['./task-comments-viewer.component.scss'],
 })
-export class TaskCommentsViewerComponent implements OnChanges, OnInit {
+export class TaskCommentsViewerComponent implements OnChanges, OnInit, OnDestroy {
   // Get the comments body from the HTML template
   @ViewChild('commentsBody') commentsBody: ElementRef;
 
@@ -44,6 +46,9 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
   @Input() task: Task;
   @Input() refocusOnTaskChange: boolean;
 
+  private taskStatusSub: Subscription;
+  private commentAddedSub: Subscription;
+
   constructor(
     private taskCommentService: TaskCommentService,
     private feedbackTemplateService: FeedbackTemplateService,
@@ -54,16 +59,24 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit {
     private alerts: AlertService,
   ) {
     const self = this;
-    this.taskCommentService.commentAdded$.subscribe((tc: TaskComment) => {
+    this.commentAddedSub = this.taskCommentService.commentAdded$.subscribe((tc: TaskComment) => {
       self.scrollDown();
     });
-    this.taskService.taskStatusUpdated$.subscribe((task) => {
-      this.fetchComments(task, false);
+
+    this.taskStatusSub = this.taskService.taskStatusUpdated$.subscribe((task) => {
+      if (task && task.project && this.project && task.project.id === this.project.id) {
+        this.fetchComments(task, false);
+      }
     });
   }
 
   ngOnInit(): void {}
 
+  ngOnDestroy(): void {
+    this.taskStatusSub?.unsubscribe();
+    this.commentAddedSub?.unsubscribe();
+  }
+
   ngOnChanges(changes: SimpleChanges) {
     // Must have project for task to be mapped
     if (changes.task?.currentValue?.project != null) {

From bce1483296064bafd44bc538f83731809d816a05 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:59:32 +1000
Subject: [PATCH 421/776] feat: return task to not started status

---
 src/app/common/footer/footer.component.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 1d7166ca35..576ae4c4b2 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -174,6 +174,12 @@
           View similarities
         </button>
         <mat-divider></mat-divider>
+        @if (!selectedTask?.hasPdf && selectedTask?.status == 'ready_for_feedback') {
+          <button mat-menu-item (click)="selectedTask?.updateTaskStatus('not_started')">
+            <mat-icon matListItemIcon aria-label="Return to Not Started">pause</mat-icon>
+            Return to Not Started
+          </button>
+        }
         <button mat-menu-item (click)="selectedTask?.updateTaskStatus('feedback_exceeded')">
           <mat-icon matListItemIcon aria-label="Switch to Feedback Exceeded"
             >running_with_errors</mat-icon

From e59af803f8440338b0210b6a437537372f5dac5b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 31 Jul 2025 13:59:01 +1000
Subject: [PATCH 422/776] fix: check if project task stats exist

---
 src/app/common/footer/footer.component.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 576ae4c4b2..7a5bcbafcc 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -6,7 +6,7 @@
         #warningText
         class="mat-caption inline-block select-none text-center w-full"
       >
-        Similarities flagged for {{ selectedTask?.project.student.name }}
+        Similarities flagged for {{ selectedTask?.project?.student.name }}
       </p>
     </div>
   }
@@ -218,15 +218,19 @@
         <mat-icon class="small-icon">file_download</mat-icon>
       </button>
       <f-project-progress-bar
-        matTooltip="{{ selectedTask?.project.taskStats[4]?.value }}% progress towards {{
-          selectedTask?.project.targetGradeWord
-        }}"
+        [matTooltip]="
+          selectedTask?.project?.taskStats?.[4]?.value
+            ? selectedTask.project.taskStats[4].value +
+              '% progress towards ' +
+              selectedTask.project.targetGradeWord
+            : 'Progress unavailable'
+        "
         [matTooltipDisabled]="selectedTask === undefined"
-        [progress]="selectedTask?.project.taskStats"
+        [progress]="selectedTask?.project?.taskStats ?? 0"
       ></f-project-progress-bar>
       <mat-chip-listbox aria-label="Target Grade Symbol" class="pointer-events-none">
         <mat-chip-option style="min-width: 33px">{{
-          selectedTask?.project.targetGradeAcronym
+          selectedTask?.project?.targetGradeAcronym
         }}</mat-chip-option>
       </mat-chip-listbox>
     </div>

From 7743ec78637756a17e8cbee786673239f2453be5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 31 Jul 2025 14:05:11 +1000
Subject: [PATCH 423/776] chore(release): 10.0.0-17

---
 CHANGELOG.md      | 15 +++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8628722d8c..22f83b7d31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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.
 
+## [10.0.0-17](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-16...v10.0.0-17) (2025-07-31)
+
+
+### Features
+
+* return task to not started status ([bce1483](https://github.com/b0ink/doubtfire-deploy/commit/bce1483296064bafd44bc538f83731809d816a05))
+
+
+### Bug Fixes
+
+* check if project task stats exist ([e59af80](https://github.com/b0ink/doubtfire-deploy/commit/e59af803f8440338b0210b6a437537372f5dac5b))
+* ensure new comments are fetched for selected project only ([3b0e387](https://github.com/b0ink/doubtfire-deploy/commit/3b0e3877e05f162143fc78065cee9a191d0755f4))
+* ensure whitespace is trimmed ([fe687df](https://github.com/b0ink/doubtfire-deploy/commit/fe687df8b035ef851b9d147e01f575187f428a8c))
+* prevent additional inbox queries ([0d35f7f](https://github.com/b0ink/doubtfire-deploy/commit/0d35f7f4ef2e87dd078edf20e509c8f6efc5c216))
+
 ## [10.0.0-16](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-15...v10.0.0-16) (2025-07-29)
 
 ## [10.0.0-15](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-14...v10.0.0-15) (2025-07-29)
diff --git a/package-lock.json b/package-lock.json
index d1045572c8..1f242b37e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-16",
+  "version": "10.0.0-17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-16",
+      "version": "10.0.0-17",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index c455d74a2e..8f3c71e9c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-16",
+  "version": "10.0.0-17",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 9cb1f1ab770ac798ec8ecc555ceb73024bc98649 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 31 Jul 2025 14:42:04 +1000
Subject: [PATCH 424/776] fix: ensure no progress returns 0

---
 src/app/common/footer/footer.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 7a5bcbafcc..1a17125de5 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -219,7 +219,7 @@
       </button>
       <f-project-progress-bar
         [matTooltip]="
-          selectedTask?.project?.taskStats?.[4]?.value
+          selectedTask?.project?.taskStats?.length > 4
             ? selectedTask.project.taskStats[4].value +
               '% progress towards ' +
               selectedTask.project.targetGradeWord

From db6549e7221b098a4563821926132e7eb9adab0b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 31 Jul 2025 14:44:12 +1000
Subject: [PATCH 425/776] chore(release): 10.0.0-18

---
 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 22f83b7d31..0e614d0756 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.
 
+## [10.0.0-18](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-17...v10.0.0-18) (2025-07-31)
+
+
+### Bug Fixes
+
+* ensure no progress returns 0 ([9cb1f1a](https://github.com/b0ink/doubtfire-deploy/commit/9cb1f1ab770ac798ec8ecc555ceb73024bc98649))
+
 ## [10.0.0-17](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-16...v10.0.0-17) (2025-07-31)
 
 
diff --git a/package-lock.json b/package-lock.json
index 1f242b37e0..6cb2b4c0cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-17",
+  "version": "10.0.0-18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-17",
+      "version": "10.0.0-18",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 8f3c71e9c5..671219ae66 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-17",
+  "version": "10.0.0-18",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 9e62214df772355048f4c7c7ffc13f3181f746e2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 5 Aug 2025 14:44:17 +1000
Subject: [PATCH 426/776] feat: mark as discussed button in mobile tutor
 discussion

---
 .../tutor-discussion.component.html               | 15 ++++++++++++---
 .../tutor-discussion.component.ts                 | 10 +++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 00eeacfdb5..63cb5aaa5b 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -70,7 +70,7 @@
                   class="notification"
                   [ngClass]="{
                     active: task.numNewComments > 0 || task.similaritiesDetected,
-                    similarities: task.similaritiesDetected,
+                    similarities: task.similaritiesDetected
                   }"
                 ></span>
                 <user-icon class="self-center" [user]="project?.student" [size]="30"> </user-icon>
@@ -135,7 +135,7 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
 
   @if (project && filteredTasks.length) {
     <div class="mt-2">
-      <div class="w-full flex justify-center items-center my-3 gap-5">
+      <div class="w-full flex justify-center items-center my-3 gap-8">
         <button
           class="bg-gray-100 medium-icon-button"
           mat-fab
@@ -154,7 +154,16 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
         >
           <!-- Mark as Complete -->
           <mat-icon>done</mat-icon>
-          <!-- <mat-icon class="text-2xl leading-none m-0">done</mat-icon> -->
+        </button>
+
+        <button
+          class="bg-blue-300 medium-icon-button"
+          mat-fab
+          [disabled]="!tasks.selectedOptions.selected.length"
+          (click)="markSelectedTasksDicussed()"
+        >
+          <!-- Mark as Discussed -->
+          <mat-icon>group</mat-icon>
         </button>
       </div>
     </div>
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index d16e40a46b..b716a155c4 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -1,4 +1,4 @@
-import {AfterViewInit, Component, Input, OnInit, ViewChild, ViewEncapsulation} from '@angular/core';
+import {AfterViewInit, Component, Input, ViewChild, ViewEncapsulation} from '@angular/core';
 import {MatSelectionList} from '@angular/material/list';
 import {MatTabChangeEvent} from '@angular/material/tabs';
 import {StateService, UIRouter} from '@uirouter/core';
@@ -210,6 +210,14 @@ export class TutorDiscussionComponent implements AfterViewInit {
     }
   }
 
+  public markSelectedTasksDicussed() {
+    const selectedTasks = this.tasksList.selectedOptions.selected;
+    for (const taskOption of selectedTasks) {
+      const task = taskOption.value as Task;
+      task.markAsDiscussed();
+    }
+  }
+
   private getUnit(): Promise<Unit> {
     return new Promise((resolve, reject) => {
       this.unitService.get({id: this._unitId}).subscribe({

From 248be93e7c8b5ff060957e500b6a4943882f456c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 5 Aug 2025 17:28:40 +1000
Subject: [PATCH 427/776] feat: init lti integration

---
 proxy.conf.json                               |  4 ++
 .../api/services/authentication.service.ts    | 13 ++++
 src/app/doubtfire-angular.module.ts           |  4 ++
 src/app/doubtfire.states.ts                   | 40 +++++++++++++
 .../lti-dashboard.component.html              | 59 +++++++++++++++++++
 .../lti-dashboard.component.scss              |  0
 .../lti-dashboard/lti-dashboard.component.ts  | 21 +++++++
 .../lti-deeplink/lti-deeplink.component.html  | 25 ++++++++
 .../lti-deeplink/lti-deeplink.component.scss  |  0
 .../lti-deeplink/lti-deeplink.component.ts    | 23 ++++++++
 .../states/sign-in/sign-in.component.ts       | 56 +++++++++++++++++-
 11 files changed, 243 insertions(+), 2 deletions(-)
 create mode 100644 src/app/home/states/lti-dashboard/lti-dashboard.component.html
 create mode 100644 src/app/home/states/lti-dashboard/lti-dashboard.component.scss
 create mode 100644 src/app/home/states/lti-dashboard/lti-dashboard.component.ts
 create mode 100644 src/app/home/states/lti-deeplink/lti-deeplink.component.html
 create mode 100644 src/app/home/states/lti-deeplink/lti-deeplink.component.scss
 create mode 100644 src/app/home/states/lti-deeplink/lti-deeplink.component.ts

diff --git a/proxy.conf.json b/proxy.conf.json
index 63dd627501..adb4a435ce 100644
--- a/proxy.conf.json
+++ b/proxy.conf.json
@@ -2,5 +2,9 @@
   "/api": {
     "target": "http://localhost:3000",
     "secure": false
+  },
+  "/lti/api": {
+    "target": "http://host.docker.internal:3002",
+    "secure": false
   }
 }
diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index f54eeb705d..cd20be5401 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -231,6 +231,19 @@ export class AuthenticationService {
     );
   }
 
+  public signInWithLti(userCredentials: {lti_token: string}): Observable<void> {
+    return this.httpClient.post(`${this.AUTH_URL}/lti`, userCredentials).pipe(
+      map((response: AuthResponse) => {
+        const username = encodeURIComponent(response.user['username']);
+        const authToken = encodeURIComponent(response.auth_token);
+        window.location.href = `/sign_in?username=${username}&authToken=${authToken}&isLtiLogin=true`;
+      }),
+      catchError((error) => {
+        return throwError(() => error);
+      }),
+    );
+  }
+
   public signOut(ssoSignOut = true): void {
     // This function is called after the token is deleted...
     const doSignOut = () => {
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 4ae6668614..543b94a67e 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -275,6 +275,8 @@ import {SidekiqProgressModalComponent} from './common/modals/sidekiq-progress-mo
 import {SidekiqJobsModalComponent} from './common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component';
 import {SidekiqJobService} from './api/services/sidekiq-job.service';
 import {UnavailableCardComponent} from './errors/unavailable-card/unavailable-card.component';
+import {LtiDashboardComponent} from './home/states/lti-dashboard/lti-dashboard.component';
+import {LtiDeeplinkComponent} from './home/states/lti-deeplink/lti-deeplink.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -417,6 +419,8 @@ const MY_DATE_FORMAT = {
     SidekiqProgressModalComponent,
     SidekiqJobsModalComponent,
     UnavailableCardComponent,
+    LtiDashboardComponent,
+    LtiDeeplinkComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index e586f227af..16137a82fd 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -13,6 +13,8 @@ import {TutorDiscussionComponent} from './projects/states/tutor-discussion/tutor
 import {SuccessCloseComponent} from './common/success-close/success-close.component';
 import {ProjectPlanComponent} from './projects/states/plan/project-plan.component';
 import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-viewer.component';
+import {LtiDashboardComponent} from './home/states/lti-dashboard/lti-dashboard.component';
+import {LtiDeeplinkComponent} from './home/states/lti-deeplink/lti-deeplink.component';
 
 /*
  * Use this file to store any states that are sourced by angular components.
@@ -486,6 +488,42 @@ const jplagReportViewerState: NgHybridStateDeclaration = {
   },
 };
 
+// Lti States
+
+/**
+ * Define the LTI dashboard state.
+ */
+const LtiDashboardState: NgHybridStateDeclaration = {
+  name: 'lti',
+  url: '/lti',
+  views: {
+    main: {
+      component: LtiDashboardComponent,
+    },
+  },
+  data: {
+    pageTitle: 'Home Page',
+    roleWhitelist: ['Student', 'Tutor', 'Convenor', 'Admin', 'Auditor'],
+  },
+};
+
+/**
+ * Renders the content selection form shown when "Select Content" is clicked in Moodle's external tool setup.
+ */
+const LtiDeeplinkState: NgHybridStateDeclaration = {
+  name: 'lti/deeplink',
+  url: '/lti/deeplink',
+  views: {
+    main: {
+      component: LtiDeeplinkComponent,
+    },
+  },
+  data: {
+    pageTitle: 'Select Content',
+    roleWhitelist: ['Student', 'Tutor', 'Convenor', 'Admin', 'Auditor'],
+  },
+};
+
 /**
  * Export the list of states we have created in angular
  */
@@ -508,4 +546,6 @@ export const doubtfireStates = [
   projectPlanState,
   TutorDiscussionState,
   jplagReportViewerState,
+  LtiDashboardState,
+  LtiDeeplinkState,
 ];
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.html b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
new file mode 100644
index 0000000000..a1f78b85f1
--- /dev/null
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
@@ -0,0 +1,59 @@
+<div id="home" class="w-full h-screen px-20 justify-center items-center">
+  <div class="flex flex-col gap-5 w-full max-w-lg mx-auto justify-center h-screen">
+    <div class="flex justify-center items-center">
+      <mat-icon
+        svgIcon="formatif-logo"
+        class="formatif-icon"
+        aria-label="Formatif logo"
+        class="w-[100px] h-[100px]"
+      ></mat-icon>
+      <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
+    </div>
+    <button
+      mat-fab
+      extended
+      color="primary"
+      class="h-[50px] my-5"
+      (click)="launchApplication()"
+      target="_blank"
+    >
+      <mat-icon>rocket_launch</mat-icon>
+      Launch
+    </button>
+
+    <div class="flex justify-center gap-5">
+      <button
+        mat-fab
+        matTooltip="Manage Unit"
+        matTooltipPosition="above"
+        aria-label=""
+        class="w-[60px] h-[60px]"
+        color="default"
+      >
+        <mat-icon mat-icon-button>school</mat-icon>
+      </button>
+
+      <button
+        mat-fab
+        matTooltip="Manage Enrolment"
+        matTooltipPosition="above"
+        aria-label=""
+        class="w-[60px] h-[60px]"
+        color="default"
+      >
+        <mat-icon mat-icon-button>admin_panel_settings</mat-icon>
+      </button>
+
+      <button
+        mat-fab
+        matTooltip="View Progress"
+        matTooltipPosition="above"
+        aria-label=""
+        class="w-[60px] h-[60px]"
+        color="default"
+      >
+        <mat-icon mat-icon-button>assessment</mat-icon>
+      </button>
+    </div>
+  </div>
+</div>
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.scss b/src/app/home/states/lti-dashboard/lti-dashboard.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
new file mode 100644
index 0000000000..89869b57a9
--- /dev/null
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -0,0 +1,21 @@
+import {AfterViewInit, Component, Inject, OnInit} from '@angular/core';
+import {UIRouter} from '@uirouter/angular';
+
+@Component({
+  selector: 'f-lti-dashboard',
+  templateUrl: 'lti-dashboard.component.html',
+  styleUrls: ['lti-dashboard.component.scss'],
+})
+export class LtiDashboardComponent implements AfterViewInit {
+  constructor(@Inject(UIRouter) private router: UIRouter) {}
+
+  ngAfterViewInit(): void {
+    // Scroll to the bottom of the page in case the header is visible
+    // Ensures our action buttons are centered
+    setTimeout(() => window.scrollTo(0, document.body.scrollHeight), 100);
+  }
+
+  public launchApplication(): void {
+    window.open('http://localhost:4200/home', '_blank');
+  }
+}
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.html b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
new file mode 100644
index 0000000000..8bc300d1c2
--- /dev/null
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
@@ -0,0 +1,25 @@
+<div id="home" class="w-full h-screen px-20 justify-center items-center">
+  <div class="flex flex-col gap-5 w-full max-w-lg mx-auto justify-center h-screen">
+    <div class="flex justify-center items-center">
+      <mat-icon
+        svgIcon="formatif-logo"
+        class="formatif-icon"
+        aria-label="Formatif logo"
+        class="w-[100px] h-[100px]"
+      ></mat-icon>
+      <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
+    </div>
+    <p>
+      Students will be automatically enrolled in this unit when they launch the OnTrack tool from
+      this course.
+    </p>
+    <mat-form-field>
+      <mat-label>Select a unit to link</mat-label>
+      <mat-select [(value)]="selectedUnit">
+        <mat-option value="FIT1045">FIT1045 - Introduction to Programming</mat-option>
+        <mat-option value="FIT1045">FIT1045 - Introduction to Programming</mat-option>
+      </mat-select>
+    </mat-form-field>
+    <button mat-raised-button color="primary" (click)="submit()">Confirm</button>
+  </div>
+</div>
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.scss b/src/app/home/states/lti-deeplink/lti-deeplink.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
new file mode 100644
index 0000000000..a39d5fea37
--- /dev/null
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
@@ -0,0 +1,23 @@
+import {AfterViewInit, Component, Inject} from '@angular/core';
+import {UIRouter} from '@uirouter/angular';
+
+@Component({
+  selector: 'f-lti-deeplink',
+  templateUrl: 'lti-deeplink.component.html',
+  styleUrls: ['lti-deeplink.component.scss'],
+})
+export class LtiDeeplinkComponent implements AfterViewInit {
+  constructor(@Inject(UIRouter) private router: UIRouter) {}
+
+  selectedUnit: string;
+
+  ngAfterViewInit(): void {
+    // Scroll to the bottom of the page in case the header is visible
+    // Ensures our action buttons are centered
+    setTimeout(() => window.scrollTo(0, document.body.scrollHeight), 100);
+  }
+
+  public submit(): void {
+    console.log(`Selected unit is ${this.selectedUnit}`);
+  }
+}
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index e059c0439d..1e32e0f9da 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -56,6 +56,8 @@ export class SignInComponent implements OnInit {
   // Get query params from the resolve in the router state
   @Input() username: string;
   @Input() authToken: string;
+  @Input() ltiToken: string;
+  @Input() isLtiLogin: boolean;
 
   constructor(
     private authService: AuthenticationService,
@@ -68,10 +70,31 @@ export class SignInComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
+    this.authService.afterAuthCall((result) => {
+      if (result) {
+        const params = getUrlParams(document.location.href);
+        this.isLoading = false;
+
+        if (params.ltiToken) {
+          this.globalState.hideHeader();
+          return this.state.go('lti');
+        } else {
+          this.globalState.goHome();
+          return this.state.go('welcome');
+        }
+      }
+      this.isLoading = true;
+    });
+
     this.globalState.onLoad(() => this.initAfterGlobalLoad());
   }
 
   private initAfterGlobalLoad(): void {
+    if (!this.isLoading) {
+      // return out if we're already redirecting elsewhere in the afterAuthCall
+      return;
+    }
+
     this.formData = {
       username: '',
       password: '',
@@ -84,12 +107,15 @@ export class SignInComponent implements OnInit {
     this.externalName = this.constants.ExternalName;
 
     // HACK: Workaround the fact that query params do not work in Safari with ui-router
+    const params = getUrlParams(document.location.href);
     if (!this.username) {
-      const params = getUrlParams(document.location.href);
       this.username = this.transition.params().username || params.username;
       this.authToken = this.transition.params().authToken || params.authToken;
     }
 
+    this.ltiToken = params.ltiToken ?? undefined;
+    this.isLtiLogin = params.isLtiLogin?.toLowerCase() === 'true' ? true : false;
+
     // wait 2 seconds with rxjs
     const wait = new Promise((resolve) => setTimeout(resolve, 3000));
     this.http.get(`${this.constants.API_URL}/auth/method`).subscribe({
@@ -106,6 +132,27 @@ export class SignInComponent implements OnInit {
             username: this.username,
             remember: this.authService.rememberMe,
           });
+        } else if (this.ltiToken) {
+          // We have a signed Lti token containing user data
+          // Forward it to the API and request a one time auth token
+          this.signingIn = true;
+
+          this.authService
+            .signInWithLti({
+              lti_token: this.ltiToken,
+            })
+            .subscribe({
+              next: () => {
+                // this.globalState.goHome();
+                // this.actionSignInSuccess();
+              },
+              error: (err) => {
+                this.signingIn = false;
+                this.formData.password = '';
+                this.invalidCredentials = true;
+                this.alerts.error(err, 6000);
+              },
+            });
         } else if (this.SSOLoginUrl) {
           if (this.autoLogin) {
             return wait.then(() => {
@@ -190,7 +237,12 @@ export class SignInComponent implements OnInit {
 
     this.authService.signIn(signInCredentials).subscribe({
       next: () => {
-        this.actionSignInSuccess();
+        if (this.isLtiLogin) {
+          this.globalState.loadGlobals();
+          this.state.go('lti');
+        } else {
+          this.actionSignInSuccess();
+        }
       },
       error: (err) => {
         this.signingIn = false;

From 1d42c139f50b0d265f702ebf24cd6e36840401f4 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 6 Aug 2025 16:57:28 +1000
Subject: [PATCH 428/776] chore: init placeholder ui

---
 .../lti-dashboard.component.html              |  3 +++
 .../lti-deeplink/lti-deeplink.component.html  | 15 ++++++++++----
 .../lti-deeplink/lti-deeplink.component.ts    | 20 +++++++++++++++++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.html b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
index a1f78b85f1..61a9439fa1 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.html
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
@@ -55,5 +55,8 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
         <mat-icon mat-icon-button>assessment</mat-icon>
       </button>
     </div>
+    <div class="text-center text-gray-300 mt-4 text-base">
+      COS10001 &mdash; Introduction to Programming
+    </div>
   </div>
 </div>
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.html b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
index 8bc300d1c2..b690e7171e 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.html
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
@@ -1,5 +1,5 @@
 <div id="home" class="w-full h-screen px-20 justify-center items-center">
-  <div class="flex flex-col gap-5 w-full max-w-lg mx-auto justify-center h-screen">
+  <div class="flex flex-col gap-5 w-full max-w-xl mx-auto justify-center items-center h-screen">
     <div class="flex justify-center items-center">
       <mat-icon
         svgIcon="formatif-logo"
@@ -9,17 +9,24 @@
       ></mat-icon>
       <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
     </div>
-    <p>
+    <p class="w-full text-center">
       Students will be automatically enrolled in this unit when they launch the OnTrack tool from
       this course.
     </p>
-    <mat-form-field>
+    <mat-form-field class="w-full">
       <mat-label>Select a unit to link</mat-label>
+      <!-- TODO: fetch active units -->
       <mat-select [(value)]="selectedUnit">
         <mat-option value="FIT1045">FIT1045 - Introduction to Programming</mat-option>
         <mat-option value="FIT1045">FIT1045 - Introduction to Programming</mat-option>
       </mat-select>
     </mat-form-field>
-    <button mat-raised-button color="primary" (click)="submit()">Confirm</button>
+    <button mat-raised-button class="w-full max-w-lg" color="primary" (click)="submit()">
+      Confirm
+    </button>
+    <div class="text-gray-500 text-center w-full">or</div>
+    <button mat-button color="accent" class="w-full max-w-lg" (click)="createUnit()">
+      Create a new Unit
+    </button>
   </div>
 </div>
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
index a39d5fea37..8a4b72b669 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
@@ -1,5 +1,7 @@
-import {AfterViewInit, Component, Inject} from '@angular/core';
+import {AfterViewInit, Component, Inject, Input} from '@angular/core';
 import {UIRouter} from '@uirouter/angular';
+import {Subscription} from 'rxjs';
+import {CreateNewUnitModal} from 'src/app/admin/modals/create-new-unit-modal/create-new-unit-modal.component';
 
 @Component({
   selector: 'f-lti-deeplink',
@@ -7,17 +9,31 @@ import {UIRouter} from '@uirouter/angular';
   styleUrls: ['lti-deeplink.component.scss'],
 })
 export class LtiDeeplinkComponent implements AfterViewInit {
-  constructor(@Inject(UIRouter) private router: UIRouter) {}
+  constructor(private createUnitModalService: CreateNewUnitModal) {}
 
   selectedUnit: string;
 
+  @Input() ltiKey: string;
+
   ngAfterViewInit(): void {
     // Scroll to the bottom of the page in case the header is visible
     // Ensures our action buttons are centered
     setTimeout(() => window.scrollTo(0, document.body.scrollHeight), 100);
+
+    console.log(this.ltiKey);
   }
 
   public submit(): void {
     console.log(`Selected unit is ${this.selectedUnit}`);
   }
+
+  public createUnit(): void {
+    const dialog = this.createUnitModalService.show();
+
+    const sub = dialog.afterAllClosed.subscribe(() => {
+      console.log('closed! fetching the units again...');
+      // Try defaulting to the last unit created?
+      sub.unsubscribe();
+    });
+  }
 }

From 0dc5e52e43143a222430060acd51b157a951c2e1 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 6 Aug 2025 17:02:02 +1000
Subject: [PATCH 429/776] refactor: ensure new feedback chips are fetched

---
 src/app/api/models/task-definition.ts          |  5 ++++-
 .../feedback-template-editor.component.ts      | 18 +++++++++++++++++-
 .../learning-outcome-editor.component.ts       | 18 +++++++++++++++++-
 .../nested-csv-download-modal.component.ts     |  1 +
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 8f3fce78ac..94b1774f8e 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -125,7 +125,10 @@ export class TaskDefinition extends Entity {
   public refresh(): void {
     const alerts = AppInjector.get(AlertService);
     AppInjector.get(TaskDefinitionService)
-      .fetch(this.id)
+      .fetch({
+        unitId: this.unit.id,
+        id: this.id,
+      })
       .subscribe({
         next: (taskDefinition) => {
           console.log(taskDefinition.name);
diff --git a/src/app/common/feedback-template-editor/feedback-template-editor.component.ts b/src/app/common/feedback-template-editor/feedback-template-editor.component.ts
index 25c00f7d99..8d97643141 100644
--- a/src/app/common/feedback-template-editor/feedback-template-editor.component.ts
+++ b/src/app/common/feedback-template-editor/feedback-template-editor.component.ts
@@ -243,7 +243,23 @@ export class FeedbackTemplateEditorComponent implements OnChanges, AfterViewInit
       (response: any) => {
         this.csvResultModalService.show('Feedback Templates CSV Upload Results', response);
         if (response.success.length > 0) {
-          this.context.refresh();
+          let contextType: 'units' | 'task_definitions';
+
+          if (this.context instanceof Unit) {
+            this.context.refresh();
+            contextType = 'units';
+          } else if (this.context instanceof TaskDefinition) {
+            this.context.unit.refresh();
+            contextType = 'task_definitions';
+          }
+          if (contextType) {
+            this.feedbackTemplateService
+              .fetchAll({contextType, contextId: this.context.id}, {})
+              .subscribe({
+                next: () => this.getFeedbackChips(),
+                error: () => this.alerts.error('Error loading task feedback templates.'),
+              });
+          }
         }
       },
     );
diff --git a/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
index e93bc4ef37..f1b501bd8d 100644
--- a/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
+++ b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
@@ -21,6 +21,7 @@ import {
   LearningOutcome,
   LearningOutcomeService,
   TaskService,
+  FeedbackTemplateService,
 } from 'src/app/api/models/doubtfire-model';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {MatSort, Sort} from '@angular/material/sort';
@@ -71,6 +72,7 @@ export class LearningOutcomeEditorComponent implements OnChanges, AfterViewInit,
     private learningOutcomeService: LearningOutcomeService,
     private fileDownloaderService: FileDownloaderService,
     private nestedCsvDownloadModalService: NestedCsvDownloadModalService,
+    private feedbackTemplateService: FeedbackTemplateService,
     private taskService: TaskService,
     @Inject(csvResultModalService) private csvResultModalService: any,
     @Inject(csvUploadModalService) private csvUploadModal: any,
@@ -263,7 +265,21 @@ export class LearningOutcomeEditorComponent implements OnChanges, AfterViewInit,
       (response: any) => {
         this.csvResultModalService.show(`${type} CSV Upload Results`, response);
         if (response.success.length > 0) {
-          this.context.refresh();
+          let contextType: 'units' | 'task_definitions';
+          if (this.context instanceof Unit) {
+            this.context.refresh();
+            contextType = 'units';
+          } else if (this.context instanceof TaskDefinition) {
+            this.context.unit.refresh();
+            contextType = 'task_definitions';
+          }
+          if (type === 'Feedback Templates' && contextType) {
+            this.feedbackTemplateService
+              .fetchAll({contextType, contextId: this.context.id}, {})
+              .subscribe({
+                error: () => this.alerts.error('Error loading task feedback templates.'),
+              });
+          }
         }
       },
     );
diff --git a/src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component.ts b/src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component.ts
index b18e6dc3b6..508cf87af7 100644
--- a/src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component.ts
+++ b/src/app/common/learning-outcome-editor/nested-csv-download-modal/nested-csv-download-modal.component.ts
@@ -20,5 +20,6 @@ export class NestedCsvDownloadModalComponent {
       `${this.data.url}?includes_tlos=${this.includeNested}`,
       this.data.name,
     );
+    this.dialogRef.close();
   }
 }

From 73de1f1c68223c863c35198b773f0bdeaa1f549e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 7 Aug 2025 15:01:46 +1000
Subject: [PATCH 430/776] feat: enable unit linking to lms context using
 deeplink

---
 src/app/api/models/user/user.ts               |  3 +
 src/app/api/services/lti.service.ts           | 14 +++
 .../http-authentication.interceptor.ts        | 24 ++---
 src/app/config/constants/apiURL.ts            |  3 +-
 src/app/config/constants/hostUrl.ts           |  2 +
 src/app/config/constants/ltiApiUrl.ts         |  3 +
 src/app/doubtfire.states.ts                   | 10 ++-
 .../lti-deeplink/lti-deeplink.component.html  | 52 ++++++-----
 .../lti-deeplink/lti-deeplink.component.ts    | 88 ++++++++++++++++---
 9 files changed, 153 insertions(+), 46 deletions(-)
 create mode 100644 src/app/api/services/lti.service.ts
 create mode 100644 src/app/config/constants/hostUrl.ts
 create mode 100644 src/app/config/constants/ltiApiUrl.ts

diff --git a/src/app/api/models/user/user.ts b/src/app/api/models/user/user.ts
index 89abd9df21..4fc56c9349 100644
--- a/src/app/api/models/user/user.ts
+++ b/src/app/api/models/user/user.ts
@@ -25,6 +25,9 @@ export class User extends Entity {
   public pronouns: string | null;
   public acceptedTiiEula: boolean;
 
+  // LTI Token
+  public ltik: string;
+
   public override toJson<T extends Entity>(
     mappingData: EntityMapping<T>,
     ignoreKeys?: string[],
diff --git a/src/app/api/services/lti.service.ts b/src/app/api/services/lti.service.ts
new file mode 100644
index 0000000000..157d80fcdd
--- /dev/null
+++ b/src/app/api/services/lti.service.ts
@@ -0,0 +1,14 @@
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {Observable} from 'rxjs';
+import LTI_API_URL from 'src/app/config/constants/ltiApiUrl';
+
+@Injectable()
+export class LtiService {
+  constructor(private httpClient: HttpClient) {}
+
+  // Sends a deeplink request to the LTI.js API (not the Ruby API).
+  public sendDeeplinkRequest(data: {unit_id: string}): Observable<string> {
+    return this.httpClient.post<string>(`${LTI_API_URL}/deeplink`, data);
+  }
+}
diff --git a/src/app/common/services/http-authentication.interceptor.ts b/src/app/common/services/http-authentication.interceptor.ts
index 44e0cd5d12..c0a98652ac 100644
--- a/src/app/common/services/http-authentication.interceptor.ts
+++ b/src/app/common/services/http-authentication.interceptor.ts
@@ -1,21 +1,25 @@
-import { Injectable } from '@angular/core';
-import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http';
-import { Observable } from 'rxjs';
+import {Injectable} from '@angular/core';
+import {HttpRequest, HttpHandler, HttpEvent, HttpInterceptor} from '@angular/common/http';
+import {Observable} from 'rxjs';
 import API_URL from 'src/app/config/constants/apiURL';
-import { UserService } from 'src/app/api/services/user.service';
+import {UserService} from 'src/app/api/services/user.service';
+import LTI_API_URL from 'src/app/config/constants/ltiApiUrl';
 
 @Injectable()
 export class HttpAuthenticationInterceptor implements HttpInterceptor {
-  constructor(
-    private userService: UserService
-  ) {}
+  constructor(private userService: UserService) {}
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    if (request.url.startsWith(API_URL) && this.userService.currentUser.authenticationToken) {
+    if (request.url.startsWith(API_URL) || request.url.startsWith(LTI_API_URL)) {
       request = request.clone({
         setHeaders: {
-          'Auth-Token': `${this.userService.currentUser.authenticationToken}`,
-          Username: `${this.userService.currentUser.username}`,
+          ...(this.userService.currentUser.authenticationToken && {
+            'Auth-Token': this.userService.currentUser.authenticationToken,
+            Username: this.userService.currentUser.username,
+          }),
+          ...(this.userService.currentUser.ltik && {
+            Authorization: `Bearer ${this.userService.currentUser.ltik}`,
+          }),
         },
       });
     }
diff --git a/src/app/config/constants/apiURL.ts b/src/app/config/constants/apiURL.ts
index f2c362ac12..6e502f57ce 100644
--- a/src/app/config/constants/apiURL.ts
+++ b/src/app/config/constants/apiURL.ts
@@ -1,2 +1,3 @@
-const API_URL: string = `${window.location.protocol}//${window.location.hostname}${window.location.port ? ':' + window.location.port : ''}/api`;
+import HOST_URL from './hostUrl';
+const API_URL: string = `${HOST_URL}/api`;
 export default API_URL;
diff --git a/src/app/config/constants/hostUrl.ts b/src/app/config/constants/hostUrl.ts
new file mode 100644
index 0000000000..7503d2e19c
--- /dev/null
+++ b/src/app/config/constants/hostUrl.ts
@@ -0,0 +1,2 @@
+const HOST_URL: string = `${window.location.protocol}//${window.location.hostname}${window.location.port ? ':' + window.location.port : ''}`;
+export default HOST_URL;
diff --git a/src/app/config/constants/ltiApiUrl.ts b/src/app/config/constants/ltiApiUrl.ts
new file mode 100644
index 0000000000..a3c45ed8d6
--- /dev/null
+++ b/src/app/config/constants/ltiApiUrl.ts
@@ -0,0 +1,3 @@
+import HOST_URL from './hostUrl';
+const LTI_API_URL: string = `${HOST_URL}/lti/api`;
+export default LTI_API_URL;
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 16137a82fd..6903c52608 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -512,7 +512,15 @@ const LtiDashboardState: NgHybridStateDeclaration = {
  */
 const LtiDeeplinkState: NgHybridStateDeclaration = {
   name: 'lti/deeplink',
-  url: '/lti/deeplink',
+  url: '/lti/deeplink?ltik',
+  resolve: {
+    ltik: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.ltik;
+      },
+    ],
+  },
   views: {
     main: {
       component: LtiDeeplinkComponent,
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.html b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
index b690e7171e..a56ad58a86 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.html
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
@@ -1,5 +1,5 @@
 <div id="home" class="w-full h-screen px-20 justify-center items-center">
-  <div class="flex flex-col gap-5 w-full max-w-xl mx-auto justify-center items-center h-screen">
+  <div class="flex flex-col gap-5 w-full max-w-2xl mx-auto justify-center items-center h-screen">
     <div class="flex justify-center items-center">
       <mat-icon
         svgIcon="formatif-logo"
@@ -9,24 +9,36 @@
       ></mat-icon>
       <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
     </div>
-    <p class="w-full text-center">
-      Students will be automatically enrolled in this unit when they launch the OnTrack tool from
-      this course.
-    </p>
-    <mat-form-field class="w-full">
-      <mat-label>Select a unit to link</mat-label>
-      <!-- TODO: fetch active units -->
-      <mat-select [(value)]="selectedUnit">
-        <mat-option value="FIT1045">FIT1045 - Introduction to Programming</mat-option>
-        <mat-option value="FIT1045">FIT1045 - Introduction to Programming</mat-option>
-      </mat-select>
-    </mat-form-field>
-    <button mat-raised-button class="w-full max-w-lg" color="primary" (click)="submit()">
-      Confirm
-    </button>
-    <div class="text-gray-500 text-center w-full">or</div>
-    <button mat-button color="accent" class="w-full max-w-lg" (click)="createUnit()">
-      Create a new Unit
-    </button>
+
+    @if (!activeUnits.length) {
+      <p class="w-full text-center text-gray-400">
+        You must already be a Convenor or Admin to link a unit. You are not currently assigned to
+        any units.
+      </p>
+    } @else {
+      <p class="w-full text-center">
+        Students will be automatically enrolled in this unit when they launch the OnTrack tool from
+        this course.
+      </p>
+      <mat-form-field class="w-full">
+        <mat-label>Select a unit to link</mat-label>
+        <mat-select [(value)]="selectedUnit">
+          @for (unit of activeUnits; track unit) {
+            <mat-option [value]="unit"
+              >{{ unit.code }} - {{ unit.name }} ({{ unit.teachingPeriod.name }})</mat-option
+            >
+          }
+        </mat-select>
+      </mat-form-field>
+      <button
+        mat-raised-button
+        class="w-full max-w-lg"
+        color="primary"
+        (click)="submit()"
+        [disabled]="!selectedUnit"
+      >
+        Confirm
+      </button>
+    }
   </div>
 </div>
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
index 8a4b72b669..6fa97b4c96 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
@@ -1,7 +1,12 @@
-import {AfterViewInit, Component, Inject, Input} from '@angular/core';
-import {UIRouter} from '@uirouter/angular';
-import {Subscription} from 'rxjs';
+import {AfterViewInit, Component, Input} from '@angular/core';
 import {CreateNewUnitModal} from 'src/app/admin/modals/create-new-unit-modal/create-new-unit-modal.component';
+import {Unit} from 'src/app/api/models/unit';
+import {AuthenticationService} from 'src/app/api/services/authentication.service';
+import {LtiService} from 'src/app/api/services/lti.service';
+import {UnitService} from 'src/app/api/services/unit.service';
+import {UserService} from 'src/app/api/services/user.service';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
   selector: 'f-lti-deeplink',
@@ -9,31 +14,86 @@ import {CreateNewUnitModal} from 'src/app/admin/modals/create-new-unit-modal/cre
   styleUrls: ['lti-deeplink.component.scss'],
 })
 export class LtiDeeplinkComponent implements AfterViewInit {
-  constructor(private createUnitModalService: CreateNewUnitModal) {}
+  constructor(
+    private createUnitModalService: CreateNewUnitModal,
+    private unitService: UnitService,
+    private authenticationService: AuthenticationService,
+    private confirmationModalService: ConfirmationModalService,
+    private alertsService: AlertService,
+    private ltiService: LtiService,
+    private userService: UserService,
+  ) {}
 
-  selectedUnit: string;
+  @Input() ltik: string;
 
-  @Input() ltiKey: string;
+  public selectedUnit: Unit;
+  public activeUnits: Unit[] = [];
+
+  public unitLinked: boolean = false;
 
   ngAfterViewInit(): void {
     // Scroll to the bottom of the page in case the header is visible
     // Ensures our action buttons are centered
     setTimeout(() => window.scrollTo(0, document.body.scrollHeight), 100);
 
-    console.log(this.ltiKey);
+    this.authenticationService.afterAuthCall(() => {
+      this.userService.currentUser.ltik = this.ltik;
+      this.loadUnits();
+    });
+
+    // TODO: query our LTI API to see if we have already linked a unit
   }
 
   public submit(): void {
-    console.log(`Selected unit is ${this.selectedUnit}`);
+    this.confirmationModalService.show(
+      `Are you sure you want to link ${this.selectedUnit.code} to ${'Moodle-Name-Here'}?`,
+      'Once you have linked an OnTrack unit, students who launch this app will be enrolled automatically. Unlinking a unit will not withdraw students automatically.',
+      () => {
+        // Trigger API call to LTI.js with our deeplink request
+        console.log('Trigger API call to LTI.js');
+        this.linkUnit(this.selectedUnit);
+      },
+    );
   }
 
-  public createUnit(): void {
-    const dialog = this.createUnitModalService.show();
+  private async linkUnit(unit: Unit) {
+    const formData = {
+      unit_id: unit.code,
+    };
 
-    const sub = dialog.afterAllClosed.subscribe(() => {
-      console.log('closed! fetching the units again...');
-      // Try defaulting to the last unit created?
-      sub.unsubscribe();
+    this.ltiService.sendDeeplinkRequest(formData).subscribe({
+      next: (form) => {
+        // On success, LTI.js returns an HTML script that tells our LMS to return back to the settings page
+        document.body.innerHTML += form;
+        setTimeout(() => {
+          (document.getElementById('ltijs_submit') as HTMLFormElement)?.submit();
+        });
+      },
+      error: (error) => {
+        console.log(error);
+        this.alertsService.error(`Failed to link unit: ${error.error}`, 6000);
+      },
     });
   }
+
+  public loadUnits(): void {
+    // Load units that current user is a convenor/admin of
+    this.unitService
+      .fetchAll(
+        {},
+        {
+          params: {
+            include_in_active: true,
+          },
+        },
+      )
+      .subscribe({
+        next: (units) => {
+          this.activeUnits = [...units];
+        },
+        error: (error) => {
+          this.alertsService.error(`Failed to fetch units: ${error.message}`, 6000);
+        },
+      });
+  }
 }

From 4faf78c430fd8b1abd92f5a6256b51c05ae1f742 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 7 Aug 2025 15:40:04 +1000
Subject: [PATCH 431/776] chore: simplify error message

---
 src/app/home/states/lti-deeplink/lti-deeplink.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
index 6fa97b4c96..f1c1350073 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
@@ -92,7 +92,7 @@ export class LtiDeeplinkComponent implements AfterViewInit {
           this.activeUnits = [...units];
         },
         error: (error) => {
-          this.alertsService.error(`Failed to fetch units: ${error.message}`, 6000);
+          this.alertsService.error(`Failed to fetch units`, 6000);
         },
       });
   }

From c40249f63ef22ae0758155f42756cc3db2e12b55 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 7 Aug 2025 16:15:12 +1000
Subject: [PATCH 432/776] chore: import lti service

---
 src/app/doubtfire-angular.module.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 543b94a67e..90a4c2e5a6 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -277,6 +277,7 @@ import {SidekiqJobService} from './api/services/sidekiq-job.service';
 import {UnavailableCardComponent} from './errors/unavailable-card/unavailable-card.component';
 import {LtiDashboardComponent} from './home/states/lti-dashboard/lti-dashboard.component';
 import {LtiDeeplinkComponent} from './home/states/lti-deeplink/lti-deeplink.component';
+import {LtiService} from './api/services/lti.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -507,6 +508,7 @@ const MY_DATE_FORMAT = {
     NestedCsvDownloadModalService,
     StaffNoteService,
     SidekiqJobService,
+    LtiService,
   ],
   imports: [
     FlexLayoutModule,

From 5adbcb10c04274035926c7c7a53c0f9f8d2f1bcf Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 7 Aug 2025 16:16:11 +1000
Subject: [PATCH 433/776] chore(release): 10.0.0-19

---
 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 0e614d0756..cc62715143 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.
 
+## [10.0.0-19](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-18...v10.0.0-19) (2025-08-07)
+
+
+### Features
+
+* mark as discussed button in mobile tutor discussion ([9e62214](https://github.com/b0ink/doubtfire-deploy/commit/9e62214df772355048f4c7c7ffc13f3181f746e2))
+
 ## [10.0.0-18](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-17...v10.0.0-18) (2025-07-31)
 
 
diff --git a/package-lock.json b/package-lock.json
index 6cb2b4c0cf..e7e656a47a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-18",
+  "version": "10.0.0-19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-18",
+      "version": "10.0.0-19",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 671219ae66..78d4daac87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-18",
+  "version": "10.0.0-19",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From e95544e2e158affefafd2fc0fe9657bf47c200db Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 9 Aug 2025 01:03:14 +1000
Subject: [PATCH 434/776] fix: forward correct lti token

---
 src/app/api/services/authentication.service.ts    |  8 ++++++--
 .../sessions/states/sign-in/sign-in.component.ts  | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index cd20be5401..49a18df087 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -14,6 +14,7 @@ import {AlertService} from 'src/app/common/services/alert.service';
 interface AuthResponse {
   user: object;
   auth_token: string;
+  lti_token?: string;
 }
 
 @Injectable()
@@ -231,12 +232,15 @@ export class AuthenticationService {
     );
   }
 
-  public signInWithLti(userCredentials: {lti_token: string}): Observable<void> {
+  public signInWithLti(userCredentials: {ltik: string; lti_token: string}): Observable<void> {
     return this.httpClient.post(`${this.AUTH_URL}/lti`, userCredentials).pipe(
       map((response: AuthResponse) => {
         const username = encodeURIComponent(response.user['username']);
         const authToken = encodeURIComponent(response.auth_token);
-        window.location.href = `/sign_in?username=${username}&authToken=${authToken}&isLtiLogin=true`;
+        const ltik = encodeURIComponent(userCredentials.ltik);
+        setTimeout(() => {
+          window.location.href = `/sign_in?username=${username}&authToken=${authToken}&ltik=${ltik}&isLtiLogin=true`;
+        });
       }),
       catchError((error) => {
         return throwError(() => error);
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index 1e32e0f9da..7f78635a0e 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -3,6 +3,7 @@ import {Component, Input, OnInit} from '@angular/core';
 import {StateService, Transition} from '@uirouter/core';
 import {BehaviorSubject} from 'rxjs';
 import {AuthenticationService} from 'src/app/api/services/authentication.service';
+import {UserService} from 'src/app/api/services/user.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {GlobalStateService} from 'src/app/projects/states/index/global-state.service';
@@ -57,10 +58,12 @@ export class SignInComponent implements OnInit {
   @Input() username: string;
   @Input() authToken: string;
   @Input() ltiToken: string;
+  @Input() ltik: string;
   @Input() isLtiLogin: boolean;
 
   constructor(
     private authService: AuthenticationService,
+    private userService: UserService,
     private state: StateService,
     private constants: DoubtfireConstants,
     private http: HttpClient,
@@ -77,7 +80,10 @@ export class SignInComponent implements OnInit {
 
         if (params.ltiToken) {
           this.globalState.hideHeader();
-          return this.state.go('lti');
+          this.userService.currentUser.ltik = params.ltik;
+          return this.state.go('lti', {
+            ltik: params.ltik,
+          });
         } else {
           this.globalState.goHome();
           return this.state.go('welcome');
@@ -114,6 +120,7 @@ export class SignInComponent implements OnInit {
     }
 
     this.ltiToken = params.ltiToken ?? undefined;
+    this.ltik = params.ltik ?? undefined;
     this.isLtiLogin = params.isLtiLogin?.toLowerCase() === 'true' ? true : false;
 
     // wait 2 seconds with rxjs
@@ -139,6 +146,7 @@ export class SignInComponent implements OnInit {
 
           this.authService
             .signInWithLti({
+              ltik: this.ltik,
               lti_token: this.ltiToken,
             })
             .subscribe({
@@ -239,7 +247,10 @@ export class SignInComponent implements OnInit {
       next: () => {
         if (this.isLtiLogin) {
           this.globalState.loadGlobals();
-          this.state.go('lti');
+          const params = getUrlParams(document.location.href);
+          this.state.go('lti', {
+            ltik: params.ltik,
+          });
         } else {
           this.actionSignInSuccess();
         }

From b369ebcb852036c3ca6bcc956a42eaafb2422a3e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 9 Aug 2025 01:06:22 +1000
Subject: [PATCH 435/776] refactor: lti unit linking and auto enrolment

---
 src/app/api/services/lti.service.ts           |  43 +++++++
 src/app/doubtfire.states.ts                   |  10 +-
 .../lti-dashboard.component.html              | 105 +++++++++++-------
 .../lti-dashboard/lti-dashboard.component.ts  |  90 ++++++++++++++-
 .../lti-deeplink/lti-deeplink.component.html  |   6 +-
 .../lti-deeplink/lti-deeplink.component.ts    |  43 ++++---
 6 files changed, 232 insertions(+), 65 deletions(-)

diff --git a/src/app/api/services/lti.service.ts b/src/app/api/services/lti.service.ts
index 157d80fcdd..224ce3a1dd 100644
--- a/src/app/api/services/lti.service.ts
+++ b/src/app/api/services/lti.service.ts
@@ -2,6 +2,27 @@ import {HttpClient} from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 import LTI_API_URL from 'src/app/config/constants/ltiApiUrl';
+import {Project} from '../models/project';
+
+interface info {
+  name?: string;
+  email?: string;
+  roles?: string[];
+  custom?: any;
+  context?:
+    | {
+        id?: string;
+        label?: string;
+        title?: string;
+        type?: string[];
+      }
+    | undefined;
+}
+
+export interface UnitLink {
+  contextId?: string;
+  unitId: string;
+}
 
 @Injectable()
 export class LtiService {
@@ -11,4 +32,26 @@ export class LtiService {
   public sendDeeplinkRequest(data: {unit_id: string}): Observable<string> {
     return this.httpClient.post<string>(`${LTI_API_URL}/deeplink`, data);
   }
+
+  // Sends a deeplink request to the LTI.js API (not the Ruby API).
+
+  public getInfo(): Observable<info> {
+    return this.httpClient.get<info>(`${LTI_API_URL}/info`);
+  }
+
+  public getUnitLink(): Observable<UnitLink> {
+    return this.httpClient.get<UnitLink>(`${LTI_API_URL}/link`);
+  }
+
+  public setUnitLink(data: UnitLink): Observable<UnitLink> {
+    return this.httpClient.post<UnitLink>(`${LTI_API_URL}/link`, data);
+  }
+
+  public removeUnitLink(): Observable<UnitLink> {
+    return this.httpClient.delete<UnitLink>(`${LTI_API_URL}/link`);
+  }
+
+  public enrolUser(unit: UnitLink): Observable<Project | null> {
+    return this.httpClient.post<Project | null>(`${LTI_API_URL}/enrol`, unit);
+  }
 }
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 6903c52608..72fdfe670f 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -495,7 +495,15 @@ const jplagReportViewerState: NgHybridStateDeclaration = {
  */
 const LtiDashboardState: NgHybridStateDeclaration = {
   name: 'lti',
-  url: '/lti',
+  url: '/lti?ltik',
+  resolve: {
+    ltik: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.ltik;
+      },
+    ],
+  },
   views: {
     main: {
       component: LtiDashboardComponent,
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.html b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
index 61a9439fa1..101918f96a 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.html
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
@@ -1,5 +1,5 @@
 <div id="home" class="w-full h-screen px-20 justify-center items-center">
-  <div class="flex flex-col gap-5 w-full max-w-lg mx-auto justify-center h-screen">
+  <div class="flex flex-col gap-5 w-full max-w-2xl mx-auto justify-center h-screen items-center">
     <div class="flex justify-center items-center">
       <mat-icon
         svgIcon="formatif-logo"
@@ -9,54 +9,73 @@
       ></mat-icon>
       <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
     </div>
-    <button
-      mat-fab
-      extended
-      color="primary"
-      class="h-[50px] my-5"
-      (click)="launchApplication()"
-      target="_blank"
-    >
-      <mat-icon>rocket_launch</mat-icon>
-      Launch
-    </button>
 
-    <div class="flex justify-center gap-5">
-      <button
-        mat-fab
-        matTooltip="Manage Unit"
-        matTooltipPosition="above"
-        aria-label=""
-        class="w-[60px] h-[60px]"
-        color="default"
-      >
-        <mat-icon mat-icon-button>school</mat-icon>
-      </button>
+    @if (isLoading) {
+      <!-- TODO: spinner -->
+      <p>Loading...</p>
+    } @else {
+      <div class="flex justify-center gap-5">
+        @if (currentUser?.systemRole === 'Convenor' || currentUser?.systemRole === 'Admin') {
+          <button
+            mat-fab
+            [disabled]="!linkedUnit"
+            matTooltip="Sync enrolments"
+            matTooltipPosition="above"
+            aria-label=""
+            class="w-[60px] h-[60px]"
+            color="default"
+          >
+            <mat-icon mat-icon-button>people</mat-icon>
+          </button>
 
+          <button
+            mat-fab
+            [disabled]="!linkedUnit"
+            matTooltip="Sync grades"
+            matTooltipPosition="above"
+            aria-label=""
+            class="w-[60px] h-[60px]"
+            color="default"
+            (click)="syncGrades()"
+          >
+            <mat-icon mat-icon-button>grade</mat-icon>
+          </button>
+        }
+      </div>
       <button
         mat-fab
-        matTooltip="Manage Enrolment"
-        matTooltipPosition="above"
-        aria-label=""
-        class="w-[60px] h-[60px]"
-        color="default"
+        extended
+        color="primary"
+        class="h-[50px] my-5 w-full max-w-lg"
+        (click)="launchApplication()"
+        target="_blank"
       >
-        <mat-icon mat-icon-button>admin_panel_settings</mat-icon>
+        <mat-icon>rocket_launch</mat-icon>
+        Launch {{ linkedUnit ? linkedUnit.code : 'OnTrack' }}
       </button>
+      <div class="text-center text-gray-300 mt-4 w-full">
+        @if (linkedUnit) {
+          {{ linkedUnit.code }} &mdash; {{ linkedUnit.name }}
+          @if (currentUser?.systemRole === 'Convenor' || currentUser?.systemRole === 'Admin') {
+            <br />
+            <button mat-button class="underline text-blue-400" (click)="removeLink()">
+              Unlink
+            </button>
+          }
+        } @else {
+          This course has not yet been linked to an OnTrack Unit.
 
-      <button
-        mat-fab
-        matTooltip="View Progress"
-        matTooltipPosition="above"
-        aria-label=""
-        class="w-[60px] h-[60px]"
-        color="default"
-      >
-        <mat-icon mat-icon-button>assessment</mat-icon>
-      </button>
-    </div>
-    <div class="text-center text-gray-300 mt-4 text-base">
-      COS10001 &mdash; Introduction to Programming
-    </div>
+          @if (currentUser?.systemRole === 'Convenor' || currentUser?.systemRole === 'Admin') {
+            <br />
+            <button mat-button class="underline text-blue-400" (click)="goToLinkUnit()">
+              Link it now
+            </button>
+          } @else {
+            <br />
+            Only OnTrack staff are permitted to link this course.
+          }
+        }
+      </div>
+    }
   </div>
 </div>
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index 89869b57a9..85c5a1394c 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -1,5 +1,12 @@
-import {AfterViewInit, Component, Inject, OnInit} from '@angular/core';
-import {UIRouter} from '@uirouter/angular';
+import {AfterViewInit, Component, Inject, Input, OnInit} from '@angular/core';
+import {StateService, UIRouter} from '@uirouter/angular';
+import {ProjectService, User} from 'src/app/api/models/doubtfire-model';
+import {Unit} from 'src/app/api/models/unit';
+import {AuthenticationService} from 'src/app/api/services/authentication.service';
+import {LtiService, UnitLink} from 'src/app/api/services/lti.service';
+import {UnitService} from 'src/app/api/services/unit.service';
+import {UserService} from 'src/app/api/services/user.service';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
   selector: 'f-lti-dashboard',
@@ -7,12 +14,89 @@ import {UIRouter} from '@uirouter/angular';
   styleUrls: ['lti-dashboard.component.scss'],
 })
 export class LtiDashboardComponent implements AfterViewInit {
-  constructor(@Inject(UIRouter) private router: UIRouter) {}
+  constructor(
+    @Inject(UIRouter) private router: UIRouter,
+    private ltiService: LtiService,
+    private userService: UserService,
+    private authenticationService: AuthenticationService,
+    private stateService: StateService,
+    private alertsService: AlertService,
+    private unitService: UnitService,
+    private projectService: ProjectService,
+  ) {}
 
+  @Input() ltik: string;
+
+  // linkedUnit: UnitLink;
+  linkedUnit: Unit;
+  currentUser: User;
+
+  loadingState: 'creatingUser' | 'enrollingUser' | 'fetchingUnit';
+  isLoading: boolean;
   ngAfterViewInit(): void {
     // Scroll to the bottom of the page in case the header is visible
     // Ensures our action buttons are centered
     setTimeout(() => window.scrollTo(0, document.body.scrollHeight), 100);
+
+    this.isLoading = true;
+    // TODO: add a spinner or loading indicator until final loading state is complete
+
+    this.authenticationService.afterAuthCall(() => {
+      this.userService.currentUser.ltik = this.ltik;
+      this.currentUser = this.userService.currentUser;
+
+      // Retrieve linked unit ID
+      this.ltiService.getUnitLink().subscribe({
+        next: (link) => {
+          if (!link) {
+            console.log('no link, cant enrol');
+            this.isLoading = false;
+            return;
+          }
+          // Ensure user is enrolled into the linked unit
+          this.ltiService.enrolUser(link).subscribe({
+            next: () => {
+              // Fetch unit information
+              this.unitService.get(link.unitId).subscribe({
+                next: (unit) => {
+                  this.linkedUnit = unit;
+                  this.isLoading = false;
+                },
+                error: (error) => {
+                  this.alertsService.error(error.message, 6000);
+                  this.isLoading = false;
+                },
+              });
+            },
+            error: (error) => {
+              console.error(error);
+            },
+          });
+        },
+        error: (error) => {
+          this.alertsService.error('Unauthorised. Please relaunch the app.', 6000);
+        },
+      });
+    });
+  }
+
+  goToLinkUnit(): void {
+    this.stateService.go('lti/deeplink', {
+      ltik: this.ltik,
+    });
+  }
+
+  removeLink(): void {
+    this.ltiService.removeUnitLink().subscribe({
+      next: (link) => {
+        this.linkedUnit = null;
+        console.log(link);
+      },
+      error: (error) => {
+        console.error(error);
+        this.alertsService.error(error.message, 6000);
+      },
+    });
   }
 
   public launchApplication(): void {
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.html b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
index a56ad58a86..f4814686f2 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.html
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
@@ -10,7 +10,9 @@
       <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
     </div>
 
-    @if (!activeUnits.length) {
+    @if (loadingUnits) {
+      <p>Loading...</p>
+    } @else if (!activeUnits.length) {
       <p class="w-full text-center text-gray-400">
         You must already be a Convenor or Admin to link a unit. You are not currently assigned to
         any units.
@@ -25,7 +27,7 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
         <mat-select [(value)]="selectedUnit">
           @for (unit of activeUnits; track unit) {
             <mat-option [value]="unit"
-              >{{ unit.code }} - {{ unit.name }} ({{ unit.teachingPeriod.name }})</mat-option
+              >{{ unit.code }} - {{ unit.name }} ({{ unit.teachingPeriod?.name }})</mat-option
             >
           }
         </mat-select>
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
index f1c1350073..e9e2530d9e 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
@@ -1,4 +1,5 @@
 import {AfterViewInit, Component, Input} from '@angular/core';
+import {StateService} from '@uirouter/core';
 import {CreateNewUnitModal} from 'src/app/admin/modals/create-new-unit-modal/create-new-unit-modal.component';
 import {Unit} from 'src/app/api/models/unit';
 import {AuthenticationService} from 'src/app/api/services/authentication.service';
@@ -22,6 +23,7 @@ export class LtiDeeplinkComponent implements AfterViewInit {
     private alertsService: AlertService,
     private ltiService: LtiService,
     private userService: UserService,
+    private stateService: StateService,
   ) {}
 
   @Input() ltik: string;
@@ -31,7 +33,11 @@ export class LtiDeeplinkComponent implements AfterViewInit {
 
   public unitLinked: boolean = false;
 
+  public loadingUnits: boolean;
+
   ngAfterViewInit(): void {
+    this.loadingUnits = true;
+
     // Scroll to the bottom of the page in case the header is visible
     // Ensures our action buttons are centered
     setTimeout(() => window.scrollTo(0, document.body.scrollHeight), 100);
@@ -57,23 +63,27 @@ export class LtiDeeplinkComponent implements AfterViewInit {
   }
 
   private async linkUnit(unit: Unit) {
-    const formData = {
-      unit_id: unit.code,
-    };
+    this.ltiService
+      .setUnitLink({
+        unitId: unit.id.toString(),
+        // unitCode: unit.code,
+        // unitName: unit.name,
+      })
+      .subscribe({
+        next: (link) => {
+          console.log(link);
 
-    this.ltiService.sendDeeplinkRequest(formData).subscribe({
-      next: (form) => {
-        // On success, LTI.js returns an HTML script that tells our LMS to return back to the settings page
-        document.body.innerHTML += form;
-        setTimeout(() => {
-          (document.getElementById('ltijs_submit') as HTMLFormElement)?.submit();
-        });
-      },
-      error: (error) => {
-        console.log(error);
-        this.alertsService.error(`Failed to link unit: ${error.error}`, 6000);
-      },
-    });
+          this.alertsService.success(`Successfully linked ${unit.code}`, 5000);
+
+          this.stateService.go('lti', {
+            ltik: this.ltik,
+          });
+        },
+        error: (error) => {
+          console.log(error);
+          this.alertsService.error(`Failed to link unit: ${error.error}`, 6000);
+        },
+      });
   }
 
   public loadUnits(): void {
@@ -90,6 +100,7 @@ export class LtiDeeplinkComponent implements AfterViewInit {
       .subscribe({
         next: (units) => {
           this.activeUnits = [...units];
+          this.loadingUnits = false;
         },
         error: (error) => {
           this.alertsService.error(`Failed to fetch units`, 6000);

From 0f5daa852f4c3750367f7d2c3f9b0c07ffbfed3f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 11 Aug 2025 11:15:40 +1000
Subject: [PATCH 436/776] feat: sync grades for all members

---
 src/app/api/services/lti.service.ts           | 27 +++++++++++
 .../lti-dashboard.component.html              | 16 ++++++-
 .../lti-dashboard/lti-dashboard.component.ts  | 47 +++++++++++++++++--
 3 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/src/app/api/services/lti.service.ts b/src/app/api/services/lti.service.ts
index 224ce3a1dd..a4c460a894 100644
--- a/src/app/api/services/lti.service.ts
+++ b/src/app/api/services/lti.service.ts
@@ -19,6 +19,15 @@ interface info {
     | undefined;
 }
 
+export interface RetrievedGrade {
+  id: string;
+  scoreOf: string;
+  userId: string;
+  resultScore: number;
+  resultMaximum: number;
+  comment: string;
+}
+
 export interface UnitLink {
   contextId?: string;
   unitId: string;
@@ -54,4 +63,22 @@ export class LtiService {
   public enrolUser(unit: UnitLink): Observable<Project | null> {
     return this.httpClient.post<Project | null>(`${LTI_API_URL}/enrol`, unit);
   }
+
+  public getMembers(): Observable<any> {
+    return this.httpClient.get<any>(`${LTI_API_URL}/members`);
+  }
+
+  // Sync grade for current student
+  public syncGrade(): Observable<boolean> {
+    return this.httpClient.post<boolean>(`${LTI_API_URL}/grades`, {});
+  }
+
+  // Sync grades for all members in the context (course)
+  public syncStudentsGrades(): Observable<boolean> {
+    return this.httpClient.post<boolean>(`${LTI_API_URL}/grades`, {});
+  }
+
+  public getGrade(): Observable<RetrievedGrade[] | null> {
+    return this.httpClient.get<RetrievedGrade[] | null>(`${LTI_API_URL}/grade`, {});
+  }
 }
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.html b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
index 101918f96a..dd960a815d 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.html
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
@@ -27,7 +27,6 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
           >
             <mat-icon mat-icon-button>people</mat-icon>
           </button>
-
           <button
             mat-fab
             [disabled]="!linkedUnit"
@@ -36,7 +35,20 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
             aria-label=""
             class="w-[60px] h-[60px]"
             color="default"
-            (click)="syncGrades()"
+            (click)="syncStudentsGrades()"
+          >
+            <mat-icon mat-icon-button>grade</mat-icon>
+          </button>
+        } @else {
+          <button
+            mat-fab
+            [disabled]="!linkedUnit"
+            matTooltip="Sync grades"
+            matTooltipPosition="above"
+            aria-label=""
+            class="w-[60px] h-[60px]"
+            color="default"
+            (click)="syncMyGrade()"
           >
             <mat-icon mat-icon-button>grade</mat-icon>
           </button>
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index 85c5a1394c..21676544e8 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -1,13 +1,13 @@
-import {AfterViewInit, Component, Inject, Input, OnInit} from '@angular/core';
+import {AfterViewInit, Component, Inject, Input} from '@angular/core';
 import {StateService, UIRouter} from '@uirouter/angular';
+import {csvResultModalService} from 'src/app/ajs-upgraded-providers';
 import {ProjectService, User} from 'src/app/api/models/doubtfire-model';
 import {Unit} from 'src/app/api/models/unit';
 import {AuthenticationService} from 'src/app/api/services/authentication.service';
-import {LtiService, UnitLink} from 'src/app/api/services/lti.service';
+import {LtiService} from 'src/app/api/services/lti.service';
 import {UnitService} from 'src/app/api/services/unit.service';
 import {UserService} from 'src/app/api/services/user.service';
 import {AlertService} from 'src/app/common/services/alert.service';
-
 @Component({
   selector: 'f-lti-dashboard',
   templateUrl: 'lti-dashboard.component.html',
@@ -23,6 +23,7 @@ export class LtiDashboardComponent implements AfterViewInit {
     private alertsService: AlertService,
     private unitService: UnitService,
     private projectService: ProjectService,
+    @Inject(csvResultModalService) private _csvResultModalService: any,
   ) {}
 
   @Input() ltik: string;
@@ -53,6 +54,9 @@ export class LtiDashboardComponent implements AfterViewInit {
             this.isLoading = false;
             return;
           }
+
+          // this.getGrade();
+
           // Ensure user is enrolled into the linked unit
           this.ltiService.enrolUser(link).subscribe({
             next: () => {
@@ -99,6 +103,43 @@ export class LtiDashboardComponent implements AfterViewInit {
     });
   }
 
+  // getGrade(): void {
+  //   this.ltiService.getGrade().subscribe({
+  //     next: (result) => {
+  //       console.log('grade result?: ', result);
+  //       console.log(JSON.stringify(result));
+  //     },
+  //     error: (error) => {
+  //       console.log(error);
+  //     },
+  //   });
+  // }
+
+  syncMyGrade(): void {
+    this.ltiService.syncGrade().subscribe({
+      next: (result) => {
+        console.log('Successfully synced grade from OnTrack');
+        this.alertsService.success('Successfully synced grade from OnTrack', 5000);
+      },
+      error: (error) => {
+        console.log(error);
+        this.alertsService.error(`Failed to retrieve grade`);
+      },
+    });
+  }
+
+  syncStudentsGrades(): void {
+    this.ltiService.syncStudentsGrades().subscribe({
+      next: (result) => {
+        this.alertsService.success('Successfully synced grades from OnTrack', 5000);
+        this._csvResultModalService.show('Grade sync', result);
+      },
+      error: (error) => {
+        console.log(error);
+        this.alertsService.error(`Failed to retrieve grade`);
+      },
+    });
+  }
   public launchApplication(): void {
     window.open('http://localhost:4200/home', '_blank');
   }

From 68ed6f7118b11bacad0aed0a294126189c530434 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 11 Aug 2025 12:44:23 +1000
Subject: [PATCH 437/776] refactor: adjust due date descriptions when flexible
 dates enabled

---
 src/app/api/models/task.ts                    |   5 +
 .../task-description-card.component.html      |  33 ++++-
 .../task-description-card.component.ts        |   7 +
 .../task-due-card.component.html              | 121 ++++++++++++------
 .../task-due-card/task-due-card.component.ts  |   8 +-
 5 files changed, 130 insertions(+), 44 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2e9fe84256..d126c0718f 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -179,6 +179,11 @@ export class Task extends Entity {
     return formatDate(this.localDueDate(), 'd MMM', locale);
   }
 
+  public localDeadlineDateString(): string {
+    const locale: string = AppInjector.get(LOCALE_ID);
+    return formatDate(this.localDeadlineDate(), 'd MMM', locale);
+  }
+
   public get dueWeek(): number {
     const startDate: Date = this.unit.startDate;
     const dueDate: Date = this.localDueDate();
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html
index aa8601876a..2e44b47ce8 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.html
@@ -12,12 +12,33 @@
     }
     <ul>
       <li>{{ grades.names[taskDef?.targetGrade] }} Task</li>
-      <li>Start Date &mdash; Aim to start this task by {{ startDate() | date: 'EEE d MMM' }}.</li>
-      <li [hidden]="!task?.extensions || task?.extensions <= 0">
-        Extension &mdash; The due date has been extended by
-        {{ task?.extensions }} week{{ task?.extensions > 1 ? 's' : '' }}.
-      </li>
-      <li>Due Date &mdash; Aim to complete by {{ dueDate() | date: 'EEE d MMM' }}.</li>
+
+      @if (taskDef.unit.allowFlexibleDates) {
+        <li>I'm planning to <b>start</b> this task by {{ startDate() | date: 'EEE d MMM' }}.</li>
+        <li [hidden]="!task?.extensions || task?.extensions <= 0">
+          The due date has been <b>extended</b> by {{ task?.extensions }} week{{
+            task?.extensions > 1 ? 's' : ''
+          }}.
+        </li>
+        <li>I'm aiming to <b>submit</b> this task by {{ dueDate() | date: 'EEE d MMM' }}.</li>
+        <li>
+          To receive <b>feedback</b>, I must submit this task by
+          {{ feedbackDate() | date: 'EEE d MMM' }}.
+        </li>
+      } @else {
+        <li>
+          Start Date &mdash; I'm aiming to <b>start</b> this task by
+          {{ startDate() | date: 'EEE d MMM' }}.
+        </li>
+        <li [hidden]="!task?.extensions || task?.extensions <= 0">
+          Extension &mdash; The due date has been extended by
+          {{ task?.extensions }} week{{ task?.extensions > 1 ? 's' : '' }}.
+        </li>
+        <li>
+          Due Date &mdash; I'm aiming to <b>submit</b> this task by
+          {{ dueDate() | date: 'EEE d MMM' }}.
+        </li>
+      }
     </ul>
   </mat-card-content>
   <mat-card-actions
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
index 4b85d05a06..5a27cae3e7 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
@@ -56,6 +56,13 @@ export class TaskDescriptionCardComponent {
     return this.task?.startDate ?? this.taskDef?.startDate;
   }
 
+  public feedbackDate(): Date {
+    if (this.task) {
+      return this.task.localDeadlineDate();
+    }
+    this.taskDef.localDeadlineDate();
+  }
+
   public shouldShowDeadline(): boolean {
     return this.task && this.task.daysUntilDeadlineDate() <= 14;
   }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
index 52b9a12b4b..28baa761d9 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
@@ -10,54 +10,103 @@
     </mat-card-header>
     <mat-card-content>
       <!--Due and not in discuss-->
-      <p [hidden]="task?.inDiscussState()">
-        This task's due date is <strong>{{ task?.localDueDateString() }}</strong
-        >. You should aim to complete this task before then to keep your progress on track.
-      </p>
+          @if (flexibleDatesEnabled) {
+            <p [hidden]="task?.inDiscussState()">
+              Your target due date for this task is
+              <strong>{{ task?.localDueDateString() }}</strong
+              >. You should aim to complete this task before then to keep your progress on track.
+            </p>
+          } @else {
+            <p [hidden]="task?.inDiscussState()">
+              This task's due date is <strong>{{ task?.localDueDateString() }}</strong
+              >. You should aim to complete this task before then to keep your progress on track.
+            </p>
+          }
     </mat-card-content>
     <mat-card-content [hidden]="!task?.inDiscussState()">
       <!--Due but in discuss-->
-      <p>
-        This task's due date is <strong>{{ task?.localDueDateString() }}</strong
-        >. Make sure to discuss this task with your tutor as soon as possible.
-      </p>
-      <p class="mat-caption">
-        Tasks are only considered <strong>Completed</strong> once your tutor has <strong>Discussed</strong> your work
-        with you.
-      </p>
-    </mat-card-content>
+          @if (flexibleDatesEnabled) {
+            <p>
+              This target due date for this task is <strong>{{ task?.localDueDateString() }}</strong
+              >. Make sure to discuss this task with your tutor as soon as possible.
+            </p>
+            <p class="mat-caption">
+              Tasks are only considered <strong>Completed</strong> once your tutor has
+              <strong>Discussed</strong> your work with you.
+            </p>
+          } @else {
+            <p>
+              This task's due date is <strong>{{ task?.localDueDateString() }}</strong
+              >. Make sure to discuss this task with your tutor as soon as possible.
+            </p>
+            <p class="mat-caption">
+              Tasks are only considered <strong>Completed</strong> once your tutor has
+              <strong>Discussed</strong> your work with you.
+            </p>
+          }
+        </mat-card-content>
   </mat-card>
   }
 
   <!--/is due soon-->
   @if (task?.betweenDueDateAndDeadlineDate()) {
-  <mat-card appearance="outlined">
-    <mat-card-header class="bg-yellow-600 text-white">
-      <mat-card-title class="flex items-center mb-4"
-        ><mat-icon>warning</mat-icon>
-        <span class="ml-4">Past Due Date By {{ task?.timePastDueDateDescription() }}</span></mat-card-title
-      >
-    </mat-card-header>
+      <mat-card appearance="outlined">
+        <mat-card-header class="bg-yellow-600 text-white">
+          <mat-card-title class="flex items-center mb-4"
+            ><mat-icon>warning</mat-icon>
+            @if (flexibleDatesEnabled) {
+              <span class="ml-4">Past Target Date By {{ task?.timePastDueDateDescription() }}</span>
+            } @else {
+              <span class="ml-4">Past Due Date By {{ task?.timePastDueDateDescription() }}</span>
+            }
+          </mat-card-title>
+        </mat-card-header>
 
-    <mat-card-content class="bg-yellow-50" [hidden]="task?.inDiscussState()">
-      <!--Not in submitted state and overdue-->
-      <p class="mt-2">
-        You should have completed this task by <strong>{{ task?.localDueDateString() }}</strong
-        >. Try and finish it as soon as possible to avoid falling behind. You will need to request an extension in order
-        to have this task checked and marked as complete by your tutor.
-      </p>
+        <mat-card-content class="bg-yellow-50" [hidden]="task?.inDiscussState()">
+          <!--Not in submitted state and overdue-->
+          @if (flexibleDatesEnabled) {
+            <p class="mt-2 p-2">
+              You should have submitted this task by
+              <strong>{{ task?.localDueDateString() }}</strong> to keep your progress on track. Try
+              to finish it as soon as possible to avoid delays. You can revise your project plan
+              dates, but ensure you submit before the deadline to receive feedback.
+            </p>
+          } @else {
+            <p class="mt-2 p-2">
+              You should have completed this task by
+              <strong>{{ task?.localDueDateString() }}</strong
+              >. Try and finish it as soon as possible to avoid falling behind. You will need to
+              request an extension in order to have this task checked and marked as complete by your
+              tutor.
+            </p>
+          }
     </mat-card-content>
     <mat-card-content [hidden]="!task?.inDiscussState()">
       <!--Not discussed-->
-      <p>
-        You should have completed this task by <strong>{{ task?.localDueDateString() }}</strong
-        >. Make sure to discuss this task with your tutor as soon as possible. If this task remains on this state for an
-        extended period, it will be marked as Time Exceeded.
-      </p>
-      <p class="mat-caption">
-        Tasks are only considered <strong>completed</strong> once your tutor has <strong>discussed</strong> your work
-        with you.
-      </p>
+          @if (flexibleDatesEnabled) {
+            <p>
+              You should have completed this task by
+              <strong>{{ task?.localDueDateString() }}</strong
+              >. Make sure to discuss this task with your tutor as soon as possible. If you do not
+              discuss this task by {{ task?.localDeadlineDateString() }}, it will be marked as Time
+              Exceeded.
+            </p>
+            <p class="mat-caption">
+              Tasks are only considered <strong>completed</strong> once your tutor has
+              <strong>discussed</strong> your work with you.
+            </p>
+          } @else {
+            <p>
+              You should have completed this task by <strong>{{ task?.localDueDateString() }}</strong
+              >. Make sure to discuss this task with your tutor as soon as possible. If this task remains on this state for an
+              extended period, it will be marked as Time Exceeded.
+            </p>
+            <p class="mat-caption">
+              Tasks are only considered <strong>completed</strong> once your tutor has <strong>discussed</strong> your work
+              with you.
+            </p>
+          }
+
     </mat-card-content>
   </mat-card>
   }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.ts
index b6886013d0..a84d979294 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.ts
@@ -1,5 +1,5 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Task } from 'src/app/api/models/task';
+import {Component, Input, OnInit} from '@angular/core';
+import {Task} from 'src/app/api/models/task';
 
 @Component({
   selector: 'f-task-due-card',
@@ -11,4 +11,8 @@ export class TaskDueCardComponent implements OnInit {
   constructor() {}
 
   ngOnInit(): void {}
+
+  public get flexibleDatesEnabled(): boolean {
+    return this.task?.unit?.allowFlexibleDates;
+  }
 }

From 5dc583140eeadd666b78b330bbf550f66791d2ea Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 11 Aug 2025 14:03:49 +1000
Subject: [PATCH 438/776] refactor: add linked learning outcome chips

---
 .../task-ilos-card.component.html             |  7 ++++++
 .../task-ilos-card.component.ts               | 24 ++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.html
index 36310f1050..e4bf3548c2 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.html
@@ -13,6 +13,13 @@
           <tr class="even:bg-white odd:bg-gray-100 border-b border-gray-200">
             <td class="px-6 py-4 text-black uppercase">{{ ilo.abbreviation }}</td>
             <td class="px-6 py-4 text-gray-500">{{ ilo.fullOutcomeDescription }}</td>
+            <td class="px-6 py-4 text-gray-500 flex justify-end">
+              @for (outcome of getLinkedOutcomes(ilo); track outcome.abbreviation) {
+                <mat-chip-row class="m-1" matTooltip="{{ outcome.shortDescription }}">{{
+                  outcome.abbreviation
+                }}</mat-chip-row>
+              }
+            </td>
           </tr>
         }
       </tbody>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.ts
index cad3bdc270..3a0cf9ce54 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-ilos-card/task-ilos-card.component.ts
@@ -15,6 +15,7 @@ export class TaskIlosCardComponent implements OnInit, OnChanges {
   @Input() taskDef: TaskDefinition | undefined;
   @Input() project: Project;
 
+  allOutcomesCache: LearningOutcome[] = []; // Track linked outcomes
   learningOutcomes: LearningOutcome[] = [];
 
   public ngOnChanges(_changes: SimpleChanges) {
@@ -29,20 +30,31 @@ export class TaskIlosCardComponent implements OnInit, OnChanges {
     this.learningOutcomes = [];
 
     if (this.iloContextType === 'Unit' && this.unit) {
-      for (const ilo of this.unit.ilos) {
-        this.learningOutcomes.push(ilo);
-      }
+      this.addIlosToCache(this.unit.ilos as LearningOutcome[]);
+      this.learningOutcomes.push(...this.unit.ilos);
     } else if (this.iloContextType === 'TaskDefinition' && this.taskDef) {
+      this.addIlosToCache(this.taskDef.unit.ilos as LearningOutcome[]);
       this.taskDef.learningOutcomesCache.values.subscribe((ilos) => {
-        for (const ilo of ilos) {
-          this.learningOutcomes.push(ilo);
-        }
+        this.learningOutcomes.push(...ilos);
+        this.addIlosToCache(ilos);
       });
     }
 
     // TODO: implement Course and Global learning outcomes when available
   }
 
+  private addIlosToCache(outcomes: LearningOutcome[]): void {
+    for (const ilo of outcomes) {
+      if (!this.allOutcomesCache.find((existing) => existing.id === ilo.id)) {
+        this.allOutcomesCache.push(ilo);
+      }
+    }
+  }
+
+  getLinkedOutcomes(ilo: LearningOutcome): LearningOutcome[] {
+    return this.allOutcomesCache.filter((outcome) => ilo.linkedOutcomeIds.includes(outcome.id));
+  }
+
   public getIloContextLabel(): string {
     switch (this.iloContextType) {
       case 'TaskDefinition':

From ba41e0ba24570a865c98369f83c6d1bb764d8891 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 11 Aug 2025 14:59:11 +1000
Subject: [PATCH 439/776] refactor: fallback to custom teaching period dates

---
 .../lti-dashboard.component.html              | 13 -----
 .../lti-dashboard/lti-dashboard.component.ts  | 50 +++++++++++--------
 .../lti-deeplink/lti-deeplink.component.html  |  8 +--
 .../lti-deeplink/lti-deeplink.component.ts    | 21 +++++++-
 4 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.html b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
index dd960a815d..68540c6f70 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.html
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
@@ -39,19 +39,6 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
           >
             <mat-icon mat-icon-button>grade</mat-icon>
           </button>
-        } @else {
-          <button
-            mat-fab
-            [disabled]="!linkedUnit"
-            matTooltip="Sync grades"
-            matTooltipPosition="above"
-            aria-label=""
-            class="w-[60px] h-[60px]"
-            color="default"
-            (click)="syncMyGrade()"
-          >
-            <mat-icon mat-icon-button>grade</mat-icon>
-          </button>
         }
       </div>
       <button
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index 21676544e8..a48699591c 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -7,6 +7,7 @@ import {AuthenticationService} from 'src/app/api/services/authentication.service
 import {LtiService} from 'src/app/api/services/lti.service';
 import {UnitService} from 'src/app/api/services/unit.service';
 import {UserService} from 'src/app/api/services/user.service';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 @Component({
   selector: 'f-lti-dashboard',
@@ -23,6 +24,7 @@ export class LtiDashboardComponent implements AfterViewInit {
     private alertsService: AlertService,
     private unitService: UnitService,
     private projectService: ProjectService,
+    private confirmationModalService: ConfirmationModalService,
     @Inject(csvResultModalService) private _csvResultModalService: any,
   ) {}
 
@@ -115,30 +117,36 @@ export class LtiDashboardComponent implements AfterViewInit {
   //   });
   // }
 
-  syncMyGrade(): void {
-    this.ltiService.syncGrade().subscribe({
-      next: (result) => {
-        console.log('Successfully synced grade from OnTrack');
-        this.alertsService.success('Successfully synced grade from OnTrack', 5000);
-      },
-      error: (error) => {
-        console.log(error);
-        this.alertsService.error(`Failed to retrieve grade`);
-      },
-    });
-  }
+  // syncMyGrade(): void {
+  //   this.ltiService.syncGrade().subscribe({
+  //     next: (result) => {
+  //       console.log('Successfully synced grade from OnTrack');
+  //       this.alertsService.success('Successfully synced grade from OnTrack', 5000);
+  //     },
+  //     error: (error) => {
+  //       console.log(error);
+  //       this.alertsService.error(`Failed to retrieve grade`);
+  //     },
+  //   });
+  // }
 
   syncStudentsGrades(): void {
-    this.ltiService.syncStudentsGrades().subscribe({
-      next: (result) => {
-        this.alertsService.success('Successfully synced grades from OnTrack', 5000);
-        this._csvResultModalService.show('Grade sync', result);
+    this.confirmationModalService.show(
+      'Sync Grades from OnTrack',
+      'Are you sure you want to sync portfolio grades from OnTrack? Please confirm that grades are final and approved for release.',
+      () => {
+        this.ltiService.syncStudentsGrades().subscribe({
+          next: (result) => {
+            this.alertsService.success('Successfully synced grades from OnTrack', 5000);
+            this._csvResultModalService.show('Grade sync', result);
+          },
+          error: (error) => {
+            console.log(error);
+            this.alertsService.error(`Failed to retrieve grade`);
+          },
+        });
       },
-      error: (error) => {
-        console.log(error);
-        this.alertsService.error(`Failed to retrieve grade`);
-      },
-    });
+    );
   }
   public launchApplication(): void {
     window.open('http://localhost:4200/home', '_blank');
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.html b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
index f4814686f2..2ab7465ca9 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.html
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.html
@@ -1,5 +1,5 @@
 <div id="home" class="w-full h-screen px-20 justify-center items-center">
-  <div class="flex flex-col gap-5 w-full max-w-2xl mx-auto justify-center items-center h-screen">
+  <div class="flex flex-col gap-5 w-full max-w-4xl mx-auto justify-center items-center h-screen">
     <div class="flex justify-center items-center">
       <mat-icon
         svgIcon="formatif-logo"
@@ -13,12 +13,12 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
     @if (loadingUnits) {
       <p>Loading...</p>
     } @else if (!activeUnits.length) {
-      <p class="w-full text-center text-gray-400">
+      <p class="w-full text-center text-gray-400 max-w-2xl">
         You must already be a Convenor or Admin to link a unit. You are not currently assigned to
         any units.
       </p>
     } @else {
-      <p class="w-full text-center">
+      <p class="w-full text-center max-w-2xl">
         Students will be automatically enrolled in this unit when they launch the OnTrack tool from
         this course.
       </p>
@@ -27,7 +27,7 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
         <mat-select [(value)]="selectedUnit">
           @for (unit of activeUnits; track unit) {
             <mat-option [value]="unit"
-              >{{ unit.code }} - {{ unit.name }} ({{ unit.teachingPeriod?.name }})</mat-option
+              >{{ unit.code }} {{ unit.name }} ({{ getTeachingPeriod(unit) }})</mat-option
             >
           }
         </mat-select>
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
index e9e2530d9e..0209b70ef4 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
+++ b/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
@@ -52,7 +52,7 @@ export class LtiDeeplinkComponent implements AfterViewInit {
 
   public submit(): void {
     this.confirmationModalService.show(
-      `Are you sure you want to link ${this.selectedUnit.code} to ${'Moodle-Name-Here'}?`,
+      `Are you sure you want to link ${this.selectedUnit.code} ${this.selectedUnit.name} (${this.getTeachingPeriod(this.selectedUnit)}) to this course?`,
       'Once you have linked an OnTrack unit, students who launch this app will be enrolled automatically. Unlinking a unit will not withdraw students automatically.',
       () => {
         // Trigger API call to LTI.js with our deeplink request
@@ -62,6 +62,20 @@ export class LtiDeeplinkComponent implements AfterViewInit {
     );
   }
 
+  private formatTeachingPeriod(date): string {
+    const month = date.toLocaleString('en-US', {month: 'short'});
+    const year = String(date.getFullYear()).slice(-2);
+    return `${month} '${year}`;
+  }
+
+  public getTeachingPeriod(unit: Unit) {
+    if (unit.teachingPeriod?.name) {
+      return unit.teachingPeriod.name;
+    }
+
+    return `${this.formatTeachingPeriod(unit.startDate)} - ${this.formatTeachingPeriod(unit.endDate)}`;
+  }
+
   private async linkUnit(unit: Unit) {
     this.ltiService
       .setUnitLink({
@@ -99,7 +113,10 @@ export class LtiDeeplinkComponent implements AfterViewInit {
       )
       .subscribe({
         next: (units) => {
-          this.activeUnits = [...units];
+          // Show newer units first
+          this.activeUnits = [...units].sort(
+            (a, b) => b.startDate.getTime() - a.startDate.getTime(),
+          );
           this.loadingUnits = false;
         },
         error: (error) => {

From 5ec499f37b93f2b4bd56d145501fd55ab6af45e6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 11 Aug 2025 17:12:07 +1000
Subject: [PATCH 440/776] feat: sync enrolments for all lti members

---
 src/app/api/services/lti.service.ts           | 10 ++----
 .../lti-dashboard.component.html              |  1 +
 .../lti-dashboard/lti-dashboard.component.ts  | 33 +++++++++++++++++++
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/app/api/services/lti.service.ts b/src/app/api/services/lti.service.ts
index a4c460a894..6ed17157e4 100644
--- a/src/app/api/services/lti.service.ts
+++ b/src/app/api/services/lti.service.ts
@@ -68,17 +68,13 @@ export class LtiService {
     return this.httpClient.get<any>(`${LTI_API_URL}/members`);
   }
 
-  // Sync grade for current student
-  public syncGrade(): Observable<boolean> {
-    return this.httpClient.post<boolean>(`${LTI_API_URL}/grades`, {});
-  }
-
   // Sync grades for all members in the context (course)
   public syncStudentsGrades(): Observable<boolean> {
     return this.httpClient.post<boolean>(`${LTI_API_URL}/grades`, {});
   }
 
-  public getGrade(): Observable<RetrievedGrade[] | null> {
-    return this.httpClient.get<RetrievedGrade[] | null>(`${LTI_API_URL}/grade`, {});
+  // Sync grades for all members in the context (course)
+  public syncEnrolments(): Observable<boolean> {
+    return this.httpClient.post<boolean>(`${LTI_API_URL}/enrolments`, {});
   }
 }
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.html b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
index 68540c6f70..e8969eb3a6 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.html
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
@@ -24,6 +24,7 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
             aria-label=""
             class="w-[60px] h-[60px]"
             color="default"
+            (click)="syncEnrolments()"
           >
             <mat-icon mat-icon-button>people</mat-icon>
           </button>
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index a48699591c..3dd0a77596 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -130,6 +130,39 @@ export class LtiDashboardComponent implements AfterViewInit {
   //   });
   // }
 
+  syncEnrolments(): void {
+    if (!this.linkedUnit) {
+      this.alertsService.error(
+        `Course must be linked to an OnTrack unit before you can sync members.`,
+        6000,
+      );
+      return;
+    }
+
+    this.ltiService.getMembers().subscribe({
+      next: (members) => {
+        this.confirmationModalService.show(
+          'Sync Enrolments into OnTrack',
+          `Are you sure you want to import ${members.members.length} users into ${this.linkedUnit.code} ${this.linkedUnit.name}`,
+          () => {
+            this.ltiService.syncEnrolments().subscribe({
+              next: (result) => {
+                this.alertsService.success('Successfully imported users into OnTrack', 5000);
+              },
+              error: (error) => {
+                console.log(error);
+                this.alertsService.error(`Failed to retrieve grade`);
+              },
+            });
+          },
+        );
+      },
+      error: (error) => {
+        this.alertsService.error('Failed to retrieve course members', 6000);
+      },
+    });
+  }
+
   syncStudentsGrades(): void {
     this.confirmationModalService.show(
       'Sync Grades from OnTrack',

From 82081b9b417488f10ee9a705f9d22e86d28ac06f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 11 Aug 2025 17:24:02 +1000
Subject: [PATCH 441/776] refactor: remove deeplinking

---
 src/app/api/services/lti.service.ts                 |  7 -------
 src/app/doubtfire-angular.module.ts                 |  4 ++--
 src/app/doubtfire.states.ts                         | 13 ++++++-------
 .../states/lti-dashboard/lti-dashboard.component.ts |  2 +-
 .../lti-unit-link.component.html}                   |  0
 .../lti-unit-link.component.scss}                   |  0
 .../lti-unit-link.component.ts}                     | 10 +++++-----
 7 files changed, 14 insertions(+), 22 deletions(-)
 rename src/app/home/states/{lti-deeplink/lti-deeplink.component.html => lti-unit-link/lti-unit-link.component.html} (100%)
 rename src/app/home/states/{lti-deeplink/lti-deeplink.component.scss => lti-unit-link/lti-unit-link.component.scss} (100%)
 rename src/app/home/states/{lti-deeplink/lti-deeplink.component.ts => lti-unit-link/lti-unit-link.component.ts} (93%)

diff --git a/src/app/api/services/lti.service.ts b/src/app/api/services/lti.service.ts
index 6ed17157e4..8f48045cce 100644
--- a/src/app/api/services/lti.service.ts
+++ b/src/app/api/services/lti.service.ts
@@ -37,13 +37,6 @@ export interface UnitLink {
 export class LtiService {
   constructor(private httpClient: HttpClient) {}
 
-  // Sends a deeplink request to the LTI.js API (not the Ruby API).
-  public sendDeeplinkRequest(data: {unit_id: string}): Observable<string> {
-    return this.httpClient.post<string>(`${LTI_API_URL}/deeplink`, data);
-  }
-
-  // Sends a deeplink request to the LTI.js API (not the Ruby API).
-
   public getInfo(): Observable<info> {
     return this.httpClient.get<info>(`${LTI_API_URL}/info`);
   }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 90a4c2e5a6..df1fa7fc7a 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -276,7 +276,7 @@ import {SidekiqJobsModalComponent} from './common/modals/sidekiq-jobs-modal/side
 import {SidekiqJobService} from './api/services/sidekiq-job.service';
 import {UnavailableCardComponent} from './errors/unavailable-card/unavailable-card.component';
 import {LtiDashboardComponent} from './home/states/lti-dashboard/lti-dashboard.component';
-import {LtiDeeplinkComponent} from './home/states/lti-deeplink/lti-deeplink.component';
+import {LtiUnitLinkComponent} from './home/states/lti-unit-link/lti-unit-link.component';
 import {LtiService} from './api/services/lti.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
@@ -421,7 +421,7 @@ const MY_DATE_FORMAT = {
     SidekiqJobsModalComponent,
     UnavailableCardComponent,
     LtiDashboardComponent,
-    LtiDeeplinkComponent,
+    LtiUnitLinkComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 72fdfe670f..c63825ecf7 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -14,8 +14,7 @@ import {SuccessCloseComponent} from './common/success-close/success-close.compon
 import {ProjectPlanComponent} from './projects/states/plan/project-plan.component';
 import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-viewer.component';
 import {LtiDashboardComponent} from './home/states/lti-dashboard/lti-dashboard.component';
-import {LtiDeeplinkComponent} from './home/states/lti-deeplink/lti-deeplink.component';
-
+import {LtiUnitLinkComponent} from './home/states/lti-unit-link/lti-unit-link.component';
 /*
  * Use this file to store any states that are sourced by angular components.
  */
@@ -518,9 +517,9 @@ const LtiDashboardState: NgHybridStateDeclaration = {
 /**
  * Renders the content selection form shown when "Select Content" is clicked in Moodle's external tool setup.
  */
-const LtiDeeplinkState: NgHybridStateDeclaration = {
-  name: 'lti/deeplink',
-  url: '/lti/deeplink?ltik',
+const LtiUnitLinkState: NgHybridStateDeclaration = {
+  name: 'lti/link',
+  url: '/lti/link?ltik',
   resolve: {
     ltik: [
       '$stateParams',
@@ -531,7 +530,7 @@ const LtiDeeplinkState: NgHybridStateDeclaration = {
   },
   views: {
     main: {
-      component: LtiDeeplinkComponent,
+      component: LtiUnitLinkComponent,
     },
   },
   data: {
@@ -563,5 +562,5 @@ export const doubtfireStates = [
   TutorDiscussionState,
   jplagReportViewerState,
   LtiDashboardState,
-  LtiDeeplinkState,
+  LtiUnitLinkState,
 ];
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index 3dd0a77596..1f5df6ff9c 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -87,7 +87,7 @@ export class LtiDashboardComponent implements AfterViewInit {
   }
 
   goToLinkUnit(): void {
-    this.stateService.go('lti/deeplink', {
+    this.stateService.go('lti/link', {
       ltik: this.ltik,
     });
   }
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.html b/src/app/home/states/lti-unit-link/lti-unit-link.component.html
similarity index 100%
rename from src/app/home/states/lti-deeplink/lti-deeplink.component.html
rename to src/app/home/states/lti-unit-link/lti-unit-link.component.html
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.scss b/src/app/home/states/lti-unit-link/lti-unit-link.component.scss
similarity index 100%
rename from src/app/home/states/lti-deeplink/lti-deeplink.component.scss
rename to src/app/home/states/lti-unit-link/lti-unit-link.component.scss
diff --git a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts b/src/app/home/states/lti-unit-link/lti-unit-link.component.ts
similarity index 93%
rename from src/app/home/states/lti-deeplink/lti-deeplink.component.ts
rename to src/app/home/states/lti-unit-link/lti-unit-link.component.ts
index 0209b70ef4..bb305a8ed3 100644
--- a/src/app/home/states/lti-deeplink/lti-deeplink.component.ts
+++ b/src/app/home/states/lti-unit-link/lti-unit-link.component.ts
@@ -10,11 +10,11 @@ import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal
 import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
-  selector: 'f-lti-deeplink',
-  templateUrl: 'lti-deeplink.component.html',
-  styleUrls: ['lti-deeplink.component.scss'],
+  selector: 'f-lti-unit-link',
+  templateUrl: 'lti-unit-link.component.html',
+  styleUrls: ['lti-unit-link.component.scss'],
 })
-export class LtiDeeplinkComponent implements AfterViewInit {
+export class LtiUnitLinkComponent implements AfterViewInit {
   constructor(
     private createUnitModalService: CreateNewUnitModal,
     private unitService: UnitService,
@@ -55,7 +55,7 @@ export class LtiDeeplinkComponent implements AfterViewInit {
       `Are you sure you want to link ${this.selectedUnit.code} ${this.selectedUnit.name} (${this.getTeachingPeriod(this.selectedUnit)}) to this course?`,
       'Once you have linked an OnTrack unit, students who launch this app will be enrolled automatically. Unlinking a unit will not withdraw students automatically.',
       () => {
-        // Trigger API call to LTI.js with our deeplink request
+        // Trigger API call to LTI.js with our unit link request
         console.log('Trigger API call to LTI.js');
         this.linkUnit(this.selectedUnit);
       },

From b4c2f78311d9e154b07b0699fd4dd92153915a74 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 12 Aug 2025 09:34:40 +1000
Subject: [PATCH 442/776] chore(release): 10.0.0-20

---
 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 cc62715143..f905800659 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.
 
+## [10.0.0-20](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-19...v10.0.0-20) (2025-08-11)
+
 ## [10.0.0-19](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-18...v10.0.0-19) (2025-08-07)
 
 
diff --git a/package-lock.json b/package-lock.json
index e7e656a47a..faada21259 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-19",
+  "version": "10.0.0-20",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-19",
+      "version": "10.0.0-20",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 78d4daac87..00848c7684 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-19",
+  "version": "10.0.0-20",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 12e65d8f1609f2030b25347beb1c0e06f513f65c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 12 Aug 2025 13:10:36 +1000
Subject: [PATCH 443/776] feat: unauthorised lti banner

---
 .../states/lti-dashboard/lti-dashboard.component.html  | 10 ++++++++--
 .../states/lti-dashboard/lti-dashboard.component.ts    |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.html b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
index e8969eb3a6..fddf8a592b 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.html
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
@@ -11,8 +11,14 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
     </div>
 
     @if (isLoading) {
-      <!-- TODO: spinner -->
-      <p>Loading...</p>
+      @if (unauthorised) {
+        <div class="w-full bg-red-200 text-red-800 p-5 text-center font-semibold rounded-lg">
+          An error occurred. Please refresh the page.
+        </div>
+      } @else {
+        <!-- TODO: spinner -->
+        <p>Loading...</p>
+      }
     } @else {
       <div class="flex justify-center gap-5">
         @if (currentUser?.systemRole === 'Convenor' || currentUser?.systemRole === 'Admin') {
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index 1f5df6ff9c..5279c2d982 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -33,6 +33,7 @@ export class LtiDashboardComponent implements AfterViewInit {
   // linkedUnit: UnitLink;
   linkedUnit: Unit;
   currentUser: User;
+  unauthorised: boolean = false;
 
   loadingState: 'creatingUser' | 'enrollingUser' | 'fetchingUnit';
   isLoading: boolean;
@@ -81,6 +82,7 @@ export class LtiDashboardComponent implements AfterViewInit {
         },
         error: (error) => {
           this.alertsService.error('Unauthorised. Please relaunch the app.', 6000);
+          this.unauthorised = true;
         },
       });
     });

From 8fb47079da57dbfed68d557471a4eee9a75d1826 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 12 Aug 2025 14:03:56 +1000
Subject: [PATCH 444/776] chore: check for ltik

---
 src/app/sessions/states/sign-in/sign-in.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index 7f78635a0e..8f047489d4 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -78,7 +78,7 @@ export class SignInComponent implements OnInit {
         const params = getUrlParams(document.location.href);
         this.isLoading = false;
 
-        if (params.ltiToken) {
+        if (params.isLtiLogin && params.ltik) {
           this.globalState.hideHeader();
           this.userService.currentUser.ltik = params.ltik;
           return this.state.go('lti', {

From c2d15367d9c53cb426dd12e73dc8d0b779a7f563 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 12 Aug 2025 14:07:24 +1000
Subject: [PATCH 445/776] fix: clear notification after fetching task comments

---
 .../task-comments-viewer/task-comments-viewer.component.ts     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 6736f5d8bd..8819d11421 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -112,6 +112,9 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit, OnDestroy
         );
 
     request$.subscribe((comments) => {
+      // Remove task notification
+      task.numNewComments = 0;
+
       for (const comment of comments) {
         const existingComment = task.commentCache.get(comment.id);
         comment.task = task;

From 7248c6554044c0748c886c73a3c79308176f32d1 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 12 Aug 2025 14:30:09 +1000
Subject: [PATCH 446/776] chore(release): 10.0.0-21

---
 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 f905800659..64179c7b99 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.
 
+## [10.0.0-21](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-20...v10.0.0-21) (2025-08-12)
+
+
+### Bug Fixes
+
+* clear notification after fetching task comments ([c2d1536](https://github.com/b0ink/doubtfire-deploy/commit/c2d15367d9c53cb426dd12e73dc8d0b779a7f563))
+
 ## [10.0.0-20](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-19...v10.0.0-20) (2025-08-11)
 
 ## [10.0.0-19](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-18...v10.0.0-19) (2025-08-07)
diff --git a/package-lock.json b/package-lock.json
index faada21259..8377877f02 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-20",
+  "version": "10.0.0-21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-20",
+      "version": "10.0.0-21",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 00848c7684..f14bc56717 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-20",
+  "version": "10.0.0-21",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 5b44b7d685e0138b2a679efa326519ea73d0e58a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 13 Aug 2025 10:58:17 +1000
Subject: [PATCH 447/776] chore: set loading to false on enrol error

---
 src/app/home/states/lti-dashboard/lti-dashboard.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index 5279c2d982..c047d46217 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -77,6 +77,7 @@ export class LtiDashboardComponent implements AfterViewInit {
             },
             error: (error) => {
               console.error(error);
+              this.isLoading = false;
             },
           });
         },

From c6e4223064abe7b60596f6561009c4b43814407b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:46:49 +1000
Subject: [PATCH 448/776] refactor: move csv downloads into sidekiq jobs

---
 src/app/api/models/unit.ts                    | 18 +++----
 .../unit-analytics-route.component.html       | 10 +++-
 .../unit-analytics-route.component.ts         | 51 ++++++++++++++++++-
 3 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index df07d32d04..2bf02f1448 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -28,7 +28,9 @@ import {
 } from './doubtfire-model';
 import {LearningOutcome} from './learning-outcome';
 import {AlertService} from 'src/app/common/services/alert.service';
-import { D2lAssessmentMapping } from './d2l/d2l_assessment_mapping';
+import {D2lAssessmentMapping} from './d2l/d2l_assessment_mapping';
+import {SidekiqJob} from './sidekiq-job';
+import {HttpClient} from '@angular/common/http';
 
 export class Unit extends Entity {
   id: number;
@@ -575,17 +577,15 @@ export class Unit extends Entity {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/csv/task_definitions?unit_id=${this.id}`;
   }
 
-  public downloadTaskCompletionCsv(): void {
-    AppInjector.get(FileDownloaderService).downloadFile(
-      `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/task_completion.json`,
-      `${this.name}-task-completion.csv`,
+  public downloadTaskCompletionCsv(): Observable<SidekiqJob> {
+    return AppInjector.get(HttpClient).get<SidekiqJob>(
+      `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/task_completion`,
     );
   }
 
-  public downloadTutorAssessmentCsv(): void {
-    AppInjector.get(FileDownloaderService).downloadFile(
-      `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/tutor_assessments.json`,
-      `${this.name}-tutor-assessments.csv`,
+  public downloadTutorAssessmentCsv(): Observable<SidekiqJob> {
+    return AppInjector.get(HttpClient).get<SidekiqJob>(
+      `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/tutor_assessments`,
     );
   }
 
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.html b/src/app/units/states/analytics/unit-analytics-route.component.html
index 643d344195..9a5996ff38 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.html
+++ b/src/app/units/states/analytics/unit-analytics-route.component.html
@@ -1,4 +1,10 @@
 <h1>Unit Statistics</h1>
 
-<button mat-button (click)="unit.downloadTaskCompletionCsv()">Task Completion Stats</button>
-<button mat-button (click)="unit.downloadTutorAssessmentCsv()">Tutor Assessment Stats</button>
+<div class="flex gap-2">
+  <button mat-button (click)="getTaskCompletionCsv()">
+    <mat-icon>download</mat-icon> Task Completion Stats
+  </button>
+  <button mat-button (click)="getTutorAssessmentCsv()">
+    <mat-icon>download</mat-icon> Tutor Assessment Stats
+  </button>
+</div>
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.ts b/src/app/units/states/analytics/unit-analytics-route.component.ts
index 3029bcdd6a..dcb3aa357f 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.ts
+++ b/src/app/units/states/analytics/unit-analytics-route.component.ts
@@ -1,5 +1,10 @@
-import { Component, Input } from '@angular/core';
-import { Unit } from 'src/app/api/models/unit';
+import {Component, Input} from '@angular/core';
+import {Observable} from 'rxjs';
+import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
+import {Unit} from 'src/app/api/models/unit';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
   selector: 'f-unit-analytics',
@@ -8,4 +13,46 @@ import { Unit } from 'src/app/api/models/unit';
 })
 export class UnitAnalyticsComponent {
   @Input() unit: Unit;
+
+  constructor(
+    private sidekiqProgressModalService: SidekiqProgressModalService,
+    private alertsService: AlertService,
+    private fileDownloaderService: FileDownloaderService,
+  ) {}
+
+  public getTaskCompletionCsv() {
+    this.downloadCsv(
+      this.unit.downloadTaskCompletionCsv(),
+      'Task Completion Stats CSV',
+      `${this.unit.code}-task-completion-stats.csv`,
+    );
+  }
+
+  public getTutorAssessmentCsv() {
+    this.downloadCsv(
+      this.unit.downloadTutorAssessmentCsv(),
+      'Tutor Assessment Stats CSV',
+      `${this.unit.code}-tutor-assessment-stats.csv`,
+    );
+  }
+
+  private downloadCsv(newJob: Observable<SidekiqJob>, title: string, filename: string) {
+    newJob.subscribe({
+      next: (job) => {
+        if (!job || !job.id) {
+          return this.alertsService.error(`Failed to download ${title}`, 6000);
+        }
+        this.sidekiqProgressModalService.show(`Downloading ${title}`, job.id).subscribe((job) => {
+          console.log(job);
+          const blob = new Blob([job.result], {type: 'text/csv'});
+          const url = URL.createObjectURL(blob);
+
+          this.fileDownloaderService.downloadBlobToFile(url, filename);
+        });
+      },
+      error: (_error) => {
+        this.alertsService.error(`Could not download ${title}`, 6000);
+      },
+    });
+  }
 }

From 4a943736689e41c405a831ca88a1303fb7c00385 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:47:15 +1000
Subject: [PATCH 449/776] feat: download tasks awaiting feedback csv

---
 src/app/api/models/unit.ts                                | 6 ++++++
 .../states/analytics/unit-analytics-route.component.html  | 3 +++
 .../states/analytics/unit-analytics-route.component.ts    | 8 ++++++++
 3 files changed, 17 insertions(+)

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 2bf02f1448..075c2f99d9 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -583,6 +583,12 @@ export class Unit extends Entity {
     );
   }
 
+  public downloadTasksAwaitingFeedbackCsv(): Observable<SidekiqJob> {
+    return AppInjector.get(HttpClient).get<SidekiqJob>(
+      `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/tasks_awaiting_feedback`,
+    );
+  }
+
   public downloadTutorAssessmentCsv(): Observable<SidekiqJob> {
     return AppInjector.get(HttpClient).get<SidekiqJob>(
       `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/tutor_assessments`,
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.html b/src/app/units/states/analytics/unit-analytics-route.component.html
index 9a5996ff38..f89e7c5246 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.html
+++ b/src/app/units/states/analytics/unit-analytics-route.component.html
@@ -7,4 +7,7 @@ <h1>Unit Statistics</h1>
   <button mat-button (click)="getTutorAssessmentCsv()">
     <mat-icon>download</mat-icon> Tutor Assessment Stats
   </button>
+  <button mat-button (click)="getTasksAwaitingFeedbackCsv()">
+    <mat-icon>download</mat-icon> Tasks Awaiting Feedback
+  </button>
 </div>
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.ts b/src/app/units/states/analytics/unit-analytics-route.component.ts
index dcb3aa357f..f0282e2e96 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.ts
+++ b/src/app/units/states/analytics/unit-analytics-route.component.ts
@@ -36,6 +36,14 @@ export class UnitAnalyticsComponent {
     );
   }
 
+  public getTasksAwaitingFeedbackCsv() {
+    this.downloadCsv(
+      this.unit.downloadTasksAwaitingFeedbackCsv(),
+      'Tasks Awaiting Feedback CSV',
+      `${this.unit.code}-tasks-awaiting-feedback.csv`,
+    );
+  }
+
   private downloadCsv(newJob: Observable<SidekiqJob>, title: string, filename: string) {
     newJob.subscribe({
       next: (job) => {

From b8779e70d4decdc837caa8c84e8e8e2dfd3faf7f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:49:27 +1000
Subject: [PATCH 450/776] fix: add return statement

---
 .../unit-students-editor/unit-students-editor.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
index d0bed342f8..c4402e82b3 100644
--- a/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-students-editor/unit-students-editor.component.ts
@@ -137,7 +137,7 @@ export class UnitStudentsEditorComponent implements AfterViewInit, OnDestroy {
       this.unit.enrolStudentsCSVUrl,
       (response: SidekiqJob) => {
         if (!response || !response.id) {
-          this.alerts.error('Failed to start student import job', 6000);
+          return this.alerts.error('Failed to start student import job', 6000);
         }
         this.sidekiqProgressModalService
           .show(`Importing Students: ${this.unit.code}`, response.id)

From 6a60d94b896d173a5008badd1b45bc7f45eee808 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:51:24 +1000
Subject: [PATCH 451/776] fix: show full progress when sidekiq job is complete

---
 .../sidekiq-progress-modal.component.html        | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html
index 99afb9712e..c206750cf5 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.html
@@ -12,9 +12,21 @@ <h3 mat-dialog-title>
       } @else {
         <div>{{ job?.status.toUpperCase() }}{{ job?.message ? ': ' + job.message : '' }}</div>
       }
-      <div>{{ job?.processedCount }}/{{ job?.totalCount }} ({{ job?.pctComplete }}%)</div>
+      <div>
+        {{ job?.status === 'complete' ? job?.totalCount : job?.processedCount }}/{{
+          job?.totalCount
+        }}
+        ({{ job?.status === 'complete' ? '100' : job?.pctComplete }}%)
+      </div>
     </div>
-    <mat-progress-bar mode="determinate" [value]="job?.pctComplete ?? 0"></mat-progress-bar>
+    @if (job?.status === 'queued') {
+      <mat-progress-bar mode="buffer" [value]="job?.pctComplete ?? 0"></mat-progress-bar>
+    } @else {
+      <mat-progress-bar
+        mode="determinate"
+        [value]="job?.status === 'complete' ? 100 : job?.pctComplete ?? 0"
+      ></mat-progress-bar>
+    }
   </mat-dialog-content>
   <mat-dialog-actions class="flex justify-between">
     <button mat-raised-button (click)="dismissModal()">Dismiss</button>

From 1d307e95c73527e5996327b0027173a114a20bf6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 14 Aug 2025 15:51:21 +1000
Subject: [PATCH 452/776] chore(release): 10.0.0-22

---
 CHANGELOG.md      | 13 +++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64179c7b99..8e74a44ef2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 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.
 
+## [10.0.0-22](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-21...v10.0.0-22) (2025-08-14)
+
+
+### Features
+
+* download tasks awaiting feedback csv ([4a94373](https://github.com/b0ink/doubtfire-deploy/commit/4a943736689e41c405a831ca88a1303fb7c00385))
+
+
+### Bug Fixes
+
+* add return statement ([b8779e7](https://github.com/b0ink/doubtfire-deploy/commit/b8779e70d4decdc837caa8c84e8e8e2dfd3faf7f))
+* show full progress when sidekiq job is complete ([6a60d94](https://github.com/b0ink/doubtfire-deploy/commit/6a60d94b896d173a5008badd1b45bc7f45eee808))
+
 ## [10.0.0-21](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-20...v10.0.0-21) (2025-08-12)
 
 
diff --git a/package-lock.json b/package-lock.json
index 8377877f02..ef43715198 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-21",
+  "version": "10.0.0-22",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-21",
+      "version": "10.0.0-22",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index f14bc56717..3930278910 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-21",
+  "version": "10.0.0-22",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 955fdb76b5a3dffdb6b8fb3f000f4b1ef75b5cb7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 14 Aug 2025 16:53:32 +1000
Subject: [PATCH 453/776] chore: remove debug log

---
 src/app/units/states/analytics/unit-analytics-route.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/units/states/analytics/unit-analytics-route.component.ts b/src/app/units/states/analytics/unit-analytics-route.component.ts
index f0282e2e96..9e92ef6041 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.ts
+++ b/src/app/units/states/analytics/unit-analytics-route.component.ts
@@ -51,7 +51,6 @@ export class UnitAnalyticsComponent {
           return this.alertsService.error(`Failed to download ${title}`, 6000);
         }
         this.sidekiqProgressModalService.show(`Downloading ${title}`, job.id).subscribe((job) => {
-          console.log(job);
           const blob = new Blob([job.result], {type: 'text/csv'});
           const url = URL.createObjectURL(blob);
 

From 7a7da13ec939b7cec01089e22ca014ce1d0bf9e9 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 14 Aug 2025 17:30:04 +1000
Subject: [PATCH 454/776] chore(release): 10.0.0-23

---
 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 8e74a44ef2..c16f0462a5 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.
 
+## [10.0.0-23](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-22...v10.0.0-23) (2025-08-14)
+
 ## [10.0.0-22](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-21...v10.0.0-22) (2025-08-14)
 
 
diff --git a/package-lock.json b/package-lock.json
index ef43715198..c97d612bff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-22",
+  "version": "10.0.0-23",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-22",
+      "version": "10.0.0-23",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 3930278910..61c73fb91a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-22",
+  "version": "10.0.0-23",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From e0503f424dfbef49e68b4e2f697e8d135120634e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 14 Aug 2025 17:56:07 +1000
Subject: [PATCH 455/776] feat: display result of student imports

---
 src/app/home/states/lti-dashboard/lti-dashboard.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index c047d46217..8c3ff2346b 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -150,6 +150,7 @@ export class LtiDashboardComponent implements AfterViewInit {
           () => {
             this.ltiService.syncEnrolments().subscribe({
               next: (result) => {
+                this._csvResultModalService.show('Enrolment sync', result);
                 this.alertsService.success('Successfully imported users into OnTrack', 5000);
               },
               error: (error) => {

From 192b6ee37ecfbe4c3d450b743110dc6782311ae0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 18 Aug 2025 10:21:34 +1000
Subject: [PATCH 456/776] refactor: move lti enrolment sync into sidekiq job

---
 src/app/api/services/lti.service.ts           |  5 ++-
 .../lti-dashboard.component.html              | 23 +++++++++--
 .../lti-dashboard/lti-dashboard.component.ts  | 38 ++++++++++++++++---
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/app/api/services/lti.service.ts b/src/app/api/services/lti.service.ts
index 8f48045cce..3f97e32fda 100644
--- a/src/app/api/services/lti.service.ts
+++ b/src/app/api/services/lti.service.ts
@@ -3,6 +3,7 @@ import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 import LTI_API_URL from 'src/app/config/constants/ltiApiUrl';
 import {Project} from '../models/project';
+import {SidekiqJob} from '../models/sidekiq-job';
 
 interface info {
   name?: string;
@@ -67,7 +68,7 @@ export class LtiService {
   }
 
   // Sync grades for all members in the context (course)
-  public syncEnrolments(): Observable<boolean> {
-    return this.httpClient.post<boolean>(`${LTI_API_URL}/enrolments`, {});
+  public syncEnrolments(): Observable<SidekiqJob> {
+    return this.httpClient.post<SidekiqJob>(`${LTI_API_URL}/enrolments`, {});
   }
 }
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.html b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
index fddf8a592b..ba12db70e8 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.html
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.html
@@ -24,27 +24,42 @@ <h1 class="m-0 ml-5 text-6xl">OnTrack</h1>
         @if (currentUser?.systemRole === 'Convenor' || currentUser?.systemRole === 'Admin') {
           <button
             mat-fab
-            [disabled]="!linkedUnit"
+            [disabled]="!linkedUnit || isSyncingEnrolments || isSyncingGrades"
             matTooltip="Sync enrolments"
             matTooltipPosition="above"
             aria-label=""
-            class="w-[60px] h-[60px]"
+            class="w-[60px] h-[60px] relative"
+            [ngClass]="{'bg-gray-300': isSyncingEnrolments}"
             color="default"
             (click)="syncEnrolments()"
           >
+            @if (isSyncingEnrolments) {
+              <mat-spinner
+                diameter="35"
+                class="z-50 absolute left-1/2 -translate-x-1/2 top-1/2 -translate-y-1/2"
+              ></mat-spinner>
+            }
             <mat-icon mat-icon-button>people</mat-icon>
           </button>
           <button
             mat-fab
-            [disabled]="!linkedUnit"
+            [disabled]="!linkedUnit || isSyncingEnrolments || isSyncingGrades"
             matTooltip="Sync grades"
             matTooltipPosition="above"
             aria-label=""
-            class="w-[60px] h-[60px]"
+            class="w-[60px] h-[60px] relative"
+            [ngClass]="{'bg-gray-300': isSyncingGrades}"
             color="default"
             (click)="syncStudentsGrades()"
           >
             <mat-icon mat-icon-button>grade</mat-icon>
+
+            @if (isSyncingGrades) {
+              <mat-spinner
+                diameter="35"
+                class="z-50 absolute left-1/2 -translate-x-1/2 top-1/2 -translate-y-1/2"
+              ></mat-spinner>
+            }
           </button>
         }
       </div>
diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index 8c3ff2346b..009f46d46a 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -8,7 +8,9 @@ import {LtiService} from 'src/app/api/services/lti.service';
 import {UnitService} from 'src/app/api/services/unit.service';
 import {UserService} from 'src/app/api/services/user.service';
 import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
+import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 import {AlertService} from 'src/app/common/services/alert.service';
+
 @Component({
   selector: 'f-lti-dashboard',
   templateUrl: 'lti-dashboard.component.html',
@@ -25,7 +27,9 @@ export class LtiDashboardComponent implements AfterViewInit {
     private unitService: UnitService,
     private projectService: ProjectService,
     private confirmationModalService: ConfirmationModalService,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     @Inject(csvResultModalService) private _csvResultModalService: any,
+    private sidekiqProgressModalService: SidekiqProgressModalService,
   ) {}
 
   @Input() ltik: string;
@@ -37,6 +41,10 @@ export class LtiDashboardComponent implements AfterViewInit {
 
   loadingState: 'creatingUser' | 'enrollingUser' | 'fetchingUnit';
   isLoading: boolean;
+
+  isSyncingGrades: boolean;
+  isSyncingEnrolments: boolean;
+
   ngAfterViewInit(): void {
     // Scroll to the bottom of the page in case the header is visible
     // Ensures our action buttons are centered
@@ -81,7 +89,7 @@ export class LtiDashboardComponent implements AfterViewInit {
             },
           });
         },
-        error: (error) => {
+        error: (_error) => {
           this.alertsService.error('Unauthorised. Please relaunch the app.', 6000);
           this.unauthorised = true;
         },
@@ -148,20 +156,35 @@ export class LtiDashboardComponent implements AfterViewInit {
           'Sync Enrolments into OnTrack',
           `Are you sure you want to import ${members.members.length} users into ${this.linkedUnit.code} ${this.linkedUnit.name}`,
           () => {
+            this.isSyncingEnrolments = true;
             this.ltiService.syncEnrolments().subscribe({
-              next: (result) => {
-                this._csvResultModalService.show('Enrolment sync', result);
-                this.alertsService.success('Successfully imported users into OnTrack', 5000);
+              next: (job) => {
+                if (!job) {
+                  this.isSyncingEnrolments = false;
+                  return this.alertsService.error(`Failed to sync enrolments`);
+                }
+
+                this.sidekiqProgressModalService
+                  .show('Syncing users into OnTrack', job.id)
+                  .subscribe((completedJob) => {
+                    this.isSyncingEnrolments = false;
+                    this._csvResultModalService.show(
+                      'Enrolment sync',
+                      JSON.parse(completedJob.result),
+                    );
+                    this.alertsService.success('Successfully imported users into OnTrack', 5000);
+                  });
               },
               error: (error) => {
                 console.log(error);
-                this.alertsService.error(`Failed to retrieve grade`);
+                this.alertsService.error(`Failed to sync enrolments`);
+                this.isSyncingEnrolments = false;
               },
             });
           },
         );
       },
-      error: (error) => {
+      error: (_error) => {
         this.alertsService.error('Failed to retrieve course members', 6000);
       },
     });
@@ -172,14 +195,17 @@ export class LtiDashboardComponent implements AfterViewInit {
       'Sync Grades from OnTrack',
       'Are you sure you want to sync portfolio grades from OnTrack? Please confirm that grades are final and approved for release.',
       () => {
+        this.isSyncingGrades = true;
         this.ltiService.syncStudentsGrades().subscribe({
           next: (result) => {
+            this.isSyncingGrades = false;
             this.alertsService.success('Successfully synced grades from OnTrack', 5000);
             this._csvResultModalService.show('Grade sync', result);
           },
           error: (error) => {
             console.log(error);
             this.alertsService.error(`Failed to retrieve grade`);
+            this.isSyncingGrades = true;
           },
         });
       },

From d5c1a51dc049b025ae85b2ef6513630a197eabee Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 19 Aug 2025 16:39:48 +1000
Subject: [PATCH 457/776] feat: add task prerequisites

---
 src/app/api/models/task-definition.ts         |   9 ++
 .../api/services/task-definition.service.ts   |  44 +++++++
 src/app/doubtfire-angular.module.ts           |   2 +
 .../task-definition-editor.component.html     |  24 +++-
 ...sk-definition-prerequisites.component.html |  55 ++++++++
 ...sk-definition-prerequisites.component.scss |   0
 ...task-definition-prerequisites.component.ts | 118 ++++++++++++++++++
 7 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.scss
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 94b1774f8e..47e2462e60 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -52,6 +52,9 @@ export class TaskDefinition extends Entity {
   similarityLanguage: string = 'c';
   hasJplagReport: boolean;
 
+  public readonly taskPrerequisitesCache: EntityCache<TaskDefinition> =
+    new EntityCache<TaskDefinition>();
+
   public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
     new EntityCache<LearningOutcome>();
 
@@ -249,6 +252,12 @@ export class TaskDefinition extends Entity {
     }/scorm_data`;
   }
 
+  public get taskPrerequisiteUrl(): string {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
+      this.id
+    }/prerequisites`;
+  }
+
   public get taskOverseerResourcesUploadUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${
       this.id
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index c71adaffbe..edacb26aa9 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -6,6 +6,7 @@ import API_URL from 'src/app/config/constants/apiURL';
 import {MappingFunctions} from './mapping-fn';
 import {AppInjector} from 'src/app/app-injector';
 import {Observable} from 'rxjs';
+import {MappingProcess} from 'ngx-entity-service/lib/mapping-process';
 
 @Injectable()
 export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
@@ -125,6 +126,31 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
           });
         },
       },
+      {
+        keys: ['prerequisites', 'task_prerequisites'],
+        toEntityOpAsync: (process: MappingProcess<TaskDefinition>) => {
+          // HACK: Wait for all the other task definitions to be processed before we map the pre-requisites
+          setTimeout(() => {
+            const prereqs = process.data['task_prerequisites'];
+            const td = process.entity;
+            const taskDefinitions = process.entity.unit.taskDefinitionCache.currentValues;
+
+            // remove any prerequisites that have been deleted
+            td.taskPrerequisitesCache.currentValues
+              .filter((p) => !prereqs.some((pr) => pr['prerequisite_id'] === p.id))
+              .forEach((p) => td.taskPrerequisitesCache.delete(p.id));
+
+            // add/update prerequisites
+            for (const prereq of prereqs) {
+              td.taskPrerequisitesCache.getOrCreate(
+                prereq['prerequisite_id'],
+                this,
+                taskDefinitions.find((t) => t.id === prereq['prerequisite_id']),
+              );
+            }
+          });
+        },
+      },
     );
 
     this.mapping.mapAllKeysToJsonExcept(
@@ -169,4 +195,22 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
     formData.append('file', file);
     return AppInjector.get(HttpClient).post<boolean>(taskDefinition.scormDataUploadUrl, formData);
   }
+
+  public addTaskPrerequisite(
+    taskDefinition: TaskDefinition,
+    prerequsite: TaskDefinition,
+  ): Observable<boolean> {
+    return AppInjector.get(HttpClient).post<boolean>(taskDefinition.taskPrerequisiteUrl, {
+      prerequisite_id: prerequsite.id,
+    });
+  }
+
+  public removeTaskPrerequisite(
+    taskDefinition: TaskDefinition,
+    prerequsite: TaskDefinition,
+  ): Observable<boolean> {
+    return AppInjector.get(HttpClient).delete<boolean>(
+      `${taskDefinition.taskPrerequisiteUrl}/${prerequsite.id}`,
+    );
+  }
 }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 4ae6668614..b7bf074873 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -275,6 +275,7 @@ import {SidekiqProgressModalComponent} from './common/modals/sidekiq-progress-mo
 import {SidekiqJobsModalComponent} from './common/modals/sidekiq-jobs-modal/sidekiq-jobs-modal.component';
 import {SidekiqJobService} from './api/services/sidekiq-job.service';
 import {UnavailableCardComponent} from './errors/unavailable-card/unavailable-card.component';
+import {TaskDefinitionPrerequisitesComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -417,6 +418,7 @@ const MY_DATE_FORMAT = {
     SidekiqProgressModalComponent,
     SidekiqJobsModalComponent,
     UnavailableCardComponent,
+    TaskDefinitionPrerequisitesComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 3e1a5f5d5b..9909605b58 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -125,6 +125,26 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
           7
         </div>
       </div>
+      <div class="w-full">
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Pre-requisite Tasks</h3>
+        <p class="font-normal text-gray-700">
+          Select which tasks need to be in a submitted state before this task can be submitted
+        </p>
+        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
+          <f-task-definition-prerequisites [taskDefinition]="taskDefinition">
+          </f-task-definition-prerequisites>
+        </div>
+      </div>
+    </div>
+
+    <div class="flex mt-10">
+      <div class="mr-6">
+        <div
+          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
+        >
+          8
+        </div>
+      </div>
 
       <div class="w-full">
         <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
@@ -147,7 +167,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
         <div
           class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
         >
-          8
+          9
         </div>
       </div>
       <div class="w-full">
@@ -166,7 +186,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">SCORM test</h3>
         <div
           class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
         >
-          9
+          10
         </div>
       </div>
 
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
new file mode 100644
index 0000000000..9219e23298
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -0,0 +1,55 @@
+<div class="flex flex-col">
+  <div class="flex-grow flex flex-row">
+    <table class="w-full">
+      <tbody>
+        @for (prereq of prerequisites | async; track prereq) {
+          @if (prereq.id !== taskDefinition.id) {
+            <tr class="border-b">
+              <td class="py-2 px-3 w-[120px]">{{ prereq.abbreviation }}</td>
+              <td class="py-2 px-3">{{ prereq.name }}</td>
+              <td class="py-2 px-3 text-right">
+                <button
+                  mat-icon-button
+                  aria-label="Remove prerequisite"
+                  color="warn"
+                  (click)="removePrerequisite(prereq)"
+                >
+                  <mat-icon>delete</mat-icon>
+                </button>
+              </td>
+            </tr>
+          }
+        }
+      </tbody>
+    </table>
+  </div>
+
+  <div class="flex-grow flex flex-row items-center">
+    <mat-form-field appearance="outline" class="w-full mt-[22px]">
+      <input
+        placeholder="Select a task prerequisite"
+        type="text"
+        matInput
+        [matAutocomplete]="auto"
+        [(ngModel)]="selectedTaskPrerequisite"
+        [formControl]="searchCtrl"
+      />
+      <button
+        mat-raised-button
+        color="primary"
+        class="min-w-xl mr-4"
+        (click)="addTaskPrerequisite()"
+        [disabled]="!selectedTaskPrerequisite"
+        matSuffix
+      >
+        <mat-icon class="icon_display">add</mat-icon>
+        Add
+      </button>
+      <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn">
+        @for (td of filteredTaskDefs; track td) {
+          <mat-option [value]="td"> {{ td.abbreviation }} - {{ td.name }} </mat-option>
+        }
+      </mat-autocomplete>
+    </mat-form-field>
+  </div>
+</div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
new file mode 100644
index 0000000000..4c1bceadfa
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -0,0 +1,118 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {FormControl} from '@angular/forms';
+import {Observable} from 'rxjs';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {Unit} from 'src/app/api/models/unit';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-task-definition-prerequisites',
+  templateUrl: 'task-definition-prerequisites.component.html',
+  styleUrls: ['task-definition-prerequisites.component.scss'],
+})
+export class TaskDefinitionPrerequisitesComponent implements OnInit {
+  @Input() taskDefinition: TaskDefinition;
+
+  selectedTaskPrerequisite: TaskDefinition | null = null;
+  searchCtrl = new FormControl('');
+
+  // All other task definitions in the unit (exclude the current one)
+  filteredTaskDefs: TaskDefinition[] = [];
+
+  constructor(
+    private taskDefinitionService: TaskDefinitionService,
+    private alertService: AlertService,
+  ) {}
+  public get unit(): Unit {
+    return this.taskDefinition?.unit;
+  }
+
+  public get prerequisites(): Observable<TaskDefinition[]> {
+    return this.taskDefinition.taskPrerequisitesCache.values;
+  }
+
+  ngOnInit(): void {
+    this.searchCtrl.valueChanges.subscribe((value: string | TaskDefinition) => {
+      const search = (typeof value === 'string' ? value : value?.name || '').toLowerCase();
+
+      this.filteredTaskDefs = this.taskDefinition.unit.taskDefinitionCache.currentValues
+        .filter((td) => td.id !== this.taskDefinition.id)
+        .filter(
+          (td) =>
+            !this.taskDefinition.taskPrerequisitesCache.currentValues.some((p) => p.id === td.id),
+        )
+        .filter(
+          (td) =>
+            td.name.toLowerCase().includes(search) ||
+            td.abbreviation.toLowerCase().includes(search),
+        );
+    });
+  }
+
+  displayFn(td: TaskDefinition): string {
+    return td && td.abbreviation ? `${td.abbreviation} - ${td.name}` : '';
+  }
+
+  public addTaskPrerequisite(): void {
+    const taskDefinition = this.taskDefinition;
+    const selectedTaskPrerequisite = this.selectedTaskPrerequisite;
+
+    this.selectedTaskPrerequisite = null;
+
+    if (!taskDefinition) {
+      return this.alertService.error('Invalid task definition', 6000);
+    }
+
+    if (!selectedTaskPrerequisite) {
+      return this.alertService.error(
+        'Please select a task definition to add as a prerequisite',
+        6000,
+      );
+    }
+
+    this.taskDefinitionService
+      .addTaskPrerequisite(taskDefinition, selectedTaskPrerequisite)
+      .subscribe({
+        next: (response) => {
+          if (!response) {
+            this.alertService.error('Failed to add task prerequisite', 6000);
+            return;
+          }
+          this.alertService.success(
+            `Successfully added task ${selectedTaskPrerequisite.abbreviation} as a prerequisite`,
+            5000,
+          );
+          this.unit.refresh();
+        },
+        error: (error) => {
+          this.alertService.error(`Failed to add task prerequisite: ${error}`, 6000);
+        },
+      });
+  }
+
+  public removePrerequisite(taskDefToRemove: TaskDefinition) {
+    if (!taskDefToRemove) {
+      return;
+    }
+
+    this.taskDefinitionService
+      .removeTaskPrerequisite(this.taskDefinition, taskDefToRemove)
+      .subscribe({
+        next: (response) => {
+          if (!response) {
+            this.alertService.error('Failed to remove task prerequisite', 6000);
+            return;
+          }
+          this.alertService.success(
+            `Removed task ${taskDefToRemove.abbreviation} as a prerequisite`,
+            5000,
+          );
+          this.unit.refresh();
+        },
+        error: (error) => {
+          this.alertService.error(`Failed to remove task prerequisite: ${error}`, 6000);
+        },
+      });
+  }
+}

From 111f60a4272abcf683c50b711bd43a1f772153ec Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 19 Aug 2025 17:52:51 +1000
Subject: [PATCH 458/776] feat: show list of prerequisites in task dashboard

---
 src/app/doubtfire-angular.module.ts           |  2 +
 src/app/doubtfire-angularjs.module.ts         |  6 ++
 .../task-prerequisites-card.component.html    | 11 +++
 .../task-prerequisites-card.component.scss    |  0
 .../task-prerequisites-card.component.ts      | 10 +++
 .../task-status-card.component.html           | 17 +++-
 .../task-status-card.component.ts             | 44 +++++++---
 .../task-dashboard/task-dashboard.tpl.html    |  8 +-
 .../task-definition-editor.component.html     |  2 +-
 ...sk-definition-prerequisites.component.html | 80 ++++++++++---------
 ...task-definition-prerequisites.component.ts |  1 +
 11 files changed, 130 insertions(+), 51 deletions(-)
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.scss
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index b7bf074873..a6ad5158b5 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -276,6 +276,7 @@ import {SidekiqJobsModalComponent} from './common/modals/sidekiq-jobs-modal/side
 import {SidekiqJobService} from './api/services/sidekiq-job.service';
 import {UnavailableCardComponent} from './errors/unavailable-card/unavailable-card.component';
 import {TaskDefinitionPrerequisitesComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component';
+import {TaskPrerequisitesCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -419,6 +420,7 @@ const MY_DATE_FORMAT = {
     SidekiqJobsModalComponent,
     UnavailableCardComponent,
     TaskDefinitionPrerequisitesComponent,
+    TaskPrerequisitesCardComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 1797da538a..50807ec1b3 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -227,6 +227,7 @@ import {LearningOutcomeEditorComponent} from './common/learning-outcome-editor/l
 import {FeedbackTemplateService} from './api/services/feedback-template.service';
 import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.component';
 import {SidekiqProgressModalService} from './common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
+import {TaskPrerequisitesCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component';
 
 export const DoubtfireAngularJSModule = angular.module('doubtfire', [
   'doubtfire.config',
@@ -496,6 +497,11 @@ DoubtfireAngularJSModule.directive(
   downgradeComponent({component: StaffNotesComponent}),
 );
 
+DoubtfireAngularJSModule.directive(
+  'fTaskPrerequisitesCard',
+  downgradeComponent({component: TaskPrerequisitesCardComponent}),
+);
+
 // Global configuration
 
 // If the user enters a URL that doesn't match any known URL (state), send them to `/home`
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
new file mode 100644
index 0000000000..6ce811e082
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
@@ -0,0 +1,11 @@
+<mat-card appearance="outlined" class="p-[16px]">
+  <mat-card-title class="f-card-title">Tasks Required to Complete First</mat-card-title>
+  <mat-card-subtitle class="mb-4">
+    You must complete all of the following tasks before submitting
+    {{ taskDefinition.abbreviation }}.</mat-card-subtitle
+  >
+  <f-task-definition-prerequisites
+    [taskDefinition]="taskDefinition"
+    [editingMode]="false"
+  ></f-task-definition-prerequisites>
+</mat-card>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.scss b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.ts
new file mode 100644
index 0000000000..9c881c8a4d
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.ts
@@ -0,0 +1,10 @@
+import {Component, Input} from '@angular/core';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+@Component({
+  selector: 'f-task-prerequisites-card',
+  templateUrl: './task-prerequisites-card.component.html',
+  styleUrls: ['./task-prerequisites-card.component.scss'],
+})
+export class TaskPrerequisitesCardComponent {
+  @Input() taskDefinition: TaskDefinition;
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
index 24700b3b52..aa4ee640c1 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
@@ -1,7 +1,11 @@
 <mat-card appearance="outlined">
   @if (triggers?.length > 0) {
     <mat-form-field class="px-4 pt-4" appearance="outline">
-      <mat-select [value]="task?.status" (selectionChange)="triggerTransition($event.value)">
+      <mat-select
+        [value]="task?.status"
+        (selectionChange)="triggerTransition($event.value)"
+        [disabled]="blockedByPrerequisites"
+      >
         <mat-select-trigger>
           <span style="display: inline-flex">
             <status-icon [status]="task?.status" style="margin-right: 10px"></status-icon>
@@ -30,10 +34,19 @@ <h5>{{ task?.statusLabel() }}</h5>
 
   <mat-card-content>
     <p>{{ task?.statusHelp().reason }} {{ task?.statusHelp().action }}</p>
+    @if (blockedByPrerequisites) {
+      <p>
+        To submit this task, you must first complete all tasks that are listed as prerequisites.
+      </p>
+    }
   </mat-card-content>
 
   <mat-card-actions class="space-x-2">
-    <button mat-stroked-button (click)="triggerTransition('ready_for_feedback')" [disabled]="isReadyForFeedback()">
+    <button
+      mat-stroked-button
+      (click)="triggerTransition('ready_for_feedback')"
+      [disabled]="isReadyForFeedback() || blockedByPrerequisites"
+    >
       Upload Submission
     </button>
 
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index c2b7992cd1..e131097f2e 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -1,12 +1,13 @@
-import { AfterViewInit, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { UIRouter } from '@uirouter/core';
+import {AfterViewInit, Component, Input, OnChanges, SimpleChanges} from '@angular/core';
+import {UIRouter} from '@uirouter/core';
 import * as _ from 'lodash';
-import { Task } from 'src/app/api/models/task';
-import { TaskStatusEnum } from 'src/app/api/models/task-status';
-import { TaskService } from 'src/app/api/services/task.service';
-import { ExtensionModalService } from 'src/app/common/modals/extension-modal/extension-modal.service';
-import { QrModalService } from 'src/app/common/modals/qr-modal/qr-modal.service';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {Project} from 'src/app/api/models/project';
+import {Task} from 'src/app/api/models/task';
+import {TaskStatus, TaskStatusEnum} from 'src/app/api/models/task-status';
+import {TaskService} from 'src/app/api/services/task.service';
+import {ExtensionModalService} from 'src/app/common/modals/extension-modal/extension-modal.service';
+import {QrModalService} from 'src/app/common/modals/qr-modal/qr-modal.service';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 @Component({
   selector: 'f-task-status-card',
   templateUrl: './task-status-card.component.html',
@@ -27,12 +28,14 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
   @Input() task: Task;
   taskStatusColor: string;
 
+  private project?: Project;
+
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.task) {
       this.task = changes.task.currentValue;
       this.reapplyTriggers();
       this.taskStatusColor = this.taskService.statusColors.get(this.task.statusClass());
-
+      this.project = this.task.project;
       this.textCss = `::ng-deep f-task-status-card .mat-mdc-text-field-wrapper.mdc-text-field {
         background-color: #${this.taskStatusColor} !important;
       }`;
@@ -43,6 +46,29 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     document.getElementsByTagName('style')[0].append(this.textCss);
   }
 
+  public get blockedByPrerequisites(): boolean {
+    if (!this.project) {
+      return false;
+    }
+
+    const prereqs = this.task.definition.taskPrerequisitesCache.currentValues;
+    // If no prerequisites, allow submission
+    if (!prereqs.length) {
+      return false;
+    }
+
+    for (const prereq of prereqs) {
+      const task = this.project.tasks.find((t) => t.definition.id === prereq.id);
+
+      // If the task doesnt exist or isnt completed, block submission
+      if (!task || !TaskStatus.SUBMITTED_STATUSES.includes(task.status)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   reapplyTriggers(): void {
     // if tutor is in queryParam
     if (this.router.globals.params.tutor != null) {
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index 0c70ec90ad..d61bff5c49 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -45,7 +45,13 @@
       [task-def]="task.definition"
       [ilo-context-type]="'TaskDefinition'"
     ></f-task-ilos-card>
-    <task-description-card [task-def]="task.definition" [task]="task" [unit]="task.unit" (switch-view$)="switchView($event)"></task-description-card>
+    <task-description-card
+      [task-def]="task.definition"
+      [task]="task"
+      [unit]="task.unit"
+      (switch-view$)="switchView($event)"
+    ></task-description-card>
+    <f-task-prerequisites-card [task-definition]="task.definition"></f-task-prerequisites-card>
     <f-task-scorm-card [task]="task"></f-task-scorm-card>
     <f-task-status-card [task]="task"></f-task-status-card>
     <f-task-due-card [task]="task"></f-task-due-card>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 9909605b58..5f9fbe45cd 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -131,7 +131,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Pre-requisite T
           Select which tasks need to be in a submitted state before this task can be submitted
         </p>
         <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-prerequisites [taskDefinition]="taskDefinition">
+          <f-task-definition-prerequisites [taskDefinition]="taskDefinition" [editingMode]="true">
           </f-task-definition-prerequisites>
         </div>
       </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index 9219e23298..15c5c87ac4 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -7,16 +7,18 @@
             <tr class="border-b">
               <td class="py-2 px-3 w-[120px]">{{ prereq.abbreviation }}</td>
               <td class="py-2 px-3">{{ prereq.name }}</td>
-              <td class="py-2 px-3 text-right">
-                <button
-                  mat-icon-button
-                  aria-label="Remove prerequisite"
-                  color="warn"
-                  (click)="removePrerequisite(prereq)"
-                >
-                  <mat-icon>delete</mat-icon>
-                </button>
-              </td>
+              @if (editingMode) {
+                <td class="py-2 px-3 text-right">
+                  <button
+                    mat-icon-button
+                    aria-label="Remove prerequisite"
+                    color="warn"
+                    (click)="removePrerequisite(prereq)"
+                  >
+                    <mat-icon>delete</mat-icon>
+                  </button>
+                </td>
+              }
             </tr>
           }
         }
@@ -24,32 +26,34 @@
     </table>
   </div>
 
-  <div class="flex-grow flex flex-row items-center">
-    <mat-form-field appearance="outline" class="w-full mt-[22px]">
-      <input
-        placeholder="Select a task prerequisite"
-        type="text"
-        matInput
-        [matAutocomplete]="auto"
-        [(ngModel)]="selectedTaskPrerequisite"
-        [formControl]="searchCtrl"
-      />
-      <button
-        mat-raised-button
-        color="primary"
-        class="min-w-xl mr-4"
-        (click)="addTaskPrerequisite()"
-        [disabled]="!selectedTaskPrerequisite"
-        matSuffix
-      >
-        <mat-icon class="icon_display">add</mat-icon>
-        Add
-      </button>
-      <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn">
-        @for (td of filteredTaskDefs; track td) {
-          <mat-option [value]="td"> {{ td.abbreviation }} - {{ td.name }} </mat-option>
-        }
-      </mat-autocomplete>
-    </mat-form-field>
-  </div>
+  @if (editingMode) {
+    <div class="flex-grow flex flex-row items-center">
+      <mat-form-field appearance="outline" class="w-full mt-[22px]">
+        <input
+          placeholder="Select a task prerequisite"
+          type="text"
+          matInput
+          [matAutocomplete]="auto"
+          [(ngModel)]="selectedTaskPrerequisite"
+          [formControl]="searchCtrl"
+        />
+        <button
+          mat-raised-button
+          color="primary"
+          class="min-w-xl mr-4"
+          (click)="addTaskPrerequisite()"
+          [disabled]="!selectedTaskPrerequisite"
+          matSuffix
+        >
+          <mat-icon class="icon_display">add</mat-icon>
+          Add
+        </button>
+        <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn">
+          @for (td of filteredTaskDefs; track td) {
+            <mat-option [value]="td"> {{ td.abbreviation }} - {{ td.name }} </mat-option>
+          }
+        </mat-autocomplete>
+      </mat-form-field>
+    </div>
+  }
 </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 4c1bceadfa..2454104dc4 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -13,6 +13,7 @@ import {AlertService} from 'src/app/common/services/alert.service';
 })
 export class TaskDefinitionPrerequisitesComponent implements OnInit {
   @Input() taskDefinition: TaskDefinition;
+  @Input() editingMode: boolean;
 
   selectedTaskPrerequisite: TaskDefinition | null = null;
   searchCtrl = new FormControl('');

From 7e1a7dbd3351dbcc8230f115554d6afdfaca0f70 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:22:55 +1000
Subject: [PATCH 459/776] feat: cross out prerequisite tasks that have been
 submitted

---
 src/app/api/models/task-definition.ts         |  7 ++++-
 .../task-prerequisites-card.component.html    |  5 ++--
 .../task-prerequisites-card.component.ts      |  2 ++
 .../task-dashboard/task-dashboard.tpl.html    |  5 +++-
 ...sk-definition-prerequisites.component.html | 27 +++++++++++++++++--
 ...task-definition-prerequisites.component.ts |  2 ++
 6 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 47e2462e60..4160c7c764 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -5,7 +5,8 @@ import {AppInjector} from 'src/app/app-injector';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {TaskDefinitionService} from '../services/task-definition.service';
-import {Grade, GroupSet, LearningOutcome, TutorialStream, Unit} from './doubtfire-model';
+import {Grade, GroupSet, LearningOutcome, Project, TutorialStream, Unit} from './doubtfire-model';
+import {Task} from './doubtfire-model';
 
 export type UploadRequirement = {
   key: string;
@@ -297,4 +298,8 @@ export class TaskDefinition extends Entity {
       .delete(this.taskOverseerResourcesUploadUrl)
       .pipe(tap(() => (this.hasTaskAssessmentResources = false)));
   }
+
+  public projectTask(project?: Project): Task | undefined {
+    return project?.tasks?.find((p) => p.definition.id === this.id);
+  }
 }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
index 6ce811e082..d476add755 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
@@ -1,11 +1,12 @@
 <mat-card appearance="outlined" class="p-[16px]">
-  <mat-card-title class="f-card-title">Tasks Required to Complete First</mat-card-title>
+  <mat-card-title class="f-card-title">Prerequisite Tasks</mat-card-title>
   <mat-card-subtitle class="mb-4">
-    You must complete all of the following tasks before submitting
+    You must submit these tasks before you can submit
     {{ taskDefinition.abbreviation }}.</mat-card-subtitle
   >
   <f-task-definition-prerequisites
     [taskDefinition]="taskDefinition"
     [editingMode]="false"
+    [task]="task"
   ></f-task-definition-prerequisites>
 </mat-card>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.ts
index 9c881c8a4d..7bd7259574 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.ts
@@ -1,5 +1,6 @@
 import {Component, Input} from '@angular/core';
 import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {Task} from 'src/app/api/models/task';
 @Component({
   selector: 'f-task-prerequisites-card',
   templateUrl: './task-prerequisites-card.component.html',
@@ -7,4 +8,5 @@ import {TaskDefinition} from 'src/app/api/models/task-definition';
 })
 export class TaskPrerequisitesCardComponent {
   @Input() taskDefinition: TaskDefinition;
+  @Input() task?: Task;
 }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index d61bff5c49..1032e8a8f3 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -51,7 +51,10 @@
       [unit]="task.unit"
       (switch-view$)="switchView($event)"
     ></task-description-card>
-    <f-task-prerequisites-card [task-definition]="task.definition"></f-task-prerequisites-card>
+    <f-task-prerequisites-card
+      [task-definition]="task.definition"
+      [task]="task"
+    ></f-task-prerequisites-card>
     <f-task-scorm-card [task]="task"></f-task-scorm-card>
     <f-task-status-card [task]="task"></f-task-status-card>
     <f-task-due-card [task]="task"></f-task-due-card>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index 15c5c87ac4..6784e30589 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -5,8 +5,31 @@
         @for (prereq of prerequisites | async; track prereq) {
           @if (prereq.id !== taskDefinition.id) {
             <tr class="border-b">
-              <td class="py-2 px-3 w-[120px]">{{ prereq.abbreviation }}</td>
-              <td class="py-2 px-3">{{ prereq.name }}</td>
+              @if (!editingMode) {
+                <td class="py-2 px-3">
+                  <status-icon
+                    [hidden]="isNarrow"
+                    matBadgePosition="before"
+                    [status]="prereq.projectTask(task?.project)?.status ?? 'not_started'"
+                  ></status-icon>
+                </td>
+              }
+
+              <td
+                class="py-2 px-3 w-[50px]"
+                [class.line-through]="prereq.projectTask(task?.project)?.inSubmittedState()"
+              >
+                {{ prereq.abbreviation }}
+              </td>
+              <td
+                class="py-2 px-3"
+                [class.line-through]="prereq.projectTask(task?.project)?.inSubmittedState()"
+              >
+                {{ prereq.name }}
+              </td>
+              @if (!editingMode) {
+                <td>{{ prereq.projectTask(task?.project)?.statusLabel() ?? 'Not Started' }}</td>
+              }
               @if (editingMode) {
                 <td class="py-2 px-3 text-right">
                   <button
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 2454104dc4..cf073a27ca 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -1,6 +1,7 @@
 import {Component, Input, OnInit} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {Observable} from 'rxjs';
+import {Task} from 'src/app/api/models/task';
 import {TaskDefinition} from 'src/app/api/models/task-definition';
 import {Unit} from 'src/app/api/models/unit';
 import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
@@ -14,6 +15,7 @@ import {AlertService} from 'src/app/common/services/alert.service';
 export class TaskDefinitionPrerequisitesComponent implements OnInit {
   @Input() taskDefinition: TaskDefinition;
   @Input() editingMode: boolean;
+  @Input() task: Task;
 
   selectedTaskPrerequisite: TaskDefinition | null = null;
   searchCtrl = new FormControl('');

From 4359eca0f11ef4aacaeca2b1022a97c94db2857e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:24:20 +1000
Subject: [PATCH 460/776] chore: ensure correct column key

---
 src/app/api/services/task-definition.service.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index edacb26aa9..7b482031bf 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -131,21 +131,22 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
         toEntityOpAsync: (process: MappingProcess<TaskDefinition>) => {
           // HACK: Wait for all the other task definitions to be processed before we map the pre-requisites
           setTimeout(() => {
+            const idColumnKey = 'prerequisite_id';
             const prereqs = process.data['task_prerequisites'];
             const td = process.entity;
             const taskDefinitions = process.entity.unit.taskDefinitionCache.currentValues;
 
             // remove any prerequisites that have been deleted
             td.taskPrerequisitesCache.currentValues
-              .filter((p) => !prereqs.some((pr) => pr['prerequisite_id'] === p.id))
+              .filter((p) => !prereqs.some((pr) => pr[idColumnKey] === p.id))
               .forEach((p) => td.taskPrerequisitesCache.delete(p.id));
 
             // add/update prerequisites
             for (const prereq of prereqs) {
               td.taskPrerequisitesCache.getOrCreate(
-                prereq['prerequisite_id'],
+                prereq[idColumnKey],
                 this,
-                taskDefinitions.find((t) => t.id === prereq['prerequisite_id']),
+                taskDefinitions.find((t) => t.id === prereq[idColumnKey]),
               );
             }
           });

From b46ec014b23207b43ac43395b0b18eb09ac61374 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:56:04 +1000
Subject: [PATCH 461/776] refactor: hide task prerequisites card if empty

---
 src/app/api/models/task.ts                    | 38 +++++++++++++++++--
 .../task-status-card.component.html           |  6 +--
 .../task-status-card.component.ts             | 23 -----------
 .../task-dashboard/task-dashboard.tpl.html    |  1 +
 4 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index d126c0718f..e81f240c91 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -345,9 +345,7 @@ export class Task extends Entity {
         // Always show in days, Hours, Minutes and Seconds.
         return `${diff} ${data.period.charAt(0).toUpperCase() + data.period.substring(1)}`;
       } else if (diff === 1 && data.period !== 'weeks') {
-        return `1 ${
-          data.period.charAt(0).toUpperCase() + data.period.slice(1, -1)
-        }`;
+        return `1 ${data.period.charAt(0).toUpperCase() + data.period.slice(1, -1)}`;
       }
     }
 
@@ -676,7 +674,7 @@ export class Task extends Entity {
         }
         const alerts: any = AppInjector.get(AlertService);
         alerts.message('Submission cancelled. Status was reverted.', 6000);
-      }
+      },
     );
   }
 
@@ -925,4 +923,36 @@ export class Task extends Entity {
       },
     );
   }
+
+  public hasPrerequisiteTasks(): boolean {
+    if (!this.project) {
+      return false;
+    }
+    return this.definition.taskPrerequisitesCache.currentValues.length > 0;
+  }
+
+  /**
+   * Returns true if this task has prerequisite tasks that are not in a submitted state
+   */
+  public blockedByPrerequisiteTasks(): boolean {
+    if (!this.project) {
+      return false;
+    }
+
+    const prereqs = this.definition.taskPrerequisitesCache.currentValues;
+    if (!prereqs.length) {
+      return false;
+    }
+
+    for (const prereq of prereqs) {
+      const task = this.project.tasks.find((t) => t.definition.id === prereq.id);
+
+      // If the task doesnt exist or isnt completed, block submission
+      if (!task || !task.inSubmittedState()) {
+        return true;
+      }
+    }
+
+    return false;
+  }
 }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
index aa4ee640c1..f22341ce4b 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
@@ -4,7 +4,7 @@
       <mat-select
         [value]="task?.status"
         (selectionChange)="triggerTransition($event.value)"
-        [disabled]="blockedByPrerequisites"
+        [disabled]="task?.blockedByPrerequisiteTasks()"
       >
         <mat-select-trigger>
           <span style="display: inline-flex">
@@ -34,7 +34,7 @@ <h5>{{ task?.statusLabel() }}</h5>
 
   <mat-card-content>
     <p>{{ task?.statusHelp().reason }} {{ task?.statusHelp().action }}</p>
-    @if (blockedByPrerequisites) {
+    @if (task?.blockedByPrerequisiteTasks()) {
       <p>
         To submit this task, you must first complete all tasks that are listed as prerequisites.
       </p>
@@ -45,7 +45,7 @@ <h5>{{ task?.statusLabel() }}</h5>
     <button
       mat-stroked-button
       (click)="triggerTransition('ready_for_feedback')"
-      [disabled]="isReadyForFeedback() || blockedByPrerequisites"
+      [disabled]="isReadyForFeedback() || task?.blockedByPrerequisiteTasks()"
     >
       Upload Submission
     </button>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index e131097f2e..cf9131a65b 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -46,29 +46,6 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     document.getElementsByTagName('style')[0].append(this.textCss);
   }
 
-  public get blockedByPrerequisites(): boolean {
-    if (!this.project) {
-      return false;
-    }
-
-    const prereqs = this.task.definition.taskPrerequisitesCache.currentValues;
-    // If no prerequisites, allow submission
-    if (!prereqs.length) {
-      return false;
-    }
-
-    for (const prereq of prereqs) {
-      const task = this.project.tasks.find((t) => t.definition.id === prereq.id);
-
-      // If the task doesnt exist or isnt completed, block submission
-      if (!task || !TaskStatus.SUBMITTED_STATUSES.includes(task.status)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
   reapplyTriggers(): void {
     // if tutor is in queryParam
     if (this.router.globals.params.tutor != null) {
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index 1032e8a8f3..0f146e5290 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -53,6 +53,7 @@
     ></task-description-card>
     <f-task-prerequisites-card
       [task-definition]="task.definition"
+      ng-if="task.hasPrerequisiteTasks()"
       [task]="task"
     ></f-task-prerequisites-card>
     <f-task-scorm-card [task]="task"></f-task-scorm-card>

From 122cf1583222cd9ca623602225193d51423fb4a8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:57:01 +1000
Subject: [PATCH 462/776] refactor: improve ui layout

---
 .../task-prerequisites-card.component.html                  | 6 +++++-
 .../task-definition-prerequisites.component.html            | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
index d476add755..f5a9b77326 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
@@ -1,5 +1,9 @@
 <mat-card appearance="outlined" class="p-[16px]">
-  <mat-card-title class="f-card-title">Prerequisite Tasks</mat-card-title>
+  <div class="flex justify-between items-center w-full">
+    <mat-card-title class="f-card-title">Prerequisite Tasks</mat-card-title>
+    <mat-icon>pending_actions</mat-icon>
+  </div>
+
   <mat-card-subtitle class="mb-4">
     You must submit these tasks before you can submit
     {{ taskDefinition.abbreviation }}.</mat-card-subtitle
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index 6784e30589..9ca9e7df84 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -6,7 +6,7 @@
           @if (prereq.id !== taskDefinition.id) {
             <tr class="border-b">
               @if (!editingMode) {
-                <td class="py-2 px-3">
+                <td class="py-2 px-3 w-[75px]">
                   <status-icon
                     [hidden]="isNarrow"
                     matBadgePosition="before"
@@ -16,7 +16,7 @@
               }
 
               <td
-                class="py-2 px-3 w-[50px]"
+                class="py-2 px-3 w-[50px] text-center"
                 [class.line-through]="prereq.projectTask(task?.project)?.inSubmittedState()"
               >
                 {{ prereq.abbreviation }}

From b10b4ab74026871f9ee6a64cc8b9b6cdda33db2a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:58:28 +1000
Subject: [PATCH 463/776] chore: remove hyphen

---
 .../task-definition-editor.component.html                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 5f9fbe45cd..19b8410308 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -126,7 +126,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
         </div>
       </div>
       <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Pre-requisite Tasks</h3>
+        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Prerequisite Tasks</h3>
         <p class="font-normal text-gray-700">
           Select which tasks need to be in a submitted state before this task can be submitted
         </p>

From 4953ea424611c90f46bd68982d4703d2ef84e5b7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 20 Aug 2025 12:19:01 +1000
Subject: [PATCH 464/776] chore: update jplag report viewer

---
 JPlag-Report-Viewer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/JPlag-Report-Viewer b/JPlag-Report-Viewer
index 0cfaed30f0..76e84d2791 160000
--- a/JPlag-Report-Viewer
+++ b/JPlag-Report-Viewer
@@ -1 +1 @@
-Subproject commit 0cfaed30f06b129198ed85ae3726eab4c3739156
+Subproject commit 76e84d27913c1bb8c3456b0d97003185ba90d13a

From 4201d714a04fe1a7f1eb47a6bccbb68568c24fad Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 20 Aug 2025 13:53:56 +1000
Subject: [PATCH 465/776] chore: add multi language option

---
 .../task-definition-upload/task-definition-upload.component.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
index 5191ecf70c..48d7fd0080 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
@@ -105,6 +105,7 @@
         <mat-option value="emf-model">EMF Model</mat-option>
         <mat-option value="scxml">SCXML</mat-option>
         <mat-option value="text">Text</mat-option>
+        <mat-option value="multi">Multi-language</mat-option>
       </mat-select>
     </mat-form-field>
     <mat-form-field appearance="outline" class="basis-1/2">

From f91d73d9bebfd967843f354921461b3c6f367392 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 21 Aug 2025 10:29:40 +1000
Subject: [PATCH 466/776] chore: update jplag report viewer

---
 JPlag-Report-Viewer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/JPlag-Report-Viewer b/JPlag-Report-Viewer
index 76e84d2791..26e62e17b1 160000
--- a/JPlag-Report-Viewer
+++ b/JPlag-Report-Viewer
@@ -1 +1 @@
-Subproject commit 76e84d27913c1bb8c3456b0d97003185ba90d13a
+Subproject commit 26e62e17b11b136af5568c78327cfec82a691034

From 753287e4d8c0d83b0c4392f87863f55459a53da5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 21 Aug 2025 10:29:53 +1000
Subject: [PATCH 467/776] refactor: update postmessage parameters

---
 .../task-similarity-view.component.ts         |  2 +-
 .../jplag/jplag-report-viewer.component.ts    | 19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
index 8026dc45e0..abdfcf3288 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component.ts
@@ -75,7 +75,7 @@ export class TaskSimilarityViewComponent implements OnChanges {
       (_, response: HttpResponse<Blob>) => {
         // Open JPlag report viewer in embedded iframe
         setTimeout(() => {
-          this.jplagViewer.openReport(response.body);
+          this.jplagViewer.uploadReport(response.body);
           setTimeout(() => {
             // Open comparison between the two students
             this.jplagViewer.openComparison(
diff --git a/src/app/projects/states/jplag/jplag-report-viewer.component.ts b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
index 739aadad92..1b6bf53b71 100644
--- a/src/app/projects/states/jplag/jplag-report-viewer.component.ts
+++ b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
@@ -9,30 +9,21 @@ export class JplagReportViewerComponent {
 
   @Input() hidden: boolean = false;
 
-  public openReport(file: Blob) {
+  public uploadReport(file: Blob) {
     // Send the JPlag report to load
     this.jplagIframe.nativeElement.contentWindow?.postMessage({
-      type: 'upload-jplag-file',
+      type: 'upload-jplag-report',
       file: file,
       name: 'report.jplag',
     });
   }
 
-  public setSearchFilter(searchTerm: string) {
-    // Search comparisons by student username, auto load comparisons if only one is found
-    this.jplagIframe.nativeElement.contentWindow?.postMessage({
-      type: 'set-search-filter-value',
-      filter: searchTerm,
-      autoViewComparison: true,
-    });
-  }
-
-  public openComparison(submissionId1: string, submissionId2: string) {
+  public openComparison(firstSubmissionId: string, secondSubmissionId: string) {
     // Open comparisons between these two submissions (student usernames)
     this.jplagIframe.nativeElement.contentWindow?.postMessage({
       type: 'open-comparison',
-      submissionId1,
-      submissionId2,
+      firstSubmissionId,
+      secondSubmissionId,
     });
   }
 }

From 194b2fa825d60dea997644a5c086ab43d0317e69 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 21 Aug 2025 11:12:28 +1000
Subject: [PATCH 468/776] chore: filter out tasks with a higher task grade

- Prerequisites can not be of a higher target grade
---
 .../task-definition-prerequisites.component.ts               | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index cf073a27ca..a1f4ec70ac 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -40,11 +40,16 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit {
       const search = (typeof value === 'string' ? value : value?.name || '').toLowerCase();
 
       this.filteredTaskDefs = this.taskDefinition.unit.taskDefinitionCache.currentValues
+        // Hide self from the list
         .filter((td) => td.id !== this.taskDefinition.id)
+        // Hide tasks already added as a prerequisite
         .filter(
           (td) =>
             !this.taskDefinition.taskPrerequisitesCache.currentValues.some((p) => p.id === td.id),
         )
+        // Higher target grades can not be a prerequisite
+        .filter((td) => td.targetGrade <= this.taskDefinition.targetGrade)
+        // Search filter
         .filter(
           (td) =>
             td.name.toLowerCase().includes(search) ||

From 584576c02f4ecdef74d3986563a84ca05289bd4e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 21 Aug 2025 12:31:41 +1000
Subject: [PATCH 469/776] chore: ensure filter updates when changing task
 definitions

---
 ...task-definition-prerequisites.component.ts | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index a1f4ec70ac..efb329b948 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
 import {FormControl} from '@angular/forms';
 import {Observable} from 'rxjs';
 import {Task} from 'src/app/api/models/task';
@@ -12,7 +12,7 @@ import {AlertService} from 'src/app/common/services/alert.service';
   templateUrl: 'task-definition-prerequisites.component.html',
   styleUrls: ['task-definition-prerequisites.component.scss'],
 })
-export class TaskDefinitionPrerequisitesComponent implements OnInit {
+export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   @Input() taskDefinition: TaskDefinition;
   @Input() editingMode: boolean;
   @Input() task: Task;
@@ -38,26 +38,37 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit {
   ngOnInit(): void {
     this.searchCtrl.valueChanges.subscribe((value: string | TaskDefinition) => {
       const search = (typeof value === 'string' ? value : value?.name || '').toLowerCase();
-
-      this.filteredTaskDefs = this.taskDefinition.unit.taskDefinitionCache.currentValues
-        // Hide self from the list
-        .filter((td) => td.id !== this.taskDefinition.id)
-        // Hide tasks already added as a prerequisite
-        .filter(
-          (td) =>
-            !this.taskDefinition.taskPrerequisitesCache.currentValues.some((p) => p.id === td.id),
-        )
-        // Higher target grades can not be a prerequisite
-        .filter((td) => td.targetGrade <= this.taskDefinition.targetGrade)
-        // Search filter
-        .filter(
-          (td) =>
-            td.name.toLowerCase().includes(search) ||
-            td.abbreviation.toLowerCase().includes(search),
-        );
+      this.filterTaskDefs(search);
     });
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (
+      changes.taskDefinition &&
+      changes.taskDefinition.previousValue?.id !== changes.taskDefinition.currentValue?.id
+    ) {
+      this.filterTaskDefs(this.searchCtrl.value ?? '');
+    }
+  }
+
+  private filterTaskDefs(search: string) {
+    this.filteredTaskDefs = this.taskDefinition.unit.taskDefinitionCache.currentValues
+      // Hide self from the list
+      .filter((td) => td.id !== this.taskDefinition.id)
+      // Hide tasks already added as a prerequisite
+      .filter(
+        (td) =>
+          !this.taskDefinition.taskPrerequisitesCache.currentValues.some((p) => p.id === td.id),
+      )
+      // Higher target grades can not be a prerequisite
+      .filter((td) => td.targetGrade <= this.taskDefinition.targetGrade)
+      // Search filter
+      .filter(
+        (td) =>
+          td.name.toLowerCase().includes(search) || td.abbreviation.toLowerCase().includes(search),
+      );
+  }
+
   displayFn(td: TaskDefinition): string {
     return td && td.abbreviation ? `${td.abbreviation} - ${td.name}` : '';
   }

From c342e9618a668fb3bcadc1978ff5039408f033f0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 21 Aug 2025 16:18:04 +1000
Subject: [PATCH 470/776] chore(release): 10.0.0-24

---
 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 c16f0462a5..af7fe7efd9 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.
 
+## [10.0.0-24](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-23...v10.0.0-24) (2025-08-21)
+
 ## [10.0.0-23](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-22...v10.0.0-23) (2025-08-14)
 
 ## [10.0.0-22](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-21...v10.0.0-22) (2025-08-14)
diff --git a/package-lock.json b/package-lock.json
index c97d612bff..1ca8dd9291 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-23",
+  "version": "10.0.0-24",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-23",
+      "version": "10.0.0-24",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 61c73fb91a..1c678063a1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-23",
+  "version": "10.0.0-24",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 1559e8104c8c4bc137df4f46a0a5ed0e345260af Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 25 Aug 2025 16:31:06 +1000
Subject: [PATCH 471/776] feat: add attendance marked task comment

---
 src/app/api/services/task.service.ts          |  16 +++
 .../task-dropdown.component.html              |   7 ++
 src/app/doubtfire.states.ts                   |  43 +++++++
 .../tutor-discussion.component.html           | 106 ++++++++++++------
 .../tutor-discussion.component.ts             | 105 +++++++++++++----
 .../task-comments-viewer.component.html       |  21 ++++
 .../task-comments-viewer.component.ts         |   3 +-
 7 files changed, 247 insertions(+), 54 deletions(-)

diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 9c83e0ba6e..84d84827a8 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -216,4 +216,20 @@ export class TaskService extends CachedEntityService<Task> {
 
     return null;
   }
+
+  public markAttendance(task: Task): Observable<void> {
+    const options: RequestOptions<Task> = {
+      entity: task,
+      cache: task.project.taskCache,
+      endpointFormat: `${this.endpointFormat}/attendance`,
+    };
+
+    return this.post(
+      {
+        projectId: task.project.id,
+        taskDefId: task.definition.id,
+      },
+      options,
+    );
+  }
 }
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index c4c8d206de..30c568bea1 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -136,6 +136,13 @@
         <button uiSref="units/analytics" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
           <mat-icon aria-label="Unit Analytics icon" fontIcon="insights"></mat-icon>Analytics
         </button>
+        <button
+          uiSref="tutor-attendance"
+          [uiParams]="{unitId: unitRole.unit.id, attendance: true}"
+          mat-menu-item
+        >
+          <mat-icon aria-label="Unit Attendance icon" fontIcon="history_edu"></mat-icon>Attendance
+        </button>
         @if (
           unitRole.role === 'Convenor' || unitRole.role === 'Admin' || unitRole.role === 'Auditor'
         ) {
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index e586f227af..d17705fdc9 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -472,6 +472,48 @@ const TutorDiscussionState: NgHybridStateDeclaration = {
   },
 };
 
+const TutorAttendance: NgHybridStateDeclaration = {
+  name: 'tutor-attendance',
+  url: '/tutor-attendance?unitId&attendance',
+  resolve: {
+    unitId: function ($stateParams) {
+      return $stateParams.unitId;
+    },
+    unit: function ($stateParams) {
+      const unitService = AppInjector.get(UnitService);
+      const globalState = AppInjector.get(GlobalStateService);
+      const authService = AppInjector.get(AuthenticationService);
+      globalState.onLoad(() => {});
+      console.log($stateParams);
+
+      return new Promise((resolve) => {
+        globalState.onLoad(() => {});
+        authService.afterAuthCall(() => {
+          unitService.get({id: $stateParams.unitId}).subscribe((unit) => {
+            resolve(unit);
+          });
+        });
+      });
+    },
+    attendance: function ($stateParams) {
+      console.log($stateParams);
+      if ($stateParams.attendance == 'true' || $stateParams.attendance === true) {
+        return true;
+      }
+      return false;
+    },
+  },
+  views: {
+    main: {
+      component: TutorDiscussionComponent,
+    },
+  },
+  data: {
+    pageTitle: 'Tutor Attendance',
+    roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
+  },
+};
+
 const jplagReportViewerState: NgHybridStateDeclaration = {
   name: 'jplag-report-viewer',
   url: '/jplag-report-viewer',
@@ -508,4 +550,5 @@ export const doubtfireStates = [
   projectPlanState,
   TutorDiscussionState,
   jplagReportViewerState,
+  TutorAttendance,
 ];
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 63cb5aaa5b..96dfd34a7a 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -28,22 +28,46 @@
 
 <!-- We offset the height by 145px to compensate for the header -->
 <div class="w-full flex flex-col h-[calc(100vh-145px)]">
+  @if (attendance && unit) {
+    <div class="flex items-center gap-4">
+      <mat-form-field appearance="outline" class="w-full mt-[22px]">
+        <mat-select
+          placeholder="Select a task"
+          [(ngModel)]="selectedTaskDefinition"
+          [disabled]="selectedTaskDefinition"
+        >
+          @for (td of unit?.taskDefinitionCache.values | async; track td) {
+            <mat-option [value]="td">{{ td.abbreviation }} - {{ td.name }}</mat-option>
+          }
+        </mat-select>
+      </mat-form-field>
+      @if (selectedTaskDefinition) {
+        <button mat-raised-button color="red" (click)="selectedTaskDefinition = null">Clear</button>
+      }
+    </div>
+  }
+
   <div class="task-inbox flex flex-col flex-1 justify-normal items-center w-full">
     <div class="flex justify-between w-full relative">
       @if (project && project?.student) {
         <div></div>
         <div class="absolute left-1/2 transform -translate-x-1/2 text-center">
           <div class="text-center">
-            {{ project?.student?.firstName }} {{ project?.student?.lastName }}
+            {{ project?.student?.firstName }} {{ project?.student?.lastName }} ({{
+              project?.student.student_id
+            }})
           </div>
           <div class="text-center">
             Target Grade: {{ getTargetTradeString(project?.targetGrade) }}
           </div>
         </div>
-        <button mat-icon-button color="primary" (click)="scanQrCode()">
-          <mat-icon>qr_code</mat-icon>
-        </button>
+      } @else {
+        <div></div>
+        <div>Select a student...</div>
       }
+      <button mat-icon-button color="primary" (click)="scanQrCode()">
+        <mat-icon>qr_code</mat-icon>
+      </button>
     </div>
 
     @if (project && !filteredTasks.length) {
@@ -56,7 +80,7 @@
           class="clearfix w-full"
           style="padding: 0; height: 60px"
           togglePosition="before"
-          [selected]="task.status === 'discuss'"
+          [selected]="task.status === 'discuss' || attendance"
         >
           @if (task) {
             <div class="w-full" id="{{ task.id }}">
@@ -136,35 +160,48 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
   @if (project && filteredTasks.length) {
     <div class="mt-2">
       <div class="w-full flex justify-center items-center my-3 gap-8">
-        <button
-          class="bg-gray-100 medium-icon-button"
-          mat-fab
-          color="secondary"
-          [disabled]="!tasks.selectedOptions.selected.length"
-          (click)="setSelectedTasksStatus('fix_and_resubmit')"
-        >
-          <!-- Redo -->
-          <mat-icon>construction</mat-icon>
-        </button>
-        <button
-          class="bg-green-400 medium-icon-button"
-          mat-fab
-          [disabled]="!tasks.selectedOptions.selected.length"
-          (click)="setSelectedTasksStatus('complete')"
-        >
-          <!-- Mark as Complete -->
-          <mat-icon>done</mat-icon>
-        </button>
+        @if (attendance) {
+          <button
+            class="bg-gray-100 medium-icon-button"
+            mat-fab
+            color="secondary"
+            [disabled]="!tasks.selectedOptions.selected.length"
+            (click)="markSelectedTasksAttendance()"
+          >
+            <!-- Redo -->
+            <mat-icon>how_to_reg</mat-icon>
+          </button>
+        } @else {
+          <button
+            class="bg-gray-100 medium-icon-button"
+            mat-fab
+            color="secondary"
+            [disabled]="!tasks.selectedOptions.selected.length"
+            (click)="setSelectedTasksStatus('fix_and_resubmit')"
+          >
+            <!-- Redo -->
+            <mat-icon>construction</mat-icon>
+          </button>
+          <button
+            class="bg-green-400 medium-icon-button"
+            mat-fab
+            [disabled]="!tasks.selectedOptions.selected.length"
+            (click)="setSelectedTasksStatus('complete')"
+          >
+            <!-- Mark as Complete -->
+            <mat-icon>done</mat-icon>
+          </button>
 
-        <button
-          class="bg-blue-300 medium-icon-button"
-          mat-fab
-          [disabled]="!tasks.selectedOptions.selected.length"
-          (click)="markSelectedTasksDicussed()"
-        >
-          <!-- Mark as Discussed -->
-          <mat-icon>group</mat-icon>
-        </button>
+          <button
+            class="bg-blue-300 medium-icon-button"
+            mat-fab
+            [disabled]="!tasks.selectedOptions.selected.length"
+            (click)="markSelectedTasksDicussed()"
+          >
+            <!-- Mark as Discussed -->
+            <mat-icon>group</mat-icon>
+          </button>
+        }
       </div>
     </div>
   }
@@ -172,7 +209,8 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
   @if (selectedTask && project) {
     <mat-tab-group dynamicHeight (selectedTabChange)="onTabChange($event)">
       <mat-tab label="Task Comments"></mat-tab>
-      <mat-tab label="Staff Notes"></mat-tab>
+
+      <mat-tab [matTooltip]="project?.staffNoteCount" label="Staff Notes"></mat-tab>
     </mat-tab-group>
 
     @if (footerTabView === TutorDiscussionTabView.SHOW_COMMENTS) {
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index b716a155c4..8913297809 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -9,6 +9,8 @@ import {
   ProjectService,
   Task,
   TaskCommentService,
+  TaskDefinition,
+  TaskService,
   TaskStatusEnum,
   Unit,
   UnitService,
@@ -30,8 +32,10 @@ enum TutorDiscussionTabView {
 export class TutorDiscussionComponent implements AfterViewInit {
   @Input() unitId: number;
   @Input() projectId: number;
+  @Input() attendance: boolean;
 
   @ViewChild('tasks') tasksList: MatSelectionList;
+  selectedTaskDefinition: TaskDefinition | null = null;
 
   public filteredTasks: Task[] = [];
   public allTasks: Task[] = [];
@@ -48,6 +52,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
 
   private _unitId: number;
   private _projectId: number;
+  private _username: string;
 
   public TutorDiscussionTabView = TutorDiscussionTabView;
   public footerTabView: TutorDiscussionTabView = TutorDiscussionTabView.SHOW_COMMENTS;
@@ -62,6 +67,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
     private alertService: AlertService,
     private route: UIRouter,
     private taskCommentService: TaskCommentService,
+    private taskService: TaskService,
   ) {}
 
   onTabChange(event: MatTabChangeEvent): void {
@@ -81,6 +87,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
   }
 
   public ngAfterViewInit(): void {
+    console.log('is attendnance? ', this.attendance);
     this.authService.afterAuthCall((result) => {
       if (!result) {
         return this.state.go('sign_in');
@@ -95,7 +102,14 @@ export class TutorDiscussionComponent implements AfterViewInit {
             this._unitId = Number(this.unitId);
             this.getStudentTasks();
           } else {
-            this.scanQrCode();
+            if (!this.attendance) {
+              this.scanQrCode();
+            } else {
+              this._unitId = Number(this.unitId);
+              this.getUnit().then((u) => {
+                this.unit = u;
+              });
+            }
           }
         }
       }
@@ -109,10 +123,26 @@ export class TutorDiscussionComponent implements AfterViewInit {
 
     try {
       const params = new URL(data).searchParams;
-      const unitId = Number(params.get('unitId'));
-      const projectId = Number(params.get('projectId'));
-      if (!isNaN(unitId) && !isNaN(projectId)) {
-        this.changeProject(unitId, projectId);
+      const unitId = parseInt(params.get('unitId'));
+      const projectId = parseInt(params.get('projectId'));
+
+      const username = params.get('username');
+
+      console.log('we got ', unitId, projectId, username);
+      console.log(params);
+      if ((!isNaN(unitId) && !isNaN(projectId)) || username) {
+        if (unitId) {
+          this._unitId = unitId;
+        }
+        if (projectId) {
+          this._projectId = projectId;
+        }
+        if (username) {
+          this._username = username;
+        }
+        console.log('changing project', unitId, projectId, username);
+
+        this.changeProject();
       }
     } catch {
       // QR code data is invalid
@@ -129,9 +159,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
     }
   }
 
-  private changeProject(unitId: number, projectId: number) {
-    this._unitId = unitId;
-    this._projectId = projectId;
+  private changeProject() {
     this.html5QrcodeScanner.pause(true);
     this.loadingStudentData = true;
     setTimeout(() => {
@@ -142,6 +170,11 @@ export class TutorDiscussionComponent implements AfterViewInit {
   hideQrScannerBloat: boolean = true;
 
   public scanQrCode() {
+    if (this.attendance && !this.selectedTaskDefinition) {
+      this.alertService.error('Please select a task first');
+      return;
+    }
+
     this.scanningQr = true;
     this.loadingStudentData = false;
 
@@ -218,11 +251,35 @@ export class TutorDiscussionComponent implements AfterViewInit {
     }
   }
 
+  public markSelectedTasksAttendance() {
+    const selectedTasks = this.tasksList.selectedOptions.selected;
+    if (selectedTasks.length > 1) {
+      this.alertService.error('Can only mark attendance 1 task at a time', 5000);
+      return;
+    }
+    console.log(selectedTasks);
+    for (const taskOption of selectedTasks) {
+      const task = taskOption.value as Task;
+      this.taskService.markAttendance(task).subscribe({
+        next: () => {
+          console.log('good');
+          this.taskService.notifyStatusChange(task);
+          this.alertService.success('Successfully marked attendance', 2500);
+        },
+        error: (_error) => {
+          this.alertService.error('Failed to mark attendance', 5000);
+        },
+      });
+    }
+  }
+
   private getUnit(): Promise<Unit> {
     return new Promise((resolve, reject) => {
       this.unitService.get({id: this._unitId}).subscribe({
         next: (unit) => {
-          resolve(unit);
+          setTimeout(() => {
+            resolve(unit);
+          });
         },
         error: (err) => {
           reject(err);
@@ -234,7 +291,10 @@ export class TutorDiscussionComponent implements AfterViewInit {
   private loadStudents(unit: Unit): Promise<Project> {
     return new Promise((resolve, reject) => {
       this.projectService.loadStudents(unit, false, false).subscribe((projects) => {
-        const project = projects.find((p) => p.id === this._projectId);
+        console.log(projects);
+        const project =
+          projects.find((p) => p.id === this._projectId) ??
+          projects.find((p) => p.student.username === this._username);
         if (!project) {
           reject('Student is not a part of this unit');
         }
@@ -301,15 +361,22 @@ export class TutorDiscussionComponent implements AfterViewInit {
         const discussionTasks = project.tasks.filter((task) =>
           this.statusesToInclude.includes(task.status),
         );
-        this.filteredTasks = [...discussionTasks];
-        this.allTasks = [
-          ...project.tasks.filter(
-            (task) =>
-              task.status !== 'not_started' && // Filter out tasks with no submissions yet
-              task.definition.targetGrade <= project.targetGrade, // Filter out tasks that are higher than student's target grade
-          ),
-        ];
-        this.selectedTask = discussionTasks[0] ?? null;
+        if (!this.attendance) {
+          this.filteredTasks = [...discussionTasks];
+          this.allTasks = [
+            ...project.tasks.filter(
+              (task) =>
+                task.status !== 'not_started' && // Filter out tasks with no submissions yet
+                task.definition.targetGrade <= project.targetGrade, // Filter out tasks that are higher than student's target grade
+            ),
+          ];
+        } else {
+          this.filteredTasks = [
+            project.tasks.find((t) => t.definition.id === this.selectedTaskDefinition.id),
+          ];
+        }
+
+        this.selectedTask = this.filteredTasks[0] ?? null;
         this.project = project;
         this.scanningQr = false;
         this.loadingStudentData = false;
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index 8201eb6d01..c3e35ead4c 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -91,6 +91,27 @@
                 </mat-card>
               </div>
 
+              <div
+                *ngSwitchCase="'attendance_marked'"
+                class="w-full flex flex-col items-center my-2"
+                [matTooltip]="comment.createdAt | humanizedDate"
+                matTooltipPosition="above"
+                matTooltipShowDelay="1000"
+              >
+                <mat-card class="w-full self-end" appearance="outlined">
+                  <mat-card-header>
+                    <mat-icon class="m-auto" style="color: #9696969d">how_to_reg</mat-icon>
+                  </mat-card-header>
+
+                  <mat-card-content
+                    style="color: #9696969d"
+                    class="flex flex-col justify-center items-center"
+                  >
+                    {{ comment.text }}
+                  </mat-card-content>
+                </mat-card>
+              </div>
+
               <div *ngSwitchCase="'plan'" class="comment-status">
                 <hr class="hr-text" [attr.data-content]="comment.text" />
               </div>
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index 8819d11421..f3a6f71122 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -249,7 +249,8 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit, OnDestroy
       commentType == 'assessment' ||
       commentType === 'scorm' ||
       commentType === 'scorm_extension' ||
-      commentType === 'discussed_in_class'
+      commentType === 'discussed_in_class' ||
+      commentType === 'attendance_marked'
     );
   }
 

From a7588e6f007381c04a570650257cd6f2ff93e5ae Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 25 Aug 2025 16:35:32 +1000
Subject: [PATCH 472/776] fix: enforce minimum height on task comments viewer

---
 .../task-comments-viewer.component.html           | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index c3e35ead4c..5e391f5c70 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -1,5 +1,16 @@
-<div class="comments-panel h-full" appDragDrop (fileDropped)="uploadFiles($event)" fxLayout="column">
-  <div fxFlex class="comments-body" #commentsBody fxLayout="column" style="place-content: stretch !important">
+<div
+  class="comments-panel h-full min-h-[350px]"
+  appDragDrop
+  (fileDropped)="uploadFiles($event)"
+  fxLayout="column"
+>
+  <div
+    fxFlex
+    class="comments-body"
+    #commentsBody
+    fxLayout="column"
+    style="place-content: stretch !important"
+  >
     <div [hidden]="!loading" class="h-full" fxLayout="row" fxLayoutAlign="center center">
       <mat-spinner strokeWidth="2" diameter="100" color="accent"></mat-spinner>
     </div>

From 84bc5d59f0155391ace4a6a9795056af236722f5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 25 Aug 2025 16:35:53 +1000
Subject: [PATCH 473/776] chore: add missing imports

---
 src/app/doubtfire.states.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index d17705fdc9..e82a25c192 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -13,6 +13,10 @@ import {TutorDiscussionComponent} from './projects/states/tutor-discussion/tutor
 import {SuccessCloseComponent} from './common/success-close/success-close.component';
 import {ProjectPlanComponent} from './projects/states/plan/project-plan.component';
 import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-viewer.component';
+import {UnitService} from './api/services/unit.service';
+import {AppInjector} from './app-injector';
+import {GlobalStateService} from './projects/states/index/global-state.service';
+import {AuthenticationService} from './api/services/authentication.service';
 
 /*
  * Use this file to store any states that are sourced by angular components.

From 4100447e48f4c6740756a7220826b7617c717aba Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 25 Aug 2025 16:36:20 +1000
Subject: [PATCH 474/776] chore: remove debug log

---
 src/app/doubtfire.states.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index e82a25c192..a80e675809 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -488,8 +488,6 @@ const TutorAttendance: NgHybridStateDeclaration = {
       const globalState = AppInjector.get(GlobalStateService);
       const authService = AppInjector.get(AuthenticationService);
       globalState.onLoad(() => {});
-      console.log($stateParams);
-
       return new Promise((resolve) => {
         globalState.onLoad(() => {});
         authService.afterAuthCall(() => {
@@ -500,7 +498,6 @@ const TutorAttendance: NgHybridStateDeclaration = {
       });
     },
     attendance: function ($stateParams) {
-      console.log($stateParams);
       if ($stateParams.attendance == 'true' || $stateParams.attendance === true) {
         return true;
       }

From b7f4ab9e7801fbb33ffc6b4e02bf6613e6d7a524 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 10:02:50 +1000
Subject: [PATCH 475/776] feat: redirect back to inbox if unit context exists

---
 .../states/tutor-discussion/tutor-discussion.component.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 8913297809..d20859b0a3 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -152,7 +152,13 @@ export class TutorDiscussionComponent implements AfterViewInit {
   public closeQrReader(): void {
     if (!this.project) {
       // Exiting the route entirely
-      this.route.stateService.go('home');
+      if (this.unitId) {
+        this.route.stateService.go('units/tasks/inbox', {
+          unitId: this.unitId,
+        });
+      } else {
+        this.route.stateService.go('home');
+      }
     } else {
       // Close the camera view
       this.scanningQr = false;

From d1e5ab1427352fcf1b0fdd920cb9838a4f8799a0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 10:14:33 +1000
Subject: [PATCH 476/776] fix: set max width on main container

---
 .../states/tutor-discussion/tutor-discussion.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 96dfd34a7a..fc18e973da 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -27,7 +27,7 @@
 </div>
 
 <!-- We offset the height by 145px to compensate for the header -->
-<div class="w-full flex flex-col h-[calc(100vh-145px)]">
+<div class="w-full flex flex-col h-[calc(100vh-145px)] max-w-7xl mx-auto">
   @if (attendance && unit) {
     <div class="flex items-center gap-4">
       <mat-form-field appearance="outline" class="w-full mt-[22px]">

From 78ef7b5d4158cf4b087ba6556b0cc5927bb20d7c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 10:27:01 +1000
Subject: [PATCH 477/776] refactor: load student from only their username

---
 .../tutor-discussion.component.ts             | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index d20859b0a3..1bce6bf3d7 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -31,7 +31,6 @@ enum TutorDiscussionTabView {
 })
 export class TutorDiscussionComponent implements AfterViewInit {
   @Input() unitId: number;
-  @Input() projectId: number;
   @Input() attendance: boolean;
 
   @ViewChild('tasks') tasksList: MatSelectionList;
@@ -51,7 +50,6 @@ export class TutorDiscussionComponent implements AfterViewInit {
   private html5QrcodeScanner: Html5QrcodeScanner;
 
   private _unitId: number;
-  private _projectId: number;
   private _username: string;
 
   public TutorDiscussionTabView = TutorDiscussionTabView;
@@ -96,20 +94,14 @@ export class TutorDiscussionComponent implements AfterViewInit {
           // Avoid prompting students for camera permissions before redirecting to unauthorised state
           return;
         }
-        if (!this.project) {
-          if (this.unitId && this.projectId) {
-            this._projectId = Number(this.projectId);
-            this._unitId = Number(this.unitId);
-            this.getStudentTasks();
+        if (this.unitId) {
+          this._unitId = Number(this.unitId);
+          if (!this.attendance) {
+            this.scanQrCode();
           } else {
-            if (!this.attendance) {
-              this.scanQrCode();
-            } else {
-              this._unitId = Number(this.unitId);
-              this.getUnit().then((u) => {
-                this.unit = u;
-              });
-            }
+            this.getUnit().then((u) => {
+              this.unit = u;
+            });
           }
         }
       }
@@ -134,9 +126,6 @@ export class TutorDiscussionComponent implements AfterViewInit {
         if (unitId) {
           this._unitId = unitId;
         }
-        if (projectId) {
-          this._projectId = projectId;
-        }
         if (username) {
           this._username = username;
         }
@@ -298,9 +287,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
     return new Promise((resolve, reject) => {
       this.projectService.loadStudents(unit, false, false).subscribe((projects) => {
         console.log(projects);
-        const project =
-          projects.find((p) => p.id === this._projectId) ??
-          projects.find((p) => p.student.username === this._username);
+        const project = projects.find((p) => p.student.username === this._username);
         if (!project) {
           reject('Student is not a part of this unit');
         }

From 90f41493313d6a3ad9bdafdd4cd4865c80e94ca2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 10:27:55 +1000
Subject: [PATCH 478/776] feat: add tutor discussion to unit dropdown

---
 src/app/common/header/header.component.html                 | 6 ------
 .../header/task-dropdown/task-dropdown.component.html       | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/common/header/header.component.html b/src/app/common/header/header.component.html
index 27dc650f54..e10837b228 100644
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
@@ -84,12 +84,6 @@
         <mat-icon matListItemIcon aria-label="Edit profile">person</mat-icon>
         Edit Profile
       </button>
-      @if (currentUser.role !== 'Student') {
-        <button mat-menu-item uiSref="tutor-discussion">
-          <mat-icon matListItemIcon aria-label="Tutor Discussion">qr_code_scanner</mat-icon>
-          Discussion
-        </button>
-      }
       <button mat-menu-item (click)="openCalendar()">
         <mat-icon matListItemIcon aria-label="Edit calendar">calendar_month</mat-icon>
         Calendar
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index 30c568bea1..a4dca0df1f 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -111,6 +111,10 @@
         <button uiSref="units/tasks/viewer" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
           <mat-icon aria-label="Task list icon" fontIcon="list_alt"></mat-icon> Tasks
         </button>
+        <button uiSref="tutor-discussion" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
+          <mat-icon aria-label="Tutor Discussion icon" fontIcon="qr_code_scanner"></mat-icon
+          >Discussion
+        </button>
         <mat-divider></mat-divider>
         <!-- <p class="task-dropdown-heading">Students</p> -->
         <button uiSref="units/students/list" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>

From b4fed1c75d9f0ce37e56dc7a81a0fbc0157c46d5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:12:29 +1000
Subject: [PATCH 479/776] refactor: dynamic qr code caption

---
 .../modals/qr-modal/qr-modal.component.html   |  3 +--
 .../modals/qr-modal/qr-modal.component.ts     | 21 ++++++++++++----
 .../modals/qr-modal/qr-modal.service.ts       | 15 ++++++++---
 .../task-status-card.component.ts             | 25 +++++++++++--------
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/app/common/modals/qr-modal/qr-modal.component.html b/src/app/common/modals/qr-modal/qr-modal.component.html
index 7b3f559645..e22409451d 100644
--- a/src/app/common/modals/qr-modal/qr-modal.component.html
+++ b/src/app/common/modals/qr-modal/qr-modal.component.html
@@ -1,7 +1,6 @@
 <div class="p-10 w-full max-w-[500px]">
   <div class="text-center">
-    Display this QR code during your class so your tutor can scan it to view your submissions and
-    mark your tasks as complete.
+    {{ caption }}
   </div>
   <img [src]="qrCodeImage" alt="QR Code for tutor assessment" class="w-full" />
 </div>
diff --git a/src/app/common/modals/qr-modal/qr-modal.component.ts b/src/app/common/modals/qr-modal/qr-modal.component.ts
index d59b72b778..a47e0ec4db 100644
--- a/src/app/common/modals/qr-modal/qr-modal.component.ts
+++ b/src/app/common/modals/qr-modal/qr-modal.component.ts
@@ -1,6 +1,7 @@
 import {Component, Inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA} from '@angular/material/dialog';
 import QRCode from 'qrcode';
+import {QrModalData} from './qr-modal.service';
 
 @Component({
   selector: 'f-qr-modal',
@@ -8,15 +9,25 @@ import QRCode from 'qrcode';
   styleUrls: ['./qr-modal.component.scss'],
 })
 export class QrModalComponent implements OnInit {
-  constructor(@Inject(MAT_DIALOG_DATA) public data: string) {}
+  constructor(@Inject(MAT_DIALOG_DATA) public data: QrModalData) {}
 
   qrCodeImage: string;
+  caption: string;
 
   ngOnInit() {
-    if (this.data) {
-      QRCode.toDataURL(this.data).then((url) => {
-        this.qrCodeImage = url;
-      });
+    this.caption = this.data.caption;
+    if (this.data?.qrCodeImage) {
+      this.generateQr();
     }
   }
+
+  generateQr() {
+    const u = new URL(this.data.qrCodeImage);
+    u.searchParams.set('time', Math.floor(Date.now() / 1000).toString());
+    this.qrCodeImage = u.toString();
+
+    QRCode.toDataURL(u.toString()).then((url) => {
+      this.qrCodeImage = url;
+    });
+  }
 }
diff --git a/src/app/common/modals/qr-modal/qr-modal.service.ts b/src/app/common/modals/qr-modal/qr-modal.service.ts
index 7017f2c92b..1198f5d3f2 100644
--- a/src/app/common/modals/qr-modal/qr-modal.service.ts
+++ b/src/app/common/modals/qr-modal/qr-modal.service.ts
@@ -2,15 +2,24 @@ import {Injectable} from '@angular/core';
 import {MatDialog} from '@angular/material/dialog';
 import {QrModalComponent} from './qr-modal.component';
 
+export interface QrModalData {
+  qrCodeImage: string;
+  caption: string;
+  liveTimestamp: boolean;
+}
 @Injectable({
   providedIn: 'root',
 })
 export class QrModalService {
   constructor(public dialog: MatDialog) {}
 
-  public show(qrText: string) {
-    const _dialogRef = this.dialog.open(QrModalComponent, {
-      data: qrText,
+  public show(qrText: string, caption: string, liveTimestamp: boolean = false) {
+    const _dialogRef = this.dialog.open<QrModalComponent, QrModalData>(QrModalComponent, {
+      data: {
+        qrCodeImage: qrText,
+        liveTimestamp,
+        caption,
+      },
     });
   }
 }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index c2b7992cd1..9af9868bca 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -1,12 +1,13 @@
-import { AfterViewInit, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { UIRouter } from '@uirouter/core';
+import {AfterViewInit, Component, Input, OnChanges, SimpleChanges} from '@angular/core';
+import {UIRouter} from '@uirouter/core';
 import * as _ from 'lodash';
-import { Task } from 'src/app/api/models/task';
-import { TaskStatusEnum } from 'src/app/api/models/task-status';
-import { TaskService } from 'src/app/api/services/task.service';
-import { ExtensionModalService } from 'src/app/common/modals/extension-modal/extension-modal.service';
-import { QrModalService } from 'src/app/common/modals/qr-modal/qr-modal.service';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {Task} from 'src/app/api/models/task';
+import {TaskStatusEnum} from 'src/app/api/models/task-status';
+import {TaskService} from 'src/app/api/services/task.service';
+import {UserService} from 'src/app/api/services/user.service';
+import {ExtensionModalService} from 'src/app/common/modals/extension-modal/extension-modal.service';
+import {QrModalService} from 'src/app/common/modals/qr-modal/qr-modal.service';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 @Component({
   selector: 'f-task-status-card',
   templateUrl: './task-status-card.component.html',
@@ -22,6 +23,7 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     private router: UIRouter,
     private qrModalService: QrModalService,
     private doubtfireConstants: DoubtfireConstants,
+    private userService: UserService,
   ) {}
 
   @Input() task: Task;
@@ -70,8 +72,11 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
 
   openDiscussionQrCode(): void {
     const hostName = this.doubtfireConstants.API_URL.replace('/api', '');
-    const url = `${hostName}/tutor-discussion?unitId=${this.task.unit.id}&projectId=${this.task.project.id}`;
-    this.qrModalService.show(url);
+    const url = `${hostName}/tutor-discussion?unitId=${this.task.unit.id}&projectId=${this.task.project.id}&username=${this.userService.currentUser.username}`;
+    this.qrModalService.show(
+      url,
+      'Display this QR code during your class so your tutor can scan it to view your submissions and mark your tasks as complete.',
+    );
   }
 
   applyForExtension(): void {

From eaebde741788550baf248e88888d82dcb92786ec Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:12:47 +1000
Subject: [PATCH 480/776] refactor: rename to my profile

---
 src/app/common/header/header.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/header/header.component.html b/src/app/common/header/header.component.html
index e10837b228..342a6b4921 100644
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
@@ -82,7 +82,7 @@
     <mat-menu #menu2="matMenu">
       <button mat-menu-item uiSref="edit_profile">
         <mat-icon matListItemIcon aria-label="Edit profile">person</mat-icon>
-        Edit Profile
+        My Profile
       </button>
       <button mat-menu-item (click)="openCalendar()">
         <mat-icon matListItemIcon aria-label="Edit calendar">calendar_month</mat-icon>

From ad797fb29917bbab8ba08f41196b878b85cf64b6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:15:50 +1000
Subject: [PATCH 481/776] refactor: open user qr code from profile page

---
 .../edit-profile-form.component.html          | 27 ++++++++++++-------
 .../edit-profile-form.component.scss          |  5 ++++
 .../edit-profile-form.component.ts            | 12 +++++++++
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/app/common/edit-profile-form/edit-profile-form.component.html b/src/app/common/edit-profile-form/edit-profile-form.component.html
index 659a44bc80..65b6a01f07 100644
--- a/src/app/common/edit-profile-form/edit-profile-form.component.html
+++ b/src/app/common/edit-profile-form/edit-profile-form.component.html
@@ -1,15 +1,22 @@
-<form #form="ngForm" (ngSubmit)="submit()" fxLayout="column" fxLayoutAlign="center start" class="p-16">
-  <div class="main-container" style="width: 100%" fxLayout="row" fxLayoutAlign="center start">
-    <div class="main" style="width: 100%" fxLayout="column" fxLayoutAlign="start start">
+<form #form="ngForm" (ngSubmit)="submit()" fxLayout="column" fxLayoutAlign="center start">
+  <div class="main-container w-full flex flex-row justify-center items-start">
+    <div class="main flex flex-col justify-start items-start w-full">
       <!-- avatar -->
-      <div fxLayout="row" fxLayoutAlign="space-between center" style="margin-bottom: 25px">
-        <a style="margin-left: 20px" href="https://gravatar.com/connect/?source=_signup/" target="_blank">
-          <user-icon [size]="80" [user]="user" style="margin-right: 25px"></user-icon
-        ></a>
+      <div class="flex flex-row justify-between items-center mb-[25px] w-full">
+        <div class="flex flex-row justify-between items-center">
+          <a class="ml-[20px]" href="https://gravatar.com/connect/?source=_signup/" target="_blank">
+            <user-icon [size]="80" [user]="user" style="margin-right: 25px"></user-icon
+          ></a>
 
-        <div fxLayout="column" fxLayoutAlign="space-around start">
-          <h1>{{ initialFirstName }}</h1>
-          Set up your {{ externalName.value }} profile
+          <div>
+            <h1>{{ user?.firstName }}</h1>
+            Set up your {{ externalName.value }} profile
+          </div>
+        </div>
+        <div>
+          <mat-icon (click)="showQrCode()" class="hover:text-blue-500 cursor-pointer"
+            >qr_code_scanner</mat-icon
+          >
         </div>
       </div>
 
diff --git a/src/app/common/edit-profile-form/edit-profile-form.component.scss b/src/app/common/edit-profile-form/edit-profile-form.component.scss
index b134972461..f40eba08d1 100644
--- a/src/app/common/edit-profile-form/edit-profile-form.component.scss
+++ b/src/app/common/edit-profile-form/edit-profile-form.component.scss
@@ -32,3 +32,8 @@ section {
   font-weight: normal;
 }
 
+.mat-icon {
+  width: 50px;
+  height: 50px;
+  font-size: 50px;
+}
diff --git a/src/app/common/edit-profile-form/edit-profile-form.component.ts b/src/app/common/edit-profile-form/edit-profile-form.component.ts
index f3787429dc..583d43a53c 100644
--- a/src/app/common/edit-profile-form/edit-profile-form.component.ts
+++ b/src/app/common/edit-profile-form/edit-profile-form.component.ts
@@ -6,6 +6,7 @@ import {User} from 'src/app/api/models/user/user';
 import {AuthenticationService} from 'src/app/api/services/authentication.service';
 import {UserService} from 'src/app/api/services/user.service';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {QrModalService} from '../modals/qr-modal/qr-modal.service';
 
 @Component({
   selector: 'f-edit-profile-form',
@@ -20,6 +21,8 @@ export class EditProfileFormComponent implements OnInit {
     private authService: AuthenticationService,
     @Optional() @Inject(MAT_DIALOG_DATA) public data: {user: User; mode: 'edit' | 'create' | 'new'},
     private _snackBar: MatSnackBar,
+    private qrModalService: QrModalService,
+    private doubtfireConstants: DoubtfireConstants,
   ) {
     this.user = data?.user || this.userService.currentUser;
   }
@@ -114,4 +117,13 @@ export class EditProfileFormComponent implements OnInit {
       });
     }
   }
+
+  showQrCode() {
+    const hostName = this.doubtfireConstants.API_URL.replace('/api', '');
+    const url = `${hostName}/me?username=${this.userService.currentUser.username}`;
+    this.qrModalService.show(
+      url,
+      'Display this QR code during your class so your tutor can scan it to view your submissions and mark your tasks as complete.',
+    );
+  }
 }

From 1a0f82ab0f82134193bd7fe4aef84cff42556d54 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:18:37 +1000
Subject: [PATCH 482/776] chore: remove debug

---
 .../states/tutor-discussion/tutor-discussion.component.ts     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 1bce6bf3d7..701bebcfae 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -117,11 +117,8 @@ export class TutorDiscussionComponent implements AfterViewInit {
       const params = new URL(data).searchParams;
       const unitId = parseInt(params.get('unitId'));
       const projectId = parseInt(params.get('projectId'));
-
       const username = params.get('username');
 
-      console.log('we got ', unitId, projectId, username);
-      console.log(params);
       if ((!isNaN(unitId) && !isNaN(projectId)) || username) {
         if (unitId) {
           this._unitId = unitId;
@@ -129,7 +126,6 @@ export class TutorDiscussionComponent implements AfterViewInit {
         if (username) {
           this._username = username;
         }
-        console.log('changing project', unitId, projectId, username);
 
         this.changeProject();
       }

From 154b4760a481e7fb76af74b253b0f2d5e7c3cc9d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:22:32 +1000
Subject: [PATCH 483/776] refactor: resume qr scanner on invalid data

---
 .../tutor-discussion/tutor-discussion.component.ts    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 701bebcfae..6de9d63215 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -154,7 +154,16 @@ export class TutorDiscussionComponent implements AfterViewInit {
     this.html5QrcodeScanner.pause(true);
     this.loadingStudentData = true;
     setTimeout(() => {
-      this.getStudentTasks();
+      try {
+        this.getStudentTasks();
+      } catch (_e) {
+        this.alertService.error(`Invalid QR code`, 2000);
+        this.loadingStudentData = false;
+
+        setTimeout(() => {
+          this.html5QrcodeScanner.resume();
+        }, 2000);
+      }
     });
   }
 

From beaa7676a5c94253312acab3ad392560545f0f59 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 26 Aug 2025 14:22:46 +1000
Subject: [PATCH 484/776] refactor: display discussion qr in the header

---
 .../edit-profile-form.component.html                 |  5 -----
 .../edit-profile-form/edit-profile-form.component.ts | 12 ------------
 src/app/common/header/header.component.html          |  5 +++++
 src/app/common/header/header.component.ts            | 12 ++++++++++++
 src/app/doubtfire.states.ts                          |  6 +++---
 .../task-status-card/task-status-card.component.ts   |  2 +-
 .../tutor-discussion/tutor-discussion.component.ts   | 10 ++++++++--
 7 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/app/common/edit-profile-form/edit-profile-form.component.html b/src/app/common/edit-profile-form/edit-profile-form.component.html
index 65b6a01f07..9041ca5a50 100644
--- a/src/app/common/edit-profile-form/edit-profile-form.component.html
+++ b/src/app/common/edit-profile-form/edit-profile-form.component.html
@@ -13,11 +13,6 @@ <h1>{{ user?.firstName }}</h1>
             Set up your {{ externalName.value }} profile
           </div>
         </div>
-        <div>
-          <mat-icon (click)="showQrCode()" class="hover:text-blue-500 cursor-pointer"
-            >qr_code_scanner</mat-icon
-          >
-        </div>
       </div>
 
       <div fxLayout="row" fxFlexFill>
diff --git a/src/app/common/edit-profile-form/edit-profile-form.component.ts b/src/app/common/edit-profile-form/edit-profile-form.component.ts
index 583d43a53c..f3787429dc 100644
--- a/src/app/common/edit-profile-form/edit-profile-form.component.ts
+++ b/src/app/common/edit-profile-form/edit-profile-form.component.ts
@@ -6,7 +6,6 @@ import {User} from 'src/app/api/models/user/user';
 import {AuthenticationService} from 'src/app/api/services/authentication.service';
 import {UserService} from 'src/app/api/services/user.service';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
-import {QrModalService} from '../modals/qr-modal/qr-modal.service';
 
 @Component({
   selector: 'f-edit-profile-form',
@@ -21,8 +20,6 @@ export class EditProfileFormComponent implements OnInit {
     private authService: AuthenticationService,
     @Optional() @Inject(MAT_DIALOG_DATA) public data: {user: User; mode: 'edit' | 'create' | 'new'},
     private _snackBar: MatSnackBar,
-    private qrModalService: QrModalService,
-    private doubtfireConstants: DoubtfireConstants,
   ) {
     this.user = data?.user || this.userService.currentUser;
   }
@@ -117,13 +114,4 @@ export class EditProfileFormComponent implements OnInit {
       });
     }
   }
-
-  showQrCode() {
-    const hostName = this.doubtfireConstants.API_URL.replace('/api', '');
-    const url = `${hostName}/me?username=${this.userService.currentUser.username}`;
-    this.qrModalService.show(
-      url,
-      'Display this QR code during your class so your tutor can scan it to view your submissions and mark your tasks as complete.',
-    );
-  }
 }
diff --git a/src/app/common/header/header.component.html b/src/app/common/header/header.component.html
index 342a6b4921..96706776c9 100644
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
@@ -45,6 +45,11 @@
         <mat-icon>cloud_sync_outline</mat-icon>
       </button>
     }
+    @if (currentUnit) {
+      <button mat-icon-button (click)="showMyQr()">
+        <mat-icon>qr_code_scanner</mat-icon>
+      </button>
+    }
     @if (currentUser.role === 'Admin' || currentUser.role === 'Convenor') {
       <button
         #menuState="matMenuTrigger"
diff --git a/src/app/common/header/header.component.ts b/src/app/common/header/header.component.ts
index a1956c015c..090b9413d2 100644
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
@@ -11,6 +11,7 @@ import { MediaObserver } from 'ng-flex-layout';
 import { DoubtfireConstants, LogoSettings } from 'src/app/config/constants/doubtfire-constants';
 import {SidekiqJobEntry, SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
 import {SidekiqJobsModalService} from '../modals/sidekiq-jobs-modal/sidekiq-jobs-modal.service';
+import {QrModalService} from '../modals/qr-modal/qr-modal.service';
 
 @Component({
   selector: 'app-header',
@@ -54,6 +55,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
     protected doubtfireConstants: DoubtfireConstants,
     private sidekiqJobService: SidekiqJobService,
     private sidekiqJobsModalService: SidekiqJobsModalService,
+    private qrModalService: QrModalService,
   ) {}
 
   ngOnInit(): void {
@@ -136,6 +138,16 @@ export class HeaderComponent implements OnInit, OnDestroy {
     });
   }
 
+  showMyQr() {
+    const hostName = this.doubtfireConstants.API_URL.replace('/api', '');
+    const url = `${hostName}/tutor-discussion?unitId=${this.currentUnit.id}&username=${this.currentUser.username}`;
+    this.qrModalService.show(
+      url,
+      'Display this QR code during your class so your tutor can scan it to view your submissions and mark your tasks as complete.',
+      true,
+    );
+  }
+
   showSidekiqJob() {
     this.sidekiqJobsModalService.show();
   }
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index a80e675809..f1d531fd0f 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -449,7 +449,7 @@ const projectPlanState: NgHybridStateDeclaration = {
 
 const TutorDiscussionState: NgHybridStateDeclaration = {
   name: 'tutor-discussion',
-  url: '/tutor-discussion?unitId&projectId',
+  url: '/tutor-discussion?unitId&username',
   views: {
     main: {
       component: TutorDiscussionComponent,
@@ -462,10 +462,10 @@ const TutorDiscussionState: NgHybridStateDeclaration = {
         return $stateParams.unitId;
       },
     ],
-    projectId: [
+    username: [
       '$stateParams',
       function ($stateParams) {
-        return $stateParams.projectId;
+        return $stateParams.username;
       },
     ],
   },
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index 9af9868bca..6b6124267a 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -72,7 +72,7 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
 
   openDiscussionQrCode(): void {
     const hostName = this.doubtfireConstants.API_URL.replace('/api', '');
-    const url = `${hostName}/tutor-discussion?unitId=${this.task.unit.id}&projectId=${this.task.project.id}&username=${this.userService.currentUser.username}`;
+    const url = `${hostName}/tutor-discussion?unitId=${this.task.unit.id}&username=${this.userService.currentUser.username}`;
     this.qrModalService.show(
       url,
       'Display this QR code during your class so your tutor can scan it to view your submissions and mark your tasks as complete.',
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 6de9d63215..03f1347cc6 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -31,6 +31,7 @@ enum TutorDiscussionTabView {
 })
 export class TutorDiscussionComponent implements AfterViewInit {
   @Input() unitId: number;
+  @Input() username: string;
   @Input() attendance: boolean;
 
   @ViewChild('tasks') tasksList: MatSelectionList;
@@ -85,7 +86,6 @@ export class TutorDiscussionComponent implements AfterViewInit {
   }
 
   public ngAfterViewInit(): void {
-    console.log('is attendnance? ', this.attendance);
     this.authService.afterAuthCall((result) => {
       if (!result) {
         return this.state.go('sign_in');
@@ -97,7 +97,13 @@ export class TutorDiscussionComponent implements AfterViewInit {
         if (this.unitId) {
           this._unitId = Number(this.unitId);
           if (!this.attendance) {
-            this.scanQrCode();
+            // Tutor discussion view
+            if (this.username) {
+              this._username = this.username;
+              this.getStudentTasks();
+            } else {
+              this.scanQrCode();
+            }
           } else {
             this.getUnit().then((u) => {
               this.unit = u;

From 2556355b0c3e1770fab021ed7d46e462882025b3 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 09:32:05 +1000
Subject: [PATCH 485/776] fix: only clear draft comment after successfully
 sending message

---
 .../task-comment-composer.component.ts               | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index e9bc679323..80b377c653 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -525,8 +525,6 @@ export class TaskCommentComposerComponent
 
     this.submittedTaskIds.add(taskKey);
 
-
-
     try {
       sessionStorage.setItem('task_comments_submitted',
         JSON.stringify([...this.submittedTaskIds]));
@@ -534,13 +532,13 @@ export class TaskCommentComposerComponent
       console.error('Error saving submitted tasks:', e);
     }
 
-    if (this.task) {
-      localStorage.removeItem(this.getDraftKey(this.task));
-      this.previousTaskId = this.task.id;
-    }
-
     this.taskCommentService.addComment(this.task, text, 'text', originalComment).subscribe({
       next: (tc: TaskComment) => {
+        if (this.task) {
+          localStorage.removeItem(this.getDraftKey(this.task));
+          this.previousTaskId = this.task.id;
+        }
+
         const inputEl = this.input.first.nativeElement;
         const originalOnInput = inputEl.oninput;
         inputEl.oninput = null;

From 8aa3382442b0954047a3ab088292aebd8977bbbc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 09:54:41 +1000
Subject: [PATCH 486/776] chore(release): 10.0.0-25

---
 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 af7fe7efd9..70d6e25d3a 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.
 
+## [10.0.0-25](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-24...v10.0.0-25) (2025-08-26)
+
+
+### Bug Fixes
+
+* only clear draft comment after successfully sending message ([2556355](https://github.com/b0ink/doubtfire-deploy/commit/2556355b0c3e1770fab021ed7d46e462882025b3))
+
 ## [10.0.0-24](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-23...v10.0.0-24) (2025-08-21)
 
 ## [10.0.0-23](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-22...v10.0.0-23) (2025-08-14)
diff --git a/package-lock.json b/package-lock.json
index 1ca8dd9291..27720fc88d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-24",
+  "version": "10.0.0-25",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-24",
+      "version": "10.0.0-25",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 1c678063a1..93863178e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-24",
+  "version": "10.0.0-25",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 2aa5f3fdc924fe63ea44eb39db687e29695e5890 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 11:10:55 +1000
Subject: [PATCH 487/776] chore: remove debug log

---
 .../states/tutor-discussion/tutor-discussion.component.ts        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 03f1347cc6..d110d7b279 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -297,7 +297,6 @@ export class TutorDiscussionComponent implements AfterViewInit {
   private loadStudents(unit: Unit): Promise<Project> {
     return new Promise((resolve, reject) => {
       this.projectService.loadStudents(unit, false, false).subscribe((projects) => {
-        console.log(projects);
         const project = projects.find((p) => p.student.username === this._username);
         if (!project) {
           reject('Student is not a part of this unit');

From 2bebd24df5d779faffb9cb6c0b130b673e3df320 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 11:16:24 +1000
Subject: [PATCH 488/776] chore: fix styling

---
 .../states/tutor-discussion/tutor-discussion.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index fc18e973da..5e8b57d21b 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -63,7 +63,7 @@
         </div>
       } @else {
         <div></div>
-        <div>Select a student...</div>
+        <div class="mt-5 italic text-gray-500">Click the QR code to open the scanner..</div>
       }
       <button mat-icon-button color="primary" (click)="scanQrCode()">
         <mat-icon>qr_code</mat-icon>

From fc61c575d8845824e60dea631bcbccf9d5491fc5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 11:16:41 +1000
Subject: [PATCH 489/776] chore: fix layout

---
 .../tutor-discussion/tutor-discussion.component.html       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 5e8b57d21b..e49ed47092 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -53,9 +53,10 @@
         <div></div>
         <div class="absolute left-1/2 transform -translate-x-1/2 text-center">
           <div class="text-center">
-            {{ project?.student?.firstName }} {{ project?.student?.lastName }} ({{
-              project?.student.student_id
-            }})
+            {{ project?.student?.firstName }} {{ project?.student?.lastName }}
+            @if (project?.student.student_id) {
+              ({{ project?.student.student_id }})
+            }
           </div>
           <div class="text-center">
             Target Grade: {{ getTargetTradeString(project?.targetGrade) }}

From 4953d55460c1bc36c3a83b136d6096d5dca663f8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 11:17:07 +1000
Subject: [PATCH 490/776] chore: reword error message

---
 .../states/tutor-discussion/tutor-discussion.component.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index d110d7b279..39f55abf7d 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -177,7 +177,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
 
   public scanQrCode() {
     if (this.attendance && !this.selectedTaskDefinition) {
-      this.alertService.error('Please select a task first');
+      this.alertService.error('You must select a task first', 3000);
       return;
     }
 

From fd5c92bfe2affba75d11a9ad681e99f8c4f294c7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 11:45:15 +1000
Subject: [PATCH 491/776] chore(release): 10.0.0-26

---
 CHANGELOG.md      | 15 +++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70d6e25d3a..52bd9a4b72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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.
 
+## [10.0.0-26](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-25...v10.0.0-26) (2025-08-27)
+
+
+### Features
+
+* add attendance marked task comment ([1559e81](https://github.com/b0ink/doubtfire-deploy/commit/1559e8104c8c4bc137df4f46a0a5ed0e345260af))
+* add tutor discussion to unit dropdown ([90f4149](https://github.com/b0ink/doubtfire-deploy/commit/90f41493313d6a3ad9bdafdd4cd4865c80e94ca2))
+* redirect back to inbox if unit context exists ([b7f4ab9](https://github.com/b0ink/doubtfire-deploy/commit/b7f4ab9e7801fbb33ffc6b4e02bf6613e6d7a524))
+
+
+### Bug Fixes
+
+* enforce minimum height on task comments viewer ([a7588e6](https://github.com/b0ink/doubtfire-deploy/commit/a7588e6f007381c04a570650257cd6f2ff93e5ae))
+* set max width on main container ([d1e5ab1](https://github.com/b0ink/doubtfire-deploy/commit/d1e5ab1427352fcf1b0fdd920cb9838a4f8799a0))
+
 ## [10.0.0-25](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-24...v10.0.0-25) (2025-08-26)
 
 
diff --git a/package-lock.json b/package-lock.json
index 27720fc88d..1342be3572 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-25",
+  "version": "10.0.0-26",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-25",
+      "version": "10.0.0-26",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 93863178e1..98fcda86ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-25",
+  "version": "10.0.0-26",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From a3f3b977251a206b268c369c370934ff69b574d3 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 12:11:55 +1000
Subject: [PATCH 492/776] fix: add padding when edit profile form displayed as
 modal

---
 .../edit-profile-form.component.html                |  8 +++++++-
 .../edit-profile-form.component.ts                  |  8 +++++++-
 .../edit-profile-dialog.service.ts                  | 13 +++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/app/common/edit-profile-form/edit-profile-form.component.html b/src/app/common/edit-profile-form/edit-profile-form.component.html
index 9041ca5a50..0825a194b8 100644
--- a/src/app/common/edit-profile-form/edit-profile-form.component.html
+++ b/src/app/common/edit-profile-form/edit-profile-form.component.html
@@ -1,4 +1,10 @@
-<form #form="ngForm" (ngSubmit)="submit()" fxLayout="column" fxLayoutAlign="center start">
+<form
+  #form="ngForm"
+  (ngSubmit)="submit()"
+  fxLayout="column"
+  fxLayoutAlign="center start"
+  [ngClass]="{'p-16': modal}"
+>
   <div class="main-container w-full flex flex-row justify-center items-start">
     <div class="main flex flex-col justify-start items-start w-full">
       <!-- avatar -->
diff --git a/src/app/common/edit-profile-form/edit-profile-form.component.ts b/src/app/common/edit-profile-form/edit-profile-form.component.ts
index f3787429dc..34e58371c2 100644
--- a/src/app/common/edit-profile-form/edit-profile-form.component.ts
+++ b/src/app/common/edit-profile-form/edit-profile-form.component.ts
@@ -18,7 +18,9 @@ export class EditProfileFormComponent implements OnInit {
     private userService: UserService,
     private state: StateService,
     private authService: AuthenticationService,
-    @Optional() @Inject(MAT_DIALOG_DATA) public data: {user: User; mode: 'edit' | 'create' | 'new'},
+    @Optional()
+    @Inject(MAT_DIALOG_DATA)
+    public data: {user: User; mode: 'edit' | 'create' | 'new'; modal: boolean},
     private _snackBar: MatSnackBar,
   ) {
     this.user = data?.user || this.userService.currentUser;
@@ -31,6 +33,7 @@ export class EditProfileFormComponent implements OnInit {
    * new is used for creating a new user
    */
   @Input() mode: 'edit' | 'create' | 'new';
+  @Input() modal: boolean = false;
 
   public user: User;
   public externalName = this.constants.ExternalName;
@@ -44,6 +47,9 @@ export class EditProfileFormComponent implements OnInit {
     if (this.data?.mode) {
       this.mode = this.data.mode;
     }
+    if (this.data?.modal) {
+      this.modal = this.data.modal;
+    }
 
     this.user.optInToResearch = false;
     this.user.receiveFeedbackNotifications = true;
diff --git a/src/app/common/modals/edit-profile-dialog/edit-profile-dialog.service.ts b/src/app/common/modals/edit-profile-dialog/edit-profile-dialog.service.ts
index 2fc14b6339..726408c7b8 100644
--- a/src/app/common/modals/edit-profile-dialog/edit-profile-dialog.service.ts
+++ b/src/app/common/modals/edit-profile-dialog/edit-profile-dialog.service.ts
@@ -1,7 +1,7 @@
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { User } from 'src/app/api/models/doubtfire-model';
-import { EditProfileFormComponent } from '../../edit-profile-form/edit-profile-form.component';
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {User} from 'src/app/api/models/doubtfire-model';
+import {EditProfileFormComponent} from '../../edit-profile-form/edit-profile-form.component';
 
 @Injectable({
   providedIn: 'root',
@@ -11,8 +11,9 @@ export class EditProfileDialogService {
 
   openDialog(user: User, mode: 'edit' | 'create' | 'new'): void {
     this.dialog.open(EditProfileFormComponent, {
-      width: '800px',
-      data: {user, mode: mode},
+      width: '100%',
+      maxWidth: '800px',
+      data: {user, mode: mode, modal: true},
     });
   }
 }

From d1eeefbea53cb13385bef2b3ba6b04d2f606c391 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 12:13:40 +1000
Subject: [PATCH 493/776] fix: show student id

---
 .../states/tutor-discussion/tutor-discussion.component.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index e49ed47092..8ed4a498e5 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -54,8 +54,8 @@
         <div class="absolute left-1/2 transform -translate-x-1/2 text-center">
           <div class="text-center">
             {{ project?.student?.firstName }} {{ project?.student?.lastName }}
-            @if (project?.student.student_id) {
-              ({{ project?.student.student_id }})
+            @if (project?.student.studentId) {
+              ({{ project?.student.studentId }})
             }
           </div>
           <div class="text-center">

From 9e9b9dbfb13d7531cb5387060407e23c25212cca Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 12:56:24 +1000
Subject: [PATCH 494/776] feat: add option for qr footer text

---
 .../common/modals/qr-modal/qr-modal.component.html    |  3 +++
 src/app/common/modals/qr-modal/qr-modal.component.ts  |  2 ++
 src/app/common/modals/qr-modal/qr-modal.service.ts    | 11 +++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/common/modals/qr-modal/qr-modal.component.html b/src/app/common/modals/qr-modal/qr-modal.component.html
index e22409451d..8926bebe63 100644
--- a/src/app/common/modals/qr-modal/qr-modal.component.html
+++ b/src/app/common/modals/qr-modal/qr-modal.component.html
@@ -3,4 +3,7 @@
     {{ caption }}
   </div>
   <img [src]="qrCodeImage" alt="QR Code for tutor assessment" class="w-full" />
+  @if (footer) {
+    <div class="text-center">{{ footer }}</div>
+  }
 </div>
diff --git a/src/app/common/modals/qr-modal/qr-modal.component.ts b/src/app/common/modals/qr-modal/qr-modal.component.ts
index a47e0ec4db..45fb24e6b1 100644
--- a/src/app/common/modals/qr-modal/qr-modal.component.ts
+++ b/src/app/common/modals/qr-modal/qr-modal.component.ts
@@ -13,9 +13,11 @@ export class QrModalComponent implements OnInit {
 
   qrCodeImage: string;
   caption: string;
+  footer: string;
 
   ngOnInit() {
     this.caption = this.data.caption;
+    this.footer = this.data.footer;
     if (this.data?.qrCodeImage) {
       this.generateQr();
     }
diff --git a/src/app/common/modals/qr-modal/qr-modal.service.ts b/src/app/common/modals/qr-modal/qr-modal.service.ts
index 1198f5d3f2..04871d938a 100644
--- a/src/app/common/modals/qr-modal/qr-modal.service.ts
+++ b/src/app/common/modals/qr-modal/qr-modal.service.ts
@@ -5,6 +5,7 @@ import {QrModalComponent} from './qr-modal.component';
 export interface QrModalData {
   qrCodeImage: string;
   caption: string;
+  footer: string;
   liveTimestamp: boolean;
 }
 @Injectable({
@@ -13,12 +14,18 @@ export interface QrModalData {
 export class QrModalService {
   constructor(public dialog: MatDialog) {}
 
-  public show(qrText: string, caption: string, liveTimestamp: boolean = false) {
+  public show(
+    qrText: string,
+    caption: string,
+    footer: string = '',
+    liveTimestamp: boolean = false,
+  ) {
     const _dialogRef = this.dialog.open<QrModalComponent, QrModalData>(QrModalComponent, {
       data: {
         qrCodeImage: qrText,
-        liveTimestamp,
         caption,
+        footer,
+        liveTimestamp,
       },
     });
   }

From 1f7fa51d65767b3186e6eda8970a408cf0e6c847 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 12:57:15 +1000
Subject: [PATCH 495/776] feat: support viewing qr for selected student in
 tutor view

---
 src/app/common/header/header.component.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/common/header/header.component.ts b/src/app/common/header/header.component.ts
index 090b9413d2..fc1778f1d2 100644
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
@@ -140,10 +140,19 @@ export class HeaderComponent implements OnInit, OnDestroy {
 
   showMyQr() {
     const hostName = this.doubtfireConstants.API_URL.replace('/api', '');
-    const url = `${hostName}/tutor-discussion?unitId=${this.currentUnit.id}&username=${this.currentUser.username}`;
+
+    const projectView =
+      this.currentProject &&
+      this.currentProject.student &&
+      this.currentProject.student.username !== this.currentUser.username;
+
+    const username = projectView ? this.currentProject.student.username : this.currentUser.username;
+
+    const url = `${hostName}/tutor-discussion?unitId=${this.currentUnit.id}&username=${username}`;
     this.qrModalService.show(
       url,
       'Display this QR code during your class so your tutor can scan it to view your submissions and mark your tasks as complete.',
+      projectView ? `Viewing QR for ${this.currentProject.student.name}` : '',
       true,
     );
   }

From abdc69d3bbafc1e65b19b2e5a0f8851fa0345422 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 13:04:46 +1000
Subject: [PATCH 496/776] chore(release): 10.0.0-27

---
 CHANGELOG.md      | 14 ++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52bd9a4b72..ef75672e21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 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.
 
+## [10.0.0-27](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-26...v10.0.0-27) (2025-08-27)
+
+
+### Features
+
+* add option for qr footer text ([9e9b9db](https://github.com/b0ink/doubtfire-deploy/commit/9e9b9dbfb13d7531cb5387060407e23c25212cca))
+* support viewing qr for selected student in tutor view ([1f7fa51](https://github.com/b0ink/doubtfire-deploy/commit/1f7fa51d65767b3186e6eda8970a408cf0e6c847))
+
+
+### Bug Fixes
+
+* add padding when edit profile form displayed as modal ([a3f3b97](https://github.com/b0ink/doubtfire-deploy/commit/a3f3b977251a206b268c369c370934ff69b574d3))
+* show student id ([d1eeefb](https://github.com/b0ink/doubtfire-deploy/commit/d1eeefbea53cb13385bef2b3ba6b04d2f606c391))
+
 ## [10.0.0-26](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-25...v10.0.0-26) (2025-08-27)
 
 
diff --git a/package-lock.json b/package-lock.json
index 1342be3572..4b6c2e0aa0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-26",
+  "version": "10.0.0-27",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-26",
+      "version": "10.0.0-27",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 98fcda86ea..03416c540a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-26",
+  "version": "10.0.0-27",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 731d1abc2ea14a6fdc40d52c51094979e4fda88b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 13:23:26 +1000
Subject: [PATCH 497/776] refactor: ensure route params are passed properly

---
 src/app/doubtfire.states.ts | 50 +++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index f1d531fd0f..91efbded77 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -15,7 +15,6 @@ import {ProjectPlanComponent} from './projects/states/plan/project-plan.componen
 import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-viewer.component';
 import {UnitService} from './api/services/unit.service';
 import {AppInjector} from './app-injector';
-import {GlobalStateService} from './projects/states/index/global-state.service';
 import {AuthenticationService} from './api/services/authentication.service';
 
 /*
@@ -480,29 +479,35 @@ const TutorAttendance: NgHybridStateDeclaration = {
   name: 'tutor-attendance',
   url: '/tutor-attendance?unitId&attendance',
   resolve: {
-    unitId: function ($stateParams) {
-      return $stateParams.unitId;
-    },
-    unit: function ($stateParams) {
-      const unitService = AppInjector.get(UnitService);
-      const globalState = AppInjector.get(GlobalStateService);
-      const authService = AppInjector.get(AuthenticationService);
-      globalState.onLoad(() => {});
-      return new Promise((resolve) => {
-        globalState.onLoad(() => {});
-        authService.afterAuthCall(() => {
-          unitService.get({id: $stateParams.unitId}).subscribe((unit) => {
-            resolve(unit);
+    unitId: [
+      '$stateParams',
+      function ($stateParams) {
+        return $stateParams.unitId;
+      },
+    ],
+    unit: [
+      '$stateParams',
+      function ($stateParams) {
+        const unitService = AppInjector.get(UnitService);
+        const authService = AppInjector.get(AuthenticationService);
+        return new Promise((resolve) => {
+          authService.afterAuthCall(() => {
+            unitService.get({id: $stateParams.unitId}).subscribe((unit) => {
+              resolve(unit);
+            });
           });
         });
-      });
-    },
-    attendance: function ($stateParams) {
-      if ($stateParams.attendance == 'true' || $stateParams.attendance === true) {
-        return true;
-      }
-      return false;
-    },
+      },
+    ],
+    attendance: [
+      '$stateParams',
+      function ($stateParams) {
+        if ($stateParams.attendance == 'true' || $stateParams.attendance === true) {
+          return true;
+        }
+        return false;
+      },
+    ],
   },
   views: {
     main: {
@@ -511,6 +516,7 @@ const TutorAttendance: NgHybridStateDeclaration = {
   },
   data: {
     pageTitle: 'Tutor Attendance',
+    task: 'Tutor Attendance',
     roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
   },
 };

From a44edf59c1665803c7788af75cf4cca783db2e0d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 13:28:30 +1000
Subject: [PATCH 498/776] chore: remove unit param resolve

---
 src/app/doubtfire.states.ts | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 91efbded77..8131da1dc6 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -13,9 +13,6 @@ import {TutorDiscussionComponent} from './projects/states/tutor-discussion/tutor
 import {SuccessCloseComponent} from './common/success-close/success-close.component';
 import {ProjectPlanComponent} from './projects/states/plan/project-plan.component';
 import {JplagReportViewerComponent} from './projects/states/jplag/jplag-report-viewer.component';
-import {UnitService} from './api/services/unit.service';
-import {AppInjector} from './app-injector';
-import {AuthenticationService} from './api/services/authentication.service';
 
 /*
  * Use this file to store any states that are sourced by angular components.
@@ -485,20 +482,6 @@ const TutorAttendance: NgHybridStateDeclaration = {
         return $stateParams.unitId;
       },
     ],
-    unit: [
-      '$stateParams',
-      function ($stateParams) {
-        const unitService = AppInjector.get(UnitService);
-        const authService = AppInjector.get(AuthenticationService);
-        return new Promise((resolve) => {
-          authService.afterAuthCall(() => {
-            unitService.get({id: $stateParams.unitId}).subscribe((unit) => {
-              resolve(unit);
-            });
-          });
-        });
-      },
-    ],
     attendance: [
       '$stateParams',
       function ($stateParams) {

From d980518bb70d4ec74263adc04b356b4235dca2c7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 13:28:40 +1000
Subject: [PATCH 499/776] chore(release): 10.0.0-28

---
 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 ef75672e21..029fad8170 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.
 
+## [10.0.0-28](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-27...v10.0.0-28) (2025-08-27)
+
 ## [10.0.0-27](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-26...v10.0.0-27) (2025-08-27)
 
 
diff --git a/package-lock.json b/package-lock.json
index 4b6c2e0aa0..32d3d4c67f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-27",
+  "version": "10.0.0-28",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-27",
+      "version": "10.0.0-28",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 03416c540a..3f73620194 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-27",
+  "version": "10.0.0-28",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 142c080bbb265c152ff53c114e671bdc06ab8f3f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 13:41:54 +1000
Subject: [PATCH 500/776] refactor: shorten task name

---
 src/app/doubtfire.states.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 8131da1dc6..67469cbd49 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -466,8 +466,8 @@ const TutorDiscussionState: NgHybridStateDeclaration = {
     ],
   },
   data: {
-    pageTitle: 'Tutor Discussion',
-    task: 'Tutor Discussion',
+    pageTitle: 'Discussion',
+    task: 'Discussion',
     roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
   },
 };
@@ -498,8 +498,8 @@ const TutorAttendance: NgHybridStateDeclaration = {
     },
   },
   data: {
-    pageTitle: 'Tutor Attendance',
-    task: 'Tutor Attendance',
+    pageTitle: 'Attendance',
+    task: 'Attendance',
     roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
   },
 };

From 75571cf443d46bd2f7e2c988321fb7b80e883162 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 13:44:45 +1000
Subject: [PATCH 501/776] chore(release): 10.0.0-29

---
 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 029fad8170..dcc99ceafc 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.
 
+## [10.0.0-29](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-28...v10.0.0-29) (2025-08-27)
+
 ## [10.0.0-28](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-27...v10.0.0-28) (2025-08-27)
 
 ## [10.0.0-27](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-26...v10.0.0-27) (2025-08-27)
diff --git a/package-lock.json b/package-lock.json
index 32d3d4c67f..44be777aaa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-28",
+  "version": "10.0.0-29",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-28",
+      "version": "10.0.0-29",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 3f73620194..7416e1c795 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-28",
+  "version": "10.0.0-29",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From a8710aa2cc9699a2f31f59a94ddca731fefd12bb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 14:43:50 +1000
Subject: [PATCH 502/776] refactor: rename attendance to check-in

---
 .../common/header/task-dropdown/task-dropdown.component.html  | 2 +-
 src/app/doubtfire.states.ts                                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index a4dca0df1f..c5d1d763d4 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -145,7 +145,7 @@
           [uiParams]="{unitId: unitRole.unit.id, attendance: true}"
           mat-menu-item
         >
-          <mat-icon aria-label="Unit Attendance icon" fontIcon="history_edu"></mat-icon>Attendance
+          <mat-icon aria-label="Student Check In icon" fontIcon="history_edu"></mat-icon>Check-in
         </button>
         @if (
           unitRole.role === 'Convenor' || unitRole.role === 'Admin' || unitRole.role === 'Auditor'
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 67469cbd49..75be18ea7e 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -498,8 +498,8 @@ const TutorAttendance: NgHybridStateDeclaration = {
     },
   },
   data: {
-    pageTitle: 'Attendance',
-    task: 'Attendance',
+    pageTitle: 'Check-in',
+    task: 'Check-in',
     roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
   },
 };

From ce367303b36eb0eaed99649a8293c09490d9a839 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 14:45:41 +1000
Subject: [PATCH 503/776] chore(release): 10.0.0-30

---
 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 dcc99ceafc..ae4c15a411 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.
 
+## [10.0.0-30](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-29...v10.0.0-30) (2025-08-27)
+
 ## [10.0.0-29](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-28...v10.0.0-29) (2025-08-27)
 
 ## [10.0.0-28](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-27...v10.0.0-28) (2025-08-27)
diff --git a/package-lock.json b/package-lock.json
index 44be777aaa..9a079f05f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-29",
+  "version": "10.0.0-30",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-29",
+      "version": "10.0.0-30",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 7416e1c795..7efd9da978 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-29",
+  "version": "10.0.0-30",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 3033c6ca3c27ad4fc0a7ce4bda3ac44df09516e3 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 14:53:28 +1000
Subject: [PATCH 504/776] fix: use new checked_in comment type

---
 .../task-comments-viewer/task-comments-viewer.component.html    | 2 +-
 .../task-comments-viewer/task-comments-viewer.component.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index 5e391f5c70..ff7197b321 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -103,7 +103,7 @@
               </div>
 
               <div
-                *ngSwitchCase="'attendance_marked'"
+                *ngSwitchCase="'checked_in'"
                 class="w-full flex flex-col items-center my-2"
                 [matTooltip]="comment.createdAt | humanizedDate"
                 matTooltipPosition="above"
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
index f3a6f71122..d7366dac8d 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.ts
@@ -250,7 +250,7 @@ export class TaskCommentsViewerComponent implements OnChanges, OnInit, OnDestroy
       commentType === 'scorm' ||
       commentType === 'scorm_extension' ||
       commentType === 'discussed_in_class' ||
-      commentType === 'attendance_marked'
+      commentType === 'checked_in'
     );
   }
 

From af115b31709a025831b11e3450f70943a877b177 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 14:56:25 +1000
Subject: [PATCH 505/776] refactor: replace attendance with check in

---
 src/app/api/services/task.service.ts                        | 4 ++--
 .../states/tutor-discussion/tutor-discussion.component.html | 2 +-
 .../states/tutor-discussion/tutor-discussion.component.ts   | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 84d84827a8..2eb4bd1c5f 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -217,11 +217,11 @@ export class TaskService extends CachedEntityService<Task> {
     return null;
   }
 
-  public markAttendance(task: Task): Observable<void> {
+  public checkInTaskForStudent(task: Task): Observable<void> {
     const options: RequestOptions<Task> = {
       entity: task,
       cache: task.project.taskCache,
-      endpointFormat: `${this.endpointFormat}/attendance`,
+      endpointFormat: `${this.endpointFormat}/check_in`,
     };
 
     return this.post(
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 8ed4a498e5..0c669784dd 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -167,7 +167,7 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
             mat-fab
             color="secondary"
             [disabled]="!tasks.selectedOptions.selected.length"
-            (click)="markSelectedTasksAttendance()"
+            (click)="markSelectedTasksCheckedIn()"
           >
             <!-- Redo -->
             <mat-icon>how_to_reg</mat-icon>
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 39f55abf7d..d4ff2ccce3 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -257,18 +257,16 @@ export class TutorDiscussionComponent implements AfterViewInit {
     }
   }
 
-  public markSelectedTasksAttendance() {
+  public markSelectedTasksCheckedIn() {
     const selectedTasks = this.tasksList.selectedOptions.selected;
     if (selectedTasks.length > 1) {
       this.alertService.error('Can only mark attendance 1 task at a time', 5000);
       return;
     }
-    console.log(selectedTasks);
     for (const taskOption of selectedTasks) {
       const task = taskOption.value as Task;
-      this.taskService.markAttendance(task).subscribe({
+      this.taskService.checkInTaskForStudent(task).subscribe({
         next: () => {
-          console.log('good');
           this.taskService.notifyStatusChange(task);
           this.alertService.success('Successfully marked attendance', 2500);
         },

From 957b35c9ea9590770b679ceed1d47bd63b6faeaa Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 14:57:12 +1000
Subject: [PATCH 506/776] chore: update alert

---
 .../states/tutor-discussion/tutor-discussion.component.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index d4ff2ccce3..d4d3b98bdf 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -268,7 +268,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
       this.taskService.checkInTaskForStudent(task).subscribe({
         next: () => {
           this.taskService.notifyStatusChange(task);
-          this.alertService.success('Successfully marked attendance', 2500);
+          this.alertService.success('Successfully checked in', 2500);
         },
         error: (_error) => {
           this.alertService.error('Failed to mark attendance', 5000);

From 736b342233ff1ed761940ec389b43b46aa348f45 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 14:57:46 +1000
Subject: [PATCH 507/776] chore: update alert

---
 .../states/tutor-discussion/tutor-discussion.component.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index d4d3b98bdf..71694b9a02 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -260,7 +260,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
   public markSelectedTasksCheckedIn() {
     const selectedTasks = this.tasksList.selectedOptions.selected;
     if (selectedTasks.length > 1) {
-      this.alertService.error('Can only mark attendance 1 task at a time', 5000);
+      this.alertService.error('Can only check-in 1 task at a time', 5000);
       return;
     }
     for (const taskOption of selectedTasks) {
@@ -271,7 +271,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
           this.alertService.success('Successfully checked in', 2500);
         },
         error: (_error) => {
-          this.alertService.error('Failed to mark attendance', 5000);
+          this.alertService.error('Failed to check-in', 5000);
         },
       });
     }

From 24d9e6d158a55a0c68a2fc3fe2ff1485589b0c4b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 27 Aug 2025 14:59:49 +1000
Subject: [PATCH 508/776] chore(release): 10.0.0-31

---
 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 ae4c15a411..8f4da09cf3 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.
 
+## [10.0.0-31](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-30...v10.0.0-31) (2025-08-27)
+
+
+### Bug Fixes
+
+* use new checked_in comment type ([3033c6c](https://github.com/b0ink/doubtfire-deploy/commit/3033c6ca3c27ad4fc0a7ce4bda3ac44df09516e3))
+
 ## [10.0.0-30](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-29...v10.0.0-30) (2025-08-27)
 
 ## [10.0.0-29](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-28...v10.0.0-29) (2025-08-27)
diff --git a/package-lock.json b/package-lock.json
index 9a079f05f1..d8c8258cc7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-30",
+  "version": "10.0.0-31",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-30",
+      "version": "10.0.0-31",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 7efd9da978..68e8d7e3a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-30",
+  "version": "10.0.0-31",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From a6ea474e01ef338cc5131d6fa969497093f1d9cd Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 28 Aug 2025 10:41:53 +1000
Subject: [PATCH 509/776] refactor: add task prerequisite entity service

---
 src/app/api/models/task-definition.ts         |  5 +-
 src/app/api/models/task-prerequisite.ts       | 27 +++++++++
 src/app/api/models/unit.ts                    |  8 +++
 .../api/services/task-definition.service.ts   | 57 ++++++++++++-------
 .../api/services/task-prerequisite.service.ts | 37 ++++++++++++
 src/app/doubtfire-angular.module.ts           |  2 +
 ...sk-definition-prerequisites.component.html | 44 +++++++++++---
 ...task-definition-prerequisites.component.ts | 53 ++++++++++++++++-
 8 files changed, 199 insertions(+), 34 deletions(-)
 create mode 100644 src/app/api/models/task-prerequisite.ts
 create mode 100644 src/app/api/services/task-prerequisite.service.ts

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 4160c7c764..1ed1938ad8 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -7,6 +7,7 @@ import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {TaskDefinitionService} from '../services/task-definition.service';
 import {Grade, GroupSet, LearningOutcome, Project, TutorialStream, Unit} from './doubtfire-model';
 import {Task} from './doubtfire-model';
+import {TaskPrerequisite} from './task-prerequisite';
 
 export type UploadRequirement = {
   key: string;
@@ -53,8 +54,8 @@ export class TaskDefinition extends Entity {
   similarityLanguage: string = 'c';
   hasJplagReport: boolean;
 
-  public readonly taskPrerequisitesCache: EntityCache<TaskDefinition> =
-    new EntityCache<TaskDefinition>();
+  public readonly taskPrerequisitesCache: EntityCache<TaskPrerequisite> =
+    new EntityCache<TaskPrerequisite>();
 
   public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
     new EntityCache<LearningOutcome>();
diff --git a/src/app/api/models/task-prerequisite.ts b/src/app/api/models/task-prerequisite.ts
new file mode 100644
index 0000000000..31e50b0c88
--- /dev/null
+++ b/src/app/api/models/task-prerequisite.ts
@@ -0,0 +1,27 @@
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {TaskDefinition, TaskStatusEnum} from './doubtfire-model';
+
+export class TaskPrerequisite extends Entity {
+  id: number;
+
+  prerequisite: TaskDefinition;
+  prerequisiteId: number;
+  taskStatusId: number;
+
+  // Minimum required status
+  taskStatus: TaskStatusEnum;
+
+  // Parent
+  taskDefinition: TaskDefinition;
+  taskDefinitionId: number;
+
+  constructor() {
+    super();
+  }
+
+  public toJson<T extends Entity>(mappingData: EntityMapping<T>, ignoreKeys?: string[]): object {
+    return {
+      task_prerequisite: super.toJson(mappingData, ignoreKeys),
+    };
+  }
+}
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 075c2f99d9..15bfccdd2e 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -31,6 +31,7 @@ import {AlertService} from 'src/app/common/services/alert.service';
 import {D2lAssessmentMapping} from './d2l/d2l_assessment_mapping';
 import {SidekiqJob} from './sidekiq-job';
 import {HttpClient} from '@angular/common/http';
+import {TaskPrerequisiteService} from '../services/task-prerequisite.service';
 
 export class Unit extends Entity {
   id: number;
@@ -328,6 +329,13 @@ export class Unit extends Entity {
       .subscribe({
         next: (unit) => {
           console.log(unit.teachingPeriod?.name);
+          const taskPrerequisiteService = AppInjector.get(TaskPrerequisiteService);
+          for (const td of unit.taskDefinitions) {
+            taskPrerequisiteService.mapTaskPrerequisites(
+              td.taskPrerequisitesCache.currentValues,
+              unit.taskDefinitions,
+            );
+          }
         },
         error: (message) => alerts.error(message, 6000),
       });
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 7b482031bf..d528706fb7 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -1,12 +1,17 @@
 import {CachedEntityService} from 'ngx-entity-service';
-import {LearningOutcomeService, TaskDefinition, Unit} from 'src/app/api/models/doubtfire-model';
+import {
+  LearningOutcomeService,
+  TaskDefinition,
+  TaskStatusEnum,
+  Unit,
+} from 'src/app/api/models/doubtfire-model';
 import {Injectable} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiURL';
 import {MappingFunctions} from './mapping-fn';
 import {AppInjector} from 'src/app/app-injector';
 import {Observable} from 'rxjs';
-import {MappingProcess} from 'ngx-entity-service/lib/mapping-process';
+import {TaskPrerequisiteService} from './task-prerequisite.service';
 
 @Injectable()
 export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
@@ -15,6 +20,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
   constructor(
     httpClient: HttpClient,
     private learningOutcomeService: LearningOutcomeService,
+    private taskPrerequisiteService: TaskPrerequisiteService,
   ) {
     super(httpClient, API_URL);
 
@@ -128,27 +134,20 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       },
       {
         keys: ['prerequisites', 'task_prerequisites'],
-        toEntityOpAsync: (process: MappingProcess<TaskDefinition>) => {
-          // HACK: Wait for all the other task definitions to be processed before we map the pre-requisites
-          setTimeout(() => {
-            const idColumnKey = 'prerequisite_id';
-            const prereqs = process.data['task_prerequisites'];
-            const td = process.entity;
-            const taskDefinitions = process.entity.unit.taskDefinitionCache.currentValues;
-
-            // remove any prerequisites that have been deleted
-            td.taskPrerequisitesCache.currentValues
-              .filter((p) => !prereqs.some((pr) => pr[idColumnKey] === p.id))
-              .forEach((p) => td.taskPrerequisitesCache.delete(p.id));
+        toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
+          data[key]?.forEach((prerequisite) => {
+            // Remove any deleted prerequisites from the cache
+            taskDefinition.taskPrerequisitesCache.forEach((_, id) => {
+              if (!data[key]?.some((p) => p['id'] === id)) {
+                taskDefinition.taskPrerequisitesCache.delete(id);
+              }
+            });
 
-            // add/update prerequisites
-            for (const prereq of prereqs) {
-              td.taskPrerequisitesCache.getOrCreate(
-                prereq[idColumnKey],
-                this,
-                taskDefinitions.find((t) => t.id === prereq[idColumnKey]),
-              );
-            }
+            taskDefinition.taskPrerequisitesCache.getOrCreate(
+              prerequisite['id'],
+              this.taskPrerequisiteService,
+              prerequisite,
+            );
           });
         },
       },
@@ -202,7 +201,21 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
     prerequsite: TaskDefinition,
   ): Observable<boolean> {
     return AppInjector.get(HttpClient).post<boolean>(taskDefinition.taskPrerequisiteUrl, {
+      task_def_id: taskDefinition.id,
+      prerequisite_id: prerequsite.id,
+    });
+  }
+
+  public updateTaskPrerequisite(
+    taskDefinition: TaskDefinition,
+    prerequsite: TaskDefinition,
+    taskStatus: TaskStatusEnum,
+  ): Observable<boolean> {
+    return AppInjector.get(HttpClient).put<boolean>(taskDefinition.taskPrerequisiteUrl, {
+      unit_id: taskDefinition.unit.id,
+      task_def_id: taskDefinition.id,
       prerequisite_id: prerequsite.id,
+      task_status_required: taskStatus,
     });
   }
 
diff --git a/src/app/api/services/task-prerequisite.service.ts b/src/app/api/services/task-prerequisite.service.ts
new file mode 100644
index 0000000000..faac775f60
--- /dev/null
+++ b/src/app/api/services/task-prerequisite.service.ts
@@ -0,0 +1,37 @@
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import {TaskDefinition} from 'src/app/api/models/doubtfire-model';
+import API_URL from 'src/app/config/constants/apiURL';
+import {TaskPrerequisite} from '../models/task-prerequisite';
+
+@Injectable()
+export class TaskPrerequisiteService extends CachedEntityService<TaskPrerequisite> {
+  protected readonly endpointFormat = 'units/:unitId:/task_definitions/:id:/prerequisites';
+
+  constructor(httpClient: HttpClient) {
+    super(httpClient, API_URL);
+
+    console.log('making new prerequisite');
+
+    this.mapping.addKeys('id', 'taskDefinitionId', 'prerequisiteId', 'taskStatus');
+
+    // this.mapping.mapAllKeysToJsonExcept('id', 'taskDefinitionId', 'prerequisiteId', 'taskStatus');
+  }
+
+  public override createInstanceFrom(json: object, other?: any): TaskPrerequisite {
+    return new TaskPrerequisite();
+  }
+
+  public mapTaskPrerequisites(
+    prerequisites: readonly TaskPrerequisite[],
+    definitions: readonly TaskDefinition[],
+  ): void {
+    for (const prerequisite of prerequisites) {
+      prerequisite.taskDefinition = definitions.find(
+        (td) => td.id === prerequisite.taskDefinitionId,
+      );
+      prerequisite.prerequisite = definitions.find((td) => td.id === prerequisite.prerequisiteId);
+    }
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index a6ad5158b5..9b2545118d 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -277,6 +277,7 @@ import {SidekiqJobService} from './api/services/sidekiq-job.service';
 import {UnavailableCardComponent} from './errors/unavailable-card/unavailable-card.component';
 import {TaskDefinitionPrerequisitesComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component';
 import {TaskPrerequisitesCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component';
+import {TaskPrerequisiteService} from './api/services/task-prerequisite.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -507,6 +508,7 @@ const MY_DATE_FORMAT = {
     NestedCsvDownloadModalService,
     StaffNoteService,
     SidekiqJobService,
+    TaskPrerequisiteService,
   ],
   imports: [
     FlexLayoutModule,
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index 9ca9e7df84..ee3a802614 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -2,33 +2,59 @@
   <div class="flex-grow flex flex-row">
     <table class="w-full">
       <tbody>
-        @for (prereq of prerequisites | async; track prereq) {
-          @if (prereq.id !== taskDefinition.id) {
+        @for (link of prerequisites | async; track link) {
+          @if (link.prerequisite?.id !== taskDefinition.id) {
             <tr class="border-b">
               @if (!editingMode) {
                 <td class="py-2 px-3 w-[75px]">
                   <status-icon
                     [hidden]="isNarrow"
                     matBadgePosition="before"
-                    [status]="prereq.projectTask(task?.project)?.status ?? 'not_started'"
+                    [status]="
+                      link.prerequisite?.projectTask(task?.project)?.status ?? 'not_started'
+                    "
                   ></status-icon>
                 </td>
               }
 
               <td
                 class="py-2 px-3 w-[50px] text-center"
-                [class.line-through]="prereq.projectTask(task?.project)?.inSubmittedState()"
+                [class.line-through]="
+                  link.prerequisite?.projectTask(task?.project)?.inSubmittedState()
+                "
               >
-                {{ prereq.abbreviation }}
+                {{ link.prerequisite?.abbreviation }}
               </td>
               <td
                 class="py-2 px-3"
-                [class.line-through]="prereq.projectTask(task?.project)?.inSubmittedState()"
+                [class.line-through]="
+                  link.prerequisite?.projectTask(task?.project)?.inSubmittedState()
+                "
               >
-                {{ prereq.name }}
+                {{ link.prerequisite?.name }}
               </td>
               @if (!editingMode) {
-                <td>{{ prereq.projectTask(task?.project)?.statusLabel() ?? 'Not Started' }}</td>
+                <td>
+                  {{
+                    link.prerequisite?.projectTask(task?.project)?.statusLabel() ?? 'Not Started'
+                  }}
+                </td>
+              } @else {
+                @if (link.taskStatus) {
+                  <td class="py-2 px-3">
+                    <mat-select
+                      [(value)]="link.taskStatus"
+                      placeholder="Select required status"
+                      matTooltip="Task must reach this state before students can submit"
+                      matTooltipShowDelay="1000"
+                      (selectionChange)="updateTaskPrerequisite(link)"
+                    >
+                      <mat-option *ngFor="let state of stateOptions" [value]="state.value">
+                        {{ state.label }}
+                      </mat-option>
+                    </mat-select>
+                  </td>
+                }
               }
               @if (editingMode) {
                 <td class="py-2 px-3 text-right">
@@ -36,7 +62,7 @@
                     mat-icon-button
                     aria-label="Remove prerequisite"
                     color="warn"
-                    (click)="removePrerequisite(prereq)"
+                    (click)="removePrerequisite(link.prerequisite)"
                   >
                     <mat-icon>delete</mat-icon>
                   </button>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index efb329b948..fe34a4a825 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -3,8 +3,11 @@ import {FormControl} from '@angular/forms';
 import {Observable} from 'rxjs';
 import {Task} from 'src/app/api/models/task';
 import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {TaskPrerequisite} from 'src/app/api/models/task-prerequisite';
+import {TaskStatusEnum} from 'src/app/api/models/task-status';
 import {Unit} from 'src/app/api/models/unit';
 import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {TaskPrerequisiteService} from 'src/app/api/services/task-prerequisite.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
@@ -23,15 +26,30 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   // All other task definitions in the unit (exclude the current one)
   filteredTaskDefs: TaskDefinition[] = [];
 
+  public readonly STATES: Partial<Record<TaskStatusEnum, number>> = {
+    ready_for_feedback: 1,
+    discuss: 2,
+    demonstrate: 2,
+    complete: 3,
+  };
+
+  public readonly stateOptions = [
+    {value: 'ready_for_feedback', label: 'Ready for Feedback'},
+    {value: 'discuss', label: 'Discuss / Demonstrate'},
+    // {value: 'demonstrate', label: 'Discuss / Demonstrate'},
+    {value: 'complete', label: 'Complete'},
+  ];
+
   constructor(
     private taskDefinitionService: TaskDefinitionService,
     private alertService: AlertService,
+    private taskPrerequisiteService: TaskPrerequisiteService,
   ) {}
   public get unit(): Unit {
     return this.taskDefinition?.unit;
   }
 
-  public get prerequisites(): Observable<TaskDefinition[]> {
+  public get prerequisites(): Observable<TaskPrerequisite[]> {
     return this.taskDefinition.taskPrerequisitesCache.values;
   }
 
@@ -40,6 +58,15 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       const search = (typeof value === 'string' ? value : value?.name || '').toLowerCase();
       this.filterTaskDefs(search);
     });
+
+    this.mapPrerequisites();
+  }
+
+  private mapPrerequisites() {
+    this.taskPrerequisiteService.mapTaskPrerequisites(
+      this.taskDefinition.taskPrerequisitesCache.currentValues,
+      this.taskDefinition.unit.taskDefinitionCache.currentValues,
+    );
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -110,6 +137,30 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       });
   }
 
+  public updateTaskPrerequisite(prerequisiteLink: TaskPrerequisite) {
+    this.taskDefinitionService
+      .updateTaskPrerequisite(
+        prerequisiteLink.taskDefinition,
+        prerequisiteLink.prerequisite,
+        prerequisiteLink.taskStatus,
+      )
+      .subscribe({
+        next: (response) => {
+          if (!response) {
+            this.alertService.error('Failed to add task prerequisite', 6000);
+            return;
+          }
+          this.alertService.success(
+            `Successfully updated prerequisite ${prerequisiteLink.prerequisite.abbreviation} to ${prerequisiteLink.taskStatus} `,
+            5000,
+          );
+        },
+        error: (error) => {
+          this.alertService.error(`Failed to add task prerequisite: ${error}`, 6000);
+        },
+      });
+  }
+
   public removePrerequisite(taskDefToRemove: TaskDefinition) {
     if (!taskDefToRemove) {
       return;

From 89ad2e98ae4544d46ee9d764d693a1df82c392f4 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 1 Sep 2025 11:56:08 +1000
Subject: [PATCH 510/776] refactor: store prerequisites in local variable

---
 src/app/api/models/unit.ts                    |  7 ------
 .../api/services/task-prerequisite.service.ts | 12 ----------
 ...sk-definition-prerequisites.component.html |  2 +-
 ...task-definition-prerequisites.component.ts | 24 +++++++++++++++----
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 15bfccdd2e..e2f5e8a6c0 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -329,13 +329,6 @@ export class Unit extends Entity {
       .subscribe({
         next: (unit) => {
           console.log(unit.teachingPeriod?.name);
-          const taskPrerequisiteService = AppInjector.get(TaskPrerequisiteService);
-          for (const td of unit.taskDefinitions) {
-            taskPrerequisiteService.mapTaskPrerequisites(
-              td.taskPrerequisitesCache.currentValues,
-              unit.taskDefinitions,
-            );
-          }
         },
         error: (message) => alerts.error(message, 6000),
       });
diff --git a/src/app/api/services/task-prerequisite.service.ts b/src/app/api/services/task-prerequisite.service.ts
index faac775f60..abb699c9ab 100644
--- a/src/app/api/services/task-prerequisite.service.ts
+++ b/src/app/api/services/task-prerequisite.service.ts
@@ -22,16 +22,4 @@ export class TaskPrerequisiteService extends CachedEntityService<TaskPrerequisit
   public override createInstanceFrom(json: object, other?: any): TaskPrerequisite {
     return new TaskPrerequisite();
   }
-
-  public mapTaskPrerequisites(
-    prerequisites: readonly TaskPrerequisite[],
-    definitions: readonly TaskDefinition[],
-  ): void {
-    for (const prerequisite of prerequisites) {
-      prerequisite.taskDefinition = definitions.find(
-        (td) => td.id === prerequisite.taskDefinitionId,
-      );
-      prerequisite.prerequisite = definitions.find((td) => td.id === prerequisite.prerequisiteId);
-    }
-  }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index ee3a802614..7c43314d03 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -2,7 +2,7 @@
   <div class="flex-grow flex flex-row">
     <table class="w-full">
       <tbody>
-        @for (link of prerequisites | async; track link) {
+        @for (link of taskPrerequisites; track link) {
           @if (link.prerequisite?.id !== taskDefinition.id) {
             <tr class="border-b">
               @if (!editingMode) {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index fe34a4a825..41d30ec4a7 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -26,6 +26,8 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   // All other task definitions in the unit (exclude the current one)
   filteredTaskDefs: TaskDefinition[] = [];
 
+  taskPrerequisites: TaskPrerequisite[] = [];
+
   public readonly STATES: Partial<Record<TaskStatusEnum, number>> = {
     ready_for_feedback: 1,
     discuss: 2,
@@ -63,10 +65,14 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   }
 
   private mapPrerequisites() {
-    this.taskPrerequisiteService.mapTaskPrerequisites(
-      this.taskDefinition.taskPrerequisitesCache.currentValues,
-      this.taskDefinition.unit.taskDefinitionCache.currentValues,
-    );
+    const prerequisites = this.taskPrerequisites;
+    const definitions = this.taskDefinition.unit.taskDefinitions;
+    for (const prerequisite of prerequisites) {
+      prerequisite.taskDefinition = definitions.find(
+        (td) => td.id === prerequisite.taskDefinitionId,
+      );
+      prerequisite.prerequisite = definitions.find((td) => td.id === prerequisite.prerequisiteId);
+    }
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -75,6 +81,16 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       changes.taskDefinition.previousValue?.id !== changes.taskDefinition.currentValue?.id
     ) {
       this.filterTaskDefs(this.searchCtrl.value ?? '');
+
+      this.taskPrerequisiteService
+        .query({
+          unitId: this.unit.id,
+          id: this.taskDefinition.id,
+        })
+        .subscribe((data) => {
+          this.taskPrerequisites = [...data];
+          this.mapPrerequisites();
+        });
     }
   }
 

From b68b795fae2bbe96fd7369296e567e0b1c3a2cef Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 2 Sep 2025 11:23:00 +1000
Subject: [PATCH 511/776] chore: add png logo

---
 src/assets/images/logo.png | Bin 0 -> 2897 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/assets/images/logo.png

diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a874b1e6d078872893233291f8975247c9b03afa
GIT binary patch
literal 2897
zcmcImc{r478-E8gWgI0-r(;P6F{Vh3t<hw3s6!Jo*0M}Wh)_b7#uAqficZ;PFie)$
z7}0TT(TGA$mPuyDzO)=<WGRCp`CiNEI@kBl_t$s5&-2{Rz5VX{{$1~TU2i<m@`NN(
z9ti+|r1`I=)&Kz0fbPXx5zwi2*3ljki1Q~;m;$S752LOy82}^@=B6gLA^lTB%XgIA
zm0CV(rjQ?q6Y&R~n@oTI<B@dQTsy_Hx;E~WPsv?JPF6Sm7a4K&L_ann_b)W;=gz4k
zzh$o6u+P*zSV=`4zuTE_tZQMSX;z}vg-TauT)cIkIM5aG_35>~T9+`(#fA3vWjbXw
zDqu{QI)m|C&`pSQY)1qowN*BRh7X0}-m`ZHlbz^2+tMfP#^-D2`bXL1E995WWG82v
z$xGzmCUV<b@ZNR<z2x9~anEggaM<#0-n@UQ9%nLiyuhDYoz(+6md^BC4L>5^Y0l=F
z@>;LyKJMm?L+SLMC;lQ6Lt~?c>38bFLKfpMnpQ3cRn5s?AwSlD<-hVMZmX;a#&c^_
zOyv$N)OLohgxssj?*@zNYd}9S&0J)6rNzu)w&s*1qTudaR@?kfr8`M>RRv(FKluRs
zb{9#;V4ho=x&$~RG4uNv9xXK#5^<?Mv}4q<!A=c*rqU$H@S(AsET|fQ;*1(0bYu2e
z*k-#84o5c%IR_8)cqs6kOZSuRp8MoD#@?0!2hWw)wM|k=bx1IyufACpMyKj_83c(t
zWH5hSq_U?`dW4yFj-i8wL)KO*kPsIo&RE}T%7#Ic(I<C3=%e`0BI;2pDy|}^T;Nt+
z1b`ikQ9+hoD9{cjuZk$?qg0|qP%0v*sP(<BM4g8q7!W3aWUTKsWh-OXzeB#~ApRZl
zPfh|1g{EYrsR=|OTqIH*GjvIPZ@eFTT?17`iGZ1`A_0ICO`kp!TT}M`pA|8}MxloM
z&MnX|5LwV{Td9@+(+IY9fwXn&t|$?8m@FP93zLBkJSi2TEozNBh$M){^8oUDD3lUq
zZl}EA*o;Cj{y|;?+>BK(eR8xzmz&4n4(AskAjie%$@iT<U~nQ>AL0*dWuUcVQ*IPr
zH^F2@|Cbwxm4Zlw7DOWa$i@{g+my|U%ZrTZwa%a(*O$`T0Be&22^;db=E-?}tfeQg
zUNBaSJ4G`;lk1rlI6+uXU|w;>9@>Dj*_J$!l;^sEgxsmV;debJkB~KZ0dWX;TYFO@
zdZnSa(tg9&xfz`CI?p-R$VzH6CH_~gJV?2%voSYZVx4Fh?{h=S-cRp-*wAeM*mTqP
z5Q;Kn{@eOJ$-h4Jad5)-rodw`{y^~=k0r_X6)Pi_Lr5aPUm|e=&+gGFGqH19g4#@~
zKUfg9M~C{&py=Cd^KLo^Vb^;2B3LXTYFpYHTDJ}B+hG};qm6xI5Z-j)G(ta!%k?1^
z(1$n^zxWXMW`pDhC7q#DjTanuA0jkHg(XO`Di(7hMh1!}ps;KW=(ElnHK@7EN~0~v
z!3tFsY=?ByC0Qx>@V#iF4{^$BkcZQ%tC`oP_v=idkc379X7TkPd3>thwT{ffawJ?<
z!S-<gb1cYi-y$u;ET-t9g6s))RZgVi4!QmM%qq|8J!twNfkG|QNr^UrC;7jPbLj7T
zhn#KRqQKjw(bIF>xQiCya)ElYBiYRGZJ9}>o`D(swj`@0v>Bmyy(#mNn!Tq7)>b;J
zm(gkvnTV9fSI&n#O;oMFk15fTAeap>09NJ1#H$vh1XMT;9Gm|@x;z*}&q$^%q)2JF
zgT{ZFq>hzE&zQoKBw3X;&nCOxjC8s<SyKU)^V|UQHB@qT(57_Yrm^IcCx07iVtn7I
zhrSt4M0J_RZb^_7ge=k{f<KpZRkRB&;8)Japj$9j%C{|~@O6_PX4p;vxi`6HayPs#
z#;}4XY@^U0oaIv0l0s&#R?G?F1z@aPW0B4pC2oF}ZMo9WOs&<|PPr(%$3Jl~$ufNV
z@wWya;<=IFS{!oLL0e<aq(dX&N|Rd**4r=1VwVCh&e;76DTNkcZI^|7WU?ZiCG244
z!+4}}?N(`DrlDnQ9|N$kkPbhL_E-FPGdn2Eu$5q3jI}(WkBT6bOBw3r-fKbZJ^Zke
zq{^3fmCr~t`#ftO8Y7tQmLtJgSYlbv3aK$A=3WYIxV<*Woph9K2WM3SR$oMUkG{fY
zwMav}?S!!MY(cWw@~piSQ;F2fLPJ?^QIp*iSM+Xzofz7@0?Tr>W1D9`;Ej@o0=J#0
zIqz^k^Y4>+3HD`@g2ekHG6&wSR$0#{7DX%YB3Xg;MO}Ek`S+c-IE3wG2Vu6a=jP&A
z{!I$sl$C5hJh3U#2U&_AYai<=XQ0bWlqyW<n6IKZ9HtIQ@FCvdRH3?bPqP{jsmkxp
zG#+QkDUS9sLeN=~-U%}X;n$iZR*pRgz;KW1tLrlxJTOi+?os`_C2xPiw4cf4`#=b=
zjvKmscPU$%>hLqt*$Z`GIfh%`N9|>ZeBrmv9J6xQXSUo~R+$7Zuk{9$7m<5jIM-PC
z5HFMOPO6qDih`bChYtbJi=Cq=POdnYwfYdxdVhgymrk(Tg;uU2Oie1?|A9n}b!s1@
zyK+TDq39@`wh)lA?`(K@22HJB>NO7h@!je4E3xQu6JLQ#-Wd%c6tvS5jPW6i7DMH{
zSX)G%O&q}CusQoM(+a$4{JF5&OZ;7t@<te~mxSMXsjW0xT87t4S>p>e_XUwWBN89M
zf5Rptecj|SgkSIlwLiNuda2J(X9%n@I2>GO3Ox{c@2B@WW<<s-wNkDVG$<(w^KqVz
z@~?4Bm-*8;%Gc+r^uUl?{fEU-N{6`py8Pvk5skuOy$reWPd0H~!@b3k&&aNg6?-sK
z;$q;Bg25w7tK0n_4qpNzFm<{x)D(v6=oe<?Qr1HmpZ}`1y8E-67Oq9NdnZksBaOop
z=oBn9A1lOsW}b3}SnvX4JsdBC)z9O)WIO~9`GNW~K6{)}dOA3hmEzx2hmBimcAgU4
zD$exq1XF1f4Qh?TFb_wLa<t`=zFr$4M~A!EF8qU*t;Zd9+Y{JHh_tf7rKx@LVqFTM
z9vZ~XbZ7MzkA(UvzZ`M9TBHA*oO4GvcGYqcyyF2TCP#HW-Tz9km(m%-Dn3~#6uuXR
z&IQ_g7LLs($yPVMG#eVdiW_AQ`z^k-@+RNmUkz9F6AUuQr*ZaHL&CqrD0$Tn&pAH+
zEAXJQa_)<XKU1+<3$<N(L3wkIZ`ix9o+=3@*F)#S(2|6JA^Wx<UoD3cH#{afl5|VP
zg=jF8LaR!Gu~ukaZfSy>wO-oFaw_s8zTVj!R_0ER_~~}&v(Bt?2h%a!>2~2YkAA++
uiYms}i`wlDI{j&yQ=9Y-w!@4hJWHu+FA)6xA|3ii2F%SYO-qltM*j!o8~p45

literal 0
HcmV?d00001


From b1d3fb9dc19a5590a1f56be2727fe750a4ed10d6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 2 Sep 2025 12:42:19 +1000
Subject: [PATCH 512/776] chore(release): 10.0.0-32

---
 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 8f4da09cf3..1d9cd91ae1 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.
 
+## [10.0.0-32](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-31...v10.0.0-32) (2025-09-02)
+
 ## [10.0.0-31](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-30...v10.0.0-31) (2025-08-27)
 
 
diff --git a/package-lock.json b/package-lock.json
index d8c8258cc7..20b832a02d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-31",
+  "version": "10.0.0-32",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-31",
+      "version": "10.0.0-32",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 68e8d7e3a5..14a03c3292 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-31",
+  "version": "10.0.0-32",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 5ef6754e5cbace9262745e15607ae17360c2a5e0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 2 Sep 2025 16:04:44 +1000
Subject: [PATCH 513/776] chore: display number of students enrolled in
 tutorial

---
 .../unit-tutorials-list/unit-tutorials-list.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.html b/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.html
index 7f24e23587..03b219e422 100644
--- a/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.html
+++ b/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.html
@@ -206,7 +206,7 @@ <h4>Tutorials without a stream</h4>
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Capacity</th>
       <td mat-cell *matCellDef="let tutorial">
         <div *ngIf="!editing(tutorial); else edit">
-          {{ tutorial.capacity }}
+          {{ tutorial.numStudents }} / {{ tutorial.capacity }}
         </div>
         <ng-template #edit>
           <mat-form-field appearance="outline" class="data-entry">

From 33ff578c02cec457a115ee501c9829b442054b12 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:57:32 +1000
Subject: [PATCH 514/776] refactor: simplify draft comment saving process

---
 .../task-comment-composer.component.ts        | 183 +++++++-----------
 1 file changed, 75 insertions(+), 108 deletions(-)

diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index 80b377c653..e11816e3a5 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -1,36 +1,35 @@
+import {animate, style, transition, trigger} from '@angular/animations';
 import {
+  AfterViewInit,
+  ChangeDetectorRef,
   Component,
-  OnInit,
+  DoCheck,
+  ElementRef,
   Inject,
   Input,
-  ViewChildren,
-  QueryList,
-  KeyValueDiffers,
   KeyValueDiffer,
-  ElementRef,
-  ViewChild,
-  DoCheck,
-  OnDestroy,
-  AfterViewInit,
-  ChangeDetectorRef,
+  KeyValueDiffers,
   OnChanges,
-  SimpleChanges
+  OnInit,
+  QueryList,
+  SimpleChanges,
+  ViewChild,
+  ViewChildren,
 } from '@angular/core';
-import {trigger, style, animate, transition} from '@angular/animations';
-import {analyticsService} from 'src/app/ajs-upgraded-providers';
-import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {EmojiSearch} from '@ctrl/ngx-emoji-mart';
 import {EmojiData} from '@ctrl/ngx-emoji-mart/ngx-emoji/';
-import {EmojiService} from 'src/app/common/services/emoji.service';
+import {BehaviorSubject, Subscription} from 'rxjs';
+import {analyticsService} from 'src/app/ajs-upgraded-providers';
 import {
+  FeedbackTemplate,
   Task,
   TaskComment,
   TaskCommentService,
-  FeedbackTemplate,
 } from 'src/app/api/models/doubtfire-model';
-import {TaskCommentsViewerComponent} from '../task-comments-viewer/task-comments-viewer.component';
-import {BehaviorSubject, Subscription} from 'rxjs';
 import {AlertService} from 'src/app/common/services/alert.service';
+import {EmojiService} from 'src/app/common/services/emoji.service';
+import {TaskCommentsViewerComponent} from '../task-comments-viewer/task-comments-viewer.component';
 
 interface ApiError {
   error?: string;
@@ -77,21 +76,18 @@ const ACCEPTED_FILE_TYPES = [
     ]),
   ],
 })
-export class TaskCommentComposerComponent
-  implements OnInit, AfterViewInit, DoCheck, OnDestroy, OnChanges
-{
+export class TaskCommentComposerComponent implements OnInit, AfterViewInit, DoCheck, OnChanges {
   @Input() task: Task;
   @Input() sharedData: TaskCommentComposerData;
 
-
   public $userIsTyping = new BehaviorSubject<boolean>(false);
   private draftSaveSubscription = new Subscription();
   private readonly DRAFT_KEY_PREFIX = 'task_comment_draft_';
   public isDraftLoaded = false;
-  private previousTaskId: number;
-  private hasSubmittedComment = false;
   private submittedTaskIds: Set<number | string> = new Set();
 
+  public isSending: boolean = false;
+
   comment = {
     text: '',
     type: 'text',
@@ -111,13 +107,6 @@ export class TaskCommentComposerComponent
   recording = false;
   cagStartWidth: number;
 
-
-
-
-
-  // Add a task content map to store text per task
-  private taskDraftContents: Map<string, string> = new Map();
-
   constructor(
     private differs: KeyValueDiffers,
     public dialog: MatDialog,
@@ -127,7 +116,7 @@ export class TaskCommentComposerComponent
     @Inject(analyticsService) private analytics,
     private alerts: AlertService,
     @Inject(TaskCommentService) private taskCommentService: TaskCommentService,
-    private cdRef: ChangeDetectorRef
+    private cdRef: ChangeDetectorRef,
   ) {
     this.differ = this.differs.find({}).create();
     // submitted tasks from sessionStorage
@@ -150,10 +139,6 @@ export class TaskCommentComposerComponent
       const newTask = changes.task.currentValue as Task;
       // Check if the task has changed
 
-
-      this.hasSubmittedComment = false;
-
-      this.previousTaskId = newTask?.id;
       this.cancelReply();
 
       this.clearInput();
@@ -172,21 +157,20 @@ export class TaskCommentComposerComponent
     }, 100);
   }
 
-  ngOnDestroy() {
-    if (this.task?.id) {
-      try {
-        const inputElement = this.input?.first?.nativeElement;
-        if (inputElement) {
-          const text = inputElement.innerText.trim();
-          if (text && !this.hasSubmittedComment) {
-            localStorage.setItem(this.getDraftKey(this.task), text);
-          } else {
-          }
-        }
-      } catch (error) {
-      }
-    }
-  }
+  // ngOnDestroy() {
+  //   if (this.task?.id) {
+  //     try {
+  //       const inputElement = this.input?.first?.nativeElement;
+  //       if (inputElement) {
+  //         const text = inputElement.innerText.trim();
+  //         if (text && !this.hasSubmittedComment) {
+  //           localStorage.setItem(this.getDraftKey(this.task), text);
+  //         } else {
+  //         }
+  //       }
+  //     } catch (error) {}
+  //   }
+  // }
 
   // Update onInputChange to reset submitted status
   onInputChange(event: Event) {
@@ -196,7 +180,8 @@ export class TaskCommentComposerComponent
 
     // If user is typing something new after submission, reset the submitted status
     if (this.task) {
-      const taskKey = this.task.id ||
+      const taskKey =
+        this.task.id ||
         `${this.task.projectId || this.task.project?.id}_${this.task.definition?.id}`;
 
       // If this was a previously submitted task and user is typing again,
@@ -206,15 +191,17 @@ export class TaskCommentComposerComponent
 
         // Update session storage
         try {
-          sessionStorage.setItem('task_comments_submitted',
-            JSON.stringify([...this.submittedTaskIds]));
+          sessionStorage.setItem(
+            'task_comments_submitted',
+            JSON.stringify([...this.submittedTaskIds]),
+          );
         } catch (e) {
           console.error('Error saving submitted tasks:', e);
         }
       }
 
       const draftKey = this.getDraftKey(this.task);
-      this.taskDraftContents.set(draftKey, raw);
+      // this.taskDraftContents.set(draftKey, raw);
     }
 
     this.saveCurrentDraft();
@@ -227,7 +214,7 @@ export class TaskCommentComposerComponent
     }
 
     // For "not started" tasks, create a composite key using only valid properties
-    const projectId = task.projectId || (task.project?.id) || 'unknown';
+    const projectId = task.projectId || task.project?.id || 'unknown';
     // Fix: Use task.definition.id instead of task.definition_id
     const definitionId = task.definition?.id || 'unknown';
 
@@ -247,25 +234,23 @@ export class TaskCommentComposerComponent
     const draftKey = this.getDraftKey(task);
 
     try {
-
       let raw: string;
       if (this.task?.id === task.id && this.input.first) {
         raw = this.input.first.nativeElement.innerText;
       } else {
-        raw = this.taskDraftContents.get(draftKey) ?? '';
+        // raw = this.taskDraftContents.get(draftKey) ?? '';
       }
 
-
       if (!this.hasContent(raw)) {
         // No text to save, removing draft from localStorage
-        this.taskDraftContents.delete(draftKey);
+        // this.taskDraftContents.delete(draftKey);
         localStorage.removeItem(draftKey);
         return;
       }
 
       const text = raw.trim();
       // Save comment draf
-      this.taskDraftContents.set(draftKey, text);
+      // this.taskDraftContents.set(draftKey, text);
       localStorage.setItem(draftKey, text);
     } catch (error) {
       console.error('saveDraftForTask error:', error);
@@ -277,8 +262,7 @@ export class TaskCommentComposerComponent
       return;
     }
 
-    const taskKey = task.id ||
-      `${task.projectId || task.project?.id}_${task.definition?.id}`;
+    const taskKey = task.id || `${task.projectId || task.project?.id}_${task.definition?.id}`;
 
     if (this.submittedTaskIds.has(taskKey)) {
       return;
@@ -304,7 +288,7 @@ export class TaskCommentComposerComponent
         }
 
         this.input.first.nativeElement.innerText = draft;
-        this.taskDraftContents.set(draftKey, draft);
+        // this.taskDraftContents.set(draftKey, draft);
         this.isDraftLoaded = true;
         this.cdRef.detectChanges();
 
@@ -315,8 +299,7 @@ export class TaskCommentComposerComponent
       };
 
       retryWithTimeout();
-    } catch (error) {
-    }
+    } catch (error) {}
   }
 
   private clearInput() {
@@ -485,6 +468,9 @@ export class TaskCommentComposerComponent
       text.slice(position),
     ].join('');
     this.input.first.nativeElement.focus();
+    setTimeout(() => {
+      this.saveDraftForTask(this.task);
+    });
   }
 
   openDiscussionComposer() {
@@ -503,67 +489,48 @@ export class TaskCommentComposerComponent
     // });
   }
 
-
-
   addComment() {
-
+    if (this.isSending) {
+      return;
+    }
+    this.isSending = true;
 
     const originalComment = this.sharedData.originalComment;
     if (originalComment != null) {
       this.cancelReply();
-
     }
 
     const text = this.emojiService.nativeEmojiToColons(this.input.first.nativeElement.innerText);
 
-    this.hasSubmittedComment = true;
-
-
+    const taskKey =
+      this.task.id || `${this.task.projectId || this.task.project?.id}_${this.task.definition?.id}`;
 
-    const taskKey = this.task.id ||
-      `${this.task.projectId || this.task.project?.id}_${this.task.definition?.id}`;
+    const draftKey = this.getDraftKey(this.task);
+    this.taskCommentService.addComment(this.task, text, 'text', originalComment).subscribe({
+      next: (_tc: TaskComment) => {
+        this.isSending = false;
 
-    this.submittedTaskIds.add(taskKey);
+        this.submittedTaskIds.add(taskKey);
 
-    try {
-      sessionStorage.setItem('task_comments_submitted',
-        JSON.stringify([...this.submittedTaskIds]));
-    } catch (e) {
-      console.error('Error saving submitted tasks:', e);
-    }
+        try {
+          sessionStorage.setItem(
+            'task_comments_submitted',
+            JSON.stringify([...this.submittedTaskIds]),
+          );
+        } catch (e) {
+          console.error('Error saving submitted tasks:', e);
+        }
 
-    this.taskCommentService.addComment(this.task, text, 'text', originalComment).subscribe({
-      next: (tc: TaskComment) => {
         if (this.task) {
-          localStorage.removeItem(this.getDraftKey(this.task));
-          this.previousTaskId = this.task.id;
+          localStorage.removeItem(draftKey);
         }
 
-        const inputEl = this.input.first.nativeElement;
-        const originalOnInput = inputEl.oninput;
-        inputEl.oninput = null;
-
         this.input.first.nativeElement.innerText = '';
-
-        setTimeout(() => {
-          inputEl.oninput = originalOnInput;
-        }, 100);
-
-        if (this.task?.id) {
-          localStorage.removeItem(this.getDraftKey(this.task));
-        }
       },
       error: (error: ApiError) => {
-        console.log('[DRAFT-DEBUG] Error submitting comment:', error);
-        this.hasSubmittedComment = false;
-
+        this.isSending = false;
         this.alerts.error(error.error || error.message || 'Failed to add comment', 2000);
-
-        if (this.task?.id) {
-          console.log('[DRAFT-DEBUG] Restoring draft due to submission error');
-          this.saveDraftForTask(this.task);
-        }
-      }
+      },
     });
   }
 
@@ -625,7 +592,7 @@ export class TaskCommentComposerComponent
 export class DiscussionComposerDialog implements OnInit {
   constructor(
     public dialogRef: MatDialogRef<DiscussionComposerDialog>,
-    @Inject(MAT_DIALOG_DATA) public data: { task: Task },
+    @Inject(MAT_DIALOG_DATA) public data: {task: Task},
   ) {}
 
   ngOnInit() {}

From 6cbec8b79ea46cbb738da630b9de0fd2c9940163 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 4 Sep 2025 14:15:23 +1000
Subject: [PATCH 515/776] refactor: add automatic refresh token handling and
 request retry

---
 .../api/services/authentication.service.ts    | 25 +++---
 .../common/services/http-error.interceptor.ts | 77 +++++++++++++++++--
 2 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/src/app/api/services/authentication.service.ts b/src/app/api/services/authentication.service.ts
index f54eeb705d..fb0bf3a468 100644
--- a/src/app/api/services/authentication.service.ts
+++ b/src/app/api/services/authentication.service.ts
@@ -18,7 +18,6 @@ interface AuthResponse {
 
 @Injectable()
 export class AuthenticationService {
-
   /**
    * The URL for the authentication API endpoint
    */
@@ -64,7 +63,10 @@ export class AuthenticationService {
    * secure cookie.
    * @param loginResultCallback - Callback function to indicate success or failure of login.
    */
-  public attemptLoginUsingRefreshToken(loginResultCallback: (result: boolean) => void): void {
+  public attemptLoginUsingRefreshToken(
+    loginResultCallback: (result: boolean) => void,
+    firstTime: boolean = true,
+  ): void {
     // Check we have indication of secure cookie in local storage
     const remember: boolean = this.rememberMe;
 
@@ -77,7 +79,7 @@ export class AuthenticationService {
     this.httpClient.post(this.AUTH_URL + '/access-token', {}).subscribe({
       next: (response: AuthResponse | null) => {
         if (response && response.auth_token) {
-          this.setupUserFromResponse(response);
+          this.setupUserFromResponse(response, firstTime);
           loginResultCallback(true);
         } else {
           this.actionAuthFailed();
@@ -164,7 +166,7 @@ export class AuthenticationService {
    *
    * @param response the response from the authentication API
    */
-  private setupUserFromResponse(response: AuthResponse): void {
+  private setupUserFromResponse(response: AuthResponse, firstTime: boolean = true): void {
     // Extract relevant data from response and construct user object to store in cache.
     const user: User = this.userService.cache.getOrCreate(
       response.user['id'],
@@ -178,11 +180,12 @@ export class AuthenticationService {
     // Record the current user
     this.userService.currentUser = user;
 
-    // Load everything!
-    AppInjector.get(GlobalStateService).loadGlobals();
-
-    // Update token in one hour
-    setTimeout(() => this.cycleAccessToken(), 1000 * 60 * 60);
+    if (firstTime) {
+      // Load everything!
+      AppInjector.get(GlobalStateService).loadGlobals();
+      // Update token in one hour
+      setTimeout(() => this.cycleAccessToken(), 1000 * 60 * 60);
+    }
 
     // Inidcate that the authentication was successful
     this.authComplete$.next(true);
@@ -201,7 +204,7 @@ export class AuthenticationService {
     this.authComplete$.subscribe({
       next: (result) => {
         callback(result);
-      }
+      },
     });
   }
 
@@ -283,6 +286,4 @@ export class AuthenticationService {
       }),
     );
   }
-
-
 }
diff --git a/src/app/common/services/http-error.interceptor.ts b/src/app/common/services/http-error.interceptor.ts
index 9fbf32f0f6..cd7b3cbb4d 100644
--- a/src/app/common/services/http-error.interceptor.ts
+++ b/src/app/common/services/http-error.interceptor.ts
@@ -1,18 +1,48 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpErrorResponse } from '@angular/common/http';
-import { Observable, throwError } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-import { Injectable } from '@angular/core';
-import { AuthenticationService, UserService } from 'src/app/api/models/doubtfire-model';
+import {
+  HttpErrorResponse,
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {BehaviorSubject, Observable, Subject, throwError} from 'rxjs';
+import {catchError, filter, switchMap, take} from 'rxjs/operators';
+import {AuthenticationService, UserService} from 'src/app/api/models/doubtfire-model';
 
 @Injectable()
 export class HttpErrorInterceptor implements HttpInterceptor {
-  constructor(private authenticationService: AuthenticationService, private userService: UserService) {}
+  private refreshTokenInProgress = false;
+  private refreshTokenSubject: Subject<any> = new BehaviorSubject<any>(null);
+
+  constructor(
+    private authenticationService: AuthenticationService,
+    private userService: UserService,
+  ) {}
+
+  attemptRefresh$(): Observable<void> {
+    return new Observable<void>((observer) => {
+      this.authenticationService.attemptLoginUsingRefreshToken((result: boolean) => {
+        if (result) {
+          observer.next();
+          observer.complete();
+        } else {
+          this.authenticationService.timeoutAuthentication();
+          this.refreshTokenInProgress = false;
+          observer.error(new Error('Authentication timed out'));
+        }
+      }, false); // Don't display splashscreen
+    });
+  }
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     // const retryTimes: number = 3;
     // const delayDuration: number = 100;
 
+    // TODO: Check for access token / refresh token expiration before trying the initial request
+    // .. This way we can avoid spamming console with 409 errors
+
     return next.handle(request).pipe(
       // retryWhen(errors => errors
       //   .pipe(
@@ -48,11 +78,42 @@ export class HttpErrorInterceptor implements HttpInterceptor {
         console.error(`${logMessage}: ${errorMessage}`);
 
         if (error.status === 419 || (error.status === 403 && this.userService.isAnonymousUser())) {
-          this.authenticationService.timeoutAuthentication();
+          if (!this.refreshTokenInProgress) {
+            this.refreshTokenInProgress = true;
+            this.refreshTokenSubject.next(null);
+            return this.attemptRefresh$().pipe(
+              switchMap(() => {
+                this.refreshTokenInProgress = false;
+                this.refreshTokenSubject.next(this.userService.currentUser.authenticationToken);
+                return next.handle(this.injectToken(request));
+              }),
+              catchError((err) => {
+                this.refreshTokenInProgress = false;
+                return throwError(() => err);
+              }),
+            );
+          } else {
+            return this.refreshTokenSubject.pipe(
+              filter((result) => result !== null),
+              take(1),
+              switchMap((_res) => {
+                return next.handle(this.injectToken(request));
+              }),
+            );
+          }
         }
 
         return throwError(() => errorMessage);
-      })
+      }),
     );
   }
+
+  injectToken(request: HttpRequest<any>) {
+    return request.clone({
+      setHeaders: {
+        'Auth-Token': this.userService.currentUser.authenticationToken,
+        Username: this.userService.currentUser.username,
+      },
+    });
+  }
 }

From 30983819ff2a0a5ffe22f7c52e18b67ee7e8ee2a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 4 Sep 2025 14:40:25 +1000
Subject: [PATCH 516/776] chore(release): 10.0.0-33

---
 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 1d9cd91ae1..bbf8a3c778 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.
 
+## [10.0.0-33](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-32...v10.0.0-33) (2025-09-04)
+
 ## [10.0.0-32](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-31...v10.0.0-32) (2025-09-02)
 
 ## [10.0.0-31](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-30...v10.0.0-31) (2025-08-27)
diff --git a/package-lock.json b/package-lock.json
index 20b832a02d..098806e961 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-32",
+  "version": "10.0.0-33",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-32",
+      "version": "10.0.0-33",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 14a03c3292..6d98b2a68f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-32",
+  "version": "10.0.0-33",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From e6fa444dfe93d91793773b267645ef1d241a0e59 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 5 Sep 2025 13:52:00 +1000
Subject: [PATCH 517/776] refactor: improve task prerequisite entity management

---
 src/app/api/models/task-prerequisite.ts       | 56 ++++++++++++++++++-
 src/app/api/models/task.ts                    |  9 +--
 .../api/services/task-definition.service.ts   | 50 +++++++----------
 .../api/services/task-prerequisite.service.ts |  6 +-
 .../task-prerequisites-card.component.html    | 32 ++++++-----
 .../task-dashboard/task-dashboard.tpl.html    |  1 -
 ...sk-definition-prerequisites.component.html | 15 ++---
 ...task-definition-prerequisites.component.ts | 45 +++++++--------
 8 files changed, 124 insertions(+), 90 deletions(-)

diff --git a/src/app/api/models/task-prerequisite.ts b/src/app/api/models/task-prerequisite.ts
index 31e50b0c88..f2a34619bd 100644
--- a/src/app/api/models/task-prerequisite.ts
+++ b/src/app/api/models/task-prerequisite.ts
@@ -1,5 +1,8 @@
 import {Entity, EntityMapping} from 'ngx-entity-service';
-import {TaskDefinition, TaskStatusEnum} from './doubtfire-model';
+import {AppInjector} from 'src/app/app-injector';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {TaskPrerequisiteService} from '../services/task-prerequisite.service';
+import {Project, TaskDefinition, TaskStatusEnum} from './doubtfire-model';
 
 export class TaskPrerequisite extends Entity {
   id: number;
@@ -15,8 +18,18 @@ export class TaskPrerequisite extends Entity {
   taskDefinition: TaskDefinition;
   taskDefinitionId: number;
 
-  constructor() {
+  public readonly STATES: Partial<Record<TaskStatusEnum, number>> = {
+    ready_for_feedback: 1,
+    discuss: 2,
+    demonstrate: 2,
+    complete: 3,
+  };
+
+  constructor(json: any) {
     super();
+    this.taskDefinitionId = json.taskDefinitionId;
+    this.prerequisiteId = json.prerequisiteId;
+    this.taskStatus = json.taskStatus;
   }
 
   public toJson<T extends Entity>(mappingData: EntityMapping<T>, ignoreKeys?: string[]): object {
@@ -24,4 +37,43 @@ export class TaskPrerequisite extends Entity {
       task_prerequisite: super.toJson(mappingData, ignoreKeys),
     };
   }
+
+  public hasMetRequiredState(project: Project) {
+    if (!this.prerequisite || !project) {
+      return false;
+    }
+    const prerequisiteTask = this.prerequisite.projectTask(project);
+    if (!prerequisiteTask) {
+      return false;
+    }
+    const currentStatus = prerequisiteTask.status;
+    const requiredStatus = this.taskStatus;
+    if (this.STATES[currentStatus] >= this.STATES[requiredStatus]) {
+      return true;
+    }
+    return false;
+  }
+
+  public delete() {
+    const taskPrerequisiteService: TaskPrerequisiteService =
+      AppInjector.get(TaskPrerequisiteService);
+    taskPrerequisiteService
+      .delete(
+        {
+          unitId: this.taskDefinition.unit.id,
+          taskDefId: this.taskDefinitionId,
+          prerequisiteId: this.prerequisiteId,
+        },
+        {cache: this.taskDefinition.taskPrerequisitesCache},
+      )
+      .subscribe({
+        next: (response: object) => {
+          AppInjector.get(AlertService).error('Successfully deleted prerequisite', 4000);
+          this.taskDefinition.taskPrerequisitesCache.delete(this.id);
+        },
+        error: (error: any) => {
+          AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
+        },
+      });
+  }
 }
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index e81f240c91..1f8b40019f 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -944,11 +944,12 @@ export class Task extends Entity {
       return false;
     }
 
-    for (const prereq of prereqs) {
-      const task = this.project.tasks.find((t) => t.definition.id === prereq.id);
+    for (const prerequisiteLink of prereqs) {
+      const prerequisiteTask = prerequisiteLink.prerequisite;
+      const task = this.project.tasks.find((t) => t.definition.id === prerequisiteTask.id);
 
-      // If the task doesnt exist or isnt completed, block submission
-      if (!task || !task.inSubmittedState()) {
+      // If the task doesnt exist or its state has not met the minimum require state, block submission
+      if (!task || !prerequisiteLink.hasMetRequiredState(this.project)) {
         return true;
       }
     }
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index d528706fb7..8f272cb7d8 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -12,6 +12,7 @@ import {MappingFunctions} from './mapping-fn';
 import {AppInjector} from 'src/app/app-injector';
 import {Observable} from 'rxjs';
 import {TaskPrerequisiteService} from './task-prerequisite.service';
+import {TaskPrerequisite} from '../models/task-prerequisite';
 
 @Injectable()
 export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
@@ -132,25 +133,25 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
           });
         },
       },
-      {
-        keys: ['prerequisites', 'task_prerequisites'],
-        toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
-          data[key]?.forEach((prerequisite) => {
-            // Remove any deleted prerequisites from the cache
-            taskDefinition.taskPrerequisitesCache.forEach((_, id) => {
-              if (!data[key]?.some((p) => p['id'] === id)) {
-                taskDefinition.taskPrerequisitesCache.delete(id);
-              }
-            });
+      // {
+      //   keys: ['prerequisites', 'task_prerequisites'],
+      //   toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
+      //     data[key]?.forEach((prerequisite) => {
+      //       // Remove any deleted prerequisites from the cache
+      //       taskDefinition.taskPrerequisitesCache.forEach((_, id) => {
+      //         if (!data[key]?.some((p) => p['id'] === id)) {
+      //           taskDefinition.taskPrerequisitesCache.delete(id);
+      //         }
+      //       });
 
-            taskDefinition.taskPrerequisitesCache.getOrCreate(
-              prerequisite['id'],
-              this.taskPrerequisiteService,
-              prerequisite,
-            );
-          });
-        },
-      },
+      //       taskDefinition.taskPrerequisitesCache.getOrCreate(
+      //         prerequisite['id'],
+      //         this.taskPrerequisiteService,
+      //         prerequisite,
+      //       );
+      //     });
+      //   },
+      // },
     );
 
     this.mapping.mapAllKeysToJsonExcept(
@@ -199,8 +200,8 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
   public addTaskPrerequisite(
     taskDefinition: TaskDefinition,
     prerequsite: TaskDefinition,
-  ): Observable<boolean> {
-    return AppInjector.get(HttpClient).post<boolean>(taskDefinition.taskPrerequisiteUrl, {
+  ): Observable<TaskPrerequisite> {
+    return AppInjector.get(HttpClient).post<TaskPrerequisite>(taskDefinition.taskPrerequisiteUrl, {
       task_def_id: taskDefinition.id,
       prerequisite_id: prerequsite.id,
     });
@@ -218,13 +219,4 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       task_status_required: taskStatus,
     });
   }
-
-  public removeTaskPrerequisite(
-    taskDefinition: TaskDefinition,
-    prerequsite: TaskDefinition,
-  ): Observable<boolean> {
-    return AppInjector.get(HttpClient).delete<boolean>(
-      `${taskDefinition.taskPrerequisiteUrl}/${prerequsite.id}`,
-    );
-  }
 }
diff --git a/src/app/api/services/task-prerequisite.service.ts b/src/app/api/services/task-prerequisite.service.ts
index abb699c9ab..a826d3dc81 100644
--- a/src/app/api/services/task-prerequisite.service.ts
+++ b/src/app/api/services/task-prerequisite.service.ts
@@ -7,7 +7,8 @@ import {TaskPrerequisite} from '../models/task-prerequisite';
 
 @Injectable()
 export class TaskPrerequisiteService extends CachedEntityService<TaskPrerequisite> {
-  protected readonly endpointFormat = 'units/:unitId:/task_definitions/:id:/prerequisites';
+  protected readonly endpointFormat =
+    'units/:unitId:/task_definitions/:taskDefId:/prerequisites/:prerequisiteId:';
 
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
@@ -17,9 +18,10 @@ export class TaskPrerequisiteService extends CachedEntityService<TaskPrerequisit
     this.mapping.addKeys('id', 'taskDefinitionId', 'prerequisiteId', 'taskStatus');
 
     // this.mapping.mapAllKeysToJsonExcept('id', 'taskDefinitionId', 'prerequisiteId', 'taskStatus');
+    this.mapping.mapAllKeysToJsonExcept('id');
   }
 
   public override createInstanceFrom(json: object, other?: any): TaskPrerequisite {
-    return new TaskPrerequisite();
+    return new TaskPrerequisite(json);
   }
 }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
index f5a9b77326..3cda7e96db 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
@@ -1,16 +1,18 @@
-<mat-card appearance="outlined" class="p-[16px]">
-  <div class="flex justify-between items-center w-full">
-    <mat-card-title class="f-card-title">Prerequisite Tasks</mat-card-title>
-    <mat-icon>pending_actions</mat-icon>
-  </div>
+@if (task.hasPrerequisiteTasks()) {
+  <mat-card appearance="outlined" class="p-[16px]">
+    <div class="flex justify-between items-center w-full">
+      <mat-card-title class="f-card-title">Prerequisite Tasks</mat-card-title>
+      <mat-icon>pending_actions</mat-icon>
+    </div>
 
-  <mat-card-subtitle class="mb-4">
-    You must submit these tasks before you can submit
-    {{ taskDefinition.abbreviation }}.</mat-card-subtitle
-  >
-  <f-task-definition-prerequisites
-    [taskDefinition]="taskDefinition"
-    [editingMode]="false"
-    [task]="task"
-  ></f-task-definition-prerequisites>
-</mat-card>
+    <mat-card-subtitle class="mb-4">
+      You must submit these tasks before you can submit
+      {{ taskDefinition.abbreviation }}.</mat-card-subtitle
+    >
+    <f-task-definition-prerequisites
+      [taskDefinition]="taskDefinition"
+      [editingMode]="false"
+      [task]="task"
+    ></f-task-definition-prerequisites>
+  </mat-card>
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index 0f146e5290..1032e8a8f3 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -53,7 +53,6 @@
     ></task-description-card>
     <f-task-prerequisites-card
       [task-definition]="task.definition"
-      ng-if="task.hasPrerequisiteTasks()"
       [task]="task"
     ></f-task-prerequisites-card>
     <f-task-scorm-card [task]="task"></f-task-scorm-card>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index 7c43314d03..e34caf2ecc 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -2,7 +2,7 @@
   <div class="flex-grow flex flex-row">
     <table class="w-full">
       <tbody>
-        @for (link of taskPrerequisites; track link) {
+        @for (link of taskDefinition.taskPrerequisitesCache.values | async; track link) {
           @if (link.prerequisite?.id !== taskDefinition.id) {
             <tr class="border-b">
               @if (!editingMode) {
@@ -19,18 +19,11 @@
 
               <td
                 class="py-2 px-3 w-[50px] text-center"
-                [class.line-through]="
-                  link.prerequisite?.projectTask(task?.project)?.inSubmittedState()
-                "
+                [class.line-through]="link.hasMetRequiredState(task?.project)"
               >
                 {{ link.prerequisite?.abbreviation }}
               </td>
-              <td
-                class="py-2 px-3"
-                [class.line-through]="
-                  link.prerequisite?.projectTask(task?.project)?.inSubmittedState()
-                "
-              >
+              <td class="py-2 px-3" [class.line-through]="link.hasMetRequiredState(task?.project)">
                 {{ link.prerequisite?.name }}
               </td>
               @if (!editingMode) {
@@ -62,7 +55,7 @@
                     mat-icon-button
                     aria-label="Remove prerequisite"
                     color="warn"
-                    (click)="removePrerequisite(link.prerequisite)"
+                    (click)="removePrerequisite(link)"
                   >
                     <mat-icon>delete</mat-icon>
                   </button>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 41d30ec4a7..6dbc0196a5 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -26,8 +26,6 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   // All other task definitions in the unit (exclude the current one)
   filteredTaskDefs: TaskDefinition[] = [];
 
-  taskPrerequisites: TaskPrerequisite[] = [];
-
   public readonly STATES: Partial<Record<TaskStatusEnum, number>> = {
     ready_for_feedback: 1,
     discuss: 2,
@@ -65,7 +63,7 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   }
 
   private mapPrerequisites() {
-    const prerequisites = this.taskPrerequisites;
+    const prerequisites = this.taskDefinition.taskPrerequisitesCache.currentValues;
     const definitions = this.taskDefinition.unit.taskDefinitions;
     for (const prerequisite of prerequisites) {
       prerequisite.taskDefinition = definitions.find(
@@ -85,10 +83,16 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       this.taskPrerequisiteService
         .query({
           unitId: this.unit.id,
-          id: this.taskDefinition.id,
+          taskDefId: this.taskDefinition.id,
         })
         .subscribe((data) => {
-          this.taskPrerequisites = [...data];
+          for (const prereq of data) {
+            this.taskDefinition.taskPrerequisitesCache.getOrCreate(
+              prereq.id,
+              this.taskPrerequisiteService,
+              prereq,
+            );
+          }
           this.mapPrerequisites();
         });
     }
@@ -141,6 +145,13 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
             this.alertService.error('Failed to add task prerequisite', 6000);
             return;
           }
+          taskDefinition.taskPrerequisitesCache.getOrCreate(
+            response.id,
+            this.taskPrerequisiteService,
+            response,
+          );
+          this.mapPrerequisites();
+
           this.alertService.success(
             `Successfully added task ${selectedTaskPrerequisite.abbreviation} as a prerequisite`,
             5000,
@@ -177,28 +188,10 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       });
   }
 
-  public removePrerequisite(taskDefToRemove: TaskDefinition) {
-    if (!taskDefToRemove) {
+  public removePrerequisite(prerequisiteToRemove: TaskPrerequisite) {
+    if (!prerequisiteToRemove) {
       return;
     }
-
-    this.taskDefinitionService
-      .removeTaskPrerequisite(this.taskDefinition, taskDefToRemove)
-      .subscribe({
-        next: (response) => {
-          if (!response) {
-            this.alertService.error('Failed to remove task prerequisite', 6000);
-            return;
-          }
-          this.alertService.success(
-            `Removed task ${taskDefToRemove.abbreviation} as a prerequisite`,
-            5000,
-          );
-          this.unit.refresh();
-        },
-        error: (error) => {
-          this.alertService.error(`Failed to remove task prerequisite: ${error}`, 6000);
-        },
-      });
+    prerequisiteToRemove.delete();
   }
 }

From 1d5ef4d8026f92243731ce38692e552074142a0c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 5 Sep 2025 13:53:58 +1000
Subject: [PATCH 518/776] chore: remove task prerequisite mapping

---
 .../api/services/task-definition.service.ts   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 8f272cb7d8..42efbb8cb6 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -133,25 +133,6 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
           });
         },
       },
-      // {
-      //   keys: ['prerequisites', 'task_prerequisites'],
-      //   toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
-      //     data[key]?.forEach((prerequisite) => {
-      //       // Remove any deleted prerequisites from the cache
-      //       taskDefinition.taskPrerequisitesCache.forEach((_, id) => {
-      //         if (!data[key]?.some((p) => p['id'] === id)) {
-      //           taskDefinition.taskPrerequisitesCache.delete(id);
-      //         }
-      //       });
-
-      //       taskDefinition.taskPrerequisitesCache.getOrCreate(
-      //         prerequisite['id'],
-      //         this.taskPrerequisiteService,
-      //         prerequisite,
-      //       );
-      //     });
-      //   },
-      // },
     );
 
     this.mapping.mapAllKeysToJsonExcept(

From 48931988c7a08a853a8eaf8f552f9ca084ef19b6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 5 Sep 2025 13:56:58 +1000
Subject: [PATCH 519/776] chore: filter out tasks from prerequisites that have
 a later due date

---
 .../task-definition-prerequisites.component.ts                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 6dbc0196a5..5e9e327a3e 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -109,6 +109,8 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       )
       // Higher target grades can not be a prerequisite
       .filter((td) => td.targetGrade <= this.taskDefinition.targetGrade)
+      // Tasks with a later due date can not be a prerequisite
+      .filter((td) => td.targetDate <= this.taskDefinition.targetDate)
       // Search filter
       .filter(
         (td) =>

From ee2b9085a931df551408cd12dbc8187c04d088fc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 5 Sep 2025 14:37:38 +1000
Subject: [PATCH 520/776] fix: allow scrolling in edit profile form dialog

---
 .../modals/edit-profile-dialog/edit-profile-dialog.service.ts    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/common/modals/edit-profile-dialog/edit-profile-dialog.service.ts b/src/app/common/modals/edit-profile-dialog/edit-profile-dialog.service.ts
index 726408c7b8..4a14715c36 100644
--- a/src/app/common/modals/edit-profile-dialog/edit-profile-dialog.service.ts
+++ b/src/app/common/modals/edit-profile-dialog/edit-profile-dialog.service.ts
@@ -14,6 +14,7 @@ export class EditProfileDialogService {
       width: '100%',
       maxWidth: '800px',
       data: {user, mode: mode, modal: true},
+      panelClass: 'overflow-y-auto',
     });
   }
 }

From c2c6002cef6e5a75f722c964bf2843cf662380f4 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 8 Sep 2025 13:21:13 +1000
Subject: [PATCH 521/776] feat: task assessment counts csv

---
 src/app/api/models/unit.ts                                | 6 ++++++
 .../states/analytics/unit-analytics-route.component.html  | 3 +++
 .../states/analytics/unit-analytics-route.component.ts    | 8 ++++++++
 3 files changed, 17 insertions(+)

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 075c2f99d9..9adc9fa5e5 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -589,6 +589,12 @@ export class Unit extends Entity {
     );
   }
 
+  public downloadTaskAssessmentCountsCsv(): Observable<SidekiqJob> {
+    return AppInjector.get(HttpClient).get<SidekiqJob>(
+      `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/task_assessment_counts`,
+    );
+  }
+
   public downloadTutorAssessmentCsv(): Observable<SidekiqJob> {
     return AppInjector.get(HttpClient).get<SidekiqJob>(
       `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/tutor_assessments`,
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.html b/src/app/units/states/analytics/unit-analytics-route.component.html
index f89e7c5246..361c9ce18c 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.html
+++ b/src/app/units/states/analytics/unit-analytics-route.component.html
@@ -10,4 +10,7 @@ <h1>Unit Statistics</h1>
   <button mat-button (click)="getTasksAwaitingFeedbackCsv()">
     <mat-icon>download</mat-icon> Tasks Awaiting Feedback
   </button>
+  <button mat-button (click)="getTaskAssessmentCountCsv()">
+    <mat-icon>download</mat-icon> Task Assessment Counts
+  </button>
 </div>
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.ts b/src/app/units/states/analytics/unit-analytics-route.component.ts
index 9e92ef6041..12e4770d84 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.ts
+++ b/src/app/units/states/analytics/unit-analytics-route.component.ts
@@ -44,6 +44,14 @@ export class UnitAnalyticsComponent {
     );
   }
 
+  public getTaskAssessmentCountCsv() {
+    this.downloadCsv(
+      this.unit.downloadTaskAssessmentCountsCsv(),
+      'Task Assessment Counts CSV',
+      `${this.unit.code}-task-assessment-counts.csv`,
+    );
+  }
+
   private downloadCsv(newJob: Observable<SidekiqJob>, title: string, filename: string) {
     newJob.subscribe({
       next: (job) => {

From 74df6ac45fb106d5bba81bdb9bf84ce11d6c95f7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 8 Sep 2025 15:42:35 +1000
Subject: [PATCH 522/776] refactor: filter task prerequisites after cache
 update

---
 src/app/api/models/task-prerequisite.ts       | 32 ++++++++++++-------
 ...task-definition-prerequisites.component.ts |  5 ++-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/app/api/models/task-prerequisite.ts b/src/app/api/models/task-prerequisite.ts
index f2a34619bd..43450deedf 100644
--- a/src/app/api/models/task-prerequisite.ts
+++ b/src/app/api/models/task-prerequisite.ts
@@ -1,8 +1,9 @@
 import {Entity, EntityMapping} from 'ngx-entity-service';
+import {Observable, tap} from 'rxjs';
 import {AppInjector} from 'src/app/app-injector';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {TaskPrerequisiteService} from '../services/task-prerequisite.service';
-import {Project, TaskDefinition, TaskStatusEnum} from './doubtfire-model';
+import {Project, TaskDefinition, TaskStatus, TaskStatusEnum} from './doubtfire-model';
 
 export class TaskPrerequisite extends Entity {
   id: number;
@@ -38,6 +39,10 @@ export class TaskPrerequisite extends Entity {
     };
   }
 
+  public requiredStatusLabel() {
+    return TaskStatus.STATUS_LABELS.get(this.taskStatus);
+  }
+
   public hasMetRequiredState(project: Project) {
     if (!this.prerequisite || !project) {
       return false;
@@ -54,10 +59,11 @@ export class TaskPrerequisite extends Entity {
     return false;
   }
 
-  public delete() {
+  public delete(): Observable<unknown> {
     const taskPrerequisiteService: TaskPrerequisiteService =
       AppInjector.get(TaskPrerequisiteService);
-    taskPrerequisiteService
+
+    return taskPrerequisiteService
       .delete(
         {
           unitId: this.taskDefinition.unit.id,
@@ -66,14 +72,16 @@ export class TaskPrerequisite extends Entity {
         },
         {cache: this.taskDefinition.taskPrerequisitesCache},
       )
-      .subscribe({
-        next: (response: object) => {
-          AppInjector.get(AlertService).error('Successfully deleted prerequisite', 4000);
-          this.taskDefinition.taskPrerequisitesCache.delete(this.id);
-        },
-        error: (error: any) => {
-          AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
-        },
-      });
+      .pipe(
+        tap({
+          next: () => {
+            AppInjector.get(AlertService).error('Successfully deleted prerequisite', 4000);
+            this.taskDefinition.taskPrerequisitesCache.delete(this.id);
+          },
+          error: (error) => {
+            AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
+          },
+        }),
+      );
   }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 5e9e327a3e..1c27ea2fbf 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -159,6 +159,7 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
             5000,
           );
           this.unit.refresh();
+          this.filterTaskDefs(this.searchCtrl.value ?? '');
         },
         error: (error) => {
           this.alertService.error(`Failed to add task prerequisite: ${error}`, 6000);
@@ -194,6 +195,8 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
     if (!prerequisiteToRemove) {
       return;
     }
-    prerequisiteToRemove.delete();
+    prerequisiteToRemove.delete().subscribe(() => {
+      this.filterTaskDefs(this.searchCtrl.value ?? '');
+    });
   }
 }

From dff45f22db9d947824a2d53ed679c54e64e4ed41 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 8 Sep 2025 15:43:21 +1000
Subject: [PATCH 523/776] refactor: explicitly pass the id of the prerequisite
 link

---
 src/app/api/services/task-definition.service.ts   | 15 +++++++--------
 .../task-definition-prerequisites.component.ts    | 10 +++-------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 42efbb8cb6..4d8a29c43d 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -189,15 +189,14 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
   }
 
   public updateTaskPrerequisite(
-    taskDefinition: TaskDefinition,
-    prerequsite: TaskDefinition,
+    taskPrerequisiteLink: TaskPrerequisite,
     taskStatus: TaskStatusEnum,
   ): Observable<boolean> {
-    return AppInjector.get(HttpClient).put<boolean>(taskDefinition.taskPrerequisiteUrl, {
-      unit_id: taskDefinition.unit.id,
-      task_def_id: taskDefinition.id,
-      prerequisite_id: prerequsite.id,
-      task_status_required: taskStatus,
-    });
+    return AppInjector.get(HttpClient).put<boolean>(
+      `${taskPrerequisiteLink.taskDefinition.taskPrerequisiteUrl}/${taskPrerequisiteLink.id}`,
+      {
+        task_status_required: taskStatus,
+      },
+    );
   }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 1c27ea2fbf..418f2e2c37 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -169,15 +169,11 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
 
   public updateTaskPrerequisite(prerequisiteLink: TaskPrerequisite) {
     this.taskDefinitionService
-      .updateTaskPrerequisite(
-        prerequisiteLink.taskDefinition,
-        prerequisiteLink.prerequisite,
-        prerequisiteLink.taskStatus,
-      )
+      .updateTaskPrerequisite(prerequisiteLink, prerequisiteLink.taskStatus)
       .subscribe({
         next: (response) => {
           if (!response) {
-            this.alertService.error('Failed to add task prerequisite', 6000);
+            this.alertService.error('Failed to update task prerequisite', 6000);
             return;
           }
           this.alertService.success(
@@ -186,7 +182,7 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
           );
         },
         error: (error) => {
-          this.alertService.error(`Failed to add task prerequisite: ${error}`, 6000);
+          this.alertService.error(`Failed to update task prerequisite: ${error}`, 6000);
         },
       });
   }

From b93d4052bbacce227e708718eb2efecdcb5e1d75 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 8 Sep 2025 15:44:35 +1000
Subject: [PATCH 524/776] refactor: rewording

---
 .../task-prerequisites-card.component.html    | 32 +++++++++----------
 .../task-definition-editor.component.html     |  4 ++-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
index 3cda7e96db..50a693a1e8 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
@@ -1,18 +1,16 @@
-@if (task.hasPrerequisiteTasks()) {
-  <mat-card appearance="outlined" class="p-[16px]">
-    <div class="flex justify-between items-center w-full">
-      <mat-card-title class="f-card-title">Prerequisite Tasks</mat-card-title>
-      <mat-icon>pending_actions</mat-icon>
-    </div>
+<mat-card appearance="outlined" class="p-[16px]" [hidden]="!task.hasPrerequisiteTasks()">
+  <div class="flex justify-between items-center w-full">
+    <mat-card-title class="f-card-title">Prerequisite Tasks</mat-card-title>
+    <mat-icon>pending_actions</mat-icon>
+  </div>
 
-    <mat-card-subtitle class="mb-4">
-      You must submit these tasks before you can submit
-      {{ taskDefinition.abbreviation }}.</mat-card-subtitle
-    >
-    <f-task-definition-prerequisites
-      [taskDefinition]="taskDefinition"
-      [editingMode]="false"
-      [task]="task"
-    ></f-task-definition-prerequisites>
-  </mat-card>
-}
+  <mat-card-subtitle class="mb-4">
+    You must finish these prerequisite tasks before you submitting
+    {{ taskDefinition.abbreviation }}.</mat-card-subtitle
+  >
+  <f-task-definition-prerequisites
+    [taskDefinition]="taskDefinition"
+    [editingMode]="false"
+    [task]="task"
+  ></f-task-definition-prerequisites>
+</mat-card>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 19b8410308..1c64fe5b51 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -128,7 +128,9 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
       <div class="w-full">
         <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Prerequisite Tasks</h3>
         <p class="font-normal text-gray-700">
-          Select which tasks need to be in a submitted state before this task can be submitted
+          Select which tasks need to be submitted before
+          <span class="font-bold">{{ taskDefinition.abbreviation }} {{ taskDefinition.name }}</span>
+          can be submitted
         </p>
         <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
           <f-task-definition-prerequisites [taskDefinition]="taskDefinition" [editingMode]="true">

From e375992dec6e54f9758ec88fc576bfee0c15adbf Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 8 Sep 2025 15:45:21 +1000
Subject: [PATCH 525/776] refactor: use material ui table

---
 ...sk-definition-prerequisites.component.html | 148 ++++++++++--------
 ...task-definition-prerequisites.component.ts |  69 +++++---
 2 files changed, 138 insertions(+), 79 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index e34caf2ecc..548f1b2830 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -1,70 +1,96 @@
 <div class="flex flex-col">
   <div class="flex-grow flex flex-row">
-    <table class="w-full">
-      <tbody>
-        @for (link of taskDefinition.taskPrerequisitesCache.values | async; track link) {
-          @if (link.prerequisite?.id !== taskDefinition.id) {
-            <tr class="border-b">
+    <table mat-table [dataSource]="dataSource">
+      <ng-container matColumnDef="current-status">
+        <th mat-header-cell *matHeaderCellDef>
+          @if (!editingMode) {
+            Status
+          }
+        </th>
+        <td mat-cell *matCellDef="let link">
+          @if (!editingMode) {
+            <ng-container>
               @if (!editingMode) {
-                <td class="py-2 px-3 w-[75px]">
-                  <status-icon
-                    [hidden]="isNarrow"
-                    matBadgePosition="before"
-                    [status]="
-                      link.prerequisite?.projectTask(task?.project)?.status ?? 'not_started'
-                    "
-                  ></status-icon>
-                </td>
+                <status-icon
+                  matBadgePosition="before"
+                  [status]="link.prerequisite?.projectTask(task?.project)?.status ?? 'not_started'"
+                ></status-icon>
               }
+            </ng-container>
+          }
+        </td>
+      </ng-container>
+      <ng-container matColumnDef="task-definition">
+        <th mat-header-cell *matHeaderCellDef>Task Definition</th>
+        <td
+          mat-cell
+          *matCellDef="let link"
+          [class.line-through]="link.hasMetRequiredState(task?.project)"
+        >
+          {{ link.prerequisite?.abbreviation }} {{ link.prerequisite?.name }}
+        </td>
+      </ng-container>
 
-              <td
-                class="py-2 px-3 w-[50px] text-center"
-                [class.line-through]="link.hasMetRequiredState(task?.project)"
+      <ng-container matColumnDef="minimum-required-state">
+        <th mat-header-cell *matHeaderCellDef>
+          @if (editingMode) {
+            Minimum Required Status
+          } @else {
+            Current Status
+          }
+        </th>
+        <td
+          mat-cell
+          *matCellDef="let link"
+          [class.line-through]="link.hasMetRequiredState(task?.project)"
+        >
+          @if (!editingMode) {
+            {{ link.prerequisite?.projectTask(task?.project)?.statusLabel() ?? 'Not Started' }}
+          } @else {
+            @if (link.taskStatus) {
+              <mat-select
+                [(value)]="link.taskStatus"
+                placeholder="Select required status"
+                matTooltip="Task must reach this state before students can submit"
+                matTooltipShowDelay="1000"
+                (selectionChange)="updateTaskPrerequisite(link)"
               >
-                {{ link.prerequisite?.abbreviation }}
-              </td>
-              <td class="py-2 px-3" [class.line-through]="link.hasMetRequiredState(task?.project)">
-                {{ link.prerequisite?.name }}
-              </td>
-              @if (!editingMode) {
-                <td>
-                  {{
-                    link.prerequisite?.projectTask(task?.project)?.statusLabel() ?? 'Not Started'
-                  }}
-                </td>
-              } @else {
-                @if (link.taskStatus) {
-                  <td class="py-2 px-3">
-                    <mat-select
-                      [(value)]="link.taskStatus"
-                      placeholder="Select required status"
-                      matTooltip="Task must reach this state before students can submit"
-                      matTooltipShowDelay="1000"
-                      (selectionChange)="updateTaskPrerequisite(link)"
-                    >
-                      <mat-option *ngFor="let state of stateOptions" [value]="state.value">
-                        {{ state.label }}
-                      </mat-option>
-                    </mat-select>
-                  </td>
-                }
-              }
-              @if (editingMode) {
-                <td class="py-2 px-3 text-right">
-                  <button
-                    mat-icon-button
-                    aria-label="Remove prerequisite"
-                    color="warn"
-                    (click)="removePrerequisite(link)"
-                  >
-                    <mat-icon>delete</mat-icon>
-                  </button>
-                </td>
-              }
-            </tr>
+                <mat-option *ngFor="let state of stateOptions" [value]="state.value">
+                  {{ state.label }}
+                </mat-option>
+              </mat-select>
+            }
+          }
+        </td>
+      </ng-container>
+
+      <ng-container matColumnDef="actions">
+        <th mat-header-cell *matHeaderCellDef>
+          @if (editingMode) {
+            Actions
+          } @else {
+            Required Status
+          }
+        </th>
+        <td mat-cell *matCellDef="let link">
+          @if (editingMode) {
+            <td class="py-2 px-3 text-right">
+              <button
+                mat-icon-button
+                aria-label="Remove prerequisite"
+                color="warn"
+                (click)="removePrerequisite(link)"
+              >
+                <mat-icon>delete</mat-icon>
+              </button>
+            </td>
+          } @else {
+            {{ link?.requiredStatusLabel() ?? 'Not Started' }}
           }
-        }
-      </tbody>
+        </td>
+      </ng-container>
+      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+      <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
     </table>
   </div>
 
@@ -83,7 +109,7 @@
           mat-raised-button
           color="primary"
           class="min-w-xl mr-4"
-          (click)="addTaskPrerequisite()"
+          (click)="addTaskPrerequisite($event)"
           [disabled]="!selectedTaskPrerequisite"
           matSuffix
         >
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 418f2e2c37..0e1a784701 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -1,6 +1,7 @@
 import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
 import {FormControl} from '@angular/forms';
-import {Observable} from 'rxjs';
+import {MatTableDataSource} from '@angular/material/table';
+import {Observable, Subscription} from 'rxjs';
 import {Task} from 'src/app/api/models/task';
 import {TaskDefinition} from 'src/app/api/models/task-definition';
 import {TaskPrerequisite} from 'src/app/api/models/task-prerequisite';
@@ -20,6 +21,17 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   @Input() editingMode: boolean;
   @Input() task: Task;
 
+  displayedColumns: string[] = [
+    'current-status',
+    'task-definition',
+    'minimum-required-state',
+    'actions',
+  ];
+
+  private prereqSub?: Subscription;
+
+  public dataSource = new MatTableDataSource<TaskPrerequisite>();
+
   selectedTaskPrerequisite: TaskDefinition | null = null;
   searchCtrl = new FormControl('');
 
@@ -59,12 +71,16 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       this.filterTaskDefs(search);
     });
 
-    this.mapPrerequisites();
+    this.prereqSub = this.taskDefinition.taskPrerequisitesCache.values.subscribe((values) => {
+      this.dataSource.data = values;
+    });
+
+    // this.fetchTaskPrerequisites();
   }
 
-  private mapPrerequisites() {
-    const prerequisites = this.taskDefinition.taskPrerequisitesCache.currentValues;
-    const definitions = this.taskDefinition.unit.taskDefinitions;
+  private mapPrerequisites(taskDefinition: TaskDefinition) {
+    const prerequisites = taskDefinition.taskPrerequisitesCache.currentValues;
+    const definitions = taskDefinition.unit.taskDefinitions;
     for (const prerequisite of prerequisites) {
       prerequisite.taskDefinition = definitions.find(
         (td) => td.id === prerequisite.taskDefinitionId,
@@ -79,23 +95,37 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       changes.taskDefinition.previousValue?.id !== changes.taskDefinition.currentValue?.id
     ) {
       this.filterTaskDefs(this.searchCtrl.value ?? '');
+      this.prereqSub?.unsubscribe();
+      this.prereqSub = this.taskDefinition.taskPrerequisitesCache.values.subscribe((values) => {
+        this.dataSource.data = values;
+      });
+      this.fetchTaskPrerequisites();
+    }
+  }
 
-      this.taskPrerequisiteService
-        .query({
-          unitId: this.unit.id,
-          taskDefId: this.taskDefinition.id,
-        })
-        .subscribe((data) => {
+  private fetchTaskPrerequisites() {
+    const taskDefinition = this.taskDefinition;
+    this.taskPrerequisiteService
+      .query({
+        unitId: this.unit.id,
+        taskDefId: taskDefinition.id,
+      })
+      .subscribe({
+        next: (data) => {
           for (const prereq of data) {
-            this.taskDefinition.taskPrerequisitesCache.getOrCreate(
+            taskDefinition.taskPrerequisitesCache.getOrCreate(
               prereq.id,
               this.taskPrerequisiteService,
               prereq,
             );
           }
-          this.mapPrerequisites();
-        });
-    }
+          this.mapPrerequisites(taskDefinition);
+          this.filterTaskDefs(this.searchCtrl.value ?? '');
+        },
+        error: (error) => {
+          console.error(error);
+        },
+      });
   }
 
   private filterTaskDefs(search: string) {
@@ -105,7 +135,9 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       // Hide tasks already added as a prerequisite
       .filter(
         (td) =>
-          !this.taskDefinition.taskPrerequisitesCache.currentValues.some((p) => p.id === td.id),
+          !this.taskDefinition.taskPrerequisitesCache.currentValues.some(
+            (p: TaskPrerequisite) => p.prerequisite.id === td.id,
+          ),
       )
       // Higher target grades can not be a prerequisite
       .filter((td) => td.targetGrade <= this.taskDefinition.targetGrade)
@@ -122,7 +154,8 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
     return td && td.abbreviation ? `${td.abbreviation} - ${td.name}` : '';
   }
 
-  public addTaskPrerequisite(): void {
+  public addTaskPrerequisite(event: Event): void {
+    event.stopPropagation();
     const taskDefinition = this.taskDefinition;
     const selectedTaskPrerequisite = this.selectedTaskPrerequisite;
 
@@ -152,7 +185,7 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
             this.taskPrerequisiteService,
             response,
           );
-          this.mapPrerequisites();
+          this.mapPrerequisites(taskDefinition);
 
           this.alertService.success(
             `Successfully added task ${selectedTaskPrerequisite.abbreviation} as a prerequisite`,

From 1fcf3b63bfa03099c3036e0e545b23043ce57be6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 8 Sep 2025 17:22:57 +1000
Subject: [PATCH 526/776] chore(release): 10.0.0-34

---
 CHANGELOG.md      | 12 ++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbf8a3c778..03c0fe0c59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 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.
 
+## [10.0.0-34](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-33...v10.0.0-34) (2025-09-08)
+
+
+### Features
+
+* task assessment counts csv ([c2c6002](https://github.com/b0ink/doubtfire-deploy/commit/c2c6002cef6e5a75f722c964bf2843cf662380f4))
+
+
+### Bug Fixes
+
+* allow scrolling in edit profile form dialog ([ee2b908](https://github.com/b0ink/doubtfire-deploy/commit/ee2b9085a931df551408cd12dbc8187c04d088fc))
+
 ## [10.0.0-33](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-32...v10.0.0-33) (2025-09-04)
 
 ## [10.0.0-32](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-31...v10.0.0-32) (2025-09-02)
diff --git a/package-lock.json b/package-lock.json
index 098806e961..33a038eaf0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-33",
+  "version": "10.0.0-34",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-33",
+      "version": "10.0.0-34",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 6d98b2a68f..f2ae5c8bd4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-33",
+  "version": "10.0.0-34",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From e0c867fc7f24301d414ed584b6859e09d95c652c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 10:06:49 +1000
Subject: [PATCH 527/776] fix: typo

---
 .../task-prerequisites-card.component.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
index 50a693a1e8..9e2f0a8853 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
@@ -5,7 +5,7 @@
   </div>
 
   <mat-card-subtitle class="mb-4">
-    You must finish these prerequisite tasks before you submitting
+    You must finish these prerequisite tasks before submitting
     {{ taskDefinition.abbreviation }}.</mat-card-subtitle
   >
   <f-task-definition-prerequisites

From f56b3d7d3f82ddbb360868083776eea9d83657e3 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 10:08:18 +1000
Subject: [PATCH 528/776] refactor: rename editing mode to staff view

---
 .../task-prerequisites-card.component.html       |  2 +-
 .../task-definition-editor.component.html        |  2 +-
 .../task-definition-prerequisites.component.html | 16 ++++++++--------
 .../task-definition-prerequisites.component.ts   |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
index 9e2f0a8853..daccda0fc2 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
@@ -10,7 +10,7 @@
   >
   <f-task-definition-prerequisites
     [taskDefinition]="taskDefinition"
-    [editingMode]="false"
+    [staffView]="false"
     [task]="task"
   ></f-task-definition-prerequisites>
 </mat-card>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 1c64fe5b51..75b9583484 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -133,7 +133,7 @@ <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Prerequisite Ta
           can be submitted
         </p>
         <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-prerequisites [taskDefinition]="taskDefinition" [editingMode]="true">
+          <f-task-definition-prerequisites [taskDefinition]="taskDefinition" [staffView]="true">
           </f-task-definition-prerequisites>
         </div>
       </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index 548f1b2830..d0c16fc54c 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -3,14 +3,14 @@
     <table mat-table [dataSource]="dataSource">
       <ng-container matColumnDef="current-status">
         <th mat-header-cell *matHeaderCellDef>
-          @if (!editingMode) {
+          @if (!staffView) {
             Status
           }
         </th>
         <td mat-cell *matCellDef="let link">
-          @if (!editingMode) {
+          @if (!staffView) {
             <ng-container>
-              @if (!editingMode) {
+              @if (!staffView) {
                 <status-icon
                   matBadgePosition="before"
                   [status]="link.prerequisite?.projectTask(task?.project)?.status ?? 'not_started'"
@@ -33,7 +33,7 @@
 
       <ng-container matColumnDef="minimum-required-state">
         <th mat-header-cell *matHeaderCellDef>
-          @if (editingMode) {
+          @if (staffView) {
             Minimum Required Status
           } @else {
             Current Status
@@ -44,7 +44,7 @@
           *matCellDef="let link"
           [class.line-through]="link.hasMetRequiredState(task?.project)"
         >
-          @if (!editingMode) {
+          @if (!staffView) {
             {{ link.prerequisite?.projectTask(task?.project)?.statusLabel() ?? 'Not Started' }}
           } @else {
             @if (link.taskStatus) {
@@ -66,14 +66,14 @@
 
       <ng-container matColumnDef="actions">
         <th mat-header-cell *matHeaderCellDef>
-          @if (editingMode) {
+          @if (staffView) {
             Actions
           } @else {
             Required Status
           }
         </th>
         <td mat-cell *matCellDef="let link">
-          @if (editingMode) {
+          @if (staffView) {
             <td class="py-2 px-3 text-right">
               <button
                 mat-icon-button
@@ -94,7 +94,7 @@
     </table>
   </div>
 
-  @if (editingMode) {
+  @if (staffView) {
     <div class="flex-grow flex flex-row items-center">
       <mat-form-field appearance="outline" class="w-full mt-[22px]">
         <input
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 0e1a784701..5e7e27cb7d 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -18,7 +18,7 @@ import {AlertService} from 'src/app/common/services/alert.service';
 })
 export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   @Input() taskDefinition: TaskDefinition;
-  @Input() editingMode: boolean;
+  @Input() staffView: boolean;
   @Input() task: Task;
 
   displayedColumns: string[] = [

From d929d80cb7bd442529e1f2b8f92f0b6db1cc7efd Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 11:26:39 +1000
Subject: [PATCH 529/776] chore(release): 10.0.0-35

---
 CHANGELOG.md      | 14 ++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03c0fe0c59..23ae073701 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 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.
 
+## [10.0.0-35](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-34...v10.0.0-35) (2025-09-09)
+
+
+### Features
+
+* add task prerequisites ([d5c1a51](https://github.com/b0ink/doubtfire-deploy/commit/d5c1a51dc049b025ae85b2ef6513630a197eabee))
+* cross out prerequisite tasks that have been submitted ([7e1a7db](https://github.com/b0ink/doubtfire-deploy/commit/7e1a7dbd3351dbcc8230f115554d6afdfaca0f70))
+* show list of prerequisites in task dashboard ([111f60a](https://github.com/b0ink/doubtfire-deploy/commit/111f60a4272abcf683c50b711bd43a1f772153ec))
+
+
+### Bug Fixes
+
+* typo ([e0c867f](https://github.com/b0ink/doubtfire-deploy/commit/e0c867fc7f24301d414ed584b6859e09d95c652c))
+
 ## [10.0.0-34](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-33...v10.0.0-34) (2025-09-08)
 
 
diff --git a/package-lock.json b/package-lock.json
index 33a038eaf0..3f886b0332 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-34",
+  "version": "10.0.0-35",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-34",
+      "version": "10.0.0-35",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index f2ae5c8bd4..1fa658b144 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-34",
+  "version": "10.0.0-35",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 37c98ac22aa1aaf764b56390a9bd5f416206e47d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 14:43:38 +1000
Subject: [PATCH 530/776] refactor: ensure correct error handling

---
 .../common/services/http-error.interceptor.ts | 64 +++++++++++--------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/app/common/services/http-error.interceptor.ts b/src/app/common/services/http-error.interceptor.ts
index cd7b3cbb4d..a182d04baf 100644
--- a/src/app/common/services/http-error.interceptor.ts
+++ b/src/app/common/services/http-error.interceptor.ts
@@ -8,7 +8,7 @@ import {
 } from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {BehaviorSubject, Observable, Subject, throwError} from 'rxjs';
-import {catchError, filter, switchMap, take} from 'rxjs/operators';
+import {catchError, filter, finalize, switchMap, take} from 'rxjs/operators';
 import {AuthenticationService, UserService} from 'src/app/api/models/doubtfire-model';
 
 @Injectable()
@@ -56,41 +56,23 @@ export class HttpErrorInterceptor implements HttpInterceptor {
       //   )
       // ),
       catchError((error: HttpErrorResponse) => {
-        let errorMessage: string = '';
-        let logMessage: string = '';
-        if (error.error instanceof ErrorEvent) {
-          // client-side error
-          errorMessage = error.error.message;
-        } else if (error.error instanceof ProgressEvent) {
-          errorMessage = error.statusText;
-        } else {
-          // server-side error
-          if (error.error.error) {
-            errorMessage = error.error.error;
-          } else if (error.error instanceof Blob) {
-            errorMessage = error.statusText;
-          } else {
-            errorMessage = error.error;
-          }
-          logMessage = `Error Code: ${error.status}`;
-        }
-
-        console.error(`${logMessage}: ${errorMessage}`);
-
-        if (error.status === 419 || (error.status === 403 && this.userService.isAnonymousUser())) {
+        if (this.isAuthError(error)) {
           if (!this.refreshTokenInProgress) {
             this.refreshTokenInProgress = true;
             this.refreshTokenSubject.next(null);
             return this.attemptRefresh$().pipe(
               switchMap(() => {
-                this.refreshTokenInProgress = false;
                 this.refreshTokenSubject.next(this.userService.currentUser.authenticationToken);
                 return next.handle(this.injectToken(request));
               }),
-              catchError((err) => {
+              catchError((err: HttpErrorResponse) => {
                 this.refreshTokenInProgress = false;
-                return throwError(() => err);
+                if (this.isAuthError(err)) {
+                  this.authenticationService.timeoutAuthentication();
+                }
+                return throwError(() => this.extractErrorMessage(err));
               }),
+              finalize(() => (this.refreshTokenInProgress = false)),
             );
           } else {
             return this.refreshTokenSubject.pipe(
@@ -103,11 +85,39 @@ export class HttpErrorInterceptor implements HttpInterceptor {
           }
         }
 
-        return throwError(() => errorMessage);
+        return throwError(() => this.extractErrorMessage(error));
       }),
     );
   }
 
+  private isAuthError(error: HttpErrorResponse) {
+    return error.status === 419 || (error.status === 403 && this.userService.isAnonymousUser());
+  }
+
+  private extractErrorMessage(error: HttpErrorResponse) {
+    let errorMessage: string = '';
+    let logMessage: string = '';
+    if (error.error instanceof ErrorEvent) {
+      // client-side error
+      errorMessage = error.error.message;
+    } else if (error.error instanceof ProgressEvent) {
+      errorMessage = error.statusText;
+    } else {
+      // server-side error
+      if (error.error.error) {
+        errorMessage = error.error.error;
+      } else if (error.error instanceof Blob) {
+        errorMessage = error.statusText;
+      } else {
+        errorMessage = error.error;
+      }
+      logMessage = `Error Code: ${error.status}`;
+    }
+
+    console.error(`${logMessage}: ${errorMessage}`);
+    return errorMessage;
+  }
+
   injectToken(request: HttpRequest<any>) {
     return request.clone({
       setHeaders: {

From 855936992050825f263eaa6ce75d728cb972acca Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 14:44:57 +1000
Subject: [PATCH 531/776] chore: remove demonstrate status option

---
 .../task-definition-prerequisites.component.ts                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 5e7e27cb7d..16972313c6 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -47,8 +47,7 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
 
   public readonly stateOptions = [
     {value: 'ready_for_feedback', label: 'Ready for Feedback'},
-    {value: 'discuss', label: 'Discuss / Demonstrate'},
-    // {value: 'demonstrate', label: 'Discuss / Demonstrate'},
+    {value: 'discuss', label: 'Discuss'},
     {value: 'complete', label: 'Complete'},
   ];
 

From 366dd2bb3abbde431a631688d7f4a542a1081277 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 14:50:47 +1000
Subject: [PATCH 532/776] chore: ensure no text wrapping

---
 .../task-definition-prerequisites.component.html                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index d0c16fc54c..a7ae1d8d99 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -65,7 +65,7 @@
       </ng-container>
 
       <ng-container matColumnDef="actions">
-        <th mat-header-cell *matHeaderCellDef>
+        <th mat-header-cell *matHeaderCellDef class="whitespace-nowrap">
           @if (staffView) {
             Actions
           } @else {

From f6d3e939bb4bf198b1a1cad56ff4c5c65551abc0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 14:51:17 +1000
Subject: [PATCH 533/776] chore: show task definition name

---
 .../task-prerequisites-card.component.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
index daccda0fc2..38b96b2683 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
@@ -6,7 +6,7 @@
 
   <mat-card-subtitle class="mb-4">
     You must finish these prerequisite tasks before submitting
-    {{ taskDefinition.abbreviation }}.</mat-card-subtitle
+    {{ taskDefinition.abbreviation }} {{ taskDefinition.name }}.</mat-card-subtitle
   >
   <f-task-definition-prerequisites
     [taskDefinition]="taskDefinition"

From 7eaf146c65af3055dcab237f41a0275ebbeb1a27 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 14:59:09 +1000
Subject: [PATCH 534/776] refactor: combine current task status column via
 status icon

---
 ...sk-definition-prerequisites.component.html | 29 +++++--------------
 ...task-definition-prerequisites.component.ts |  7 +----
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index a7ae1d8d99..fa36b9026b 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -1,25 +1,6 @@
 <div class="flex flex-col">
   <div class="flex-grow flex flex-row">
     <table mat-table [dataSource]="dataSource">
-      <ng-container matColumnDef="current-status">
-        <th mat-header-cell *matHeaderCellDef>
-          @if (!staffView) {
-            Status
-          }
-        </th>
-        <td mat-cell *matCellDef="let link">
-          @if (!staffView) {
-            <ng-container>
-              @if (!staffView) {
-                <status-icon
-                  matBadgePosition="before"
-                  [status]="link.prerequisite?.projectTask(task?.project)?.status ?? 'not_started'"
-                ></status-icon>
-              }
-            </ng-container>
-          }
-        </td>
-      </ng-container>
       <ng-container matColumnDef="task-definition">
         <th mat-header-cell *matHeaderCellDef>Task Definition</th>
         <td
@@ -45,7 +26,10 @@
           [class.line-through]="link.hasMetRequiredState(task?.project)"
         >
           @if (!staffView) {
-            {{ link.prerequisite?.projectTask(task?.project)?.statusLabel() ?? 'Not Started' }}
+            <status-icon
+              matBadgePosition="before"
+              [status]="link.prerequisite?.projectTask(task?.project)?.status ?? 'not_started'"
+            ></status-icon>
           } @else {
             @if (link.taskStatus) {
               <mat-select
@@ -85,7 +69,10 @@
               </button>
             </td>
           } @else {
-            {{ link?.requiredStatusLabel() ?? 'Not Started' }}
+            <status-icon
+              matBadgePosition="before"
+              [status]="link.taskStatus ?? 'complete'"
+            ></status-icon>
           }
         </td>
       </ng-container>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 16972313c6..62ffbf2c4b 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -21,12 +21,7 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   @Input() staffView: boolean;
   @Input() task: Task;
 
-  displayedColumns: string[] = [
-    'current-status',
-    'task-definition',
-    'minimum-required-state',
-    'actions',
-  ];
+  displayedColumns: string[] = ['task-definition', 'minimum-required-state', 'actions'];
 
   private prereqSub?: Subscription;
 

From 7941b6aa9305eb6b55c0154aefdd4d56f92217d3 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 14:59:33 +1000
Subject: [PATCH 535/776] chore(release): 10.0.0-36

---
 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 23ae073701..be689890db 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.
 
+## [10.0.0-36](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-35...v10.0.0-36) (2025-09-09)
+
 ## [10.0.0-35](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-34...v10.0.0-35) (2025-09-09)
 
 
diff --git a/package-lock.json b/package-lock.json
index 3f886b0332..778420ecf0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-35",
+  "version": "10.0.0-36",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-35",
+      "version": "10.0.0-36",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 1fa658b144..16f74593f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-35",
+  "version": "10.0.0-36",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 6116f7cfbce4d21c512b11f293698f6d76fc157f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 15:11:49 +1000
Subject: [PATCH 536/776] chore: remove debug log

---
 src/app/api/services/task-prerequisite.service.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/api/services/task-prerequisite.service.ts b/src/app/api/services/task-prerequisite.service.ts
index a826d3dc81..d8ced93c47 100644
--- a/src/app/api/services/task-prerequisite.service.ts
+++ b/src/app/api/services/task-prerequisite.service.ts
@@ -1,7 +1,6 @@
 import {HttpClient} from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {CachedEntityService} from 'ngx-entity-service';
-import {TaskDefinition} from 'src/app/api/models/doubtfire-model';
 import API_URL from 'src/app/config/constants/apiURL';
 import {TaskPrerequisite} from '../models/task-prerequisite';
 
@@ -13,8 +12,6 @@ export class TaskPrerequisiteService extends CachedEntityService<TaskPrerequisit
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
 
-    console.log('making new prerequisite');
-
     this.mapping.addKeys('id', 'taskDefinitionId', 'prerequisiteId', 'taskStatus');
 
     // this.mapping.mapAllKeysToJsonExcept('id', 'taskDefinitionId', 'prerequisiteId', 'taskStatus');

From a4cdc1f89f958894e6100cf3021112408d4cc67b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 15:50:56 +1000
Subject: [PATCH 537/776] chore(release): 10.0.0-37

---
 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 be689890db..39651842e2 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.
 
+## [10.0.0-37](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-36...v10.0.0-37) (2025-09-09)
+
 ## [10.0.0-36](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-35...v10.0.0-36) (2025-09-09)
 
 ## [10.0.0-35](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-34...v10.0.0-35) (2025-09-09)
diff --git a/package-lock.json b/package-lock.json
index 778420ecf0..c626cd4249 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-36",
+  "version": "10.0.0-37",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-36",
+      "version": "10.0.0-37",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 16f74593f5..793efe5bfc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-36",
+  "version": "10.0.0-37",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 1cc06c0dc9ab29bf0a2106546eb5b0453681bdcc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Sep 2025 17:53:50 +1000
Subject: [PATCH 538/776] refactor: redirect to discussion route if tutor
 clicks qr code

---
 src/app/common/header/header.component.ts | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/app/common/header/header.component.ts b/src/app/common/header/header.component.ts
index fc1778f1d2..a0d791146c 100644
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
@@ -12,6 +12,7 @@ import { DoubtfireConstants, LogoSettings } from 'src/app/config/constants/doubt
 import {SidekiqJobEntry, SidekiqJobService} from 'src/app/api/services/sidekiq-job.service';
 import {SidekiqJobsModalService} from '../modals/sidekiq-jobs-modal/sidekiq-jobs-modal.service';
 import {QrModalService} from '../modals/qr-modal/qr-modal.service';
+import {StateService} from '@uirouter/core';
 
 @Component({
   selector: 'app-header',
@@ -56,6 +57,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
     private sidekiqJobService: SidekiqJobService,
     private sidekiqJobsModalService: SidekiqJobsModalService,
     private qrModalService: QrModalService,
+    private stateService: StateService,
   ) {}
 
   ngOnInit(): void {
@@ -147,14 +149,19 @@ export class HeaderComponent implements OnInit, OnDestroy {
       this.currentProject.student.username !== this.currentUser.username;
 
     const username = projectView ? this.currentProject.student.username : this.currentUser.username;
-
-    const url = `${hostName}/tutor-discussion?unitId=${this.currentUnit.id}&username=${username}`;
-    this.qrModalService.show(
-      url,
-      'Display this QR code during your class so your tutor can scan it to view your submissions and mark your tasks as complete.',
-      projectView ? `Viewing QR for ${this.currentProject.student.name}` : '',
-      true,
-    );
+    if (projectView || this.currentUser.role === 'Student') {
+      const url = `${hostName}/tutor-discussion?unitId=${this.currentUnit.id}&username=${username}`;
+      this.qrModalService.show(
+        url,
+        'Display this QR code during your class so your tutor can scan it to view your submissions and mark your tasks as complete.',
+        projectView ? `Viewing QR for ${this.currentProject.student.name}` : '',
+        true,
+      );
+    } else {
+      this.stateService.go('tutor-discussion', {
+        unitId: this.currentUnit.id,
+      });
+    }
   }
 
   showSidekiqJob() {

From 3945f4e2ecff1a1d79662c099baf745bfd6f4b7d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 10 Sep 2025 09:52:00 +1000
Subject: [PATCH 539/776] fix: ensure task prerequisites are correctly cached

---
 .../task-definition-prerequisites.component.ts   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 62ffbf2c4b..1e11eed7ff 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -100,13 +100,21 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
   private fetchTaskPrerequisites() {
     const taskDefinition = this.taskDefinition;
     this.taskPrerequisiteService
-      .query({
-        unitId: this.unit.id,
-        taskDefId: taskDefinition.id,
-      })
+      .query(
+        {
+          unitId: this.unit.id,
+          taskDefId: taskDefinition.id,
+        },
+        {
+          cache: taskDefinition.taskPrerequisitesCache,
+        },
+      )
       .subscribe({
         next: (data) => {
           for (const prereq of data) {
+            if (prereq.taskDefinitionId !== taskDefinition.id) {
+              continue;
+            }
             taskDefinition.taskPrerequisitesCache.getOrCreate(
               prereq.id,
               this.taskPrerequisiteService,

From 13c631883a107ac5f34fb87b4248200a6678175c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 10 Sep 2025 09:54:24 +1000
Subject: [PATCH 540/776] chore(release): 10.0.0-38

---
 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 39651842e2..b6d985b3d5 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.
 
+## [10.0.0-38](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-37...v10.0.0-38) (2025-09-09)
+
+
+### Bug Fixes
+
+* ensure task prerequisites are correctly cached ([3945f4e](https://github.com/b0ink/doubtfire-deploy/commit/3945f4e2ecff1a1d79662c099baf745bfd6f4b7d))
+
 ## [10.0.0-37](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-36...v10.0.0-37) (2025-09-09)
 
 ## [10.0.0-36](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-35...v10.0.0-36) (2025-09-09)
diff --git a/package-lock.json b/package-lock.json
index c626cd4249..7501a16acc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-37",
+  "version": "10.0.0-38",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-37",
+      "version": "10.0.0-38",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 793efe5bfc..0f46afef47 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-37",
+  "version": "10.0.0-38",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 6291bd61ccc4ff45c708300d0a5014a59a565414 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 10 Sep 2025 11:10:24 +1000
Subject: [PATCH 541/776] fix: wording

---
 .../submission-type-modal/submission-type-modal.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
index ce8bd35e1e..16931e3ff4 100644
--- a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
@@ -3,7 +3,7 @@ <h2 mat-dialog-title>Select submission type</h2>
   <p>
     You can either upload your submission for tutor feedback or submit it directly for your
     portfolio. Make sure to check if a discussion is required — tutors won’t review tasks submitted
-    to the portfolio or submitted late.
+    to the portfolio or if submitted late.
   </p>
   <div class="p-5 flex justify-center gap-5">
     <button

From bc0ca8a56437bd7eb4ebad091b4d7977001a3771 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 10 Sep 2025 11:19:04 +1000
Subject: [PATCH 542/776] chore: reword

---
 .../submission-type-modal.component.html                 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
index 16931e3ff4..3618bd2977 100644
--- a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
@@ -1,9 +1,12 @@
 <h2 mat-dialog-title>Select submission type</h2>
 <mat-dialog-content>
   <p>
-    You can either upload your submission for tutor feedback or submit it directly for your
-    portfolio. Make sure to check if a discussion is required — tutors won’t review tasks submitted
-    to the portfolio or if submitted late.
+    You can either upload your submission for tutor feedback or submit it directly to your
+    portfolio. Make sure to check if a discussion is required.
+  </p>
+  <p>
+    Tutors won’t provide feedback on tasks submitted directly to the portfolio or after the
+    deadline. They will instead be assessed as part of your final grade.
   </p>
   <div class="p-5 flex justify-center gap-5">
     <button

From 17a10bd46d3035477fee0f47a84079839f38c2b8 Mon Sep 17 00:00:00 2001
From: Jason Vellucci <jason.vellucci@live.com>
Date: Wed, 10 Sep 2025 12:01:24 +1000
Subject: [PATCH 543/776] chore: migrate/group set selector (#981)

* chore: migrate group-set-selector (WIP)

- define and declare new component files

- import new component into app

- downgrade component

* chore: migrate group-set-selector

- convert AngularJS template syntax to Angular syntax
- finish implementing `group-set-selector.component.ts`
- remove redundant Coffeescript file

* chore: migrate group-set-selector

- finish defining Typescript logic
- update parent component to use Angular syntax for child component declaration

* chore: cleanup and documentation

- remove redundant Coffeescript file
- adjust frontend migration todo list

* chore: remove redundant file

- remove redundant Coffeescript file

* fix: attribute and event binding

- fix attribute and event binding syntax
- remove redundant template file

* refactor: two-way binding

- remove redundant directive attributes

- rename EventEmitter var name in child component

* Update README.md

* Update README.md

* refactor: replace Bootstrap components with Angular Material

- replace Bootstrap components with Angular Material components & directives

- refactor to use modern Angular structural directives
---
 README.md                                     |  5 +-
 src/app/doubtfire-angular.module.ts           |  5 ++
 src/app/doubtfire-angularjs.module.ts         | 57 +++++++++++++------
 .../group-selector/group-selector.tpl.html    |  8 +--
 .../group-set-selector.coffee                 | 18 ------
 .../group-set-selector.component.html         | 10 ++++
 ...scss => group-set-selector.component.scss} |  0
 .../group-set-selector.component.ts           | 31 ++++++++++
 .../group-set-selector.tpl.html               |  6 --
 src/app/groups/groups.coffee                  |  1 -
 10 files changed, 94 insertions(+), 47 deletions(-)
 delete mode 100644 src/app/groups/group-set-selector/group-set-selector.coffee
 create mode 100644 src/app/groups/group-set-selector/group-set-selector.component.html
 rename src/app/groups/group-set-selector/{group-set-selector.scss => group-set-selector.component.scss} (100%)
 create mode 100644 src/app/groups/group-set-selector/group-set-selector.component.ts
 delete mode 100644 src/app/groups/group-set-selector/group-set-selector.tpl.html

diff --git a/README.md b/README.md
index b213dcce33..e748a9393b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ A modern, lightweight learning management system.
 
 SUMMARY:
 
-73 / 132 components migrated
+74 / 132 components migrated
 
 MIGRATED:
 
@@ -91,6 +91,8 @@ MIGRATED:
 - [x] ./src/app/common/services/alert.service.ts
 - [x] ./src/app/sessions/states/sign-in/sign-in.component.ts
 - [x] ./src/app/account/edit-profile/edit-profile.component.ts
+- [x] ./src/app/groups/group-set-selector/group-set-selector.component.ts
+- [x] ./src/app/admin/modals/create-unit-modal/create-unit-modal.coffee
 
 TODO:
 
@@ -164,7 +166,6 @@ TODO:
 - [ ] ./src/app/groups/group-set-manager/group-set-manager.coffee
 - [ ] ./src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.coffee
 - [ ] ./src/app/groups/group-member-list/group-member-list.coffee
-- [ ] ./src/app/groups/group-set-selector/group-set-selector.coffee
 - [ ] ./src/app/groups/tutor-group-manager/tutor-group-manager.coffee
 - [ ] ./src/app/groups/groups.coffee
 - [ ] ./src/app/units/modals/unit-student-enrolment-modal/unit-student-enrolment-modal.coffee
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 9b2545118d..d899bd4a31 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -278,6 +278,10 @@ import {UnavailableCardComponent} from './errors/unavailable-card/unavailable-ca
 import {TaskDefinitionPrerequisitesComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component';
 import {TaskPrerequisitesCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component';
 import {TaskPrerequisiteService} from './api/services/task-prerequisite.service';
+// import { GradeIconComponent } from './common/grade-icon/grade-icon.component';
+// import { GradeTaskModalComponent } from './tasks/modals/grade-task-modal/grade-task-modal.component';
+// import { PrivacyPolicy } from './config/privacy-policy/privacy-policy';
+import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -422,6 +426,7 @@ const MY_DATE_FORMAT = {
     UnavailableCardComponent,
     TaskDefinitionPrerequisitesComponent,
     TaskPrerequisitesCardComponent,
+    GroupSetSelectorComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 50807ec1b3..dce3836133 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -87,7 +87,6 @@ import 'build/src/app/groups/group-set-manager/group-set-manager.js';
 import 'build/src/app/groups/groups.js';
 import 'build/src/app/groups/group-member-contribution-assigner/group-member-contribution-assigner.js';
 import 'build/src/app/groups/group-member-list/group-member-list.js';
-import 'build/src/app/groups/group-set-selector/group-set-selector.js';
 import 'build/src/app/units/modals/unit-student-enrolment-modal/unit-student-enrolment-modal.js';
 import 'build/src/app/units/modals/unit-ilo-edit-modal/unit-ilo-edit-modal.js';
 import 'build/src/app/units/modals/modals.js';
@@ -148,7 +147,7 @@ import {ExtensionCommentComponent} from './tasks/task-comments-viewer/extension-
 import {TaskAssessmentCommentComponent} from './tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component';
 import {ExtensionModalService} from './common/modals/extension-modal/extension-modal.service';
 import {CalendarModalService} from './common/modals/calendar-modal/calendar-modal.service';
-import { ConfirmationModalService } from './common/modals/confirmation-modal/confirmation-modal.service';
+import {ConfirmationModalService} from './common/modals/confirmation-modal/confirmation-modal.service';
 import {CampusListComponent} from './admin/institution-settings/campuses/campus-list/campus-list.component';
 import {ActivityTypeListComponent} from './admin/institution-settings/activity-type-list/activity-type-list.component';
 import {InstitutionSettingsComponent} from './admin/institution-settings/institution-settings.component';
@@ -228,20 +227,28 @@ import {FeedbackTemplateService} from './api/services/feedback-template.service'
 import {StaffNotesComponent} from './projects/states/staff-notes/staff-notes.component';
 import {SidekiqProgressModalService} from './common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 import {TaskPrerequisitesCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component';
+// import { UnitStudentEnrolmentModalService } from './units/modals/unit-student-enrolment-modal/unit-student-enrolment-modal.service';
+// import { PrivacyPolicy } from './config/privacy-policy/privacy-policy';
+import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
 
-export const DoubtfireAngularJSModule = angular.module('doubtfire', [
-  'doubtfire.config',
-  'doubtfire.sessions',
-  'doubtfire.common',
-  'doubtfire.errors',
-  'doubtfire.units',
-  'doubtfire.tasks',
-  'doubtfire.projects',
-  'doubtfire.groups',
-  'doubtfire.visualisations',
-]).config(['$locationProvider', ($locationProvider) => {
-  $locationProvider.html5Mode(true);
-}]);
+export const DoubtfireAngularJSModule = angular
+  .module('doubtfire', [
+    'doubtfire.config',
+    'doubtfire.sessions',
+    'doubtfire.common',
+    'doubtfire.errors',
+    'doubtfire.units',
+    'doubtfire.tasks',
+    'doubtfire.projects',
+    'doubtfire.groups',
+    'doubtfire.visualisations',
+  ])
+  .config([
+    '$locationProvider',
+    ($locationProvider) => {
+      $locationProvider.html5Mode(true);
+    },
+  ]);
 
 // Downgrade angular modules that we need...
 // factory -> service
@@ -252,7 +259,10 @@ DoubtfireAngularJSModule.factory('DoubtfireConstants', downgradeInjectable(Doubt
 DoubtfireAngularJSModule.factory('ExtensionModal', downgradeInjectable(ExtensionModalService));
 DoubtfireAngularJSModule.factory('Marked', downgradeInjectable(MarkedPipe));
 DoubtfireAngularJSModule.factory('CalendarModal', downgradeInjectable(CalendarModalService));
-DoubtfireAngularJSModule.factory('ConfirmationModal', downgradeInjectable(ConfirmationModalService));
+DoubtfireAngularJSModule.factory(
+  'ConfirmationModal',
+  downgradeInjectable(ConfirmationModalService),
+);
 DoubtfireAngularJSModule.factory('TaskCommentService', downgradeInjectable(TaskCommentService));
 DoubtfireAngularJSModule.factory('alertService', downgradeInjectable(AlertService));
 DoubtfireAngularJSModule.factory('tutorialService', downgradeInjectable(TutorialService));
@@ -514,3 +524,18 @@ const otherwiseConfigBlock = [
   },
 ];
 DoubtfireAngularJSModule.config(otherwiseConfigBlock);
+
+// DoubtfireAngularJSModule.directive(
+//   'fProgressBurndownChart',
+//   downgradeComponent({ component: ProgressBurndownChartComponent })
+// );
+
+// DoubtfireAngularJSModule.directive(
+//   'fTaskVisualisation',
+//   downgradeComponent({ component: TaskVisualisationComponent })
+// );
+
+DoubtfireAngularJSModule.directive(
+  'groupSetSelector',
+  downgradeComponent({component: GroupSetSelectorComponent}),
+);
diff --git a/src/app/groups/group-selector/group-selector.tpl.html b/src/app/groups/group-selector/group-selector.tpl.html
index 3e52cc4402..e0a9446a14 100644
--- a/src/app/groups/group-selector/group-selector.tpl.html
+++ b/src/app/groups/group-selector/group-selector.tpl.html
@@ -3,10 +3,10 @@ <h4 class="panel-title">
     Groups for
     <strong ng-hide="showGroupSetSelector"> {{selectedGroupSet.name}} </strong>
     <group-set-selector
-      ng-show="showGroupSetSelector"
-      unit="unit"
-      ng-model="selectedGroupSet"
-      on-change="selectGroupSet"
+      *ngIf="showGroupSetSelector"
+      [unit]="unit"
+      [(selected-group-set)]="selectedGroupSet"
+      (selected-group-set-change)="selectGroupSet($event)"
     >
     </group-set-selector>
   </h4>
diff --git a/src/app/groups/group-set-selector/group-set-selector.coffee b/src/app/groups/group-set-selector/group-set-selector.coffee
deleted file mode 100644
index 62e99b74d0..0000000000
--- a/src/app/groups/group-set-selector/group-set-selector.coffee
+++ /dev/null
@@ -1,18 +0,0 @@
-angular.module('doubtfire.groups.group-set-selector', [])
-
-#
-# Directive that can switch context of a specific group set
-#
-.directive('groupSetSelector', ->
-  restrict: 'E'
-  templateUrl: 'groups/group-set-selector/group-set-selector.tpl.html'
-  scope:
-    unit: '='
-    selectedGroupSet: '=ngModel'
-    onSelectGroupSet: '=onChange'
-  controller: ($scope) ->
-    unless $scope.unit?
-      throw Error "Unit not supplied to group set selector"
-    $scope.selectGroupSet = ->
-      $scope.onSelectGroupSet?($scope.selectedGroupSet)
-)
diff --git a/src/app/groups/group-set-selector/group-set-selector.component.html b/src/app/groups/group-set-selector/group-set-selector.component.html
new file mode 100644
index 0000000000..46486cf3f8
--- /dev/null
+++ b/src/app/groups/group-set-selector/group-set-selector.component.html
@@ -0,0 +1,10 @@
+<mat-form-field>
+  <mat-select
+    (ngModelChange)="selectGroupSet($event)"
+    [(ngModel)]="selectedGroupSet"
+  >
+    @for (gs of unit.groupSets; track gs.id) {
+      <mat-option [value]="gs">{{gs.name}}</mat-option>
+    }
+  </mat-select>
+</mat-form-field>
diff --git a/src/app/groups/group-set-selector/group-set-selector.scss b/src/app/groups/group-set-selector/group-set-selector.component.scss
similarity index 100%
rename from src/app/groups/group-set-selector/group-set-selector.scss
rename to src/app/groups/group-set-selector/group-set-selector.component.scss
diff --git a/src/app/groups/group-set-selector/group-set-selector.component.ts b/src/app/groups/group-set-selector/group-set-selector.component.ts
new file mode 100644
index 0000000000..60ece272be
--- /dev/null
+++ b/src/app/groups/group-set-selector/group-set-selector.component.ts
@@ -0,0 +1,31 @@
+import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
+import { Unit, GroupSet } from 'src/app/api/models/doubtfire-model';
+
+@Component({
+  selector: 'group-set-selector',
+  templateUrl: './group-set-selector.component.html',
+  styleUrls: ['./group-set-selector.component.scss']
+})
+export class GroupSetSelectorComponent implements OnInit {
+  @Input() unit: Unit;
+  @Input() selectedGroupSet: GroupSet;
+  @Output() selectedGroupSetChange = new EventEmitter<GroupSet>();
+
+  ngOnInit(): void {
+    if (!this.unit) {
+      throw new Error('Unit not supplied to group set selector');
+    }
+  }
+
+  /**
+   * Emits the selected group set and updates the parent component.
+   *
+   * Also updates the local state.
+   *
+   * @param {GroupSet} groupSet
+   */
+  selectGroupSet(groupSet: GroupSet): void {
+    this.selectedGroupSet = groupSet;
+    this.selectedGroupSetChange.emit(this.selectedGroupSet);
+  }
+}
diff --git a/src/app/groups/group-set-selector/group-set-selector.tpl.html b/src/app/groups/group-set-selector/group-set-selector.tpl.html
deleted file mode 100644
index e735686bb4..0000000000
--- a/src/app/groups/group-set-selector/group-set-selector.tpl.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<select
-  class="form-control"
-  ng-change="selectGroupSet()"
-  ng-options="gs as gs.name for gs in unit.groupSets"
-  ng-model="selectedGroupSet">
-</select>
diff --git a/src/app/groups/groups.coffee b/src/app/groups/groups.coffee
index 031080f0b1..391a78d492 100644
--- a/src/app/groups/groups.coffee
+++ b/src/app/groups/groups.coffee
@@ -3,5 +3,4 @@ angular.module('doubtfire.groups', [
   'doubtfire.groups.group-member-list'
   'doubtfire.groups.group-selector'
   'doubtfire.groups.group-set-manager'
-  'doubtfire.groups.group-set-selector'
 ])

From 86433bb18e6ff9b024d7c397b8744618721b602f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 10 Sep 2025 14:16:47 +1000
Subject: [PATCH 544/776] feat: display warning above task sheet for incomplete
 prerequisites

---
 .../directives/task-dashboard/task-dashboard.tpl.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index 1032e8a8f3..8a11cd6920 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -68,6 +68,17 @@
     <!--/task-description-column-->
   </div>
   <!--/panel-body-->
+  <!-- Incomplete Task Prerequisites Warning -->
+  <div
+    ng-if="task && isCurrentView('task') && task.blockedByPrerequisiteTasks()"
+    class="flex items-center text-center px-4 py-3 bg-yellow-100 border-l-4 border-r-4 border-yellow-500 text-yellow-700"
+  >
+    <i class="fa fa-exclamation-triangle mr-2 fa-lg"></i>
+    Warning: This task has {{task.definition.taskPrerequisitesCache.currentValues.length}}
+    prerequisite{{ task.definition.taskPrerequisitesCache.currentValues.length > 1 ? 's' : '' }}
+    that you still need to complete. You won’t be able to submit this task until they’re done.
+  </div>
+  <!-- /Incomplete Task Prerequisites Warning -->
   <div class="panel-body has-pdf" ng-if="isCurrentView('task')">
     <f-pdf-viewer [pdf-url]="urls.taskSheetPdfUrl"></f-pdf-viewer>
   </div>

From 3ea778d75b3b5a0a072dac80c05d3cf396baafce Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 10 Sep 2025 14:19:29 +1000
Subject: [PATCH 545/776] chore: remove 'definition' keyword

---
 .../task-definition-prerequisites.component.html                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
index fa36b9026b..cf4faacbe4 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.html
@@ -2,7 +2,7 @@
   <div class="flex-grow flex flex-row">
     <table mat-table [dataSource]="dataSource">
       <ng-container matColumnDef="task-definition">
-        <th mat-header-cell *matHeaderCellDef>Task Definition</th>
+        <th mat-header-cell *matHeaderCellDef>Task</th>
         <td
           mat-cell
           *matCellDef="let link"

From e03106f9bfa1add38fd11b7f682079b7d25202bf Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 10 Sep 2025 15:07:48 +1000
Subject: [PATCH 546/776] chore: reword

---
 .../directives/task-dashboard/task-dashboard.tpl.html          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index 8a11cd6920..d845a5bcd9 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -76,7 +76,8 @@
     <i class="fa fa-exclamation-triangle mr-2 fa-lg"></i>
     Warning: This task has {{task.definition.taskPrerequisitesCache.currentValues.length}}
     prerequisite{{ task.definition.taskPrerequisitesCache.currentValues.length > 1 ? 's' : '' }}
-    that you still need to complete. You won’t be able to submit this task until they’re done.
+    that you still need to complete. You won’t be able to submit this task until all prerequisites
+    are met.
   </div>
   <!-- /Incomplete Task Prerequisites Warning -->
   <div class="panel-body has-pdf" ng-if="isCurrentView('task')">

From a7c493e07c771dc38ad162a5b233a731e62860ff Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 10 Sep 2025 15:17:47 +1000
Subject: [PATCH 547/776] chore(release): 10.0.0-39

---
 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 b6d985b3d5..69aa0eee50 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.
 
+## [10.0.0-39](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-38...v10.0.0-39) (2025-09-10)
+
+
+### Features
+
+* display warning above task sheet for incomplete prerequisites ([86433bb](https://github.com/b0ink/doubtfire-deploy/commit/86433bb18e6ff9b024d7c397b8744618721b602f))
+
 ## [10.0.0-38](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-37...v10.0.0-38) (2025-09-09)
 
 
diff --git a/package-lock.json b/package-lock.json
index 7501a16acc..478037d0d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-38",
+  "version": "10.0.0-39",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-38",
+      "version": "10.0.0-39",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 0f46afef47..f39d913f83 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-38",
+  "version": "10.0.0-39",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 2a2e4a41e6ea20152632a9f82ca1723d9a6b56cc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 11 Sep 2025 11:26:02 +1000
Subject: [PATCH 548/776] fix: typo

---
 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 3ac8dea4b2..4bff84e86c 100644
--- a/src/app/api/models/task-status.ts
+++ b/src/app/api/models/task-status.ts
@@ -370,7 +370,7 @@ export class TaskStatus {
         detail: 'Your submission will be assessed in your portfolio',
         reason:
           'This task will no longer be checked by tutors, and will be assessed directly in your final portfolio submission.',
-        action: 'You will need to ensure this task is at an adequare standard in your portfolio.',
+        action: 'You will need to ensure this task is at an adequate standard in your portfolio.',
       },
     ],
     // [

From 09e6a9a7fdce5d34e35c0c15eb8f94ef05323f58 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 11 Sep 2025 11:30:26 +1000
Subject: [PATCH 549/776] chore: ensure current tasks status is in the trigger
 list

---
 .../task-status-card.component.ts              | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index 7cd370a13c..a5a0134dca 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -2,7 +2,7 @@ import {AfterViewInit, Component, Input, OnChanges, SimpleChanges} from '@angula
 import {UIRouter} from '@uirouter/core';
 import * as _ from 'lodash';
 import {Task} from 'src/app/api/models/task';
-import {TaskStatusEnum} from 'src/app/api/models/task-status';
+import {TaskStatusEnum, TaskStatusUiData} from 'src/app/api/models/task-status';
 import {TaskService} from 'src/app/api/services/task.service';
 import {ExtensionModalService} from 'src/app/common/modals/extension-modal/extension-modal.service';
 import {QrModalService} from 'src/app/common/modals/qr-modal/qr-modal.service';
@@ -17,8 +17,7 @@ import {UserService} from 'src/app/api/services/user.service';
   styleUrls: ['./task-status-card.component.scss'],
 })
 export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  triggers: any;
+  triggers: TaskStatusUiData[];
   textCss: string;
   constructor(
     private extensions: ExtensionModalService,
@@ -54,15 +53,18 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
   reapplyTriggers(): void {
     // if tutor is in queryParam
     if (this.router.globals.params.tutor != null) {
-      this.triggers = this.taskService.statusKeys.map(this.taskService.statusData);
+      this.triggers = this.taskService.statusKeys.map((k) => this.taskService.statusData(k));
     } else {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const studentTriggers = _.map(
-        this.taskService.switchableStates.student,
-        this.taskService.statusData,
-      ) as any;
+        this.taskService.switchableStates.student as TaskStatusEnum[],
+        (k) => this.taskService.statusData(k),
+      );
       const filteredStudentTriggers = this.task.filterFutureStates(studentTriggers);
       this.triggers = filteredStudentTriggers;
+      // Ensure the current task's status is in the list
+      if (!this.triggers.find((t) => t.status === this.task.status)) {
+        this.triggers.push(this.taskService.statusData(this.task.status));
+      }
     }
     this.taskService.statusKeys;
   }

From 712a96b138f37cc92ad960bbc551a29d5a543842 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 11 Sep 2025 12:03:52 +1000
Subject: [PATCH 550/776] chore: include definition name in automated message

---
 src/app/common/footer/footer.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index c7ab14a19b..ad80f4060e 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -78,7 +78,7 @@ export class FooterComponent implements OnInit {
       return;
     }
     task.addComment(
-      `**Automated Message:** Task "${task.definition.abbreviation}" will be graded during portfolio assessment only. You must now submit it for "Assess in Portfolio" before the portfolio deadline.`,
+      `**Automated Message:** Task "${task.definition.abbreviation} ${task.definition.name}" will be graded during portfolio assessment only. You must now submit it for "Assess in Portfolio" before the portfolio deadline.`,
     );
     setTimeout(() => {
       task.updateTaskStatus('working_on_it');

From c229f830a9b633758b83866dc20e0d4c1b4162cb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 11 Sep 2025 15:41:45 +1000
Subject: [PATCH 551/776] chore: improve wording

---
 .../submission-type-modal.component.html                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
index 3618bd2977..a6766df1c5 100644
--- a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
@@ -1,12 +1,12 @@
 <h2 mat-dialog-title>Select submission type</h2>
 <mat-dialog-content>
   <p>
-    You can either upload your submission for tutor feedback or submit it directly to your
-    portfolio. Make sure to check if a discussion is required.
+    This task will not be marked as complete by your tutor, and will instead be assessed in your
+    final portfolio.
   </p>
   <p>
-    Tutors won’t provide feedback on tasks submitted directly to the portfolio or after the
-    deadline. They will instead be assessed as part of your final grade.
+    You may submit it for tutor feedback before the deadline, but you'll still need to resubmit it
+    for your portfolio when you are ready.
   </p>
   <div class="p-5 flex justify-center gap-5">
     <button

From b5dc3db96a7cbfa555a0acf9143b44ab6d853209 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 11 Sep 2025 15:46:52 +1000
Subject: [PATCH 552/776] chore: add tooltips for submission type

---
 src/app/common/footer/footer.component.ts                       | 2 +-
 .../submission-type-modal/submission-type-modal.component.html  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index ad80f4060e..6d712f071c 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -78,7 +78,7 @@ export class FooterComponent implements OnInit {
       return;
     }
     task.addComment(
-      `**Automated Message:** Task "${task.definition.abbreviation} ${task.definition.name}" will be graded during portfolio assessment only. You must now submit it for "Assess in Portfolio" before the portfolio deadline.`,
+      `**Automated Message:** Task "${task.definition.abbreviation} ${task.definition.name}" will be graded during portfolio assessment only. You must now submit it directly for portfolio assessment before the portfolio deadline.`,
     );
     setTimeout(() => {
       task.updateTaskStatus('working_on_it');
diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
index a6766df1c5..36351da0d1 100644
--- a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
@@ -10,6 +10,7 @@ <h2 mat-dialog-title>Select submission type</h2>
   </p>
   <div class="p-5 flex justify-center gap-5">
     <button
+      matTooltip="Receive feedback from your tutor"
       mat-raised-button
       class="h-[175px] w-[175px] flex flex-col text-align p-2 items-center gap-3"
       color="primary"
@@ -19,6 +20,7 @@ <h2 mat-dialog-title>Select submission type</h2>
       <div class="text-center">Submit for Feedback</div>
     </button>
     <button
+      matTooltip="Submit directly for portfolio assessment"
       mat-raised-button
       class="h-[175px] w-[175px] flex flex-col text-align p-2 items-center gap-3"
       (click)="triggerTransition('assess_in_portfolio')"

From 82327724a84fd81bb6b8bac469fe65e757c6dadd Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 15 Sep 2025 11:22:33 +1000
Subject: [PATCH 553/776] refactor: queue submission downloads to sidekiq

---
 .../api/services/task-definition.service.ts   | 14 +++++
 .../staff-task-list.component.html            |  2 +-
 .../staff-task-list.component.ts              | 56 ++++++++++++++-----
 3 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 67f1926d92..8bbd962a00 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -13,6 +13,8 @@ import {AppInjector} from 'src/app/app-injector';
 import {Observable} from 'rxjs';
 import {TaskPrerequisiteService} from './task-prerequisite.service';
 import {TaskPrerequisite} from '../models/task-prerequisite';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {SidekiqJob} from '../models/sidekiq-job';
 
 @Injectable()
 export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
@@ -200,4 +202,16 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       },
     );
   }
+
+  public zipSubmissionFiles(taskDefinition: TaskDefinition): Observable<SidekiqJob> {
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/submission/units/${taskDefinition.unit.id}/task_definitions/${taskDefinition.id}/download_submissions/zip`;
+    const httpClient = AppInjector.get(HttpClient);
+    return httpClient.get<SidekiqJob>(url);
+  }
+
+  public zipSubmissionPdfs(taskDefinition: TaskDefinition): Observable<SidekiqJob> {
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/submission/units/${taskDefinition.unit.id}/task_definitions/${taskDefinition.id}/student_pdfs/zip`;
+    const httpClient = AppInjector.get(HttpClient);
+    return httpClient.get<SidekiqJob>(url);
+  }
 }
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index be9c666ab9..2291a5e7a6 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -75,7 +75,7 @@
           <mat-icon>download</mat-icon>
           <span>Bulk Export Submission PDFs</span>
         </button>
-        <button mat-menu-item (click)="downloadSubmissions()">
+        <button mat-menu-item (click)="downloadSubmissionFiles()">
           <mat-icon>download</mat-icon>
           <span>Bulk Export Submission Files</span>
         </button>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 412d2a2053..8be2d3a77e 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -32,6 +32,8 @@ import {SelectedTaskService} from 'src/app/projects/states/dashboard/selected-ta
 import {AlertService} from 'src/app/common/services/alert.service';
 import {HotkeysService} from '@ngneat/hotkeys';
 import {Router} from '@angular/router';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 
 @Component({
   selector: 'df-staff-task-list',
@@ -119,6 +121,8 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     private userService: UserService,
     private hotkeys: HotkeysService,
     private router: Router,
+    private taskDefinitionService: TaskDefinitionService,
+    private sidekiqProgressModalService: SidekiqProgressModalService,
   ) {}
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -221,22 +225,48 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
 
   downloadSubmissionPdfs() {
     const taskDef = this.filters.taskDefinition;
-    this.fileDownloaderService.downloadFile(
-      `${AppInjector.get(DoubtfireConstants).API_URL}/submission/unit/${
-        this.unit.id
-      }/task_definitions/${taskDef.id}/student_pdfs`,
-      `${this.unit.code}-${taskDef.abbreviation}-pdfs.zip`,
-    );
+    this.taskDefinitionService.zipSubmissionPdfs(taskDef).subscribe({
+      next: (newJob) => {
+        this.sidekiqProgressModalService
+          .show(`Downloading submission pdfs for ${taskDef.abbreviation}`, newJob.id)
+          .subscribe({
+            next: (job) => {
+              this.fileDownloaderService.downloadFile(
+                `${AppInjector.get(DoubtfireConstants).API_URL}/submission/unit/${
+                  this.unit.id
+                }/task_definitions/${taskDef.id}/student_pdfs`,
+                `${this.unit.code}-${taskDef.abbreviation}-pdfs.zip`,
+              );
+            },
+          });
+      },
+      error: (error) => {
+        this.alertService.error(error, 6000);
+      },
+    });
   }
 
-  downloadSubmissions() {
+  downloadSubmissionFiles() {
     const taskDef = this.filters.taskDefinition;
-    this.fileDownloaderService.downloadFile(
-      `${AppInjector.get(DoubtfireConstants).API_URL}/submission/unit/${
-        this.unit.id
-      }/task_definitions/${taskDef.id}/download_submissions`,
-      `${this.unit.code}-${taskDef.abbreviation}-submissions.zip`,
-    );
+    this.taskDefinitionService.zipSubmissionFiles(taskDef).subscribe({
+      next: (newJob) => {
+        this.sidekiqProgressModalService
+          .show(`Downloading submission files for ${taskDef.abbreviation}`, newJob.id)
+          .subscribe({
+            next: (job) => {
+              this.fileDownloaderService.downloadFile(
+                `${AppInjector.get(DoubtfireConstants).API_URL}/submission/unit/${
+                  this.unit.id
+                }/task_definitions/${taskDef.id}/download_submissions`,
+                `${this.unit.code}-${taskDef.abbreviation}-submissions.zip`,
+              );
+            },
+          });
+      },
+      error: (error) => {
+        this.alertService.error(error, 6000);
+      },
+    });
   }
 
   downloadJPLAGReport() {

From 4ab0ab400a386358d69d0e019a724b059c5c6259 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 15 Sep 2025 11:41:14 +1000
Subject: [PATCH 554/776] chore(release): 10.0.0-40

---
 CHANGELOG.md      | 16 ++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69aa0eee50..3154167fc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 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.
 
+## [10.0.0-40](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-39...v10.0.0-40) (2025-09-15)
+
+
+### Features
+
+* assess in portfolio status ([ada4a21](https://github.com/b0ink/doubtfire-deploy/commit/ada4a21c945018abeb9ca1169e48fdd822a27322))
+* ensure complete button updates aip only tasks to working on it ([c8dd020](https://github.com/b0ink/doubtfire-deploy/commit/c8dd020a5e572765f7710c266ae2b20563ab05c2))
+* send automated message when set back to working on it ([a858d3a](https://github.com/b0ink/doubtfire-deploy/commit/a858d3a7b2f41ac7478d4917d2d2f6c68a167e6e))
+* submission type modal ([52f7d40](https://github.com/b0ink/doubtfire-deploy/commit/52f7d404ef154ff27c0ba887c8321360df95ddb6))
+
+
+### Bug Fixes
+
+* typo ([2a2e4a4](https://github.com/b0ink/doubtfire-deploy/commit/2a2e4a41e6ea20152632a9f82ca1723d9a6b56cc))
+* wording ([6291bd6](https://github.com/b0ink/doubtfire-deploy/commit/6291bd61ccc4ff45c708300d0a5014a59a565414))
+
 ## [10.0.0-39](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-38...v10.0.0-39) (2025-09-10)
 
 
diff --git a/package-lock.json b/package-lock.json
index 478037d0d9..e0e5dd9294 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-39",
+  "version": "10.0.0-40",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-39",
+      "version": "10.0.0-40",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index f39d913f83..9510a4dc1e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-39",
+  "version": "10.0.0-40",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From d88b7fa057700be708a5f6eb3493a56853d2c52f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 15 Sep 2025 12:54:21 +1000
Subject: [PATCH 555/776] chore: reword prerequisite requirements

---
 .../task-prerequisites-card.component.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
index 38b96b2683..686ec1d828 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component.html
@@ -5,7 +5,7 @@
   </div>
 
   <mat-card-subtitle class="mb-4">
-    You must finish these prerequisite tasks before submitting
+    You must meet the prerequisites for this task before submitting
     {{ taskDefinition.abbreviation }} {{ taskDefinition.name }}.</mat-card-subtitle
   >
   <f-task-definition-prerequisites

From 91231dc6e9728e137f1299c69a3e2d7ee4e4bf24 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 15 Sep 2025 13:55:07 +1000
Subject: [PATCH 556/776] chore(release): 10.0.0-41

---
 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 3154167fc3..facb6204fd 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.
 
+## [10.0.0-41](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-40...v10.0.0-41) (2025-09-15)
+
 ## [10.0.0-40](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-39...v10.0.0-40) (2025-09-15)
 
 
diff --git a/package-lock.json b/package-lock.json
index e0e5dd9294..7785a2e837 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-40",
+  "version": "10.0.0-41",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-40",
+      "version": "10.0.0-41",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 9510a4dc1e..4087e7fc70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-40",
+  "version": "10.0.0-41",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 93304e63f780034d3deda55574c649f849eeb7e5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 17 Sep 2025 13:09:50 +1000
Subject: [PATCH 557/776] chore: alert correct error

---
 src/app/home/states/lti-dashboard/lti-dashboard.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index 009f46d46a..db081c7375 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -78,7 +78,7 @@ export class LtiDashboardComponent implements AfterViewInit {
                   this.isLoading = false;
                 },
                 error: (error) => {
-                  this.alertsService.error(error.message, 6000);
+                  this.alertsService.error(error.error, 6000);
                   this.isLoading = false;
                 },
               });
@@ -111,7 +111,7 @@ export class LtiDashboardComponent implements AfterViewInit {
       },
       error: (error) => {
         console.error(error);
-        this.alertsService.error(error.message, 6000);
+        this.alertsService.error(error.error, 6000);
       },
     });
   }

From f99fe7268ba43cd61c4f2f6077c8be55ebb9f9da Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 17 Sep 2025 13:27:51 +1000
Subject: [PATCH 558/776] chore: set lti port to 3001

---
 proxy.conf.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy.conf.json b/proxy.conf.json
index adb4a435ce..f6ccc83cc6 100644
--- a/proxy.conf.json
+++ b/proxy.conf.json
@@ -4,7 +4,7 @@
     "secure": false
   },
   "/lti/api": {
-    "target": "http://host.docker.internal:3002",
+    "target": "http://host.docker.internal:3001",
     "secure": false
   }
 }

From 54a2e698578c524dfed163725dc9f7a9fced772c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 17 Sep 2025 13:28:16 +1000
Subject: [PATCH 559/776] refactor: replace apiUrl with hostUrl

---
 angular.json                                  | 28 ++++++-------------
 src/app/api/services/lti.service.ts           |  2 +-
 .../http-authentication.interceptor.ts        |  2 +-
 .../config/constants/apiURL.devcontainer.ts   |  2 --
 src/app/config/constants/apiURL.prod.ts       |  4 ---
 src/app/config/constants/apiURL.ts            |  2 +-
 .../config/constants/hostURL.devcontainer.ts  |  2 ++
 src/app/config/constants/hostURL.prod.ts      |  2 ++
 src/app/config/constants/ltiApiUrl.ts         |  2 +-
 9 files changed, 16 insertions(+), 30 deletions(-)
 delete mode 100644 src/app/config/constants/apiURL.devcontainer.ts
 delete mode 100644 src/app/config/constants/apiURL.prod.ts
 create mode 100644 src/app/config/constants/hostURL.devcontainer.ts
 create mode 100644 src/app/config/constants/hostURL.prod.ts

diff --git a/angular.json b/angular.json
index 178af4749b..d8f15f179b 100644
--- a/angular.json
+++ b/angular.json
@@ -73,8 +73,8 @@
                   "with": "src/environments/environment.prod.ts"
                 },
                 {
-                  "replace": "src/app/config/constants/apiURL.ts",
-                  "with": "src/app/config/constants/apiURL.prod.ts"
+                  "replace": "src/app/config/constants/hostURL.ts",
+                  "with": "src/app/config/constants/hostURL.prod.ts"
                 }
               ],
               "optimization": true,
@@ -94,8 +94,8 @@
               "sourceMap": true,
               "fileReplacements": [
                 {
-                  "replace": "src/app/config/constants/apiURL.ts",
-                  "with": "src/app/config/constants/apiURL.devcontainer.ts"
+                  "replace": "src/app/config/constants/hostURL.ts",
+                  "with": "src/app/config/constants/hostURL.devcontainer.ts"
                 }
               ]
             }
@@ -143,29 +143,19 @@
               "./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css"
             ],
             "scripts": [],
-            "assets": [
-              "src/favicon.ico",
-              "src/assets",
-              "src/manifest.webmanifest"
-            ]
+            "assets": ["src/favicon.ico", "src/assets", "src/manifest.webmanifest"]
           }
         },
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.component.html"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.component.html"]
           }
         },
         "eslint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.component.html"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.component.html"]
           }
         }
       }
@@ -187,8 +177,6 @@
     "cache": {
       "enabled": true
     },
-    "schematicCollections": [
-      "@angular-eslint/schematics"
-    ]
+    "schematicCollections": ["@angular-eslint/schematics"]
   }
 }
diff --git a/src/app/api/services/lti.service.ts b/src/app/api/services/lti.service.ts
index 3f97e32fda..705a531392 100644
--- a/src/app/api/services/lti.service.ts
+++ b/src/app/api/services/lti.service.ts
@@ -1,7 +1,7 @@
 import {HttpClient} from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
-import LTI_API_URL from 'src/app/config/constants/ltiApiUrl';
+import LTI_API_URL from 'src/app/config/constants/ltiApiURL';
 import {Project} from '../models/project';
 import {SidekiqJob} from '../models/sidekiq-job';
 
diff --git a/src/app/common/services/http-authentication.interceptor.ts b/src/app/common/services/http-authentication.interceptor.ts
index c0a98652ac..d2ff87fb2c 100644
--- a/src/app/common/services/http-authentication.interceptor.ts
+++ b/src/app/common/services/http-authentication.interceptor.ts
@@ -3,7 +3,7 @@ import {HttpRequest, HttpHandler, HttpEvent, HttpInterceptor} from '@angular/com
 import {Observable} from 'rxjs';
 import API_URL from 'src/app/config/constants/apiURL';
 import {UserService} from 'src/app/api/services/user.service';
-import LTI_API_URL from 'src/app/config/constants/ltiApiUrl';
+import LTI_API_URL from 'src/app/config/constants/ltiApiURL';
 
 @Injectable()
 export class HttpAuthenticationInterceptor implements HttpInterceptor {
diff --git a/src/app/config/constants/apiURL.devcontainer.ts b/src/app/config/constants/apiURL.devcontainer.ts
deleted file mode 100644
index db635c6083..0000000000
--- a/src/app/config/constants/apiURL.devcontainer.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-const API_URL = `${window.location.origin}/api`;
-export default API_URL;
diff --git a/src/app/config/constants/apiURL.prod.ts b/src/app/config/constants/apiURL.prod.ts
deleted file mode 100644
index 2657e240f9..0000000000
--- a/src/app/config/constants/apiURL.prod.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-let API_URL: string;
-
-API_URL = `${window.location.origin}/api`;
-export default API_URL;
diff --git a/src/app/config/constants/apiURL.ts b/src/app/config/constants/apiURL.ts
index 6e502f57ce..ceddc350b0 100644
--- a/src/app/config/constants/apiURL.ts
+++ b/src/app/config/constants/apiURL.ts
@@ -1,3 +1,3 @@
-import HOST_URL from './hostUrl';
+import HOST_URL from './hostURL';
 const API_URL: string = `${HOST_URL}/api`;
 export default API_URL;
diff --git a/src/app/config/constants/hostURL.devcontainer.ts b/src/app/config/constants/hostURL.devcontainer.ts
new file mode 100644
index 0000000000..15660c01c6
--- /dev/null
+++ b/src/app/config/constants/hostURL.devcontainer.ts
@@ -0,0 +1,2 @@
+const HOST_URL: string = `${window.location.origin}/api`;
+export default HOST_URL;
diff --git a/src/app/config/constants/hostURL.prod.ts b/src/app/config/constants/hostURL.prod.ts
new file mode 100644
index 0000000000..15660c01c6
--- /dev/null
+++ b/src/app/config/constants/hostURL.prod.ts
@@ -0,0 +1,2 @@
+const HOST_URL: string = `${window.location.origin}/api`;
+export default HOST_URL;
diff --git a/src/app/config/constants/ltiApiUrl.ts b/src/app/config/constants/ltiApiUrl.ts
index a3c45ed8d6..9903f5b719 100644
--- a/src/app/config/constants/ltiApiUrl.ts
+++ b/src/app/config/constants/ltiApiUrl.ts
@@ -1,3 +1,3 @@
-import HOST_URL from './hostUrl';
+import HOST_URL from './hostURL';
 const LTI_API_URL: string = `${HOST_URL}/lti/api`;
 export default LTI_API_URL;

From a2ae46eef01e9899336afc5a66a522ed186e9aef Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 17 Sep 2025 13:57:01 +1000
Subject: [PATCH 560/776] chore: temp remove constants

---
 src/app/config/constants/apiURL.ts               | 3 ---
 src/app/config/constants/hostURL.devcontainer.ts | 2 --
 src/app/config/constants/hostURL.prod.ts         | 2 --
 src/app/config/constants/ltiApiUrl.ts            | 3 ---
 4 files changed, 10 deletions(-)
 delete mode 100644 src/app/config/constants/apiURL.ts
 delete mode 100644 src/app/config/constants/hostURL.devcontainer.ts
 delete mode 100644 src/app/config/constants/hostURL.prod.ts
 delete mode 100644 src/app/config/constants/ltiApiUrl.ts

diff --git a/src/app/config/constants/apiURL.ts b/src/app/config/constants/apiURL.ts
deleted file mode 100644
index ceddc350b0..0000000000
--- a/src/app/config/constants/apiURL.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import HOST_URL from './hostURL';
-const API_URL: string = `${HOST_URL}/api`;
-export default API_URL;
diff --git a/src/app/config/constants/hostURL.devcontainer.ts b/src/app/config/constants/hostURL.devcontainer.ts
deleted file mode 100644
index 15660c01c6..0000000000
--- a/src/app/config/constants/hostURL.devcontainer.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-const HOST_URL: string = `${window.location.origin}/api`;
-export default HOST_URL;
diff --git a/src/app/config/constants/hostURL.prod.ts b/src/app/config/constants/hostURL.prod.ts
deleted file mode 100644
index 15660c01c6..0000000000
--- a/src/app/config/constants/hostURL.prod.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-const HOST_URL: string = `${window.location.origin}/api`;
-export default HOST_URL;
diff --git a/src/app/config/constants/ltiApiUrl.ts b/src/app/config/constants/ltiApiUrl.ts
deleted file mode 100644
index 9903f5b719..0000000000
--- a/src/app/config/constants/ltiApiUrl.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import HOST_URL from './hostURL';
-const LTI_API_URL: string = `${HOST_URL}/lti/api`;
-export default LTI_API_URL;

From 63ff1fde830da1f8963cd1201e74b66fa3085622 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 17 Sep 2025 13:59:36 +1000
Subject: [PATCH 561/776] chore: restore and rename api constants

---
 angular.json                                  |   8 +-
 .../d2l/d2l_assessment_mapping.service.ts     |  12 +-
 .../api/models/task-comment/task-comment.ts   |  28 ++---
 src/app/api/services/activity-type.service.ts |  16 +--
 src/app/api/services/campus.service.ts        |  18 +--
 .../api/services/feedback-template.service.ts |   2 +-
 src/app/api/services/group-set.service.ts     |  10 +-
 src/app/api/services/group.service.ts         |  18 +--
 .../api/services/learning-outcome.service.ts  |   2 +-
 src/app/api/services/lti.service.ts           |   2 +-
 .../services/overseer-assessment.service.ts   |  33 +++---
 .../api/services/overseer-image.service.ts    |  28 ++---
 src/app/api/services/project.service.ts       | 108 ++++++++++--------
 src/app/api/services/scorm-adapter.service.ts |   2 +-
 src/app/api/services/sidekiq-job.service.ts   |   2 +-
 src/app/api/services/staff-note.service.ts    |   2 +-
 src/app/api/services/task-comment.service.ts  |  96 +++++++++-------
 .../api/services/task-definition.service.ts   |   2 +-
 .../task-outcome-alignment.service.ts         |  22 ++--
 .../api/services/task-prerequisite.service.ts |   2 +-
 .../api/services/task-similarity.service.ts   |   2 +-
 src/app/api/services/task.service.ts          |  19 +--
 .../services/teaching-period-break.service.ts |  14 +--
 .../api/services/teaching-period.service.ts   |  23 ++--
 src/app/api/services/test-attempt.service.ts  |   2 +-
 src/app/api/services/tii-action.service.ts    |  18 +--
 src/app/api/services/tii.service.ts           |   8 +-
 .../api/services/tutorial-stream.service.ts   |  16 +--
 src/app/api/services/tutorial.service.ts      |  48 ++++----
 src/app/api/services/unit-role.service.ts     |  27 +++--
 src/app/api/services/unit.service.ts          |  99 ++++++++++------
 src/app/api/services/user.service.ts          |  22 ++--
 src/app/api/services/webcal.service.ts        |  12 +-
 .../learning-outcome-editor.component.ts      |   2 +-
 .../http-authentication.interceptor.ts        |   4 +-
 src/app/config/constants/apiUrl.ts            |   3 +
 .../config/constants/doubtfire-constants.ts   |  14 +--
 .../config/constants/hostUrl.devcontainer.ts  |   2 +
 src/app/config/constants/hostUrl.prod.ts      |   2 +
 src/app/config/constants/ltiApiUrl.ts         |   3 +
 40 files changed, 416 insertions(+), 337 deletions(-)
 create mode 100644 src/app/config/constants/apiUrl.ts
 create mode 100644 src/app/config/constants/hostUrl.devcontainer.ts
 create mode 100644 src/app/config/constants/hostUrl.prod.ts
 create mode 100644 src/app/config/constants/ltiApiUrl.ts

diff --git a/angular.json b/angular.json
index d8f15f179b..cf6bc6bd32 100644
--- a/angular.json
+++ b/angular.json
@@ -73,8 +73,8 @@
                   "with": "src/environments/environment.prod.ts"
                 },
                 {
-                  "replace": "src/app/config/constants/hostURL.ts",
-                  "with": "src/app/config/constants/hostURL.prod.ts"
+                  "replace": "src/app/config/constants/hostUrl.ts",
+                  "with": "src/app/config/constants/hostUrl.prod.ts"
                 }
               ],
               "optimization": true,
@@ -94,8 +94,8 @@
               "sourceMap": true,
               "fileReplacements": [
                 {
-                  "replace": "src/app/config/constants/hostURL.ts",
-                  "with": "src/app/config/constants/hostURL.devcontainer.ts"
+                  "replace": "src/app/config/constants/hostUrl.ts",
+                  "with": "src/app/config/constants/hostUrl.devcontainer.ts"
                 }
               ]
             }
diff --git a/src/app/api/models/d2l/d2l_assessment_mapping.service.ts b/src/app/api/models/d2l/d2l_assessment_mapping.service.ts
index cef683fb23..3f2fe47087 100644
--- a/src/app/api/models/d2l/d2l_assessment_mapping.service.ts
+++ b/src/app/api/models/d2l/d2l_assessment_mapping.service.ts
@@ -1,9 +1,9 @@
-import { Injectable } from '@angular/core';
-import { EntityService } from 'ngx-entity-service';
-import API_URL from 'src/app/config/constants/apiURL';
-import { HttpClient } from '@angular/common/http';
-import { D2lAssessmentMapping } from './d2l_assessment_mapping';
-import { Unit } from '../doubtfire-model';
+import {Injectable} from '@angular/core';
+import {EntityService} from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {HttpClient} from '@angular/common/http';
+import {D2lAssessmentMapping} from './d2l_assessment_mapping';
+import {Unit} from '../doubtfire-model';
 
 @Injectable()
 export class D2lAssessmentMappingService extends EntityService<D2lAssessmentMapping> {
diff --git a/src/app/api/models/task-comment/task-comment.ts b/src/app/api/models/task-comment/task-comment.ts
index 03b7ea4559..5d49c9ef9f 100644
--- a/src/app/api/models/task-comment/task-comment.ts
+++ b/src/app/api/models/task-comment/task-comment.ts
@@ -1,10 +1,10 @@
-import { AppInjector } from 'src/app/app-injector';
-import { Entity } from 'ngx-entity-service';
-import { Project, Task, TaskCommentService, User } from 'src/app/api/models/doubtfire-model';
-import { UserService } from '../../services/user.service';
-import API_URL from 'src/app/config/constants/apiURL';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
-import { AlertService } from 'src/app/common/services/alert.service';
+import {AppInjector} from 'src/app/app-injector';
+import {Entity} from 'ngx-entity-service';
+import {Project, Task, TaskCommentService, User} from 'src/app/api/models/doubtfire-model';
+import {UserService} from '../../services/user.service';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 export class TaskComment extends Entity {
   // Linked objects
@@ -19,7 +19,7 @@ export class TaskComment extends Entity {
   recipient: User;
   createdAt: Date;
   recipientReadTime: string;
-  commentType: string = "text";
+  commentType: string = 'text';
   isNew: boolean;
   replyToId: number;
 
@@ -68,7 +68,10 @@ export class TaskComment extends Entity {
   public delete() {
     const tcs: TaskCommentService = AppInjector.get(TaskCommentService);
     tcs
-      .delete({ projectId: this.project.id, taskDefinitionId: this.task.definition.id, id: this.id }, { cache: this.task.commentCache })
+      .delete(
+        {projectId: this.project.id, taskDefinitionId: this.task.definition.id, id: this.id},
+        {cache: this.task.commentCache},
+      )
       .subscribe({
         next: (response: object) => {
           // this.task.comments = this.task.comments.filter((e: TaskComment) => e.id !== this.id);
@@ -76,12 +79,11 @@ export class TaskComment extends Entity {
         },
         error: (error: any) => {
           AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
-        }
-      }
-      );
+        },
+      });
   }
 
   public get attachmentUrl(): string {
-    return `${AppInjector.get(DoubtfireConstants).API_URL}/projects/${this.project.id}/task_def_id/${this.task.definition.id}/comments/${this.id}?as_attachment=false`
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/projects/${this.project.id}/task_def_id/${this.task.definition.id}/comments/${this.id}?as_attachment=false`;
   }
 }
diff --git a/src/app/api/services/activity-type.service.ts b/src/app/api/services/activity-type.service.ts
index bd89cb9256..628acde622 100644
--- a/src/app/api/services/activity-type.service.ts
+++ b/src/app/api/services/activity-type.service.ts
@@ -1,8 +1,8 @@
-import { ActivityType } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { CachedEntityService } from 'ngx-entity-service';
-import API_URL from 'src/app/config/constants/apiURL';
-import { HttpClient } from '@angular/common/http';
+import {ActivityType} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {HttpClient} from '@angular/common/http';
 
 @Injectable()
 export class ActivityTypeService extends CachedEntityService<ActivityType> {
@@ -11,11 +11,7 @@ export class ActivityTypeService extends CachedEntityService<ActivityType> {
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
 
-    this.mapping.addKeys(
-      'id',
-      'name',
-      'abbreviation',
-    );
+    this.mapping.addKeys('id', 'name', 'abbreviation');
 
     this.mapping.mapAllKeysToJsonExcept('id');
   }
diff --git a/src/app/api/services/campus.service.ts b/src/app/api/services/campus.service.ts
index ddf491c6d4..ddf3e95942 100644
--- a/src/app/api/services/campus.service.ts
+++ b/src/app/api/services/campus.service.ts
@@ -1,8 +1,8 @@
-import { Campus } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { CachedEntityService } from 'ngx-entity-service';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import {Campus} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable()
 export class CampusService extends CachedEntityService<Campus> {
@@ -11,13 +11,7 @@ export class CampusService extends CachedEntityService<Campus> {
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
 
-    this.mapping.addKeys(
-      'id',
-      'name',
-      'mode',
-      'abbreviation',
-      'active'
-    );
+    this.mapping.addKeys('id', 'name', 'mode', 'abbreviation', 'active');
 
     this.mapping.mapAllKeysToJsonExcept('id');
   }
diff --git a/src/app/api/services/feedback-template.service.ts b/src/app/api/services/feedback-template.service.ts
index aaf91400cf..54d981d56b 100644
--- a/src/app/api/services/feedback-template.service.ts
+++ b/src/app/api/services/feedback-template.service.ts
@@ -2,7 +2,7 @@ import {Injectable} from '@angular/core';
 import {CachedEntityService} from 'ngx-entity-service';
 import {FeedbackTemplate} from '../models/feedback-template';
 import {HttpClient} from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable()
 export class FeedbackTemplateService extends CachedEntityService<FeedbackTemplate> {
diff --git a/src/app/api/services/group-set.service.ts b/src/app/api/services/group-set.service.ts
index 4c976a6e4d..20fe97277e 100644
--- a/src/app/api/services/group-set.service.ts
+++ b/src/app/api/services/group-set.service.ts
@@ -1,8 +1,8 @@
-import { CachedEntityService } from 'ngx-entity-service';
-import { GroupSet, Unit } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import {CachedEntityService} from 'ngx-entity-service';
+import {GroupSet, Unit} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable()
 export class GroupSetService extends CachedEntityService<GroupSet> {
diff --git a/src/app/api/services/group.service.ts b/src/app/api/services/group.service.ts
index 0c3aa086a4..c9a7435828 100644
--- a/src/app/api/services/group.service.ts
+++ b/src/app/api/services/group.service.ts
@@ -1,8 +1,8 @@
-import { CachedEntityService } from 'ngx-entity-service';
-import { Group, Unit } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import {CachedEntityService} from 'ngx-entity-service';
+import {Group, Unit} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable()
 export class GroupService extends CachedEntityService<Group> {
@@ -15,22 +15,22 @@ export class GroupService extends CachedEntityService<Group> {
       'id',
       'name',
       {
-        keys: ['groupSet','group_set_id'],
+        keys: ['groupSet', 'group_set_id'],
         toEntityFn: (data: object, jsonKey: string, grp: Group) => {
           return grp.unit.groupSetsCache.get(data[jsonKey]);
-        }
+        },
       },
       'capacityAdjustment',
       'locked',
       'studentCount',
       {
-        keys: ['tutorial','tutorial_id'],
+        keys: ['tutorial', 'tutorial_id'],
         toEntityFn: (data: object, jsonKey: string, grp: Group) => {
           return grp.unit.tutorialsCache.get(data[jsonKey]);
         },
         toJsonFn: (group: Group, key: string) => {
           return group.tutorial.id;
-        }
+        },
       },
     );
 
diff --git a/src/app/api/services/learning-outcome.service.ts b/src/app/api/services/learning-outcome.service.ts
index aceffbc91e..2c4d6181c8 100644
--- a/src/app/api/services/learning-outcome.service.ts
+++ b/src/app/api/services/learning-outcome.service.ts
@@ -2,7 +2,7 @@ import {CachedEntityService} from 'ngx-entity-service';
 import {LearningOutcome} from 'src/app/api/models/doubtfire-model';
 import {Injectable} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable()
 export class LearningOutcomeService extends CachedEntityService<LearningOutcome> {
diff --git a/src/app/api/services/lti.service.ts b/src/app/api/services/lti.service.ts
index 705a531392..3f97e32fda 100644
--- a/src/app/api/services/lti.service.ts
+++ b/src/app/api/services/lti.service.ts
@@ -1,7 +1,7 @@
 import {HttpClient} from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
-import LTI_API_URL from 'src/app/config/constants/ltiApiURL';
+import LTI_API_URL from 'src/app/config/constants/ltiApiUrl';
 import {Project} from '../models/project';
 import {SidekiqJob} from '../models/sidekiq-job';
 
diff --git a/src/app/api/services/overseer-assessment.service.ts b/src/app/api/services/overseer-assessment.service.ts
index 9f0017dc98..cfb21c8879 100644
--- a/src/app/api/services/overseer-assessment.service.ts
+++ b/src/app/api/services/overseer-assessment.service.ts
@@ -1,14 +1,16 @@
-import { Injectable } from '@angular/core';
-import { EntityService } from 'ngx-entity-service';
-import { Observable } from 'rxjs';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
-import { OverseerAssessment } from '../models/overseer/overseer-assessment';
+import {Injectable} from '@angular/core';
+import {EntityService} from 'ngx-entity-service';
+import {Observable} from 'rxjs';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {OverseerAssessment} from '../models/overseer/overseer-assessment';
 
 @Injectable()
 export class OverseerAssessmentService extends EntityService<OverseerAssessment> {
-  protected readonly endpointFormat = 'projects/:project_id:/task_def_id/:td_id:/submissions/timestamps/:timestamp:';
-  protected readonly triggerEndpointFormat = 'projects/:project_id:/task_def_id/:td_id:/overseer_assessment/:id:/trigger';
+  protected readonly endpointFormat =
+    'projects/:project_id:/task_def_id/:td_id:/submissions/timestamps/:timestamp:';
+  protected readonly triggerEndpointFormat =
+    'projects/:project_id:/task_def_id/:td_id:/overseer_assessment/:id:/trigger';
 
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
@@ -25,9 +27,9 @@ export class OverseerAssessmentService extends EntityService<OverseerAssessment>
         keys: ['timestamp', 'submission_timestamp'],
         toEntityFn: (data, key, entity, params?) => {
           return new Date(data['submission_timestamp'] * 1000);
-        }
+        },
       },
-      ['timestampString', 'submission_timestamp']
+      ['timestampString', 'submission_timestamp'],
     );
   }
 
@@ -38,19 +40,18 @@ export class OverseerAssessmentService extends EntityService<OverseerAssessment>
   public queryForTask(task: any): Observable<OverseerAssessment[]> {
     const pathIds = {
       project_id: task.project.id,
-      td_id: task.definition.id
+      td_id: task.definition.id,
     };
 
     return this.query(pathIds, task);
   }
 
-  public triggerOverseer(assessment: OverseerAssessment) : Observable<OverseerAssessment> {
+  public triggerOverseer(assessment: OverseerAssessment): Observable<OverseerAssessment> {
     const pathIds = {
       project_id: assessment.task.project.id,
       td_id: assessment.task.definition.id,
-      id: assessment.id
-    }
-    return this.put(pathIds, { endpointFormat: this.triggerEndpointFormat });
+      id: assessment.id,
+    };
+    return this.put(pathIds, {endpointFormat: this.triggerEndpointFormat});
   }
-
 }
diff --git a/src/app/api/services/overseer-image.service.ts b/src/app/api/services/overseer-image.service.ts
index 53a5616f56..ebb5558b3a 100644
--- a/src/app/api/services/overseer-image.service.ts
+++ b/src/app/api/services/overseer-image.service.ts
@@ -1,9 +1,9 @@
-import { CachedEntityService } from 'ngx-entity-service';
-import { Observable, switchMap } from 'rxjs';
-import { OverseerImage } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import {CachedEntityService} from 'ngx-entity-service';
+import {Observable, switchMap} from 'rxjs';
+import {OverseerImage} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable()
 export class OverseerImageService extends CachedEntityService<OverseerImage> {
@@ -19,20 +19,22 @@ export class OverseerImageService extends CachedEntityService<OverseerImage> {
       'tag',
       'pulledImageText',
       'pulledImageStatus',
-      'lastPulledDate'
+      'lastPulledDate',
     );
 
     this.mapping.mapAllKeysToJsonExcept('id');
   }
 
   public pullDockerImage(image: OverseerImage): Observable<OverseerImage> {
-    return super.put(image, {
-      endpointFormat: this.pullImageEndpointFormat
-    }).pipe(
-      switchMap(response => {
-        return super.update(image);
+    return super
+      .put(image, {
+        endpointFormat: this.pullImageEndpointFormat,
       })
-    )
+      .pipe(
+        switchMap((response) => {
+          return super.update(image);
+        }),
+      );
   }
 
   public createInstanceFrom(json: object, other?: any): OverseerImage {
diff --git a/src/app/api/services/project.service.ts b/src/app/api/services/project.service.ts
index eaa661b1ce..a897e9c1dd 100644
--- a/src/app/api/services/project.service.ts
+++ b/src/app/api/services/project.service.ts
@@ -1,14 +1,20 @@
-import { CachedEntityService, RequestOptions } from 'ngx-entity-service';
-import { CampusService, Project, Unit, UnitService, UserService } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
-import { AppInjector } from 'src/app/app-injector';
-import { Observable } from 'rxjs';
-import { TaskService } from './task.service';
-import { MappingProcess } from 'ngx-entity-service/lib/mapping-process';
-import { TaskOutcomeAlignmentService } from './task-outcome-alignment.service';
-import { GroupService } from './group.service';
+import {CachedEntityService, RequestOptions} from 'ngx-entity-service';
+import {
+  CampusService,
+  Project,
+  Unit,
+  UnitService,
+  UserService,
+} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {AppInjector} from 'src/app/app-injector';
+import {Observable} from 'rxjs';
+import {TaskService} from './task.service';
+import {MappingProcess} from 'ngx-entity-service/lib/mapping-process';
+import {TaskOutcomeAlignmentService} from './task-outcome-alignment.service';
+import {GroupService} from './group.service';
 
 @Injectable()
 export class ProjectService extends CachedEntityService<Project> {
@@ -22,7 +28,7 @@ export class ProjectService extends CachedEntityService<Project> {
     private userService: UserService,
     private taskService: TaskService,
     private taskOutcomeAlignmentService: TaskOutcomeAlignmentService,
-    private groupService: GroupService
+    private groupService: GroupService,
   ) {
     super(httpClient, API_URL);
 
@@ -33,12 +39,14 @@ export class ProjectService extends CachedEntityService<Project> {
         keys: ['campus', 'campus_id'],
         toEntityOp: (data: object, key: string, entity: Project, params?: any) => {
           if (data['campus_id']) {
-            return this.campusService.get(data['campus_id']).subscribe(campus => { entity.campus = campus; });
+            return this.campusService.get(data['campus_id']).subscribe((campus) => {
+              entity.campus = campus;
+            });
           }
         },
         toJsonFn: (entity: Project, key: string) => {
           return entity.campus ? entity.campus.id : entity.originalJson['camput_id'] ? -1 : null;
-        }
+        },
       },
       {
         keys: 'student',
@@ -46,7 +54,7 @@ export class ProjectService extends CachedEntityService<Project> {
           const userData = data['student'];
 
           return this.userService.cache.getOrCreate(userData.id, this.userService, userData);
-        }
+        },
       },
       {
         keys: 'userId',
@@ -56,9 +64,9 @@ export class ProjectService extends CachedEntityService<Project> {
           this.userService.get(userId).subscribe({
             next: (user) => {
               entity.student = user;
-            }
+            },
           });
-        }
+        },
       },
       'enrolled',
       'targetGrade',
@@ -78,7 +86,7 @@ export class ProjectService extends CachedEntityService<Project> {
           else entity.portfolioStatus = 0;
 
           return result;
-        }
+        },
       },
       'portfolioAvailable',
       'usesDraftLearningSummary',
@@ -88,29 +96,29 @@ export class ProjectService extends CachedEntityService<Project> {
           const values = data[key];
           entity.taskStats = [
             {
-              key: "fail",
-              value: Math.round((values['red_pct'] || 0) * 100)
+              key: 'fail',
+              value: Math.round((values['red_pct'] || 0) * 100),
             },
             {
-              key: "not_started",
+              key: 'not_started',
               value: Math.round((values['grey_pct'] || 1) * 100),
             },
             {
-              key: "working_on_it",
-              value: Math.round((values['orange_pct'] ||  0) * 100),
+              key: 'working_on_it',
+              value: Math.round((values['orange_pct'] || 0) * 100),
             },
             {
-              key: "ready_for_feedback",
+              key: 'ready_for_feedback',
               value: Math.round((values['blue_pct'] || 0) * 100),
             },
             {
-              key: "complete",
-              value: Math.round((values['green_pct'] || 0) * 100)
-            }
+              key: 'complete',
+              value: Math.round((values['green_pct'] || 0) * 100),
+            },
           ];
 
           entity.orderScale = Math.round((values['order_scale'] || 0) * 100);
-        }
+        },
       },
       'grade',
       'gradeRationale',
@@ -125,7 +133,7 @@ export class ProjectService extends CachedEntityService<Project> {
         },
         toJsonFn: (entity: Project, key: string) => {
           return entity.unit?.id;
-        }
+        },
       },
       {
         keys: 'unitId',
@@ -133,13 +141,13 @@ export class ProjectService extends CachedEntityService<Project> {
           const unitService: UnitService = AppInjector.get(UnitService);
           const unitId = process.data['unit_id'];
           // Load what we have... or a a stub for now...
-          process.entity.unit = unitService.cache.getOrCreate(unitId, unitService, { id: unitId });
-          return unitService.get(unitId).subscribe(unit => {
+          process.entity.unit = unitService.cache.getOrCreate(unitId, unitService, {id: unitId});
+          return unitService.get(unitId).subscribe((unit) => {
             process.entity.unit = unit;
             unit.studentCache.add(process.entity);
             process.continue();
           });
-        }
+        },
       },
       {
         keys: 'tutorialEnrolments',
@@ -151,7 +159,7 @@ export class ProjectService extends CachedEntityService<Project> {
               project.tutorialEnrolmentsCache.add(tutorial);
             }
           });
-        }
+        },
       },
       {
         keys: 'groups',
@@ -169,18 +177,20 @@ export class ProjectService extends CachedEntityService<Project> {
         },
         toJsonFn: (entity: Project, key: string) => {
           return entity.unit?.id;
-        }
+        },
       },
       {
         keys: 'tasks',
         toEntityOp: (data: object, key: string, project: Project, params?: any) => {
           // create tasks from json
           data['tasks']?.forEach((taskData) => {
-            project.taskCache.getOrCreate(taskData['id'], this.taskService, taskData, {constructorParams: project});
+            project.taskCache.getOrCreate(taskData['id'], this.taskService, taskData, {
+              constructorParams: project,
+            });
           });
 
           project.unit.setupTasksForStudent(project);
-        }
+        },
       },
       {
         keys: 'taskOutcomeAlignments',
@@ -195,7 +205,7 @@ export class ProjectService extends CachedEntityService<Project> {
               },
             );
           });
-        }
+        },
       },
     );
 
@@ -206,7 +216,7 @@ export class ProjectService extends CachedEntityService<Project> {
       'compilePortfolio',
       'grade',
       'gradeRationale',
-      'campus'
+      'campus',
     );
   }
 
@@ -214,16 +224,20 @@ export class ProjectService extends CachedEntityService<Project> {
     return new Project(other as Unit);
   }
 
-  public loadStudents(unit: Unit, withdrawnOnly: boolean = false, useFetch: boolean = false): Observable<Project[]> {
+  public loadStudents(
+    unit: Unit,
+    withdrawnOnly: boolean = false,
+    useFetch: boolean = false,
+  ): Observable<Project[]> {
     const options: RequestOptions<Project> = {
       cache: unit.studentCache,
       endpointFormat: this.studentEndpointFormat,
       params: {
         withdrawn: withdrawnOnly,
-        unit_id: unit.id
+        unit_id: unit.id,
       },
-      constructorParams: unit
-    }
+      constructorParams: unit,
+    };
 
     if (useFetch) {
       return super.fetchAll(undefined, options);
@@ -232,13 +246,17 @@ export class ProjectService extends CachedEntityService<Project> {
     }
   }
 
-  public loadProject(proj: Project | number, unit: Unit, useFetch: boolean = false): Observable<Project> {
+  public loadProject(
+    proj: Project | number,
+    unit: Unit,
+    useFetch: boolean = false,
+  ): Observable<Project> {
     const options: RequestOptions<Project> = {
       cache: unit.studentCache,
       sourceCache: unit.studentCache,
       constructorParams: unit,
-      cacheBehaviourOnGet: "cacheQuery"
-    }
+      cacheBehaviourOnGet: 'cacheQuery',
+    };
 
     if (useFetch) {
       return super.fetch(proj, options);
diff --git a/src/app/api/services/scorm-adapter.service.ts b/src/app/api/services/scorm-adapter.service.ts
index 0f1af9889c..bdeb14fc77 100644
--- a/src/app/api/services/scorm-adapter.service.ts
+++ b/src/app/api/services/scorm-adapter.service.ts
@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {UserService} from './user.service';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 import {ScormDataModel, ScormPlayerContext} from 'src/app/api/models/doubtfire-model';
 
 @Injectable({
diff --git a/src/app/api/services/sidekiq-job.service.ts b/src/app/api/services/sidekiq-job.service.ts
index ea7c204cf2..dd5332a258 100644
--- a/src/app/api/services/sidekiq-job.service.ts
+++ b/src/app/api/services/sidekiq-job.service.ts
@@ -2,7 +2,7 @@ import {HttpClient} from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {CachedEntityService} from 'ngx-entity-service';
 import {BehaviorSubject, Observable, Subject} from 'rxjs';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 import {SidekiqJob} from '../models/sidekiq-job';
 
 export interface SidekiqJobEntry {
diff --git a/src/app/api/services/staff-note.service.ts b/src/app/api/services/staff-note.service.ts
index c025dcd932..0a707fea8c 100644
--- a/src/app/api/services/staff-note.service.ts
+++ b/src/app/api/services/staff-note.service.ts
@@ -2,7 +2,7 @@ import {HttpClient} from '@angular/common/http';
 import {EventEmitter, Injectable} from '@angular/core';
 import {CachedEntityService, RequestOptions} from 'ngx-entity-service';
 import {Project, ProjectService, UserService} from 'src/app/api/models/doubtfire-model';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 import {StaffNote} from '../models/staff-note';
 import {Observable, tap} from 'rxjs';
 
diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index 4f178ce771..afeb1f38ca 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -1,24 +1,32 @@
-import { ScormComment, Task, TaskComment, TestAttemptService, UserService } from 'src/app/api/models/doubtfire-model';
-import { EventEmitter, Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { tap } from 'rxjs/operators';
-import { CachedEntityService } from 'ngx-entity-service';
-import { DiscussionComment } from '../models/task-comment/discussion-comment';
-import { ExtensionComment } from '../models/task-comment/extension-comment';
-import { RequestOptions } from 'ngx-entity-service/lib/request-options';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
-import { EmojiService } from 'src/app/common/services/emoji.service';
-import { MappingFunctions } from './mapping-fn';
-import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
-import { ScormExtensionComment } from '../models/task-comment/scorm-extension-comment';
+import {
+  ScormComment,
+  Task,
+  TaskComment,
+  TestAttemptService,
+  UserService,
+} from 'src/app/api/models/doubtfire-model';
+import {EventEmitter, Injectable} from '@angular/core';
+import {Observable} from 'rxjs';
+import {tap} from 'rxjs/operators';
+import {CachedEntityService} from 'ngx-entity-service';
+import {DiscussionComment} from '../models/task-comment/discussion-comment';
+import {ExtensionComment} from '../models/task-comment/extension-comment';
+import {RequestOptions} from 'ngx-entity-service/lib/request-options';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {EmojiService} from 'src/app/common/services/emoji.service';
+import {MappingFunctions} from './mapping-fn';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import {ScormExtensionComment} from '../models/task-comment/scorm-extension-comment';
 
 @Injectable()
 export class TaskCommentService extends CachedEntityService<TaskComment> {
   public readonly commentAdded$: EventEmitter<TaskComment> = new EventEmitter();
 
-  private readonly commentEndpointFormat = 'projects/:projectId:/task_def_id/:taskDefinitionId:/comments/:id:';
-  private readonly discussionEndpointFormat = 'projects/:projectId:/task_def_id/:taskDefinitionId:/discussion_comments';
+  private readonly commentEndpointFormat =
+    'projects/:projectId:/task_def_id/:taskDefinitionId:/comments/:id:';
+  private readonly discussionEndpointFormat =
+    'projects/:projectId:/task_def_id/:taskDefinitionId:/discussion_comments';
   private readonly extensionGrantEndpointFormat =
     'projects/:projectId:/task_def_id/:taskDefinitionId:/assess_extension/:id:';
   private readonly requestExtensionEndpointFormat =
@@ -27,9 +35,10 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
     'projects/:projectId:/task_def_id/:taskDefinitionId:/assess_scorm_extension/:id:';
   private readonly scormRequestExtensionEndpointFormat =
     'projects/:projectId:/task_def_id/:taskDefinitionId:/request_scorm_extension';
-  private readonly discussionCommentReplyEndpointFormat = "/projects/:project_id:/task_def_id/:task_definition_id:/comments/:task_comment_id:/discussion_comment/reply";
-  private readonly getDiscussionCommentPromptEndpointFormat = "/projects/:project_id:/task_def_id/:task_definition_id:/comments/:task_comment_id:/discussion_comment/prompt_number/:prompt_number:";
-
+  private readonly discussionCommentReplyEndpointFormat =
+    '/projects/:project_id:/task_def_id/:task_definition_id:/comments/:task_comment_id:/discussion_comment/reply';
+  private readonly getDiscussionCommentPromptEndpointFormat =
+    '/projects/:project_id:/task_def_id/:task_definition_id:/comments/:task_comment_id:/discussion_comment/prompt_number/:prompt_number:';
 
   protected readonly endpointFormat = this.commentEndpointFormat;
 
@@ -50,13 +59,13 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
           const user = this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
           comment.initials = `${user.firstName[0]}${user.lastName[0]}`.toUpperCase();
           return user;
-        }
+        },
       },
       {
         keys: 'recipient',
         toEntityFn: (data: object, key: string, comment: TaskComment) => {
           return this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
-        }
+        },
       },
       'recipientReadTime',
       'replyToId',
@@ -65,17 +74,17 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
         keys: ['text', 'comment'],
         toEntityFn: (data, key, entity) => {
           return this.emojiService.colonsToNative(data['comment']);
-        }
+        },
       },
       {
         keys: 'createdAt',
-        toEntityFn: MappingFunctions.mapDate
+        toEntityFn: MappingFunctions.mapDate,
       },
       {
         keys: 'type',
-        toEntityOp: (data: object, key: string, comment:TaskComment) => {
+        toEntityOp: (data: object, key: string, comment: TaskComment) => {
           comment.commentType = data[key];
-        }
+        },
       },
       // Extension comments
       'assessed',
@@ -110,13 +119,10 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
       },
 
       // Scorm Extension Comments
-      ['taskScormExtensions', 'scorm_extensions']
+      ['taskScormExtensions', 'scorm_extensions'],
     );
 
-    this.mapping.addJsonKey(
-      'granted',
-
-    );
+    this.mapping.addJsonKey('granted');
   }
 
   /**
@@ -144,13 +150,17 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
    * @param other Contains the related Tasks used to construct the TaskComments
    * @param options
    */
-  public query(pathIds?: object, other?: object, options?: RequestOptions<TaskComment>): Observable<TaskComment[]> {
+  public query(
+    pathIds?: object,
+    other?: object,
+    options?: RequestOptions<TaskComment>,
+  ): Observable<TaskComment[]> {
     return super.query(pathIds, options).pipe(
       tap((result) => {
         // Access the task and set the number of new comments to 0 - they are now read on the server
         const task = other as any; //TODO: change to Task object
         task.numNewComments = 0;
-      })
+      }),
     );
   }
 
@@ -159,7 +169,7 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
     data: string | File | Blob,
     commentType: string,
     originalComment?: TaskComment,
-    prompts?: Blob[]
+    prompts?: Blob[],
   ): Observable<TaskComment> {
     const pathId = {
       projectId: task.project.id,
@@ -171,7 +181,7 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
       body.append('reply_to_id', originalComment?.id.toString());
     }
 
-    const opts: RequestOptions<TaskComment> = { endpointFormat: this.commentEndpointFormat };
+    const opts: RequestOptions<TaskComment> = {endpointFormat: this.commentEndpointFormat};
 
     // Based on the comment type - add to the body and configure the end point
     if (commentType === 'text' || commentType === 'scorm') {
@@ -193,7 +203,7 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
       tap((tc: TaskComment) => {
         task.refreshCommentData();
         this.commentAdded$.emit(tc);
-      })
+      }),
     );
   }
 
@@ -209,25 +219,29 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
         projectId: extension.project.id,
         taskDefinitionId: extension.task.definition.id,
       },
-      opts
+      opts,
     );
   }
 
-  public requestExtension(reason: string, weeksRequested: number, task: any): Observable<TaskComment> {
+  public requestExtension(
+    reason: string,
+    weeksRequested: number,
+    task: any,
+  ): Observable<TaskComment> {
     const opts: RequestOptions<TaskComment> = {
       endpointFormat: this.requestExtensionEndpointFormat,
       body: {
         comment: reason,
         weeks_requested: weeksRequested,
       },
-      cache: task.commentCache
+      cache: task.commentCache,
     };
     return super.create(
       {
         projectId: task.project.id,
         taskDefinitionId: task.definition.id,
       },
-      opts
+      opts,
     );
   }
 
@@ -264,12 +278,12 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
     );
   }
 
-  public postDiscussionReply(comment: TaskComment, replyAudio: Blob): Observable<TaskComment>{
+  public postDiscussionReply(comment: TaskComment, replyAudio: Blob): Observable<TaskComment> {
     const form = new FormData();
     const pathIds = {
       project_id: comment.project.id,
       task_definition_id: comment.task.id,
-      task_comment_id: comment.id
+      task_comment_id: comment.id,
     };
 
     form.append('attachment', replyAudio);
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 8bbd962a00..7692ab936b 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -7,7 +7,7 @@ import {
 } from 'src/app/api/models/doubtfire-model';
 import {Injectable} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 import {MappingFunctions} from './mapping-fn';
 import {AppInjector} from 'src/app/app-injector';
 import {Observable} from 'rxjs';
diff --git a/src/app/api/services/task-outcome-alignment.service.ts b/src/app/api/services/task-outcome-alignment.service.ts
index 061f14a91e..44fd1ea07f 100644
--- a/src/app/api/services/task-outcome-alignment.service.ts
+++ b/src/app/api/services/task-outcome-alignment.service.ts
@@ -1,9 +1,9 @@
-import { HttpClient } from '@angular/common/http';
-import { CachedEntityService } from 'ngx-entity-service';
-import { Project, TaskOutcomeAlignment, Unit } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import API_URL from 'src/app/config/constants/apiURL';
-import { UnitTutorialsListComponent } from 'src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component';
+import {HttpClient} from '@angular/common/http';
+import {CachedEntityService} from 'ngx-entity-service';
+import {Project, TaskOutcomeAlignment, Unit} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {UnitTutorialsListComponent} from 'src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component';
 
 @Injectable()
 export class TaskOutcomeAlignmentService extends CachedEntityService<TaskOutcomeAlignment> {
@@ -24,7 +24,7 @@ export class TaskOutcomeAlignmentService extends CachedEntityService<TaskOutcome
         },
         toJsonFn: (entity: TaskOutcomeAlignment, key: string) => {
           return entity.learningOutcome.id;
-        }
+        },
       },
       {
         keys: ['taskDefinition', 'task_definition_id'],
@@ -34,7 +34,7 @@ export class TaskOutcomeAlignmentService extends CachedEntityService<TaskOutcome
         },
         toJsonFn: (entity: TaskOutcomeAlignment, key: string) => {
           return entity.taskDefinition.id;
-        }
+        },
       },
       {
         keys: ['task', 'task_id'],
@@ -44,14 +44,14 @@ export class TaskOutcomeAlignmentService extends CachedEntityService<TaskOutcome
         },
         toJsonFn: (entity: TaskOutcomeAlignment, key: string) => {
           return entity.task?.id;
-        }
-      }
+        },
+      },
     );
 
     this.mapping.mapAllKeysToJsonExcept('id');
   }
 
   public override createInstanceFrom(json: any, other?: any): TaskOutcomeAlignment {
-    return new TaskOutcomeAlignment(other as (Unit | Project));
+    return new TaskOutcomeAlignment(other as Unit | Project);
   }
 }
diff --git a/src/app/api/services/task-prerequisite.service.ts b/src/app/api/services/task-prerequisite.service.ts
index d8ced93c47..d3906860f8 100644
--- a/src/app/api/services/task-prerequisite.service.ts
+++ b/src/app/api/services/task-prerequisite.service.ts
@@ -1,7 +1,7 @@
 import {HttpClient} from '@angular/common/http';
 import {Injectable} from '@angular/core';
 import {CachedEntityService} from 'ngx-entity-service';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 import {TaskPrerequisite} from '../models/task-prerequisite';
 
 @Injectable()
diff --git a/src/app/api/services/task-similarity.service.ts b/src/app/api/services/task-similarity.service.ts
index a3586d677a..2dafa21d23 100644
--- a/src/app/api/services/task-similarity.service.ts
+++ b/src/app/api/services/task-similarity.service.ts
@@ -1,7 +1,7 @@
 import {Task, TaskSimilarity} from 'src/app/api/models/doubtfire-model';
 import {Injectable} from '@angular/core';
 import {CachedEntityService} from 'ngx-entity-service';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 import {HttpClient} from '@angular/common/http';
 import {Observable} from 'rxjs';
 import {AppInjector} from 'src/app/app-injector';
diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 2eb4bd1c5f..832159ffc1 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -10,7 +10,7 @@ import {
 import {EventEmitter, Injectable} from '@angular/core';
 import {CachedEntityService, EntityCache, RequestOptions} from 'ngx-entity-service';
 import {HttpClient} from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 import {MappingFunctions} from './mapping-fn';
 import {Observable, map, tap} from 'rxjs';
 
@@ -88,7 +88,7 @@ export class TaskService extends CachedEntityService<Task> {
             }
           });
         },
-      }
+      },
     );
 
     this.mapping.addJsonKey('qualityPts', 'grade', 'includeInPortfolio', 'trigger');
@@ -120,11 +120,14 @@ export class TaskService extends CachedEntityService<Task> {
     ).pipe(
       tap((tasks: Task[]) => {
         unit.incorporateTasks(tasks);
-      })
+      }),
     );
   }
 
-  public queryTasksForTaskExplorer(unit: Unit, taskDef?: TaskDefinition | number): Observable<Task[]> {
+  public queryTasksForTaskExplorer(
+    unit: Unit,
+    taskDef?: TaskDefinition | number,
+  ): Observable<Task[]> {
     const cache: EntityCache<Task> = new EntityCache<Task>();
     return this.query(
       {
@@ -135,12 +138,12 @@ export class TaskService extends CachedEntityService<Task> {
         endpointFormat: this.taskExplorerEndpoint,
         cache: cache,
         constructorParams: unit,
-      }
+      },
     ).pipe(
       map((tasks: Task[]) => {
         unit.incorporateTasks(tasks);
         return unit.fillWithUnStartedTasks(tasks, taskDef);
-      })
+      }),
     );
   }
 
@@ -195,7 +198,7 @@ export class TaskService extends CachedEntityService<Task> {
     return TaskStatus.STATUS_LABELS.get(status);
   }
 
-  public helpDescription(status: TaskStatusEnum): { detail: string; reason: string; action: string } {
+  public helpDescription(status: TaskStatusEnum): {detail: string; reason: string; action: string} {
     return TaskStatus.HELP_DESCRIPTIONS.get(status);
   }
 
@@ -203,7 +206,7 @@ export class TaskService extends CachedEntityService<Task> {
     return TaskStatus.statusData(data);
   }
 
-  public taskKeyFromString(taskKeyString: string): { studentId: string; taskDefAbbr: string } {
+  public taskKeyFromString(taskKeyString: string): {studentId: string; taskDefAbbr: string} {
     const taskKeyComponents = taskKeyString?.split('/');
     if (taskKeyComponents) {
       const studentId = taskKeyComponents[0];
diff --git a/src/app/api/services/teaching-period-break.service.ts b/src/app/api/services/teaching-period-break.service.ts
index 0dd023264f..a7e3b296de 100644
--- a/src/app/api/services/teaching-period-break.service.ts
+++ b/src/app/api/services/teaching-period-break.service.ts
@@ -1,9 +1,9 @@
-import { HttpClient } from '@angular/common/http';
-import { CachedEntityService } from 'ngx-entity-service';
-import { TeachingPeriodBreak } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import API_URL from 'src/app/config/constants/apiURL';
-import { MappingFunctions } from './mapping-fn';
+import {HttpClient} from '@angular/common/http';
+import {CachedEntityService} from 'ngx-entity-service';
+import {TeachingPeriodBreak} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {MappingFunctions} from './mapping-fn';
 
 @Injectable()
 export class TeachingPeriodBreakService extends CachedEntityService<TeachingPeriodBreak> {
@@ -17,7 +17,7 @@ export class TeachingPeriodBreakService extends CachedEntityService<TeachingPeri
       {
         keys: 'startDate',
         toEntityFn: MappingFunctions.mapDateToDay,
-        toJsonFn: MappingFunctions.mapDayToJson
+        toJsonFn: MappingFunctions.mapDayToJson,
       },
       'numberOfWeeks',
     );
diff --git a/src/app/api/services/teaching-period.service.ts b/src/app/api/services/teaching-period.service.ts
index ab75f72ada..d2632621bc 100644
--- a/src/app/api/services/teaching-period.service.ts
+++ b/src/app/api/services/teaching-period.service.ts
@@ -1,10 +1,14 @@
-import { HttpClient } from '@angular/common/http';
-import { CachedEntityService, Entity } from 'ngx-entity-service';
-import { TeachingPeriod, TeachingPeriodBreakService, UnitService } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import API_URL from 'src/app/config/constants/apiURL';
-import { AppInjector } from 'src/app/app-injector';
-import { MappingFunctions } from './mapping-fn';
+import {HttpClient} from '@angular/common/http';
+import {CachedEntityService, Entity} from 'ngx-entity-service';
+import {
+  TeachingPeriod,
+  TeachingPeriodBreakService,
+  UnitService,
+} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {AppInjector} from 'src/app/app-injector';
+import {MappingFunctions} from './mapping-fn';
 
 @Injectable()
 export class TeachingPeriodService extends CachedEntityService<TeachingPeriod> {
@@ -12,7 +16,10 @@ export class TeachingPeriodService extends CachedEntityService<TeachingPeriod> {
 
   public static readonly rolloverEndpointFormat = 'teaching_periods/:id:/rollover';
 
-  constructor(httpClient: HttpClient, private teachingPeriodBreakService: TeachingPeriodBreakService) {
+  constructor(
+    httpClient: HttpClient,
+    private teachingPeriodBreakService: TeachingPeriodBreakService,
+  ) {
     super(httpClient, API_URL);
 
     this.mapping.addKeys(
diff --git a/src/app/api/services/test-attempt.service.ts b/src/app/api/services/test-attempt.service.ts
index 3e2c461619..9b418045ec 100644
--- a/src/app/api/services/test-attempt.service.ts
+++ b/src/app/api/services/test-attempt.service.ts
@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {CachedEntityService} from 'ngx-entity-service';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 import {Task, TestAttempt} from 'src/app/api/models/doubtfire-model';
 import {Observable} from 'rxjs';
 import {AppInjector} from 'src/app/app-injector';
diff --git a/src/app/api/services/tii-action.service.ts b/src/app/api/services/tii-action.service.ts
index a90e540142..d4bbc813ce 100644
--- a/src/app/api/services/tii-action.service.ts
+++ b/src/app/api/services/tii-action.service.ts
@@ -1,11 +1,11 @@
-import { HttpClient } from '@angular/common/http';
-import { CachedEntityService, Entity } from 'ngx-entity-service';
-import { TiiAction, Unit, UnitService, UserService } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import API_URL from 'src/app/config/constants/apiURL';
-import { AppInjector } from 'src/app/app-injector';
-import { MappingFunctions } from './mapping-fn';
-import { MappingProcess } from 'ngx-entity-service/lib/mapping-process';
+import {HttpClient} from '@angular/common/http';
+import {CachedEntityService, Entity} from 'ngx-entity-service';
+import {TiiAction, Unit, UnitService, UserService} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {AppInjector} from 'src/app/app-injector';
+import {MappingFunctions} from './mapping-fn';
+import {MappingProcess} from 'ngx-entity-service/lib/mapping-process';
 
 @Injectable()
 export class TiiActionService extends CachedEntityService<TiiAction> {
@@ -30,7 +30,7 @@ export class TiiActionService extends CachedEntityService<TiiAction> {
       },
       'errorCode',
       'errorMessage',
-      'log'
+      'log',
     );
 
     this.mapping.addJsonKey('id', 'retry');
diff --git a/src/app/api/services/tii.service.ts b/src/app/api/services/tii.service.ts
index cfc02681a3..385e9eef5c 100644
--- a/src/app/api/services/tii.service.ts
+++ b/src/app/api/services/tii.service.ts
@@ -1,7 +1,7 @@
-import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import API_URL from 'src/app/config/constants/apiURL';
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {Observable} from 'rxjs';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable({
   providedIn: 'root',
diff --git a/src/app/api/services/tutorial-stream.service.ts b/src/app/api/services/tutorial-stream.service.ts
index 648e84d4fa..4a5c5a617d 100644
--- a/src/app/api/services/tutorial-stream.service.ts
+++ b/src/app/api/services/tutorial-stream.service.ts
@@ -1,8 +1,8 @@
-import { HttpClient } from '@angular/common/http';
-import { CachedEntityService } from 'ngx-entity-service';
-import { TutorialStream } from 'src/app/api/models/doubtfire-model';
-import { Injectable } from '@angular/core';
-import API_URL from 'src/app/config/constants/apiURL';
+import {HttpClient} from '@angular/common/http';
+import {CachedEntityService} from 'ngx-entity-service';
+import {TutorialStream} from 'src/app/api/models/doubtfire-model';
+import {Injectable} from '@angular/core';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable()
 export class TutorialStreamService extends CachedEntityService<TutorialStream> {
@@ -11,11 +11,7 @@ export class TutorialStreamService extends CachedEntityService<TutorialStream> {
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
 
-    this.mapping.addKeys(
-      'name',
-      'abbreviation',
-      'activityType'
-    );
+    this.mapping.addKeys('name', 'abbreviation', 'activityType');
 
     this.mapping.mapAllKeysToJson();
   }
diff --git a/src/app/api/services/tutorial.service.ts b/src/app/api/services/tutorial.service.ts
index 179ad8031a..02cb6cc746 100644
--- a/src/app/api/services/tutorial.service.ts
+++ b/src/app/api/services/tutorial.service.ts
@@ -1,16 +1,23 @@
-import { Inject, Injectable } from '@angular/core';
-import { analyticsService } from 'src/app/ajs-upgraded-providers';
-import { HttpClient } from '@angular/common/http';
-import { CampusService, Project, Tutorial, Unit, UserService } from 'src/app/api/models/doubtfire-model';
-import { CachedEntityService, RequestOptions } from 'ngx-entity-service';
-import API_URL from 'src/app/config/constants/apiURL';
-import { Observable } from 'rxjs';
-import { AlertService } from 'src/app/common/services/alert.service';
+import {Inject, Injectable} from '@angular/core';
+import {analyticsService} from 'src/app/ajs-upgraded-providers';
+import {HttpClient} from '@angular/common/http';
+import {
+  CampusService,
+  Project,
+  Tutorial,
+  Unit,
+  UserService,
+} from 'src/app/api/models/doubtfire-model';
+import {CachedEntityService, RequestOptions} from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {Observable} from 'rxjs';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 @Injectable()
 export class TutorialService extends CachedEntityService<Tutorial> {
   protected readonly endpointFormat = 'tutorials/:id:';
-  protected readonly switchTutorialEndpointFormat = 'units/:unitId:/tutorials/:tutorialAbbreviation:/enrolments/:projectId:';
+  protected readonly switchTutorialEndpointFormat =
+    'units/:unitId:/tutorials/:tutorialAbbreviation:/enrolments/:projectId:';
 
   constructor(
     httpClient: HttpClient,
@@ -28,7 +35,7 @@ export class TutorialService extends CachedEntityService<Tutorial> {
       'meetingLocation',
       'abbreviation',
       {
-        keys: ['campus','campus_id'],
+        keys: ['campus', 'campus_id'],
         toEntityOp: (data: object, key: string, entity: Tutorial, params?: any) => {
           this.campusService.get(data['campus_id']).subscribe((campus) => {
             entity.campus = campus;
@@ -36,7 +43,7 @@ export class TutorialService extends CachedEntityService<Tutorial> {
         },
         toJsonFn: (entity: Tutorial, key: string) => {
           return entity.campus ? entity.campus.id : -1;
-        }
+        },
       },
       'capacity',
       {
@@ -46,26 +53,26 @@ export class TutorialService extends CachedEntityService<Tutorial> {
         },
         toJsonFn: (entity: Tutorial, key: string) => {
           return entity.tutor?.id;
-        }
+        },
       },
 
       'numStudents',
       {
-        keys: ['tutorialStream','tutorial_stream_abbr'],
+        keys: ['tutorialStream', 'tutorial_stream_abbr'],
         toEntityFn: (data: object, key: string, entity: Tutorial, params?: any) => {
           return entity.unit.tutorialStreamForAbbr(data[key]);
         },
         toJsonFn: (entity: Tutorial, key: string) => {
           return entity.tutorialStream ? entity.tutorialStream.abbreviation : null;
-        }
+        },
       },
 
       {
         keys: ['unit', 'unit_id'],
         toJsonFn: (entity: Tutorial, key: string) => {
           return entity.unit?.id;
-        }
-      }
+        },
+      },
     );
 
     this.mapping.mapAllKeysToJsonExcept('numStudents');
@@ -94,7 +101,7 @@ export class TutorialService extends CachedEntityService<Tutorial> {
       endpointFormat: this.switchTutorialEndpointFormat,
       cache: project.tutorialEnrolmentsCache,
       sourceCache: project.unit.tutorialsCache,
-      body: {}
+      body: {},
     };
 
     var observer: Observable<any>;
@@ -110,7 +117,9 @@ export class TutorialService extends CachedEntityService<Tutorial> {
         if (isEnrol) {
           project.tutorialEnrolmentsCache.clear();
           for (const enrolment of value.enrolments) {
-            project.tutorialEnrolmentsCache.add(project.unit.tutorialFromId(enrolment['tutorial_id']));
+            project.tutorialEnrolmentsCache.add(
+              project.unit.tutorialFromId(enrolment['tutorial_id']),
+            );
           }
         } else {
           project.tutorialEnrolmentsCache.delete(tutorial);
@@ -118,8 +127,7 @@ export class TutorialService extends CachedEntityService<Tutorial> {
       },
       error: (error) => {
         this.alerts.error(`Failed to update tutorial enrolment. ${error}`, 8000);
-      }
+      },
     });
   }
-
 }
diff --git a/src/app/api/services/unit-role.service.ts b/src/app/api/services/unit-role.service.ts
index a65f301ca8..0100bb78ce 100644
--- a/src/app/api/services/unit-role.service.ts
+++ b/src/app/api/services/unit-role.service.ts
@@ -1,9 +1,15 @@
-import { TeachingPeriodService, Unit, UnitRole, UnitService, UserService } from 'src/app/api/models/doubtfire-model';
-import { CachedEntityService } from 'ngx-entity-service';
-import { Inject, Injectable } from '@angular/core';
-import { analyticsService } from 'src/app/ajs-upgraded-providers';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import {
+  TeachingPeriodService,
+  Unit,
+  UnitRole,
+  UnitService,
+  UserService,
+} from 'src/app/api/models/doubtfire-model';
+import {CachedEntityService} from 'ngx-entity-service';
+import {Inject, Injectable} from '@angular/core';
+import {analyticsService} from 'src/app/ajs-upgraded-providers';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable()
 export class UnitRoleService extends CachedEntityService<UnitRole> {
@@ -14,7 +20,7 @@ export class UnitRoleService extends CachedEntityService<UnitRole> {
     private userService: UserService,
     private unitService: UnitService,
     private teachingPeriodService: TeachingPeriodService,
-    @Inject(analyticsService) private AnalyticsService: any
+    @Inject(analyticsService) private AnalyticsService: any,
   ) {
     super(httpClient, API_URL);
 
@@ -34,7 +40,7 @@ export class UnitRoleService extends CachedEntityService<UnitRole> {
         },
         toJsonFn: (entity: UnitRole, key: string) => {
           return entity.unit?.id;
-        }
+        },
       },
       {
         keys: 'user',
@@ -48,13 +54,13 @@ export class UnitRoleService extends CachedEntityService<UnitRole> {
         keys: 'userId',
         toJsonFn: (entity: UnitRole, key: string) => {
           return entity.user?.id;
-        }
+        },
       },
       {
         keys: 'unitId',
         toJsonFn: (entity: UnitRole, key: string) => {
           return entity.unit?.id;
-        }
+        },
       },
     );
 
@@ -64,5 +70,4 @@ export class UnitRoleService extends CachedEntityService<UnitRole> {
   public createInstanceFrom(json: any, other?: any): UnitRole {
     return new UnitRole();
   }
-
 }
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index 95dfc6b40b..498b993ee0 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -1,14 +1,24 @@
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { GroupSetService, LearningOutcomeService, OverseerImageService, TaskOutcomeAlignmentService, TeachingPeriodService, TutorialService, TutorialStreamService, Unit, UserService } from 'src/app/api/models/doubtfire-model';
-import { CachedEntityService, Entity, EntityMapping } from 'ngx-entity-service';
-import API_URL from 'src/app/config/constants/apiURL';
-import { UnitRoleService } from './unit-role.service';
-import { AppInjector } from 'src/app/app-injector';
-import { TaskDefinitionService } from './task-definition.service';
-import { GroupService } from './group.service';
-import { Observable } from 'rxjs';
-import { DoubtfireConstants } from 'src/app/config/constants/doubtfire-constants';
+import {Injectable} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
+import {
+  GroupSetService,
+  LearningOutcomeService,
+  OverseerImageService,
+  TaskOutcomeAlignmentService,
+  TeachingPeriodService,
+  TutorialService,
+  TutorialStreamService,
+  Unit,
+  UserService,
+} from 'src/app/api/models/doubtfire-model';
+import {CachedEntityService, Entity, EntityMapping} from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {UnitRoleService} from './unit-role.service';
+import {AppInjector} from 'src/app/app-injector';
+import {TaskDefinitionService} from './task-definition.service';
+import {GroupService} from './group.service';
+import {Observable} from 'rxjs';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
 
 export type IloStats = {
@@ -51,7 +61,7 @@ export class UnitService extends CachedEntityService<Unit> {
         toEntityFn: (data: object, jsonKey: string, entity: Unit) => {
           const unitRoleService = AppInjector.get(UnitRoleService);
           unitRoleService.cache.get(data[jsonKey]);
-        }
+        },
       },
       {
         keys: 'staff',
@@ -59,10 +69,10 @@ export class UnitService extends CachedEntityService<Unit> {
           const unitRoleService = AppInjector.get(UnitRoleService);
           // Add staff
           entity.staffCache.clear();
-          data[key]?.forEach(staff => {
+          data[key]?.forEach((staff) => {
             entity.staffCache.add(unitRoleService.buildInstance(staff));
           });
-        }
+        },
       },
       {
         keys: ['mainConvenor', 'main_convenor_id'],
@@ -73,7 +83,7 @@ export class UnitService extends CachedEntityService<Unit> {
         },
         toJsonFn: (unit: Unit, key: string) => {
           return unit.mainConvenor?.id;
-        }
+        },
       },
       {
         keys: ['mainConvenorUser', 'main_convenor_user_id'],
@@ -82,20 +92,22 @@ export class UnitService extends CachedEntityService<Unit> {
         },
         toJsonFn: (unit: Unit, key: string) => {
           return unit.mainConvenor?.user.id;
-        }
+        },
       },
       {
         keys: ['teachingPeriod', 'teaching_period_id'],
         toEntityFn: (data, key, entity) => {
-          if ( data['teaching_period_id'] ) {
+          if (data['teaching_period_id']) {
             const teachingPeriod = this.teachingPeriodService.cache.get(data['teaching_period_id']);
             teachingPeriod?.unitsCache.add(entity);
             return teachingPeriod;
-          } else { return undefined; }
+          } else {
+            return undefined;
+          }
         },
         toJsonFn: (entity: Unit, key: string) => {
           return entity.teachingPeriod ? entity.teachingPeriod.id : undefined;
-        }
+        },
       },
       {
         keys: 'startDate',
@@ -104,7 +116,7 @@ export class UnitService extends CachedEntityService<Unit> {
         },
         toJsonFn: (entity, key) => {
           return entity.startDate.toISOString().slice(0, 10);
-        }
+        },
       },
       {
         keys: 'endDate',
@@ -113,7 +125,7 @@ export class UnitService extends CachedEntityService<Unit> {
         },
         toJsonFn: (entity, key) => {
           return entity.endDate.toISOString().slice(0, 10);
-        }
+        },
       },
       {
         keys: 'portfolioAutoGenerationDate',
@@ -122,7 +134,7 @@ export class UnitService extends CachedEntityService<Unit> {
         },
         toJsonFn: (entity, key) => {
           return entity.portfolioAutoGenerationDate?.toISOString().slice(0, 10);
-        }
+        },
       },
       'assessmentEnabled',
       // 'overseerImageId',
@@ -156,37 +168,43 @@ export class UnitService extends CachedEntityService<Unit> {
       {
         keys: 'ilos',
         toEntityOp: (data: object, key: string, unit: Unit) => {
-          data[key]?.forEach(ilo => {
+          data[key]?.forEach((ilo) => {
             unit.learningOutcomesCache.getOrCreate(ilo['id'], this.learningOutcomeService, ilo);
           });
-        }
+        },
       },
       {
         keys: 'tutorialStreams',
         toEntityOp: (data, key, entity) => {
           data['tutorial_streams'].forEach((streamJson: object) => {
-            entity.tutorialStreamsCache.add(this.tutorialStreamService.buildInstance(streamJson, {constructorParams: entity}));
+            entity.tutorialStreamsCache.add(
+              this.tutorialStreamService.buildInstance(streamJson, {constructorParams: entity}),
+            );
           });
-        }
+        },
       },
       {
         keys: 'tutorials',
         toEntityOp: (data, key, entity) => {
           data['tutorials'].forEach((tutorialJson: object) => {
             if (tutorialJson) {
-              entity.tutorialsCache.add(this.tutorialService.buildInstance(tutorialJson, {constructorParams: entity}));
+              entity.tutorialsCache.add(
+                this.tutorialService.buildInstance(tutorialJson, {constructorParams: entity}),
+              );
             }
           });
-        }
+        },
       },
       // 'tutorialEnrolments', - map to tutorial enrolments
       {
         keys: 'groupSets',
         toEntityOp: (data, key, unit) => {
           data[key]?.forEach((groupSetJson: object) => {
-            unit.groupSetsCache.add(this.groupSetService.buildInstance(groupSetJson, {constructorParams: unit}));
+            unit.groupSetsCache.add(
+              this.groupSetService.buildInstance(groupSetJson, {constructorParams: unit}),
+            );
           });
-        }
+        },
       },
       {
         keys: 'groups',
@@ -195,17 +213,22 @@ export class UnitService extends CachedEntityService<Unit> {
             const group = this.groupService.buildInstance(groupJson, {constructorParams: unit});
             group.groupSet.groupsCache.add(group);
           });
-        }
+        },
       },
       {
         keys: 'taskDefinitions',
         toEntityOp: (data, key, unit) => {
           var seq: number = 0;
           data['task_definitions'].forEach((taskDefinitionJson: object) => {
-            const td = unit.taskDefinitionCache.getOrCreate(taskDefinitionJson['id'], this.taskDefinitionService, taskDefinitionJson, {constructorParams: unit});
+            const td = unit.taskDefinitionCache.getOrCreate(
+              taskDefinitionJson['id'],
+              this.taskDefinitionService,
+              taskDefinitionJson,
+              {constructorParams: unit},
+            );
             td.seq = seq++;
           });
-        }
+        },
       },
       {
         keys: ['draftTaskDefinition', 'draft_task_definition_id'],
@@ -214,22 +237,22 @@ export class UnitService extends CachedEntityService<Unit> {
         },
         toJsonFn: (unit: Unit, key: string) => {
           return unit.draftTaskDefinition?.id;
-        }
+        },
       },
       {
         keys: 'taskOutcomeAlignments',
         toEntityOp: (data: object, jsonKey: string, unit: Unit) => {
-          data[jsonKey].forEach( (alignment) => {
+          data[jsonKey].forEach((alignment) => {
             unit.taskOutcomeAlignmentsCache.getOrCreate(
               alignment['id'],
               this.taskOutcomeAlignmentService,
               alignment,
               {
-                constructorParams: unit
-              }
+                constructorParams: unit,
+              },
             );
           });
-        }
+        },
       },
       // 'groupMemberships', - map to group memberships
     );
diff --git a/src/app/api/services/user.service.ts b/src/app/api/services/user.service.ts
index 9a9998c2d2..d4396e8666 100644
--- a/src/app/api/services/user.service.ts
+++ b/src/app/api/services/user.service.ts
@@ -1,11 +1,11 @@
-import { UnitRole, UnitService, User } from 'src/app/api/models/doubtfire-model';
-import { CachedEntityService, RequestOptions } from 'ngx-entity-service';
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
-import { AppInjector } from 'src/app/app-injector';
-import { AuthenticationService } from './authentication.service';
-import { Observable, tap } from 'rxjs';
+import {UnitRole, UnitService, User} from 'src/app/api/models/doubtfire-model';
+import {CachedEntityService, RequestOptions} from 'ngx-entity-service';
+import {Injectable} from '@angular/core';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {AppInjector} from 'src/app/app-injector';
+import {AuthenticationService} from './authentication.service';
+import {Observable, tap} from 'rxjs';
 
 @Injectable()
 export class UserService extends CachedEntityService<User> {
@@ -34,7 +34,7 @@ export class UserService extends CachedEntityService<User> {
       'receiveFeedbackNotifications',
       'hasRunFirstTimeSetup',
       'pronouns',
-      'acceptedTiiEula'
+      'acceptedTiiEula',
     );
 
     this._currentUser = this.anonymousUser;
@@ -73,7 +73,7 @@ export class UserService extends CachedEntityService<User> {
   }
 
   public getTutors(): Observable<User[]> {
-    return this.query(undefined, { endpointFormat: this.tutorEndpointFormat });
+    return this.query(undefined, {endpointFormat: this.tutorEndpointFormat});
   }
 
   public adminRoleFor(unitId: number, user: User): UnitRole {
@@ -86,7 +86,7 @@ export class UserService extends CachedEntityService<User> {
     result.user = user;
 
     const unitService = AppInjector.get(UnitService);
-    result.unit = unitService.cache.getOrCreate(unitId, unitService, { id: unitId });
+    result.unit = unitService.cache.getOrCreate(unitId, unitService, {id: unitId});
 
     return result;
   }
diff --git a/src/app/api/services/webcal.service.ts b/src/app/api/services/webcal.service.ts
index 0823ff7360..9644b85d73 100644
--- a/src/app/api/services/webcal.service.ts
+++ b/src/app/api/services/webcal.service.ts
@@ -1,8 +1,8 @@
-import { Injectable } from '@angular/core';
-import { Webcal } from '../models/webcal/webcal';
-import { Entity, EntityService } from 'ngx-entity-service';
-import { HttpClient } from '@angular/common/http';
-import API_URL from 'src/app/config/constants/apiURL';
+import {Injectable} from '@angular/core';
+import {Webcal} from '../models/webcal/webcal';
+import {Entity, EntityService} from 'ngx-entity-service';
+import {HttpClient} from '@angular/common/http';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Injectable()
 export class WebcalService extends EntityService<Webcal> {
@@ -23,7 +23,7 @@ export class WebcalService extends EntityService<Webcal> {
       // Only used when updating the webcal.
       'shouldChangeGuid',
 
-      'reminder'
+      'reminder',
     );
 
     this.mapping.mapAllKeysToJsonExcept('id');
diff --git a/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
index f1b501bd8d..3dfa2451cf 100644
--- a/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
+++ b/src/app/common/learning-outcome-editor/learning-outcome-editor.component.ts
@@ -38,7 +38,7 @@ import {MatAutocompleteSelectedEvent} from '@angular/material/autocomplete';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
 import {isEqual} from 'lodash';
 import {NestedCsvDownloadModalService} from './nested-csv-download-modal/nested-csv-download-modal.service';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 @Component({
   selector: 'f-learning-outcome-editor',
diff --git a/src/app/common/services/http-authentication.interceptor.ts b/src/app/common/services/http-authentication.interceptor.ts
index d2ff87fb2c..920d47f4dd 100644
--- a/src/app/common/services/http-authentication.interceptor.ts
+++ b/src/app/common/services/http-authentication.interceptor.ts
@@ -1,9 +1,9 @@
 import {Injectable} from '@angular/core';
 import {HttpRequest, HttpHandler, HttpEvent, HttpInterceptor} from '@angular/common/http';
 import {Observable} from 'rxjs';
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 import {UserService} from 'src/app/api/services/user.service';
-import LTI_API_URL from 'src/app/config/constants/ltiApiURL';
+import LTI_API_URL from 'src/app/config/constants/ltiApiUrl';
 
 @Injectable()
 export class HttpAuthenticationInterceptor implements HttpInterceptor {
diff --git a/src/app/config/constants/apiUrl.ts b/src/app/config/constants/apiUrl.ts
new file mode 100644
index 0000000000..6e502f57ce
--- /dev/null
+++ b/src/app/config/constants/apiUrl.ts
@@ -0,0 +1,3 @@
+import HOST_URL from './hostUrl';
+const API_URL: string = `${HOST_URL}/api`;
+export default API_URL;
diff --git a/src/app/config/constants/doubtfire-constants.ts b/src/app/config/constants/doubtfire-constants.ts
index 67a8bbea42..0652fbf898 100644
--- a/src/app/config/constants/doubtfire-constants.ts
+++ b/src/app/config/constants/doubtfire-constants.ts
@@ -1,8 +1,8 @@
-import { HttpClient, HttpBackend } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import {HttpClient, HttpBackend} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {BehaviorSubject} from 'rxjs';
 
-import API_URL from 'src/app/config/constants/apiURL';
+import API_URL from 'src/app/config/constants/apiUrl';
 
 interface SettingsResponseFormat {
   externalName: string;
@@ -24,7 +24,7 @@ interface SignOutUrlResponseFormat {
   auth_signout_url: string;
 }
 
-@Injectable({ providedIn: 'root' })
+@Injectable({providedIn: 'root'})
 export class DoubtfireConstants {
   private http: HttpClient;
 
@@ -80,7 +80,7 @@ export class DoubtfireConstants {
 
     this.http.get<SignOutUrlResponseFormat>(url).subscribe(
       (result) => (this.SignoutURL = result.auth_signout_url),
-      (error) => console.error(error)
+      (error) => console.error(error),
     );
   }
 
@@ -95,7 +95,7 @@ export class DoubtfireConstants {
       this.LogoSettings.next({
         hasLogo: result.hasLogo,
         logoUrl: result.logoUrl,
-        logoLinkUrl: result.logoLinkUrl
+        logoLinkUrl: result.logoLinkUrl,
       });
     });
   }
diff --git a/src/app/config/constants/hostUrl.devcontainer.ts b/src/app/config/constants/hostUrl.devcontainer.ts
new file mode 100644
index 0000000000..15660c01c6
--- /dev/null
+++ b/src/app/config/constants/hostUrl.devcontainer.ts
@@ -0,0 +1,2 @@
+const HOST_URL: string = `${window.location.origin}/api`;
+export default HOST_URL;
diff --git a/src/app/config/constants/hostUrl.prod.ts b/src/app/config/constants/hostUrl.prod.ts
new file mode 100644
index 0000000000..15660c01c6
--- /dev/null
+++ b/src/app/config/constants/hostUrl.prod.ts
@@ -0,0 +1,2 @@
+const HOST_URL: string = `${window.location.origin}/api`;
+export default HOST_URL;
diff --git a/src/app/config/constants/ltiApiUrl.ts b/src/app/config/constants/ltiApiUrl.ts
new file mode 100644
index 0000000000..a3c45ed8d6
--- /dev/null
+++ b/src/app/config/constants/ltiApiUrl.ts
@@ -0,0 +1,3 @@
+import HOST_URL from './hostUrl';
+const LTI_API_URL: string = `${HOST_URL}/lti/api`;
+export default LTI_API_URL;

From 8d82cd10d03a9af3f6b3aa088c54163ef1abb2eb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 17 Sep 2025 14:04:17 +1000
Subject: [PATCH 562/776] chore(release): 10.0.0-42

---
 CHANGELOG.md      | 17 +++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index facb6204fd..e9438f7442 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 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.
 
+## [10.0.0-42](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-41...v10.0.0-42) (2025-09-17)
+
+
+### Features
+
+* display result of student imports ([e0503f4](https://github.com/b0ink/doubtfire-deploy/commit/e0503f424dfbef49e68b4e2f697e8d135120634e))
+* enable unit linking to lms context using deeplink ([73de1f1](https://github.com/b0ink/doubtfire-deploy/commit/73de1f1c68223c863c35198b773f0bdeaa1f549e))
+* init lti integration ([248be93](https://github.com/b0ink/doubtfire-deploy/commit/248be93e7c8b5ff060957e500b6a4943882f456c))
+* sync enrolments for all lti members ([5ec499f](https://github.com/b0ink/doubtfire-deploy/commit/5ec499f37b93f2b4bd56d145501fd55ab6af45e6))
+* sync grades for all members ([0f5daa8](https://github.com/b0ink/doubtfire-deploy/commit/0f5daa852f4c3750367f7d2c3f9b0c07ffbfed3f))
+* unauthorised lti banner ([12e65d8](https://github.com/b0ink/doubtfire-deploy/commit/12e65d8f1609f2030b25347beb1c0e06f513f65c))
+
+
+### Bug Fixes
+
+* forward correct lti token ([e95544e](https://github.com/b0ink/doubtfire-deploy/commit/e95544e2e158affefafd2fc0fe9657bf47c200db))
+
 ## [10.0.0-41](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-40...v10.0.0-41) (2025-09-15)
 
 ## [10.0.0-40](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-39...v10.0.0-40) (2025-09-15)
diff --git a/package-lock.json b/package-lock.json
index 7785a2e837..5ad957590a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-41",
+  "version": "10.0.0-42",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-41",
+      "version": "10.0.0-42",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 4087e7fc70..cb17e4cf9d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-41",
+  "version": "10.0.0-42",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 5889edc35bb427dfd4defefa7b77e8c81cd6dd7c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:10:45 +1000
Subject: [PATCH 563/776] fix: remove /api from host url

---
 src/app/config/constants/hostUrl.devcontainer.ts | 2 +-
 src/app/config/constants/hostUrl.prod.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/config/constants/hostUrl.devcontainer.ts b/src/app/config/constants/hostUrl.devcontainer.ts
index 15660c01c6..372945cbf8 100644
--- a/src/app/config/constants/hostUrl.devcontainer.ts
+++ b/src/app/config/constants/hostUrl.devcontainer.ts
@@ -1,2 +1,2 @@
-const HOST_URL: string = `${window.location.origin}/api`;
+const HOST_URL: string = `${window.location.origin}`;
 export default HOST_URL;
diff --git a/src/app/config/constants/hostUrl.prod.ts b/src/app/config/constants/hostUrl.prod.ts
index 15660c01c6..372945cbf8 100644
--- a/src/app/config/constants/hostUrl.prod.ts
+++ b/src/app/config/constants/hostUrl.prod.ts
@@ -1,2 +1,2 @@
-const HOST_URL: string = `${window.location.origin}/api`;
+const HOST_URL: string = `${window.location.origin}`;
 export default HOST_URL;

From 5a5e9401e2105854562f4879f7cce2ed431eb2f4 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:10:52 +1000
Subject: [PATCH 564/776] chore(release): 10.0.0-43

---
 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 e9438f7442..788423c19a 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.
 
+## [10.0.0-43](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-42...v10.0.0-43) (2025-09-17)
+
+
+### Bug Fixes
+
+* remove /api from host url ([5889edc](https://github.com/b0ink/doubtfire-deploy/commit/5889edc35bb427dfd4defefa7b77e8c81cd6dd7c))
+
 ## [10.0.0-42](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-41...v10.0.0-42) (2025-09-17)
 
 
diff --git a/package-lock.json b/package-lock.json
index 5ad957590a..4791fd7d9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-42",
+  "version": "10.0.0-43",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-42",
+      "version": "10.0.0-43",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index cb17e4cf9d..0445da7ce5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-42",
+  "version": "10.0.0-43",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 189790a8093840d2fc5fdb398abde0762d65b075 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 18 Sep 2025 10:30:40 +1000
Subject: [PATCH 565/776] chore: use host url constant

---
 src/app/common/header/header.component.ts                       | 2 +-
 src/app/config/constants/doubtfire-constants.ts                 | 2 ++
 .../directives/task-status-card/task-status-card.component.ts   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/common/header/header.component.ts b/src/app/common/header/header.component.ts
index a0d791146c..8d9e8f6a11 100644
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
@@ -141,7 +141,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
   }
 
   showMyQr() {
-    const hostName = this.doubtfireConstants.API_URL.replace('/api', '');
+    const hostName = this.doubtfireConstants.HOST_URL;
 
     const projectView =
       this.currentProject &&
diff --git a/src/app/config/constants/doubtfire-constants.ts b/src/app/config/constants/doubtfire-constants.ts
index 0652fbf898..72d1140bfc 100644
--- a/src/app/config/constants/doubtfire-constants.ts
+++ b/src/app/config/constants/doubtfire-constants.ts
@@ -3,6 +3,7 @@ import {Injectable} from '@angular/core';
 import {BehaviorSubject} from 'rxjs';
 
 import API_URL from 'src/app/config/constants/apiUrl';
+import HOST_URL from 'src/app/config/constants/hostUrl';
 
 interface SettingsResponseFormat {
   externalName: string;
@@ -34,6 +35,7 @@ export class DoubtfireConstants {
     'jakerenzella', // Jake Renzella
   ];
 
+  public HOST_URL: string = HOST_URL;
   public API_URL: string = API_URL;
 
   // Where should we redirect users on signout?
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index a5a0134dca..70934d7d51 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -98,7 +98,7 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
   }
 
   openDiscussionQrCode(): void {
-    const hostName = this.doubtfireConstants.API_URL.replace('/api', '');
+    const hostName = this.doubtfireConstants.HOST_URL;
     const url = `${hostName}/tutor-discussion?unitId=${this.task.unit.id}&username=${this.userService.currentUser.username}`;
     this.qrModalService.show(
       url,

From 2cb57ee2d33d1be94fa2ccc49b860c0ec5d5bd1f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 18 Sep 2025 11:29:39 +1000
Subject: [PATCH 566/776] refactor: require confirmation when setting project
 plan after the feedback deadline

---
 .../task-date-slider.component.ts             | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/app/common/modals/date-change-modal/task-date-slider.component.ts b/src/app/common/modals/date-change-modal/task-date-slider.component.ts
index 0969834605..4da6b3a2f8 100644
--- a/src/app/common/modals/date-change-modal/task-date-slider.component.ts
+++ b/src/app/common/modals/date-change-modal/task-date-slider.component.ts
@@ -1,7 +1,8 @@
-import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
+import {Component, Input, OnChanges, SimpleChanges} from '@angular/core';
 import {Task} from 'src/app/api/models/doubtfire-model';
-import { MappingFunctions } from 'src/app/api/services/mapping-fn';
-import { AlertService } from '../../services/alert.service';
+import {MappingFunctions} from 'src/app/api/services/mapping-fn';
+import {AlertService} from '../../services/alert.service';
+import {ConfirmationModalService} from '../confirmation-modal/confirmation-modal.service';
 
 @Component({
   selector: 'f-task-date-slider',
@@ -27,6 +28,7 @@ export class TaskDateSliderComponent implements OnChanges {
 
   public constructor(
     private alerts: AlertService,
+    private confirmationModalService: ConfirmationModalService,
   ) {}
 
   public get max(): number {
@@ -63,17 +65,28 @@ export class TaskDateSliderComponent implements OnChanges {
   }
 
   public saveDueDate(): void {
-    this.task.savePlannedDate().subscribe({
-      next: () => {
-        this.alerts.success('Plan updated successfully.');
-        this.editMode = false;
-        this.task.project.calcTopTasks();
-      },
-      error: (message) => {
-        this.alerts.error(`Error updating due date: ${message}`);
-        this.cancelEdit();
-      }
-    });
+    const save = () =>
+      this.task.savePlannedDate().subscribe({
+        next: () => {
+          this.alerts.success('Plan updated successfully.');
+          this.editMode = false;
+          this.task.project.calcTopTasks();
+        },
+        error: (message) => {
+          this.alerts.error(`Error updating due date: ${message}`, 6000);
+          this.cancelEdit();
+        },
+      });
+
+    if (this.afterDeadline()) {
+      this.confirmationModalService.show(
+        'Due date is after feedback deadline',
+        'You won’t receive feedback for this task if you submit after the feedback cutoff. Do you want to continue?',
+        save,
+      );
+    } else {
+      save();
+    }
   }
 
   public afterDeadline(): boolean {

From 058a7214fce317bf16abfbb78cbbd387a74cef44 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 18 Sep 2025 12:48:39 +1000
Subject: [PATCH 567/776] chore(release): 10.0.0-44

---
 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 788423c19a..45aefeb73a 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.
 
+## [10.0.0-44](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-43...v10.0.0-44) (2025-09-18)
+
 ## [10.0.0-43](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-42...v10.0.0-43) (2025-09-17)
 
 
diff --git a/package-lock.json b/package-lock.json
index 4791fd7d9e..3500ef85ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-43",
+  "version": "10.0.0-44",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-43",
+      "version": "10.0.0-44",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 0445da7ce5..6ba1706bec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-43",
+  "version": "10.0.0-44",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From f6db02ef7ac6514958e6f5f4a0eb5528c57e5fc6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 18 Sep 2025 16:00:39 +1000
Subject: [PATCH 568/776] refactor: check for a valid submission response

---
 .../upload-submission-modal.coffee            | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index d1c87f917b..486ae9bcbb 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -71,14 +71,22 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       $scope.uploader.payload.trigger = 'need_help' if $scope.submissionType == 'need_help'
       $scope.uploader.payload.trigger = 'assess_in_portfolio' if $scope.submissionType == 'assess_in_portfolio' || $scope.task.status == 'assess_in_portfolio'
     onSuccess: (response) ->
-      $scope.uploader.response = response
-      if $scope.task.isTestSubmission
-        newProjectService.loadProject(response.project_id, $scope.task.unit).subscribe({
-          next: (response) ->
-            $scope.task.project = response
-        })
+      # Ensure our response contains the data we're expecting
+      if typeof response is 'object' and response? and response.id? and response.project_id? and response.status?
+        $scope.uploader.response = response
+        if $scope.task.isTestSubmission
+          newProjectService.loadProject(response.project_id, $scope.task.unit).subscribe({
+            next: (response) ->
+              $scope.task.project = response
+          })
+      else
+        console.error "Invalid response", response
+        $modalInstance.close(task)
+        alertService.error("Upload failed. Please try again, or contact your tutor if the issue continues.", 8000)
+
     onFailureCancel: $modalInstance.dismiss
     onComplete: ->
+      return unless $scope.uploader.response? and $scope.uploader.response.id?
       $modalInstance.close(task)
       unless $scope.task.isTestSubmission
         # Add comment if requested

From 49fcba6bdfb9b83ead231114045c31583643b003 Mon Sep 17 00:00:00 2001
From: Jason Vellucci <jason.vellucci@live.com>
Date: Mon, 22 Sep 2025 11:18:15 +1000
Subject: [PATCH 569/776] refactor: migrate/unit staff editor 9.x (#933)

* chore: migrate/unit-staff-editor

- delete old Coffeescript file
- delete old template
- remove reference to old Coffeescript file
- link new component
- downgrade new component

* chore: migrate/unit-staff-editor

- port `unit-staff-editor-component` to Typescript from Coffeescript
- port `unit-staff-editor` template to Angular template syntax w/ Angular Material
- adjust parent component `Inputs` and attribute bindings

* Update README.md

* Update README.md

---------

Co-authored-by: Boink <40929320+b0ink@users.noreply.github.com>
---
 README.md                                     |   2 +-
 src/app/doubtfire-angular.module.ts           |   2 +
 src/app/doubtfire-angularjs.module.ts         |  11 +-
 .../states/edit/directives/directives.coffee  |   1 -
 .../unit-staff-editor.component.html          | 116 +++++++++++++++
 .../unit-staff-editor.component.ts            | 135 ++++++++++++++++++
 .../unit-staff-editor.tpl.html                | 101 -------------
 src/app/units/states/edit/edit.tpl.html       |   2 +-
 8 files changed, 264 insertions(+), 106 deletions(-)
 create mode 100644 src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
 create mode 100644 src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
 delete mode 100644 src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.tpl.html

diff --git a/README.md b/README.md
index e748a9393b..5f4e969966 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ MIGRATED:
 - [x] ./src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.ts
 - [x] ./src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-general/task-definition-general.component.ts
 - [x] ./src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.ts
+- [x] ./src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
 - [x] ./src/app/units/states/analytics/unit-analytics-route.component.ts
 - [x] ./src/app/common/footer/footer.component.ts
 - [x] ./src/app/common/audio-recorder/audio/audio-comment-recorder/audio-comment-recorder.ts
@@ -189,7 +190,6 @@ TODO:
 - [ ] ./src/app/units/states/edit/directives/directives.coffee
 - [ ] ./src/app/units/states/edit/directives/unit-group-set-editor/unit-group-set-editor.coffee
 - [ ] ./src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
-- [ ] ./src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.coffee
 - [ ] ./src/app/units/states/edit/directives/unit-ilo-editor/unit-ilo-editor.coffee
 - [ ] ./src/app/units/states/edit/edit.coffee
 - [ ] ./src/app/units/states/rollover/directives/directives.coffee
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index e20c993667..0e370154ff 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -286,6 +286,7 @@ import {TaskPrerequisiteService} from './api/services/task-prerequisite.service'
 // import { GradeIconComponent } from './common/grade-icon/grade-icon.component';
 // import { GradeTaskModalComponent } from './tasks/modals/grade-task-modal/grade-task-modal.component';
 // import { PrivacyPolicy } from './config/privacy-policy/privacy-policy';
+import {UnitStaffEditorComponent} from './units/states/edit/directives/unit-staff-editor/unit-staff-editor.component';
 import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
@@ -435,6 +436,7 @@ const MY_DATE_FORMAT = {
     LtiUnitLinkComponent,
     TaskDefinitionPrerequisitesComponent,
     TaskPrerequisitesCardComponent,
+    UnitStaffEditorComponent,
     GroupSetSelectorComponent,
   ],
   // Services we provide
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 7ce8c29c3d..223544d7bf 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -101,7 +101,6 @@ import 'build/src/app/units/states/groups/groups.js';
 import 'build/src/app/units/states/states.js';
 import 'build/src/app/units/states/edit/directives/unit-group-set-editor/unit-group-set-editor.js';
 import 'build/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.js';
-import 'build/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.js';
 import 'build/src/app/units/states/edit/directives/unit-ilo-editor/unit-ilo-editor.js';
 import 'build/src/app/units/states/edit/directives/directives.js';
 import 'build/src/app/units/states/edit/edit.js';
@@ -229,6 +228,7 @@ import {SidekiqProgressModalService} from './common/modals/sidekiq-progress-moda
 import {TaskPrerequisitesCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component';
 // import { UnitStudentEnrolmentModalService } from './units/modals/unit-student-enrolment-modal/unit-student-enrolment-modal.service';
 // import { PrivacyPolicy } from './config/privacy-policy/privacy-policy';
+import {UnitStaffEditorComponent} from './units/states/edit/directives/unit-staff-editor/unit-staff-editor.component';
 import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
 
 export const DoubtfireAngularJSModule = angular
@@ -342,7 +342,10 @@ DoubtfireAngularJSModule.directive(
   'objectSelect',
   downgradeComponent({component: ObjectSelectComponent}),
 );
-DoubtfireAngularJSModule.directive('fGradeIcon', downgradeComponent({component: GradeIconComponent}));
+DoubtfireAngularJSModule.directive(
+  'fGradeIcon',
+  downgradeComponent({component: GradeIconComponent}),
+);
 DoubtfireAngularJSModule.directive('appHeader', downgradeComponent({component: HeaderComponent}));
 DoubtfireAngularJSModule.directive(
   'splashScreen',
@@ -499,6 +502,10 @@ DoubtfireAngularJSModule.directive(
 );
 DoubtfireAngularJSModule.directive('newFUnits', downgradeComponent({component: FUnitsComponent}));
 
+DoubtfireAngularJSModule.directive(
+  'unitStaffEditor',
+  downgradeComponent({component: UnitStaffEditorComponent}),
+);
 DoubtfireAngularJSModule.directive(
   'fTaskIlosCard',
   downgradeComponent({component: TaskIlosCardComponent}),
diff --git a/src/app/units/states/edit/directives/directives.coffee b/src/app/units/states/edit/directives/directives.coffee
index bfb12ed317..fe06bf4510 100644
--- a/src/app/units/states/edit/directives/directives.coffee
+++ b/src/app/units/states/edit/directives/directives.coffee
@@ -2,5 +2,4 @@ angular.module('doubtfire.units.states.edit.directives', [
   'doubtfire.units.states.edit.directives.unit-details-editor'
   'doubtfire.units.states.edit.directives.unit-group-set-editor'
   'doubtfire.units.states.edit.directives.unit-ilo-editor'
-  'doubtfire.units.states.edit.directives.unit-staff-editor'
 ])
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
new file mode 100644
index 0000000000..84aa983f0a
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
@@ -0,0 +1,116 @@
+<div class="unit-staff-editor">
+  <!-- Template for staff avatar -->
+  <ng-template #staffAvatar let-match="match" let-query="query">
+    <a>
+      <!-- User icon or avatar -->
+      <span [innerHTML]="match.label"></span>
+    </a>
+  </ng-template>
+
+  <div class="panel panel-primary">
+    <div class="panel-heading">
+      <h3 class="panel-title">Modify Unit Staff</h3>
+      <p>Add staff members to the unit, assigning them a convenor or tutor role.</p>
+    </div>
+
+    <div class="panel-body">
+      <div class="col-sm-12">
+        <!-- Message when no staff are assigned -->
+        <div *ngIf="unitStaff.length === 0" class="callout callout-info">
+          This unit has no staff assigned.
+        </div>
+
+        <!-- Staff table -->
+        <div *ngIf="unitStaff.length > 0">
+          <table class="table table-condensed table-hover">
+            <thead>
+              <tr>
+                <th colspan="2">Name</th>
+                <th>Role</th>
+                <th>Main Convenor</th>
+                <th>Actions</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let staff of unitStaff">
+                <td style="width: 30px">
+                  <user-icon [size]="30" [user]="staff.user" aria-hidden="true"></user-icon>
+                </td>
+                <td>{{ staff.user.name }}</td>
+                <td>
+                  <div class="btn-group">
+                    <button
+                      class="btn btn-default"
+                      mat-button
+                      [class.active]="staff.role === 'Tutor'"
+                      (click)="changeRole(staff, 2)"
+                      matTooltip="Tutors deliver unit content."
+                      aria-label="Make staff member a Tutor"
+                    >
+                      Tutor
+                    </button>
+                    <button
+                      class="btn btn-default"
+                      mat-button
+                      [class.active]="staff.role === 'Convenor'"
+                      (click)="changeRole(staff, 3)"
+                      matTooltip="Convenors manage the unit."
+                      aria-label="Make staff member a Convenor"
+                    >
+                      Convenor
+                    </button>
+                  </div>
+                </td>
+                <td>
+                  <button
+                    *ngIf="staff.role === 'Convenor'"
+                    [disabled]="staff.id === unit.mainConvenor.id"
+                    type="button"
+                    class="btn btn-default"
+                    (click)="changeMainConvenor(staff)"
+                    aria-label="Make staff member the Main Convenor"
+                  >
+                    <mat-icon aria-hidden="true">
+                      {{ staff.id === unit.mainConvenor.id ? 'check' : 'close' }}
+                    </mat-icon>
+                  </button>
+                </td>
+                <td>
+                  <button
+                    mat-icon-button
+                    color="warn"
+                    (click)="removeStaff(staff)"
+                  >
+                    <mat-icon>delete</mat-icon>
+                  </button>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+    <div class="panel-footer clearfix">
+      <div class="input-group col-sm-12">
+        <mat-form-field class="full-width" appearance="outline">
+          <input
+            matInput
+            placeholder="Staff Name"
+            [(ngModel)]="searchTerm"
+            (ngModelChange)="filterStaffList()"
+            [matAutocomplete]="auto"
+          />
+          <mat-autocomplete
+            #auto="matAutocomplete"
+            (optionSelected)="addSelectedStaff($event.option.value)"
+            [displayWith]="displayStaffName"
+          >
+            <mat-option *ngFor="let staff of filteredStaff" [value]="staff">
+              {{ staff.name }}
+            </mat-option>
+          </mat-autocomplete>
+        </mat-form-field>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
new file mode 100644
index 0000000000..167ed3210f
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
@@ -0,0 +1,135 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {UnitRoleService} from 'src/app/api/services/unit-role.service';
+import {Unit} from 'src/app/api/models/unit';
+import {User} from 'src/app/api/models/doubtfire-model';
+import {UnitRole} from 'src/app/api/models/unit-role';
+
+@Component({
+  selector: 'unit-staff-editor',
+  templateUrl: 'unit-staff-editor.component.html',
+})
+export class UnitStaffEditorComponent implements OnInit {
+  @Input() unit: Unit;
+  @Input() staff: User[];
+
+  temp = [];
+  users = [];
+  unitStaff: UnitRole[];
+  filteredStaff: User[] = []; // Filtered staff members
+  searchTerm: string = ''; // Search term entered by the user
+
+  // Inject services here
+  constructor(
+    private alertService: AlertService,
+    private unitRoleService: UnitRoleService,
+  ) {}
+
+  ngOnInit(): void {
+    // Subscribe to staff cache
+    this.unit.staffCache.values.subscribe((staff: UnitRole[]) => {
+      this.unitStaff = staff;
+    });
+  }
+
+  /**
+   * Changes the role of a staff member.
+   *
+   * @param UnitRole unitRole
+   * @param number role_id
+   *
+   * @returns void
+   */
+  changeRole(unitRole: UnitRole, role_id: number) {
+    unitRole.roleId = role_id;
+    this.unitRoleService.update(unitRole).subscribe({
+      next: (response) => this.alertService.success('Role changed', 2000),
+      error: (response) => this.alertService.error(response, 6000),
+    });
+  }
+
+  /**
+   * Changes who the `Main Convenor` of the unit is.
+   *
+   * @param UnitRole staff
+   *
+   * @returns void
+   */
+  changeMainConvenor(staff: UnitRole) {
+    this.unit.changeMainConvenor(staff).subscribe({
+      next: (response) => this.alertService.success('Main convenor changed', 2000),
+      error: (response) => this.alertService.error(response, 6000),
+    });
+  }
+
+  /**
+   * Adds a staff member to the unit.
+   *
+   * @param User selectedStaff
+   *
+   * @returns void
+   */
+  addSelectedStaff(selectedStaff: User) {
+    if (selectedStaff?.id) {
+      this.unit.addStaff(selectedStaff).subscribe({
+        next: () => {
+          this.alertService.success('Staff member added', 2000);
+          this.searchTerm = ''; // Clear the input field
+          this.filterStaffList(); // Refilter the list
+        },
+        error: (response) => this.alertService.error(response, 6000),
+      });
+    } else {
+      this.alertService.error(
+        'Unable to add staff member. Ensure they have a tutor or convenor account in User admin first',
+      );
+    }
+  }
+
+  /**
+   * Used in filtering the staff list. The `searchTerm` is bound to the auto-complete input in this class's template.
+   *
+   * @returns void
+   */
+  filterStaffList(): void {
+    // `this.searchTerm` holds the selected staff member object from the dropdown OR the auto-complete input searchTerm (never at the same time).
+    // Thus, check the type here and exit early if string filtering is not needed.
+    if (typeof this.searchTerm !== 'string') {
+      return;
+    }
+    this.filteredStaff = this.staff.filter(
+      (staff) =>
+        staff.name.toLowerCase().includes(this.searchTerm.toLowerCase()) && // Find by name
+        !this.unit.staff.find((listStaff) => staff.id === listStaff.user.id), // Not already assigned to the unit
+    );
+  }
+
+  /**
+   * Generates a human-readable name made up of the passed-in staff member's `first` and `last` names.
+   *
+   * @param User staff
+   *
+   * @returns void
+   */
+  displayStaffName(staff: User): string {
+    return staff ? staff.name : '';
+  }
+
+  /**
+   * Removes a staff member from the unit.
+   *
+   * @param UnitRole staff
+   *
+   * @returns void
+   */
+  removeStaff(staff: UnitRole) {
+    this.unitRoleService.delete(staff, {cache: this.unit.staffCache}).subscribe({
+      next: (response) => this.alertService.success('Staff member removed', 2000),
+      error: (response) => this.alertService.error(response, 6000),
+    });
+  }
+
+  groupSetName(id: number) {
+    this.unit.groupSetsCache.get(id).name || 'Individual Work';
+  }
+}
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.tpl.html b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.tpl.html
deleted file mode 100644
index f8b38cecb0..0000000000
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.tpl.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<div class="unit-staff-editor">
-  <script type="text/ng-template" id="staffAvatar.html">
-    <a>
-      <!-- This is where a user icon can go -->
-      <span bind-html-unsafe="match.label | typeaheadHighlight:query"></span>
-    </a>
-  </script>
-  <div class="panel panel-primary">
-    <div class="panel-heading">
-      <h3 class="panel-title">Modify Unit Staff</h3>
-      Add staff members to the unit, assigning them a convenor or tutor role.
-    </div>
-    <div class="panel-body">
-      <div class="col-sm-12">
-        <div class="callout callout-info" ng-hide="unitStaff.length > 0">This unit has no staff assigned</div>
-        <div ng-show="unitStaff.length > 0">
-          <table class="table table-condensed table-hover">
-            <thead>
-              <tr>
-                <th colspan="2">Name</th>
-                <th>Role</th>
-                <th>Main Convenor</th>
-                <th>Actions</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr ng-repeat="staff in unitStaff">
-                <td style="width: 30px">
-                  <user-icon [size]="30" [user]="staff.user"></user-icon>
-                </td>
-                <td>{{staff.user.name}}</td>
-                <td>
-                  <div class="btn-group">
-                    <label
-                      class="btn btn-default"
-                      tooltip="Tutors deliver unit content."
-                      ng-model="staff.role"
-                      btn-radio="'Tutor'"
-                      ng-click="changeRole(staff,2)"
-                      >Tutor</label
-                    >
-                    <label
-                      class="btn btn-default"
-                      tooltip="Convenors manage the unit."
-                      ng-model="staff.role"
-                      btn-radio="'Convenor'"
-                      ng-click="changeRole(staff,3)"
-                      >Convenor</label
-                    >
-                  </div>
-                </td>
-                <td>
-                  <button
-                    ng-show="staff.role == 'Convenor'"
-                    ng-disabled="staff.id == unit.mainConvenor.id"
-                    type="button"
-                    class="btn btn-default"
-                    ng-model="unit.mainConvenor"
-                    ng-click="changeMainConvenor(staff)"
-                    btn-checkbox
-                  >
-                    <i class="fa fa-{{staff.id == unit.mainConvenor.id ? 'check' : 'times'}}"></i>
-                  </button>
-                </td>
-                <td>
-                  <button class="btn btn-danger" ng-click="removeStaff(staff)">
-                    <i class="fa fa-trash-o"></i>
-                  </button>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-    <div class="panel-footer clearfix">
-      <div class="input-group col-sm-12">
-        <input
-          class="form-control"
-          id="convenors"
-          placeholder="Staff Name"
-          ng-model="selectedStaff"
-          typeahead="staff as staff.name for staff in staff | filter: $viewValue | filter: filterStaff"
-          autocomplete="off"
-          typeahead-editable="false"
-          typeahead-wait-ms="200"
-          typeahead-template-url="staffAvatar.html"
-          typeahead-select-on-exact="true"
-          typeahead-on-select="addSelectedStaff()"
-        />
-
-        <span class="input-group-btn">
-          <button class="btn btn-success pull-right" ng-click="addSelectedStaff()">
-            <i class="fa fa-male"></i>
-            <i class="fa fa-plus"></i> Add Staff
-          </button>
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/app/units/states/edit/edit.tpl.html b/src/app/units/states/edit/edit.tpl.html
index 2c9699e496..4df8bf3d09 100644
--- a/src/app/units/states/edit/edit.tpl.html
+++ b/src/app/units/states/edit/edit.tpl.html
@@ -6,7 +6,7 @@
   </tabset><!--/tabs-->
   <unit-details-editor unit="unit" ng-if="activeTab === tabs.unitTab"></unit-details-editor>
   <f-learning-outcome-editor [context]="unit" ng-if="activeTab === tabs.learningOutcomesTab"></f-learning-outcome-editor>
-  <unit-staff-editor ng-if="activeTab === tabs.staffTab"></unit-staff-editor>
+  <unit-staff-editor [unit]="unit" [staff]="staff" ng-if="activeTab === tabs.staffTab"></unit-staff-editor>
   <unit-tutorials-manager ng-if="activeTab === tabs.tutorialsTab" [unit]="unit"></unit-tutorials-manager>
   <unit-students-editor [unit]="unit" ng-if="activeTab === tabs.studentsTab"></unit-students-editor>
   <f-unit-task-editor ng-if="activeTab === tabs.tasksTab" [unit]="unit"></f-unit-task-editor>

From 943e3bf761ab210e68d69982ccf91c0d093a836e Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 22 Sep 2025 12:44:53 +1000
Subject: [PATCH 570/776] refactor: unit staff editor material ui (#1001)

* fix: revert staff role on error

* fix: ensure full search for unit role

* chore: fix casing

* refactor: use mat table for staff editor

* chore: remove unused variables

* fix: null check

* refactor: use icon button

* chore: remove unit staff editor coffeescript file

* chore: add back staff editor tooltips
---
 src/app/common/header/header.component.ts     |   3 +-
 .../unit-staff-editor.coffee                  |  58 ------
 .../unit-staff-editor.component.html          | 197 ++++++++----------
 .../unit-staff-editor.component.ts            |  51 ++++-
 4 files changed, 127 insertions(+), 182 deletions(-)
 delete mode 100644 src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.coffee

diff --git a/src/app/common/header/header.component.ts b/src/app/common/header/header.component.ts
index 8d9e8f6a11..4601057b15 100644
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
@@ -173,8 +173,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
   }
 
   isUniqueRole = (unit) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const units = this.unitRoles.filter((role: any) => role.unit.id === unit.unit.id);
+    const units = this.unitRoles.filter((role: UnitRole) => role.unit?.id === unit.unit?.id);
     return units.length == 1 || unit.role == 'Tutor';
   };
 
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.coffee b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.coffee
deleted file mode 100644
index 3856daefe5..0000000000
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.coffee
+++ /dev/null
@@ -1,58 +0,0 @@
-angular.module('doubtfire.units.states.edit.directives.unit-staff-editor', [])
-
-#
-# Editor for adding new staff to a unit and assigning those staff
-# members new unit roles within the unit
-#
-.directive('unitStaffEditor', ->
-  replace: true
-  restrict: 'E'
-  templateUrl: 'units/states/edit/directives/unit-staff-editor/unit-staff-editor.tpl.html'
-  controller: ($scope, $rootScope, alertService, newUnitService, newUnitRoleService) ->
-    temp = []
-    users = []
-
-    $scope.unit.staffCache.values.subscribe( (staff) -> $scope.unitStaff = staff )
-
-    $scope.changeRole = (unitRole, role_id) ->
-      unitRole.roleId = role_id
-      newUnitRoleService.update(unitRole).subscribe({
-        next: (response)  -> alertService.success( "Role changed", 2000)
-        error: (response) -> alertService.error( response, 6000)
-      })
-
-    $scope.changeMainConvenor = (staff) ->
-      $scope.unit.changeMainConvenor(staff).subscribe({
-        next: (response) ->
-          alertService.success( "Main convenor changed", 2000)
-        error: (response) ->
-          alertService.error( response, 6000)
-      })
-
-    $scope.addSelectedStaff = ->
-      staff = $scope.selectedStaff
-      $scope.selectedStaff = null
-      $scope.unit.staff = [] unless $scope.unit.staff
-
-      if staff.id?
-        $scope.unit.addStaff(staff).subscribe({
-          next:  (response) -> alertService.success( "Staff member added", 2000)
-          error: (response) -> alertService.error( response, 6000)
-        })
-      else
-        alertService.error( "Unable to add staff member. Ensure they have a tutor or convenor account in User admin first.", 6000)
-
-    # Used in the typeahead to filter staff already in unit
-    $scope.filterStaff = (staff) ->
-      not _.find($scope.unit.staff, (listStaff) -> staff.id == listStaff.user.id)
-
-    $scope.removeStaff = (staff) ->
-      newUnitRoleService.delete(staff, {cache: $scope.unit.staffCache}).subscribe({
-        next:  (response) -> alertService.success( "Staff member removed", 2000)
-        error: (response) -> alertService.error( response, 6000)
-      })
-
-    $scope.groupSetName = (id) ->
-      $scope.unit.groupSetsCache.get(id)?.name || "Individual Work"
-
-)
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
index 84aa983f0a..82938cde3f 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
@@ -1,116 +1,89 @@
-<div class="unit-staff-editor">
-  <!-- Template for staff avatar -->
-  <ng-template #staffAvatar let-match="match" let-query="query">
-    <a>
-      <!-- User icon or avatar -->
-      <span [innerHTML]="match.label"></span>
-    </a>
-  </ng-template>
-
-  <div class="panel panel-primary">
-    <div class="panel-heading">
-      <h3 class="panel-title">Modify Unit Staff</h3>
-      <p>Add staff members to the unit, assigning them a convenor or tutor role.</p>
-    </div>
-
-    <div class="panel-body">
-      <div class="col-sm-12">
-        <!-- Message when no staff are assigned -->
-        <div *ngIf="unitStaff.length === 0" class="callout callout-info">
-          This unit has no staff assigned.
-        </div>
+<div>
+  <div class="header">
+    <h3>Unit Staff</h3>
+    <p>Manage unit staff by adding members and assigning them as convenors or tutors.</p>
+  </div>
+  <table mat-table [dataSource]="dataSource" matSort>
+    <ng-container matColumnDef="name">
+      <th mat-header-cell *matHeaderCellDef>Name</th>
 
-        <!-- Staff table -->
-        <div *ngIf="unitStaff.length > 0">
-          <table class="table table-condensed table-hover">
-            <thead>
-              <tr>
-                <th colspan="2">Name</th>
-                <th>Role</th>
-                <th>Main Convenor</th>
-                <th>Actions</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr *ngFor="let staff of unitStaff">
-                <td style="width: 30px">
-                  <user-icon [size]="30" [user]="staff.user" aria-hidden="true"></user-icon>
-                </td>
-                <td>{{ staff.user.name }}</td>
-                <td>
-                  <div class="btn-group">
-                    <button
-                      class="btn btn-default"
-                      mat-button
-                      [class.active]="staff.role === 'Tutor'"
-                      (click)="changeRole(staff, 2)"
-                      matTooltip="Tutors deliver unit content."
-                      aria-label="Make staff member a Tutor"
-                    >
-                      Tutor
-                    </button>
-                    <button
-                      class="btn btn-default"
-                      mat-button
-                      [class.active]="staff.role === 'Convenor'"
-                      (click)="changeRole(staff, 3)"
-                      matTooltip="Convenors manage the unit."
-                      aria-label="Make staff member a Convenor"
-                    >
-                      Convenor
-                    </button>
-                  </div>
-                </td>
-                <td>
-                  <button
-                    *ngIf="staff.role === 'Convenor'"
-                    [disabled]="staff.id === unit.mainConvenor.id"
-                    type="button"
-                    class="btn btn-default"
-                    (click)="changeMainConvenor(staff)"
-                    aria-label="Make staff member the Main Convenor"
-                  >
-                    <mat-icon aria-hidden="true">
-                      {{ staff.id === unit.mainConvenor.id ? 'check' : 'close' }}
-                    </mat-icon>
-                  </button>
-                </td>
-                <td>
-                  <button
-                    mat-icon-button
-                    color="warn"
-                    (click)="removeStaff(staff)"
-                  >
-                    <mat-icon>delete</mat-icon>
-                  </button>
-                </td>
-              </tr>
-            </tbody>
-          </table>
+      <td mat-cell *matCellDef="let unitRole">
+        <div class="flex gap-5 items-center">
+          <user-icon [size]="30" [user]="unitRole.user" aria-hidden="true"></user-icon
+          >{{ unitRole.user.name }}
         </div>
-      </div>
-    </div>
-    <div class="panel-footer clearfix">
-      <div class="input-group col-sm-12">
-        <mat-form-field class="full-width" appearance="outline">
-          <input
-            matInput
-            placeholder="Staff Name"
-            [(ngModel)]="searchTerm"
-            (ngModelChange)="filterStaffList()"
-            [matAutocomplete]="auto"
-          />
-          <mat-autocomplete
-            #auto="matAutocomplete"
-            (optionSelected)="addSelectedStaff($event.option.value)"
-            [displayWith]="displayStaffName"
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="role">
+      <th mat-header-cell *matHeaderCellDef>Role</th>
+      <td mat-cell *matCellDef="let unitRole">
+        <mat-button-toggle-group
+          name="role"
+          [ngModel]="unitRole.role"
+          (change)="onRoleChange(unitRole, $event)"
+          hideSingleSelectionIndicator
+        >
+          <mat-button-toggle
+            value="Tutor"
+            matTooltip="Tutors deliver unit content"
+            matTooltipShowDelay="1000"
+            matTooltipPosition="above"
+            >Tutor</mat-button-toggle
           >
-            <mat-option *ngFor="let staff of filteredStaff" [value]="staff">
-              {{ staff.name }}
-            </mat-option>
-          </mat-autocomplete>
-        </mat-form-field>
-      </div>
-    </div>
-  </div>
+          <mat-button-toggle
+            value="Convenor"
+            matTooltip="Convenors manage the unit"
+            matTooltipShowDelay="1000"
+            matTooltipPosition="above"
+            >Convenor</mat-button-toggle
+          >
+        </mat-button-toggle-group>
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="main-convenor">
+      <th mat-header-cell *matHeaderCellDef>Main Convenor</th>
+      <td mat-cell *matCellDef="let unitRole">
+        @if (unitRole?.role === 'Convenor') {
+          <button
+            [disabled]="unitRole.id === unit.mainConvenor.id"
+            mat-icon-button
+            (click)="changeMainConvenor(unitRole)"
+            aria-label="Make staff member the Main Convenor"
+          >
+            <mat-icon aria-hidden="true">
+              {{ unitRole.id === unit.mainConvenor.id ? 'check' : 'close' }}
+            </mat-icon>
+          </button>
+        }
+      </td>
+    </ng-container>
+    <ng-container matColumnDef="actions">
+      <th mat-header-cell *matHeaderCellDef>Actions</th>
+      <td mat-cell *matCellDef="let unitRole">
+        <button mat-icon-button color="warn" (click)="removeStaff(unitRole)">
+          <mat-icon>delete</mat-icon>
+        </button>
+      </td>
+    </ng-container>
+    <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+    <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+  </table>
+  <mat-form-field class="w-full mt-5" appearance="outline">
+    <input
+      matInput
+      placeholder="Staff Name"
+      [(ngModel)]="searchTerm"
+      (ngModelChange)="filterStaffList()"
+      [matAutocomplete]="auto"
+    />
+    <mat-autocomplete
+      #auto="matAutocomplete"
+      (optionSelected)="addSelectedStaff($event.option.value)"
+      [displayWith]="displayStaffName"
+    >
+      <mat-option *ngFor="let staff of filteredStaff" [value]="staff">
+        {{ staff.name }}
+      </mat-option>
+    </mat-autocomplete>
+  </mat-form-field>
 </div>
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
index 167ed3210f..7c53a04671 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
@@ -4,6 +4,9 @@ import {UnitRoleService} from 'src/app/api/services/unit-role.service';
 import {Unit} from 'src/app/api/models/unit';
 import {User} from 'src/app/api/models/doubtfire-model';
 import {UnitRole} from 'src/app/api/models/unit-role';
+import {MatTableDataSource} from '@angular/material/table';
+import {MatButtonToggleChange} from '@angular/material/button-toggle';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
 
 @Component({
   selector: 'unit-staff-editor',
@@ -19,19 +22,32 @@ export class UnitStaffEditorComponent implements OnInit {
   filteredStaff: User[] = []; // Filtered staff members
   searchTerm: string = ''; // Search term entered by the user
 
+  displayedColumns: string[] = ['name', 'role', 'main-convenor', 'actions'];
+  dataSource = new MatTableDataSource<UnitRole>();
+
   // Inject services here
   constructor(
     private alertService: AlertService,
     private unitRoleService: UnitRoleService,
+    private confirmationModalService: ConfirmationModalService,
   ) {}
 
   ngOnInit(): void {
     // Subscribe to staff cache
     this.unit.staffCache.values.subscribe((staff: UnitRole[]) => {
       this.unitStaff = staff;
+      this.dataSource.data = staff;
     });
   }
 
+  onRoleChange(unitRole: UnitRole, event: MatButtonToggleChange) {
+    const role = event.value;
+    if (role !== 'Tutor' && role !== 'Convenor') {
+      return;
+    }
+    const roleId = role === 'Tutor' ? 2 : 3; // map however you like
+    this.changeRole(unitRole, roleId, role);
+  }
   /**
    * Changes the role of a staff member.
    *
@@ -40,11 +56,20 @@ export class UnitStaffEditorComponent implements OnInit {
    *
    * @returns void
    */
-  changeRole(unitRole: UnitRole, role_id: number) {
-    unitRole.roleId = role_id;
+  changeRole(unitRole: UnitRole, roleId: number, role: string) {
+    const previousRoleId = unitRole.roleId;
+    const previousRole = unitRole.role;
+
+    unitRole.roleId = roleId;
+    unitRole.role = role;
     this.unitRoleService.update(unitRole).subscribe({
-      next: (response) => this.alertService.success('Role changed', 2000),
-      error: (response) => this.alertService.error(response, 6000),
+      next: () => this.alertService.success('Role changed', 2000),
+      error: (response) => {
+        // Revert changes on error
+        unitRole.roleId = previousRoleId;
+        unitRole.role = previousRole;
+        this.alertService.error(response, 6000);
+      },
     });
   }
 
@@ -56,10 +81,16 @@ export class UnitStaffEditorComponent implements OnInit {
    * @returns void
    */
   changeMainConvenor(staff: UnitRole) {
-    this.unit.changeMainConvenor(staff).subscribe({
-      next: (response) => this.alertService.success('Main convenor changed', 2000),
-      error: (response) => this.alertService.error(response, 6000),
-    });
+    this.confirmationModalService.show(
+      'Set Main Convenor',
+      `Do you want to make ${staff.user.name} the main convenor for this unit?`,
+      () => {
+        this.unit.changeMainConvenor(staff).subscribe({
+          next: (_response) => this.alertService.success('Main convenor changed', 2000),
+          error: (response) => this.alertService.error(response, 6000),
+        });
+      },
+    );
   }
 
   /**
@@ -99,7 +130,7 @@ export class UnitStaffEditorComponent implements OnInit {
     }
     this.filteredStaff = this.staff.filter(
       (staff) =>
-        staff.name.toLowerCase().includes(this.searchTerm.toLowerCase()) && // Find by name
+        staff.matches(this.searchTerm.toLowerCase()) && // Find by name
         !this.unit.staff.find((listStaff) => staff.id === listStaff.user.id), // Not already assigned to the unit
     );
   }
@@ -124,7 +155,7 @@ export class UnitStaffEditorComponent implements OnInit {
    */
   removeStaff(staff: UnitRole) {
     this.unitRoleService.delete(staff, {cache: this.unit.staffCache}).subscribe({
-      next: (response) => this.alertService.success('Staff member removed', 2000),
+      next: () => this.alertService.success('Staff member removed', 2000),
       error: (response) => this.alertService.error(response, 6000),
     });
   }

From bfae1ad69bb767cdad47dd8fac35cc84e5134534 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 22 Sep 2025 13:45:33 +1000
Subject: [PATCH 571/776] fix: check for valid unit

---
 .../unit-staff-editor/unit-staff-editor.component.html        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
index 82938cde3f..9f3a65b727 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
@@ -45,13 +45,13 @@ <h3>Unit Staff</h3>
       <td mat-cell *matCellDef="let unitRole">
         @if (unitRole?.role === 'Convenor') {
           <button
-            [disabled]="unitRole.id === unit.mainConvenor.id"
+            [disabled]="unitRole.id === unit?.mainConvenor?.id"
             mat-icon-button
             (click)="changeMainConvenor(unitRole)"
             aria-label="Make staff member the Main Convenor"
           >
             <mat-icon aria-hidden="true">
-              {{ unitRole.id === unit.mainConvenor.id ? 'check' : 'close' }}
+              {{ unitRole.id === unit?.mainConvenor?.id ? 'check' : 'close' }}
             </mat-icon>
           </button>
         }

From bfbcee98cfa4888241c5956372d004ec1cd813cb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 22 Sep 2025 14:49:36 +1000
Subject: [PATCH 572/776] feat: add observer only ui

---
 src/app/api/models/unit-role.ts                  |  1 +
 src/app/api/services/unit-role.service.ts        |  3 ++-
 .../unit-staff-editor.component.html             | 13 +++++++++++++
 .../unit-staff-editor.component.ts               | 16 +++++++++++++++-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/app/api/models/unit-role.ts b/src/app/api/models/unit-role.ts
index 5868fa2f05..63bf9852de 100644
--- a/src/app/api/models/unit-role.ts
+++ b/src/app/api/models/unit-role.ts
@@ -11,6 +11,7 @@ export class UnitRole extends Entity {
   role: string;
   user: User;
   unit: Unit;
+  observerOnly: boolean;
 
   /**
    * The id for updated roles - but we need to move away from this to the role string...
diff --git a/src/app/api/services/unit-role.service.ts b/src/app/api/services/unit-role.service.ts
index 0100bb78ce..71cb194422 100644
--- a/src/app/api/services/unit-role.service.ts
+++ b/src/app/api/services/unit-role.service.ts
@@ -62,9 +62,10 @@ export class UnitRoleService extends CachedEntityService<UnitRole> {
           return entity.unit?.id;
         },
       },
+      'observerOnly',
     );
 
-    this.mapping.addJsonKey('roleId', 'userId', 'unitId', 'role');
+    this.mapping.addJsonKey('roleId', 'userId', 'unitId', 'role', 'observerOnly');
   }
 
   public createInstanceFrom(json: any, other?: any): UnitRole {
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
index 9f3a65b727..ae0ca0114d 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
@@ -57,6 +57,19 @@ <h3>Unit Staff</h3>
         }
       </td>
     </ng-container>
+
+    <ng-container matColumnDef="observer-only">
+      <th mat-header-cell *matHeaderCellDef>Observer Only</th>
+      <td mat-cell *matCellDef="let unitRole">
+        <mat-slide-toggle
+          [checked]="unitRole.observerOnly"
+          (change)="toggleObserverOnly(unitRole)"
+          matTooltip="This staff member will have read-only access as an observer"
+          matTooltipShowDelay="1000"
+          matTooltipPosition="above"
+        ></mat-slide-toggle>
+      </td>
+    </ng-container>
     <ng-container matColumnDef="actions">
       <th mat-header-cell *matHeaderCellDef>Actions</th>
       <td mat-cell *matCellDef="let unitRole">
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
index 7c53a04671..f64d62d921 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
@@ -22,7 +22,7 @@ export class UnitStaffEditorComponent implements OnInit {
   filteredStaff: User[] = []; // Filtered staff members
   searchTerm: string = ''; // Search term entered by the user
 
-  displayedColumns: string[] = ['name', 'role', 'main-convenor', 'actions'];
+  displayedColumns: string[] = ['name', 'role', 'main-convenor', 'observer-only', 'actions'];
   dataSource = new MatTableDataSource<UnitRole>();
 
   // Inject services here
@@ -73,6 +73,20 @@ export class UnitStaffEditorComponent implements OnInit {
     });
   }
 
+  toggleObserverOnly(unitRole: UnitRole) {
+    const previousValue = unitRole.observerOnly;
+    unitRole.observerOnly = !unitRole.observerOnly;
+    unitRole.roleId = unitRole.role === 'Tutor' ? 2 : 3;
+    this.unitRoleService.update(unitRole).subscribe({
+      next: () => this.alertService.success('Observer status updated', 2000),
+      error: (response) => {
+        // Revert changes on error
+        unitRole.observerOnly = previousValue;
+        this.alertService.error(response, 6000);
+      },
+    });
+  }
+
   /**
    * Changes who the `Main Convenor` of the unit is.
    *

From 75feec9c436a852c5e6ea69c93ae300d59cdaf38 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 22 Sep 2025 15:46:50 +1000
Subject: [PATCH 573/776] chore(release): 10.0.0-45

---
 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 45aefeb73a..755a8eecd9 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.
 
+## [10.0.0-45](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-44...v10.0.0-45) (2025-09-22)
+
+
+### Bug Fixes
+
+* check for valid unit ([bfae1ad](https://github.com/b0ink/doubtfire-deploy/commit/bfae1ad69bb767cdad47dd8fac35cc84e5134534))
+
 ## [10.0.0-44](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-43...v10.0.0-44) (2025-09-18)
 
 ## [10.0.0-43](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-42...v10.0.0-43) (2025-09-17)
diff --git a/package-lock.json b/package-lock.json
index 3500ef85ca..a8b02747b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-44",
+  "version": "10.0.0-45",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-44",
+      "version": "10.0.0-45",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 6ba1706bec..1f9c61185e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-44",
+  "version": "10.0.0-45",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 01db5769b77ba2d6b8a3242935ba73481f16bf00 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 24 Sep 2025 09:13:32 +1000
Subject: [PATCH 574/776] refactor: use students preferred name in greeting
 chip

---
 src/app/api/models/user/user.ts                          | 9 +++++++++
 .../task-feedback-templates.component.ts                 | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/api/models/user/user.ts b/src/app/api/models/user/user.ts
index 4fc56c9349..03a281bf12 100644
--- a/src/app/api/models/user/user.ts
+++ b/src/app/api/models/user/user.ts
@@ -53,6 +53,15 @@ export class User extends Entity {
     return `${fn} ${sn}${nn}`;
   }
 
+  public get preferredName(): string {
+    const nickname = this.nickname.trim();
+    const firstName = this.firstName.trim();
+    if (nickname) {
+      return nickname;
+    }
+    return firstName;
+  }
+
   public matches(text: string): boolean {
     return (
       this.studentId?.toLowerCase().indexOf(text) >= 0 ||
diff --git a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
index ae3453dbaf..696e5ecca9 100644
--- a/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
+++ b/src/app/tasks/task-comment-composer/task-feedback-templates/task-feedback-templates.component.ts
@@ -191,7 +191,7 @@ export class TaskFeedbackTemplatesComponent implements OnInit, OnChanges {
   selectTemplate(template: FeedbackTemplate) {
     if (template.type === 'template') {
       if (template.chipText === 'Greeting') {
-        template.commentText = `Hi ${this.task.project.student.firstName}. `;
+        template.commentText = `Hi ${this.task.project.student.preferredName}. `;
       } else if (template.chipText === 'Summarise feedback') {
         if (!this.selectedTemplates || this.selectedTemplates.length < 1) return;
         template.commentText = 'Summary of the given feedback:';

From 568cb0e5730c9931225e750950506f42f6e6b4f8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 24 Sep 2025 11:06:49 +1000
Subject: [PATCH 575/776] chore: format

---
 .../task-due-card.component.html              | 133 +++++++++---------
 1 file changed, 70 insertions(+), 63 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
index 28baa761d9..24a8d8c1c7 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
@@ -1,15 +1,19 @@
-@if ( (!task?.inFinalState() || (task?.inTimeExceeded() && !task?.isPastDeadline())) && !task?.inAwaitingFeedbackState()
+@if (
+  (!task?.inFinalState() || (task?.inTimeExceeded() && !task?.isPastDeadline())) &&
+  !task?.inAwaitingFeedbackState()
 ) {
-<div>
-  <!--Only show this if it matters... not in final or waiting for tutor input-->
-  @if (task?.isDueSoon() && !task?.isPastDueDate()) {
-  <mat-card appearance="outlined">
-    <!--Due soon-->
-    <mat-card-header>
-      <mat-card-title>Aim To Complete Soon - Due in {{ task?.timeUntilDueDateDescription() }}</mat-card-title>
-    </mat-card-header>
-    <mat-card-content>
-      <!--Due and not in discuss-->
+  <div>
+    <!--Only show this if it matters... not in final or waiting for tutor input-->
+    @if (task?.isDueSoon() && !task?.isPastDueDate()) {
+      <mat-card appearance="outlined">
+        <!--Due soon-->
+        <mat-card-header>
+          <mat-card-title
+            >Aim To Complete Soon - Due in {{ task?.timeUntilDueDateDescription() }}</mat-card-title
+          >
+        </mat-card-header>
+        <mat-card-content>
+          <!--Due and not in discuss-->
           @if (flexibleDatesEnabled) {
             <p [hidden]="task?.inDiscussState()">
               Your target due date for this task is
@@ -22,9 +26,9 @@
               >. You should aim to complete this task before then to keep your progress on track.
             </p>
           }
-    </mat-card-content>
-    <mat-card-content [hidden]="!task?.inDiscussState()">
-      <!--Due but in discuss-->
+        </mat-card-content>
+        <mat-card-content [hidden]="!task?.inDiscussState()">
+          <!--Due but in discuss-->
           @if (flexibleDatesEnabled) {
             <p>
               This target due date for this task is <strong>{{ task?.localDueDateString() }}</strong
@@ -45,11 +49,11 @@
             </p>
           }
         </mat-card-content>
-  </mat-card>
-  }
+      </mat-card>
+    }
 
-  <!--/is due soon-->
-  @if (task?.betweenDueDateAndDeadlineDate()) {
+    <!--/is due soon-->
+    @if (task?.betweenDueDateAndDeadlineDate()) {
       <mat-card appearance="outlined">
         <mat-card-header class="bg-yellow-600 text-white">
           <mat-card-title class="flex items-center mb-4"
@@ -80,9 +84,9 @@
               tutor.
             </p>
           }
-    </mat-card-content>
-    <mat-card-content [hidden]="!task?.inDiscussState()">
-      <!--Not discussed-->
+        </mat-card-content>
+        <mat-card-content [hidden]="!task?.inDiscussState()">
+          <!--Not discussed-->
           @if (flexibleDatesEnabled) {
             <p>
               You should have completed this task by
@@ -97,52 +101,54 @@
             </p>
           } @else {
             <p>
-              You should have completed this task by <strong>{{ task?.localDueDateString() }}</strong
-              >. Make sure to discuss this task with your tutor as soon as possible. If this task remains on this state for an
-              extended period, it will be marked as Time Exceeded.
+              You should have completed this task by
+              <strong>{{ task?.localDueDateString() }}</strong
+              >. Make sure to discuss this task with your tutor as soon as possible. If this task
+              remains on this state for an extended period, it will be marked as Time Exceeded.
             </p>
             <p class="mat-caption">
-              Tasks are only considered <strong>completed</strong> once your tutor has <strong>discussed</strong> your work
-              with you.
+              Tasks are only considered <strong>completed</strong> once your tutor has
+              <strong>discussed</strong> your work with you.
             </p>
           }
+        </mat-card-content>
+      </mat-card>
+    }
 
-    </mat-card-content>
-  </mat-card>
-  }
-
-  <!--/between due date and deadline-->
-  @if (task?.isPastDeadline()) {
-  <mat-card appearance="outlined">
-    <mat-card-header class="bg-red-600 text-white">
-      <mat-card-title class="flex items-center mb-4"
-        ><mat-icon>error</mat-icon>
-        <span class="ml-4">Passed Due Date By {{ task?.timePastDueDateDescription() }}</span></mat-card-title
-      >
-    </mat-card-header>
-    <mat-card-content class="bg-red-50" [hidden]="task?.inDiscussState()">
-      <!--Past deadline and not submitted-->
-      <p class="p-2">
-        You should have completed this task by <strong>{{ task?.localDueDateString() }}</strong
-        >. This task is now past the deadline and will be marked as <em>Time Exceeded</em> when submitted. You should
-        consult with the unit assessment details to determine the impact of failing to complete this task within the
-        allocated time.
-      </p>
-    </mat-card-content>
-    <mat-card-content [hidden]="!task?.inDiscussState()">
-      <!--Past deadline but in discuss or awaiting feedback-->
-      <p>
-        You should have completed this task by <strong>{{ task?.localDueDateString() }}</strong
-        >. Make sure to discuss this task with your tutor as soon as possible.
-      </p>
-      <p class="mat-caption">
-        Tasks are only considered <strong>Completed</strong> once it demonstrates the required standard, and it is
-        <strong>discussed</strong> with your tutor.
-      </p>
-    </mat-card-content>
-  </mat-card>
-  }
-</div>
+    <!--/between due date and deadline-->
+    @if (task?.isPastDeadline()) {
+      <mat-card appearance="outlined">
+        <mat-card-header class="bg-red-600 text-white">
+          <mat-card-title class="flex items-center mb-4"
+            ><mat-icon>error</mat-icon>
+            <span class="ml-4"
+              >Passed Due Date By {{ task?.timePastDueDateDescription() }}</span
+            ></mat-card-title
+          >
+        </mat-card-header>
+        <mat-card-content class="bg-red-50" [hidden]="task?.inDiscussState()">
+          <!--Past deadline and not submitted-->
+          <p class="p-2">
+            You should have completed this task by <strong>{{ task?.localDueDateString() }}</strong
+            >. This task is now past the deadline and will be marked as <em>Time Exceeded</em> when
+            submitted. You should consult with the unit assessment details to determine the impact
+            of failing to complete this task within the allocated time.
+          </p>
+        </mat-card-content>
+        <mat-card-content [hidden]="!task?.inDiscussState()">
+          <!--Past deadline but in discuss or awaiting feedback-->
+          <p>
+            You should have completed this task by <strong>{{ task?.localDueDateString() }}</strong
+            >. Make sure to discuss this task with your tutor as soon as possible.
+          </p>
+          <p class="mat-caption">
+            Tasks are only considered <strong>Completed</strong> once it demonstrates the required
+            standard, and it is <strong>discussed</strong> with your tutor.
+          </p>
+        </mat-card-content>
+      </mat-card>
+    }
+  </div>
 }
 <!--/past deadline-->
 
@@ -154,7 +160,8 @@
     <p>
       You have submitted this task and should now wait for feedback from your tutor.
       <span [hidden]="!task?.isPastDeadline()"
-        >Do not re-upload new files at this time as the status will be changed to <strong>Time Exceeded</strong>.</span
+        >Do not re-upload new files at this time as the status will be changed to
+        <strong>Time Exceeded</strong>.</span
       >
     </p>
   </mat-card-content>

From 3bf25e77fb9d64fb1ef9801967d69357ff209354 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 24 Sep 2025 11:23:27 +1000
Subject: [PATCH 576/776] refactor: change overdue task wording for assess in
 portfolio states

---
 .../task-due-card/task-due-card.component.html | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
index 24a8d8c1c7..83bc582179 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
@@ -129,10 +129,20 @@
         <mat-card-content class="bg-red-50" [hidden]="task?.inDiscussState()">
           <!--Past deadline and not submitted-->
           <p class="p-2">
-            You should have completed this task by <strong>{{ task?.localDueDateString() }}</strong
-            >. This task is now past the deadline and will be marked as <em>Time Exceeded</em> when
-            submitted. You should consult with the unit assessment details to determine the impact
-            of failing to complete this task within the allocated time.
+            @if (task?.taskDefinition?.unit.markLateSubmissionsAsAssessInPortfolio) {
+              You should have completed this task by
+              <strong>{{ task?.localDueDateString() }}</strong
+              >. This task is now past the deadline and can only be submitted directly for your
+              portfolio without feedback. You should consult with the unit assessment details to
+              determine the impact of failing to complete this task within the allocated time.
+            } @else {
+              You should have completed this task by
+              <strong>{{ task?.localDueDateString() }}</strong
+              >. This task is now past the deadline and will be marked as
+              <em>Time Exceeded</em> when submitted. You should consult with the unit assessment
+              details to determine the impact of failing to complete this task within the allocated
+              time.
+            }
           </p>
         </mat-card-content>
         <mat-card-content [hidden]="!task?.inDiscussState()">

From e5b15713c1d133d4e8a55c70249fcbf28294530b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 24 Sep 2025 12:31:04 +1000
Subject: [PATCH 577/776] chore: return confirmation modal reference

---
 .../confirmation-modal/confirmation-modal.service.ts   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
index 6257277eff..660ddec60c 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {MatDialog} from '@angular/material/dialog';
+import {MatDialog, MatDialogRef} from '@angular/material/dialog';
 import {ConfirmationModalComponent, ConfirmationModalData} from './confirmation-modal.component';
 
 @Injectable({
@@ -8,8 +8,12 @@ import {ConfirmationModalComponent, ConfirmationModalData} from './confirmation-
 export class ConfirmationModalService {
   constructor(public dialog: MatDialog) {}
 
-  public show(title: string, message: string, action?: any) {
-    this.dialog.open<ConfirmationModalComponent, ConfirmationModalData>(
+  public show(
+    title: string,
+    message: string,
+    action?: any,
+  ): MatDialogRef<ConfirmationModalComponent, ConfirmationModalData> {
+    return this.dialog.open<ConfirmationModalComponent, ConfirmationModalData>(
       ConfirmationModalComponent,
       {
         data: {

From 75172ba67d3eb5f83c7421fec7464298efb7c8ee Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 24 Sep 2025 12:31:33 +1000
Subject: [PATCH 578/776] refactor: require confirmation for enabling assess in
 portfolio for late submissions

---
 .../unit-details-editor.coffee                | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
index a93c83b0ed..8049804f32 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
@@ -8,7 +8,7 @@ angular.module('doubtfire.units.states.edit.directives.unit-details-editor', [])
   replace: true
   restrict: 'E'
   templateUrl: 'units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html'
-  controller: ($scope, $state, $rootScope, DoubtfireConstants, newUnitService, alertService, newTeachingPeriodService, TaskSubmission, D2lUnitDetailsModal) ->
+  controller: ($scope, $timeout, $state, $rootScope, DoubtfireConstants, newUnitService, alertService, newTeachingPeriodService, TaskSubmission, D2lUnitDetailsModal, ConfirmationModal) ->
     $scope.overseerEnabled = DoubtfireConstants.IsOverseerEnabled
 
     $scope.calOptions = {
@@ -83,6 +83,28 @@ angular.module('doubtfire.units.states.edit.directives.unit-details-editor', [])
     $scope.d2lEnabled = ->
       DoubtfireConstants.IsD2LEnabled.value
 
+    updatingAssessInPortfolio = false
+    $scope.$watch 'unit.markLateSubmissionsAsAssessInPortfolio', (newVal, oldVal) ->
+      return if newVal is oldVal or newVal == false or updatingAssessInPortfolio
+      updatingAssessInPortfolio = true
+      $scope.unit.markLateSubmissionsAsAssessInPortfolio = false
+      modal = ConfirmationModal.show(
+        'Enable Assess in Portfolio?',
+        """
+        Are you sure you want to enable "Assess in Portfolio" for late submissions?
+        This will update any existing Time/Feedback Exceeded tasks to the "Assess in Portfolio" state.
+        You will not be able to disable this setting while any tasks remain in the "Assess in Portfolio" state.
+        """
+        () ->
+          $scope.unit.markLateSubmissionsAsAssessInPortfolio = true
+          $timeout ->
+            updatingAssessInPortfolio = false
+      )
+
+      modal.afterClosed().subscribe(() ->
+        $timeout ->
+          updatingAssessInPortfolio = false
+      )
 )
 
 

From 29fffd36c437218491ef0bdffc4eb4969f5d4357 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 24 Sep 2025 14:38:38 +1000
Subject: [PATCH 579/776] chore: reword automated assess in portfolio message

---
 src/app/common/footer/footer.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 6d712f071c..a53bc9700e 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -78,7 +78,7 @@ export class FooterComponent implements OnInit {
       return;
     }
     task.addComment(
-      `**Automated Message:** Task "${task.definition.abbreviation} ${task.definition.name}" will be graded during portfolio assessment only. You must now submit it directly for portfolio assessment before the portfolio deadline.`,
+      `**Automated Message:** Task "${task.definition.abbreviation} ${task.definition.name}" will be graded during portfolio assessment only. You can keep submitting it for feedback before the task deadline, but you must still submit it directly for portfolio assessment before the portfolio deadline.`,
     );
     setTimeout(() => {
       task.updateTaskStatus('working_on_it');

From e59e56f290d457ebb5c5c577128aeb9001942269 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 24 Sep 2025 14:49:33 +1000
Subject: [PATCH 580/776] chore: remove sentence regarding impact of late
 submission

---
 .../directives/task-due-card/task-due-card.component.html      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
index 83bc582179..3f3d5c6c6b 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
@@ -133,8 +133,7 @@
               You should have completed this task by
               <strong>{{ task?.localDueDateString() }}</strong
               >. This task is now past the deadline and can only be submitted directly for your
-              portfolio without feedback. You should consult with the unit assessment details to
-              determine the impact of failing to complete this task within the allocated time.
+              portfolio without feedback.
             } @else {
               You should have completed this task by
               <strong>{{ task?.localDueDateString() }}</strong

From 7cd85c0c8d838a369135bfc015cb6cc096bca29b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 24 Sep 2025 14:52:52 +1000
Subject: [PATCH 581/776] chore(release): 10.0.0-46

---
 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 755a8eecd9..a02838d827 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.
 
+## [10.0.0-46](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-45...v10.0.0-46) (2025-09-24)
+
 ## [10.0.0-45](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-44...v10.0.0-45) (2025-09-22)
 
 
diff --git a/package-lock.json b/package-lock.json
index a8b02747b3..199a950d63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-45",
+  "version": "10.0.0-46",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-45",
+      "version": "10.0.0-46",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 1f9c61185e..12ccc6d73b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-45",
+  "version": "10.0.0-46",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From e122a6464b89ee8a5f2a17b2ff4c8e0bd5947fe7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 24 Sep 2025 17:08:12 +1000
Subject: [PATCH 582/776] chore: require confirmation for assess in portfolio
 only option

---
 .../task-definition-options.component.html    |  6 ++++-
 .../task-definition-options.component.ts      | 27 ++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
index b846a681a5..6ef203ae27 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
@@ -10,7 +10,11 @@
   </div>
 
   <div class="flex-grow flex flex-row gap-5 items-center">
-    <mat-checkbox class="basis-1/2" matInput [(ngModel)]="taskDefinition.assessInPortfolioOnly"
+    <mat-checkbox
+      (change)="onToggleAssessInPortfolioOnly()"
+      class="basis-1/2"
+      matInput
+      [(ngModel)]="taskDefinition.assessInPortfolioOnly"
       >Assess in Portfolio Only</mat-checkbox
     >
     <span class="basis-1/2">
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.ts
index 7fc62fa813..80a26895c1 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.ts
@@ -1,6 +1,7 @@
-import { Component, Input } from '@angular/core';
-import { TaskDefinition } from 'src/app/api/models/task-definition';
-import { Unit } from 'src/app/api/models/unit';
+import {Component, Input} from '@angular/core';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {Unit} from 'src/app/api/models/unit';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
 
 @Component({
   selector: 'f-task-definition-options',
@@ -9,8 +10,28 @@ import { Unit } from 'src/app/api/models/unit';
 })
 export class TaskDefinitionOptionsComponent {
   @Input() taskDefinition: TaskDefinition;
+  constructor(private confirmationModal: ConfirmationModalService) {}
 
   public get unit(): Unit {
     return this.taskDefinition?.unit;
   }
+
+  public onToggleAssessInPortfolioOnly() {
+    if (!this.taskDefinition.assessInPortfolioOnly) {
+      return;
+    }
+
+    setTimeout(() => {
+      this.taskDefinition.assessInPortfolioOnly = false;
+      console.log(this.taskDefinition.assessInPortfolioOnly);
+
+      this.confirmationModal.show(
+        `Enable Assess in Portfolio Only?`,
+        `Enabling Assess in Portfolio Only will update all overdue tasks for ${this.taskDefinition.name} to the Assess in Portfolio state`,
+        () => {
+          this.taskDefinition.assessInPortfolioOnly = true;
+        },
+      );
+    });
+  }
 }

From db1ad9b8b6bde544d1e1dfc9cbe3fe3b5c79fff5 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 25 Sep 2025 12:42:34 +1000
Subject: [PATCH 583/776] refactor: migrate unit details editor (#1007)

* refactor: init unit details editor migration

* refactor: migrate unit details editor

* refactor: migrate assess in portfolio confirmation

* refactor: display teaching period dates when selected

* refactor: add draft learning summary hint

* chore: remove old unit details editor files

* chore: remove debug logs
---
 src/app/doubtfire-angular.module.ts           |   2 +
 src/app/doubtfire-angularjs.module.ts         |   7 +-
 .../states/edit/directives/directives.coffee  |   1 -
 .../unit-details-editor.coffee                | 112 ----
 .../unit-details-editor.component.html        | 212 ++++++++
 .../unit-details-editor.component.scss        |   0
 .../unit-details-editor.component.ts          | 109 ++++
 .../unit-details-editor.tpl.html              | 501 ------------------
 src/app/units/states/edit/edit.tpl.html       |   2 +-
 9 files changed, 330 insertions(+), 616 deletions(-)
 delete mode 100644 src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
 create mode 100644 src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.html
 create mode 100644 src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.scss
 create mode 100644 src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.ts
 delete mode 100644 src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 0e370154ff..cfea5a77ad 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -288,6 +288,7 @@ import {TaskPrerequisiteService} from './api/services/task-prerequisite.service'
 // import { PrivacyPolicy } from './config/privacy-policy/privacy-policy';
 import {UnitStaffEditorComponent} from './units/states/edit/directives/unit-staff-editor/unit-staff-editor.component';
 import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
+import {UnitDetailsEditorComponent} from './units/states/edit/directives/unit-details-editor/unit-details-editor.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -438,6 +439,7 @@ const MY_DATE_FORMAT = {
     TaskPrerequisitesCardComponent,
     UnitStaffEditorComponent,
     GroupSetSelectorComponent,
+    UnitDetailsEditorComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 223544d7bf..abf5a9ff2f 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -100,7 +100,6 @@ import 'build/src/app/units/states/portfolios/portfolios.js';
 import 'build/src/app/units/states/groups/groups.js';
 import 'build/src/app/units/states/states.js';
 import 'build/src/app/units/states/edit/directives/unit-group-set-editor/unit-group-set-editor.js';
-import 'build/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.js';
 import 'build/src/app/units/states/edit/directives/unit-ilo-editor/unit-ilo-editor.js';
 import 'build/src/app/units/states/edit/directives/directives.js';
 import 'build/src/app/units/states/edit/edit.js';
@@ -230,6 +229,7 @@ import {TaskPrerequisitesCardComponent} from './projects/states/dashboard/direct
 // import { PrivacyPolicy } from './config/privacy-policy/privacy-policy';
 import {UnitStaffEditorComponent} from './units/states/edit/directives/unit-staff-editor/unit-staff-editor.component';
 import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
+import {UnitDetailsEditorComponent} from './units/states/edit/directives/unit-details-editor/unit-details-editor.component';
 
 export const DoubtfireAngularJSModule = angular
   .module('doubtfire', [
@@ -520,6 +520,11 @@ DoubtfireAngularJSModule.directive(
   downgradeComponent({component: TaskPrerequisitesCardComponent}),
 );
 
+DoubtfireAngularJSModule.directive(
+  'unitDetailsEditor',
+  downgradeComponent({component: UnitDetailsEditorComponent}),
+);
+
 // Global configuration
 
 // If the user enters a URL that doesn't match any known URL (state), send them to `/home`
diff --git a/src/app/units/states/edit/directives/directives.coffee b/src/app/units/states/edit/directives/directives.coffee
index fe06bf4510..4da41cacfb 100644
--- a/src/app/units/states/edit/directives/directives.coffee
+++ b/src/app/units/states/edit/directives/directives.coffee
@@ -1,5 +1,4 @@
 angular.module('doubtfire.units.states.edit.directives', [
-  'doubtfire.units.states.edit.directives.unit-details-editor'
   'doubtfire.units.states.edit.directives.unit-group-set-editor'
   'doubtfire.units.states.edit.directives.unit-ilo-editor'
 ])
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
deleted file mode 100644
index 8049804f32..0000000000
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.coffee
+++ /dev/null
@@ -1,112 +0,0 @@
-angular.module('doubtfire.units.states.edit.directives.unit-details-editor', [])
-
-#
-# Editor for the basic details of a unit, such as the name, code
-# start and end dates etc.
-#
-.directive('unitDetailsEditor', ->
-  replace: true
-  restrict: 'E'
-  templateUrl: 'units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html'
-  controller: ($scope, $timeout, $state, $rootScope, DoubtfireConstants, newUnitService, alertService, newTeachingPeriodService, TaskSubmission, D2lUnitDetailsModal, ConfirmationModal) ->
-    $scope.overseerEnabled = DoubtfireConstants.IsOverseerEnabled
-
-    $scope.calOptions = {
-      startOpened: false
-      endOpened: false
-      portfolioAutoGenerationOpened: false
-    }
-
-    # Get docker images available for automated task assessment for the unit.
-    TaskSubmission.getDockerImagesAsPromise().then (images) ->
-      $scope.dockerImages = images
-
-    # Get the confugurable, external name of Doubtfire
-    $scope.externalName = DoubtfireConstants.ExternalName
-
-    # get the teaching periods- gets an object with the loaded teaching periods
-    newTeachingPeriodService.query().subscribe((periods) ->
-      $scope.teachingPeriods = periods
-      $scope.teachingPeriodValues = [{value: undefined, text: "None"}]
-      other = _.map periods, (p) -> {value: p, text: "#{p.year} #{p.period}"}
-      _.each other, (d) -> $scope.teachingPeriodValues.push(d)
-    )
-
-    $scope.teachingPeriodSelected = ($event) ->
-      $scope.unit.teachingPeriod = $event
-
-    $scope.unit.taskDefinitionCache.values.subscribe(
-      (taskDefs) ->
-        $scope.taskDefinitionValues = [{value: undefined, text: "None"}]
-        other = _.map taskDefs, (td) -> {value: td, text: "#{td.abbreviation}-#{td.name}"}
-        _.each other, (d) -> $scope.taskDefinitionValues.push(d)
-    )
-
-    $scope.draftTaskDefSelected = ($event) ->
-      $scope.unit.draftTaskDefinition = $event
-
-    # Datepicker opener
-    $scope.open = ($event, pickerData) ->
-      $event.preventDefault()
-      $event.stopPropagation()
-
-      if pickerData == 'start'
-        $scope.calOptions.startOpened = ! $scope.calOptions.startOpened
-        $scope.calOptions.endOpened = false
-        $scope.calOptions.portfolioAutoGenerationOpened = false
-      else if pickerData == 'end'
-        $scope.calOptions.startOpened = false
-        $scope.calOptions.endOpened = ! $scope.calOptions.endOpened
-        $scope.calOptions.portfolioAutoGenerationOpened = false
-      else if pickerData == 'autogen'
-        $scope.calOptions.startOpened = false
-        $scope.calOptions.endOpened = false
-        $scope.calOptions.portfolioAutoGenerationOpened = ! $scope.calOptions.portfolioAutoGenerationOpened
-
-    $scope.dateOptions = {
-      formatYear: 'yy',
-      startingDay: 1
-    }
-    $scope.studentSearch = ""
-
-    $scope.saveUnit = ->
-      newUnitService.update($scope.unit).subscribe({
-        next: (unit) ->
-          alertService.success( "Unit updated.", 2000)
-        error: (response) ->
-          alertService.error( "Failed to update unit. #{response}", 6000)
-    })
-
-    $scope.addD2lData = ->
-      D2lUnitDetailsModal.open($scope.unit)
-
-    $scope.d2lEnabled = ->
-      DoubtfireConstants.IsD2LEnabled.value
-
-    updatingAssessInPortfolio = false
-    $scope.$watch 'unit.markLateSubmissionsAsAssessInPortfolio', (newVal, oldVal) ->
-      return if newVal is oldVal or newVal == false or updatingAssessInPortfolio
-      updatingAssessInPortfolio = true
-      $scope.unit.markLateSubmissionsAsAssessInPortfolio = false
-      modal = ConfirmationModal.show(
-        'Enable Assess in Portfolio?',
-        """
-        Are you sure you want to enable "Assess in Portfolio" for late submissions?
-        This will update any existing Time/Feedback Exceeded tasks to the "Assess in Portfolio" state.
-        You will not be able to disable this setting while any tasks remain in the "Assess in Portfolio" state.
-        """
-        () ->
-          $scope.unit.markLateSubmissionsAsAssessInPortfolio = true
-          $timeout ->
-            updatingAssessInPortfolio = false
-      )
-
-      modal.afterClosed().subscribe(() ->
-        $timeout ->
-          updatingAssessInPortfolio = false
-      )
-)
-
-
-
-
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.html b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.html
new file mode 100644
index 0000000000..7ee30534e9
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.html
@@ -0,0 +1,212 @@
+<div class="w-full max-w-[1280px] mx-auto flex flex-col gap-5">
+  <div class="header">
+    <h3>Unit Details</h3>
+    <p>Edit and configure all details and settings for this unit.</p>
+  </div>
+  <mat-card appearance="outlined" class="p-[16px] gap-2">
+    <mat-form-field appearance="outline" class="w-full">
+      <mat-label>Code</mat-label>
+      <input matInput required [(ngModel)]="unit.code" />
+    </mat-form-field>
+
+    <mat-form-field appearance="outline" class="w-full">
+      <mat-label>Name</mat-label>
+      <input matInput required [(ngModel)]="unit.name" />
+    </mat-form-field>
+
+    <mat-form-field appearance="outline" class="w-full">
+      <mat-label>Description</mat-label>
+      <textarea matInput required [(ngModel)]="unit.description"></textarea>
+    </mat-form-field>
+  </mat-card>
+
+  <mat-card appearance="outlined" class="p-[16px] gap-2">
+    <mat-form-field appearance="outline" class="w-full">
+      <mat-label>Teaching Period</mat-label>
+      <mat-select [(ngModel)]="unit.teachingPeriod" placeholder="Select Teaching Period">
+        <mat-option [value]="undefined">None</mat-option>
+        @for (period of teachingPeriods; track period) {
+          <mat-option [value]="period">{{ period.name }}</mat-option>
+        }
+      </mat-select>
+    </mat-form-field>
+
+    <div class="flex w-full gap-5">
+      @if (!unit.teachingPeriod) {
+        <mat-form-field appearance="outline" class="w-full">
+          <mat-label>Start Date</mat-label>
+          <input matInput [matDatepicker]="startdatepicker" [(ngModel)]="unit.startDate" />
+          <mat-datepicker-toggle matIconSuffix [for]="startdatepicker"></mat-datepicker-toggle>
+          <mat-datepicker #startdatepicker></mat-datepicker>
+        </mat-form-field>
+        <mat-form-field appearance="outline" class="w-full">
+          <mat-label>End Date</mat-label>
+          <input matInput [matDatepicker]="enddatepicker" [(ngModel)]="unit.endDate" />
+          <mat-datepicker-toggle matIconSuffix [for]="enddatepicker"></mat-datepicker-toggle>
+          <mat-datepicker #enddatepicker></mat-datepicker>
+        </mat-form-field>
+      } @else {
+        <mat-form-field appearance="outline" class="w-full" disabled>
+          <mat-label>{{ unit.teachingPeriod.name }} Start Date</mat-label>
+          <input matInput [value]="unit.teachingPeriod?.startDate | date" disabled readonly />
+        </mat-form-field>
+        <mat-form-field appearance="outline" class="w-full" disabled>
+          <mat-label>{{ unit.teachingPeriod.name }} End Date</mat-label>
+          <input matInput [value]="unit.teachingPeriod?.endDate | date" disabled readonly />
+        </mat-form-field>
+      }
+    </div>
+
+    <mat-form-field appearance="outline">
+      <mat-label>Portfolio Auto-Generation Date</mat-label>
+      <input
+        matInput
+        [matDatepicker]="potfoliogendatepicker"
+        [(ngModel)]="unit.portfolioAutoGenerationDate"
+      />
+      <mat-datepicker-toggle matIconSuffix [for]="potfoliogendatepicker"></mat-datepicker-toggle>
+      <mat-datepicker #potfoliogendatepicker> </mat-datepicker>
+    </mat-form-field>
+
+    <mat-form-field appearance="outline" class="w-full">
+      <mat-label>Draft Learning Summary</mat-label>
+      <mat-select [(ngModel)]="unit.draftTaskDefinition" placeholder="Select Learning Summary Task">
+        <mat-option [value]="undefined">None</mat-option>
+        @for (td of taskDefinitions; track td) {
+          <mat-option [value]="td">{{ td.abbreviation }} - {{ td.name }}</mat-option>
+        }
+      </mat-select>
+      <mat-hint>
+        When a draft learning summary task is selected, this will ensure a students uploaded draft
+        is automatically added to the students portfolio.
+      </mat-hint>
+    </mat-form-field>
+
+    <mat-form-field appearance="outline">
+      <mat-label>Extension duration onresubmit </mat-label>
+      <input matInput required [(ngModel)]="unit.extensionWeeksOnResubmitRequest" />
+      <mat-hint>
+        When tutors request resubmission of a task, this setting determines how many weeks the task
+        will be extended to allow students to fix and resubmit their work.
+      </mat-hint>
+    </mat-form-field>
+  </mat-card>
+
+  <mat-card appearance="outlined" class="flex flex-col gap-5 p-[16px]">
+    <div>
+      <mat-slide-toggle [(ngModel)]="unit.allowFlexibleDates"
+        >Allow flexible dates</mat-slide-toggle
+      >
+      <p>Allows students to set planned due dates, without using extensions.</p>
+    </div>
+
+    <div>
+      <mat-slide-toggle [(ngModel)]="unit.allowStudentExtensionRequests"
+        >Allow student extensions</mat-slide-toggle
+      >
+      <p>When false only staff can request extensions on behalf of students.</p>
+    </div>
+
+    <div>
+      <mat-slide-toggle [(ngModel)]="unit.autoApplyExtensionBeforeDeadline"
+        >Auto apply extensions</mat-slide-toggle
+      >
+      <p>
+        When true, extensions will be automatically applied when they result in a date that is
+        between the task's due date and deadline.
+      </p>
+    </div>
+
+    <div>
+      <mat-slide-toggle
+        (change)="onToggleAssessInPortfolio($event)"
+        [(ngModel)]="unit.markLateSubmissionsAsAssessInPortfolio"
+        >Has tasks assessed in portfolio</mat-slide-toggle
+      >
+      <p>
+        When enabled, late submissions will not be automatically marked as "Time Exceeded" or
+        "Feedback Exceeded", and will instead appear as "Assess in Portfolio". Tutors can still sign
+        off tasks as complete unless the task definition has the "Assess in Portfolio Only" option
+        enabled.
+      </p>
+    </div>
+
+    <div>
+      <mat-slide-toggle [(ngModel)]="unit.allowStudentChangeTutorial"
+        >Allow students to change tutorial</mat-slide-toggle
+      >
+      <p>When false only staff can change student tutorials.</p>
+    </div>
+
+    <div>
+      <mat-slide-toggle [(ngModel)]="unit.sendNotifications"
+        >Send notification emails</mat-slide-toggle
+      >
+      <p>
+        When true, emails will be set to students each week to indicate progress and suggest future
+        tasks for them to work on.
+      </p>
+    </div>
+
+    <div>
+      <mat-slide-toggle [(ngModel)]="unit.enableSyncEnrolments"
+        >Synchronise enrolments</mat-slide-toggle
+      >
+      <p>
+        When true student enrolments will be synchronised with other systems where this is possible.
+      </p>
+    </div>
+
+    <div>
+      <mat-slide-toggle [(ngModel)]="unit.enableSyncTimetable"
+        >Synchronise timetable</mat-slide-toggle
+      >
+      <p>
+        When true timetable data will be synchronised with other systems where this is possible.
+      </p>
+    </div>
+
+    <div>
+      <mat-slide-toggle [(ngModel)]="unit.active">Active</mat-slide-toggle>
+      <p>Set to false to hide unit from students and tutors.</p>
+    </div>
+  </mat-card>
+
+  @if (overseerEnabled.value) {
+    <mat-card class="p-[16px] gap-2">
+      <div>
+        <mat-slide-toggle [(ngModel)]="unit.assessmentEnabled"
+          >Overseer assessment</mat-slide-toggle
+        >
+        <p>If true, unit tasks will be able to make use of Overseer automated checking.</p>
+      </div>
+
+      <mat-form-field appearance="outline">
+        <mat-label>Overseer Docker Image</mat-label>
+        <mat-select [(ngModel)]="unit.overseerImage">
+          @for (image of dockerImages; track image) {
+            <mat-option [value]="image">{{ image.description }}</mat-option>
+          }
+        </mat-select>
+        <mat-hint
+          >Use this to select the default container used to check tasks with Overseer.</mat-hint
+        >
+      </mat-form-field>
+    </mat-card>
+  }
+
+  <div class="flex justify-end w-full gap-5">
+    <button mat-raised-button (click)="addD2lData()" [hidden]="!d2lEnabled.value">
+      D2L Details
+    </button>
+    <button
+      mat-raised-button
+      matTooltip="Rollover the unit into a new teaching period"
+      matTooltipShowDelay="1000"
+      uiSref="units/rollover"
+    >
+      Copy
+    </button>
+    <button mat-raised-button color="primary" (click)="saveUnit()">Update</button>
+  </div>
+</div>
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.scss b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.ts b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.ts
new file mode 100644
index 0000000000..0ea300bf8e
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.ts
@@ -0,0 +1,109 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {MatSlideToggleChange} from '@angular/material/slide-toggle';
+import {OverseerImage, UnitService} from 'src/app/api/models/doubtfire-model';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {TeachingPeriod} from 'src/app/api/models/teaching-period';
+import {Unit} from 'src/app/api/models/unit';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {TeachingPeriodService} from 'src/app/api/services/teaching-period.service';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {TaskSubmissionService} from 'src/app/common/services/task-submission.service';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {D2lUnitDetailsModal} from './d2l-details-form/d2l-unit-details-form.component';
+
+@Component({
+  selector: 'f-unit-details-editor',
+  templateUrl: 'unit-details-editor.component.html',
+  styleUrls: ['unit-details-editor.component.scss'],
+})
+export class UnitDetailsEditorComponent implements OnInit {
+  @Input() unit: Unit;
+
+  constructor(
+    private teachingPeriodService: TeachingPeriodService,
+    private taskDefinitionService: TaskDefinitionService,
+    private doubtfireConstants: DoubtfireConstants,
+    private taskSubmissionService: TaskSubmissionService,
+    private d2lUnitDetailsModal: D2lUnitDetailsModal,
+    private unitService: UnitService,
+    private alertsService: AlertService,
+    private confirmationModal: ConfirmationModalService,
+  ) {}
+
+  public teachingPeriods: TeachingPeriod[];
+  public taskDefinitions: TaskDefinition[];
+  public dockerImages: OverseerImage[];
+
+  public get overseerEnabled() {
+    return this.doubtfireConstants.IsOverseerEnabled;
+  }
+
+  public get d2lEnabled() {
+    return this.doubtfireConstants.IsD2LEnabled;
+  }
+
+  ngOnInit(): void {
+    this.teachingPeriodService.query().subscribe((periods) => {
+      this.teachingPeriods = periods;
+    });
+
+    this.unit.taskDefinitionCache.values.subscribe((taskDefs) => {
+      this.taskDefinitions = taskDefs;
+    });
+
+    this.taskSubmissionService.getDockerImagesAsPromise().then((images) => {
+      this.dockerImages = images;
+    });
+  }
+
+  addD2lData() {
+    this.d2lUnitDetailsModal.open(this.unit);
+  }
+
+  saveUnit() {
+    this.unitService.update(this.unit).subscribe({
+      next: (_unit) => {
+        this.alertsService.success('Unit updated.', 2000);
+      },
+      error: (response) => {
+        this.alertsService.error(`Failed to update unit. ${response}`, 6000);
+      },
+    });
+  }
+
+  private updatingAssessInPortfolio: boolean = false;
+
+  onToggleAssessInPortfolio(event: MatSlideToggleChange) {
+    if (!event.checked || this.updatingAssessInPortfolio) {
+      return false;
+    }
+
+    if (this.updatingAssessInPortfolio) {
+      return;
+    }
+
+    this.updatingAssessInPortfolio = true;
+
+    setTimeout(() => {
+      this.unit.markLateSubmissionsAsAssessInPortfolio = false;
+      const modal = this.confirmationModal.show(
+        'Enable Assess in Portfolio?',
+        `Are you sure you want to enable "Assess in Portfolio" for late submissions?
+        This will update any existing Time/Feedback Exceeded tasks to the "Assess in Portfolio" state.
+        You will not be able to disable this setting while any tasks remain in the "Assess in Portfolio" state.`,
+        () => {
+          this.unit.markLateSubmissionsAsAssessInPortfolio = true;
+          setTimeout(() => {
+            this.updatingAssessInPortfolio = false;
+          });
+        },
+      );
+      modal.afterClosed().subscribe(() => {
+        setTimeout(() => {
+          this.updatingAssessInPortfolio = false;
+        });
+      });
+    });
+  }
+}
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
deleted file mode 100644
index 5de919ee03..0000000000
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.tpl.html
+++ /dev/null
@@ -1,501 +0,0 @@
-<div class="unit-details-editor">
-  <div class="panel panel-primary">
-    <div class="panel-heading" ng-if="unit.id == -1">
-      <h3 class="panel-title">Create Unit</h3>
-      Create a new unit with all overview unit details here.
-    </div>
-    <div class="panel-heading" ng-if="unit.id != -1">
-      <h3 class="panel-title">Update Unit</h3>
-      Update overview details of the unit below.
-    </div>
-    <form class="form-horizontal" role="form" name="unitForm" ng-submit="saveUnit()">
-      <div class="panel-body">
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="code">Code</label>
-          <div class="col-sm-9">
-            <input class="form-control" id="code" type="text" placeholder="Enter unit code" ng-model="unit.code" />
-          </div>
-        </div>
-        <!--/code-date-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="name">Name</label>
-          <div class="col-sm-9">
-            <input
-              id="name"
-              type="text"
-              class="form-control"
-              ng-model="unit.name"
-              placeholder="Enter unit name"
-            />
-          </div>
-        </div>
-        <!--/name-date-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="description">Description</label>
-          <div class="col-sm-9">
-            <textarea id="description" class="form-control" ng-model="unit.description"></textarea>
-          </div>
-        </div>
-        <!--/description-date-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="teachingPeriod">Teaching Period</label>
-          <div class="col-sm-9">
-            <object-select [source]="teachingPeriodValues" [target]="unit.teachingPeriod" (target-change)="teachingPeriodSelected($event)" label="Select Teaching Period"  />
-          </div>
-        </div>
-        <!--/teaching-period-date-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="">Draft Learning Summary</label>
-          <div class="col-sm-9">
-            <object-select [source]="taskDefinitionValues" [target]="unit.draftTaskDefinition" (target-change)="draftTaskDefSelected($event)" label="Select Learning Summary Task"  />
-
-            <span class="help-block">
-              When a draft learning summary task is selected, this will ensure a students uploaded draft is
-              automatically added to the students portfolio.
-            </span>
-          </div>
-        </div>
-        <!--/draft-learning-summary-->
-
-        <div class="form-group">
-          <label tooltip="Date for the start of teaching in the unit." class="col-sm-2 control-label" for="startdate"
-            >Start Date</label
-          >
-          <div class="col-sm-9">
-            <div class="col-sm-4 input-group">
-              <input
-                datepicker-popup="yyyy-MM-dd"
-                is-open="calOptions.startOpened"
-                type="text"
-                class="form-control"
-                id="startdate"
-                ng-model="unit.startDate"
-                ng-required="true"
-                placeholder="yyyy-MM-dd"
-                close-text="Close"
-                ng-if="!unit.teachingPeriod"
-              />
-              <input
-                type="text"
-                class="form-control"
-                id="startdate"
-                value="{{unit.teachingPeriod.startDate | date}}"
-                ng-disabled="true"
-                ng-if="unit.teachingPeriod"
-              />
-              <span class="input-group-btn">
-                <button
-                  class="btn btn-default"
-                  type="button"
-                  ng-click="open($event,'start')"
-                  ng-disabled="unit.teachingPeriod"
-                >
-                  <i class="fa fa-calendar"></i>
-                </button>
-              </span>
-            </div>
-          </div>
-        </div>
-        <!--/start-date-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate">End Date</label>
-          <div class="col-sm-9">
-            <div class="col-sm-4 input-group">
-              <input
-                datepicker-popup="{{format}}"
-                id="enddate"
-                type="text"
-                class="form-control"
-                ng-model="unit.endDate"
-                is-open="calOptions.endOpened"
-                ng-required="!unit.teachingPeriod"
-                close-text="Close"
-                ng-if="!unit.teachingPeriod"
-              />
-              <input
-                id="enddate"
-                type="text"
-                class="form-control"
-                ng-value="unit.teachingPeriod.endDate | date"
-                ng-disabled="true"
-                ng-if="unit.teachingPeriod"
-              />
-              <span class="input-group-btn">
-                <button
-                  class="btn btn-default"
-                  type="button"
-                  ng-click="open($event,'end')"
-                  ng-disabled="unit.teachingPeriod"
-                >
-                  <i class="fa fa-calendar"></i>
-                </button>
-              </span>
-            </div>
-          </div>
-        </div>
-        <!--/end-date-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="portfolioautogenerationdate">Portfolio auto-generation date</label>
-          <div class="col-sm-9">
-            <div class="col-sm-4 input-group">
-              <input
-                datepicker-popup="{{format}}"
-                id="portfolioautogenerationdate"
-                type="text"
-                class="form-control"
-                ng-model="unit.portfolioAutoGenerationDate"
-                is-open="calOptions.portfolioAutoGenerationOpened"
-                ng-required="false"
-                close-text="Close"
-              />
-              <span class="input-group-btn">
-                <button
-                  class="btn btn-default"
-                  type="button"
-                  ng-click="open($event,'autogen')"
-                >
-                  <i class="fa fa-calendar"></i>
-                </button>
-              </span>
-            </div>
-          </div>
-        </div>
-        <!--/portfolio-auto-generation-date-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate">Allow flexible dates</label>
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.allowFlexibleDates ? 'success' : 'default'}}"
-                ng-model="unit.allowFlexibleDates"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.allowFlexibleDates ? 'default' : 'danger'}}"
-                ng-model="unit.allowFlexibleDates"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block"> Allows students to set planned due dates, without using extensions. </span>
-          </div>
-        </div>
-        <!--/allowStudentExtensionRequests-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate">Allow student extensions</label>
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.allowStudentExtensionRequests ? 'success' : 'default'}}"
-                ng-model="unit.allowStudentExtensionRequests"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.allowStudentExtensionRequests ? 'default' : 'danger'}}"
-                ng-model="unit.allowStudentExtensionRequests"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block"> When false only staff can request extensions on behalf of students. </span>
-          </div>
-        </div>
-        <!--/allowStudentExtensionRequests-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="extn-on-resub">Extension duration on resubmit</label>
-          <div class="col-sm-9">
-            <input
-              class="form-control"
-              id="extn-on-resub"
-              type="number"
-              placeholder="1"
-              ng-model="unit.extensionWeeksOnResubmitRequest"
-            />
-            <span class="help-block">
-              When tutors request resubmission of a task, this setting determines how many weeks the task will be
-              extended to allow students to fix and resubmit their work.
-            </span>
-          </div>
-        </div>
-        <!--/extensionWeeksOnResubmitRequest-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate">Auto apply extensions</label>
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.autoApplyExtensionBeforeDeadline ? 'success' : 'default'}}"
-                ng-model="unit.autoApplyExtensionBeforeDeadline"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.autoApplyExtensionBeforeDeadline ? 'default' : 'danger'}}"
-                ng-model="unit.autoApplyExtensionBeforeDeadline"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block">
-              When true, extensions will be automatically applied when they result in a date that is between the task's
-              due date and deadline.
-            </span>
-          </div>
-        </div>
-        <!--/auto apply extension-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate"
-            >Has tasks assessed in portfolio</label
-          >
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.markLateSubmissionsAsAssessInPortfolio ? 'success' : 'default'}}"
-                ng-model="unit.markLateSubmissionsAsAssessInPortfolio"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.markLateSubmissionsAsAssessInPortfolio ? 'default' : 'danger'}}"
-                ng-model="unit.markLateSubmissionsAsAssessInPortfolio"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block">
-              When enabled, late submissions will not be automatically marked as "Time Exceeded" or
-              "Feedback Exceeded", and will instead appear as "Assess in Portfolio". Tutors can
-              still sign off tasks as complete unless the task definition has the "Assess in
-              Portfolio Only" option enabled.
-            </span>
-          </div>
-        </div>
-        <!--/mark-late-submissions-as-assess-in-portfolio-status-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate"
-            >Allow students to change tutorial</label
-          >
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.allowStudentChangeTutorial ? 'success' : 'default'}}"
-                ng-model="unit.allowStudentChangeTutorial"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.allowStudentChangeTutorial ? 'default' : 'danger'}}"
-                ng-model="unit.allowStudentChangeTutorial"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block"> When false only staff can change student tutorials. </span>
-          </div>
-        </div>
-        <!--/allowStudentChangeTutorial-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate">Send notification emails</label>
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.sendNotifications ? 'success' : 'default'}}"
-                ng-model="unit.sendNotifications"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.sendNotifications ? 'default' : 'danger'}}"
-                ng-model="unit.sendNotifications"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block">
-              When true, emails will be set to students each week to indicate progress and suggest future tasks for them
-              to work on.
-            </span>
-          </div>
-        </div>
-        <!--/sendNotifications-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate">Synchronise enrolments</label>
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.enableSyncEnrolments ? 'success' : 'default'}}"
-                ng-model="unit.enableSyncEnrolments"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.enableSyncEnrolments ? 'default' : 'danger'}}"
-                ng-model="unit.enableSyncEnrolments"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block">
-              When true student enrolments will be synchronised with other systems where this is possible.
-            </span>
-          </div>
-        </div>
-        <!--/syncEnrolments-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate">Synchronise Timetable</label>
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.enableSyncTimetable ? 'success' : 'default'}}"
-                ng-model="unit.enableSyncTimetable"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.enableSyncTimetable ? 'default' : 'danger'}}"
-                ng-model="unit.enableSyncTimetable"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block">
-              When true timetable data will be synchronised with other systems where this is possible.
-            </span>
-          </div>
-        </div>
-        <!--/syncTimetable-->
-
-        <div class="form-group" ng-if="overseerEnabled.value">
-          <label class="col-sm-2 control-label">Overseer Assessment</label>
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.assessmentEnabled ? 'success' : 'default'}}"
-                ng-model="unit.assessmentEnabled"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.assessmentEnabled ? 'default' : 'danger'}}"
-                ng-model="unit.assessmentEnabled"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block">
-              If true, unit tasks will be able to make use of Overseer automated checking.
-            </span>
-          </div>
-        </div><!--/task-assessment-enabled-->
-
-        <div class="form-group" ng-if="overseerEnabled.value">
-          <label class="col-sm-2 control-label">Docker Image Name</label>
-          <div class="col-sm-9">
-            <select class="form-control" ng-model="unit.overseerImage" ng-options="image as image.description for image in dockerImages" />
-            <span class="help-block">
-              Use this to select the default container used to check tasks with Overseer.
-            </span>
-          </div>
-        </div> <!--/docker-image-name-->
-
-        <div class="form-group">
-          <label class="col-sm-2 control-label" for="enddate">Active</label>
-          <div class="col-sm-9">
-            <div class="btn-group">
-              <label
-                class="btn btn-{{unit.active ? 'success' : 'default'}}"
-                ng-model="unit.active"
-                btn-radio="true"
-                uncheckable
-              >
-                <i class="fa fa-check"></i>
-              </label>
-              <label
-                class="btn btn-{{unit.active ? 'default' : 'danger'}}"
-                ng-model="unit.active"
-                btn-radio="false"
-                uncheckable
-              >
-                <i class="fa fa-times"></i>
-              </label>
-            </div>
-            <span class="help-block">
-              Set to false to hide unit from students and tutors.
-            </span>
-          </div>
-        </div>
-        <!--/active-->
-      </div>
-
-      <div class="panel-footer text-right">
-          <div class="pull-left">
-            <a class="btn btn-info" ng-click="addD2lData()" ng-enabled="unit.id != -1" ng-hide="!d2lEnabled()">
-              <header>D2L Details</header>
-            </a>
-          </div>
-          <div>
-            <a class="btn btn-success" ui-sref="units/rollover">
-              <header>Copy</header>
-            </a>
-            <input
-              type="submit"
-              value="{{ unit.id == -1 ? 'Create' : 'Update' }}"
-              class="btn btn-success"
-            />
-          </div>
-      </div>
-    </form>
-  </div>
-</div>
diff --git a/src/app/units/states/edit/edit.tpl.html b/src/app/units/states/edit/edit.tpl.html
index 4df8bf3d09..8a0dc37d52 100644
--- a/src/app/units/states/edit/edit.tpl.html
+++ b/src/app/units/states/edit/edit.tpl.html
@@ -4,7 +4,7 @@
       <tab-heading>{{tab.title}}</tab-heading>
     </tab>
   </tabset><!--/tabs-->
-  <unit-details-editor unit="unit" ng-if="activeTab === tabs.unitTab"></unit-details-editor>
+  <unit-details-editor [unit]="unit" ng-if="activeTab === tabs.unitTab"></unit-details-editor>
   <f-learning-outcome-editor [context]="unit" ng-if="activeTab === tabs.learningOutcomesTab"></f-learning-outcome-editor>
   <unit-staff-editor [unit]="unit" [staff]="staff" ng-if="activeTab === tabs.staffTab"></unit-staff-editor>
   <unit-tutorials-manager ng-if="activeTab === tabs.tutorialsTab" [unit]="unit"></unit-tutorials-manager>

From 04d3178e2e37a64c14109deaacb188056e07f225 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 25 Sep 2025 15:13:29 +1000
Subject: [PATCH 584/776] chore(release): 10.0.0-47

---
 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 a02838d827..ae329af052 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.
 
+## [10.0.0-47](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-46...v10.0.0-47) (2025-09-25)
+
+
+### Features
+
+* add observer only ui ([bfbcee9](https://github.com/b0ink/doubtfire-deploy/commit/bfbcee98cfa4888241c5956372d004ec1cd813cb))
+
 ## [10.0.0-46](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-45...v10.0.0-46) (2025-09-24)
 
 ## [10.0.0-45](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-44...v10.0.0-45) (2025-09-22)
diff --git a/package-lock.json b/package-lock.json
index 199a950d63..4b1491ce8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-46",
+  "version": "10.0.0-47",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-46",
+      "version": "10.0.0-47",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 12ccc6d73b..056ce41ad1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-46",
+  "version": "10.0.0-47",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 10e8ab033469c2dd4e78d125cb8fcfe0127cbf88 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 3 Oct 2025 14:55:31 +1000
Subject: [PATCH 585/776] refactor: migrate portfolio grade select step (#1014)

* Frontend migration of portfolio-grade-select-step to Angular 17 component

* Addressed review comments in portfolio-grade-select-step component

* Implement OnInit in PortfolioGradeSelectStepComponent

* replaced bootsrap UI component with Angular material

* chore: bring back deleted lines

* refactor: replace css with tailwind

* chore: revert import order

* chore: revert import order

* chore: revert import order

* chore: revert order

* refactor: simplify grade changing

---------

Co-authored-by: Pasindu Fernando <116358471+Pasindufdo98@users.noreply.github.com>
---
 src/app/doubtfire-angular.module.ts           |  7 +-
 src/app/doubtfire-angularjs.module.ts         |  7 +-
 .../portfolio/directives/directives.coffee    |  1 -
 .../portfolio-grade-select-step.coffee        | 19 ----
 ...portfolio-grade-select-step.component.html | 96 +++++++++++++++++++
 ...portfolio-grade-select-step.component.scss |  0
 .../portfolio-grade-select-step.component.ts  | 57 +++++++++++
 .../portfolio-grade-select-step.scss          | 10 --
 .../portfolio-grade-select-step.tpl.html      | 60 ------------
 .../states/portfolio/portfolio.tpl.html       |  6 +-
 10 files changed, 168 insertions(+), 95 deletions(-)
 delete mode 100644 src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.coffee
 create mode 100644 src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.html
 create mode 100644 src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.scss
 create mode 100644 src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.ts
 delete mode 100644 src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.scss
 delete mode 100644 src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.tpl.html

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index cfea5a77ad..369039dfbc 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -283,12 +283,12 @@ import {LtiService} from './api/services/lti.service';
 import {TaskDefinitionPrerequisitesComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component';
 import {TaskPrerequisitesCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-prerequisites-card/task-prerequisites-card.component';
 import {TaskPrerequisiteService} from './api/services/task-prerequisite.service';
-// import { GradeIconComponent } from './common/grade-icon/grade-icon.component';
-// import { GradeTaskModalComponent } from './tasks/modals/grade-task-modal/grade-task-modal.component';
-// import { PrivacyPolicy } from './config/privacy-policy/privacy-policy';
+// import {GradeTaskModalComponent} from './tasks/modals/grade-task-modal/grade-task-modal.component';
+// import {PrivacyPolicy} from './config/privacy-policy/privacy-policy';
 import {UnitStaffEditorComponent} from './units/states/edit/directives/unit-staff-editor/unit-staff-editor.component';
 import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
 import {UnitDetailsEditorComponent} from './units/states/edit/directives/unit-details-editor/unit-details-editor.component';
+import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -440,6 +440,7 @@ const MY_DATE_FORMAT = {
     UnitStaffEditorComponent,
     GroupSetSelectorComponent,
     UnitDetailsEditorComponent,
+    PortfolioGradeSelectStepComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index abf5a9ff2f..963bf7d209 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -72,7 +72,6 @@ import 'build/src/app/projects/states/outcomes/outcomes.js';
 import 'build/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-review-step.js';
 import 'build/src/app/projects/states/portfolio/directives/portfolio-learning-summary-report-step/portfolio-learning-summary-report-step.js';
 import 'build/src/app/projects/states/portfolio/directives/portfolio-add-extra-files-step/portfolio-add-extra-files-step.js';
-import 'build/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.js';
 import 'build/src/app/projects/states/portfolio/directives/portfolio-welcome-step/portfolio-welcome-step.js';
 import 'build/src/app/projects/states/portfolio/directives/portfolio-tasks-step/portfolio-tasks-step.js';
 import 'build/src/app/projects/states/portfolio/directives/directives.js';
@@ -230,6 +229,7 @@ import {TaskPrerequisitesCardComponent} from './projects/states/dashboard/direct
 import {UnitStaffEditorComponent} from './units/states/edit/directives/unit-staff-editor/unit-staff-editor.component';
 import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
 import {UnitDetailsEditorComponent} from './units/states/edit/directives/unit-details-editor/unit-details-editor.component';
+import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component';
 
 export const DoubtfireAngularJSModule = angular
   .module('doubtfire', [
@@ -525,6 +525,11 @@ DoubtfireAngularJSModule.directive(
   downgradeComponent({component: UnitDetailsEditorComponent}),
 );
 
+DoubtfireAngularJSModule.directive(
+  'fPortfolioGradeSelectStep',
+  downgradeComponent({component: PortfolioGradeSelectStepComponent}),
+);
+
 // Global configuration
 
 // If the user enters a URL that doesn't match any known URL (state), send them to `/home`
diff --git a/src/app/projects/states/portfolio/directives/directives.coffee b/src/app/projects/states/portfolio/directives/directives.coffee
index 8ce9be0be3..661acd16e7 100644
--- a/src/app/projects/states/portfolio/directives/directives.coffee
+++ b/src/app/projects/states/portfolio/directives/directives.coffee
@@ -1,6 +1,5 @@
 angular.module('doubtfire.projects.states.portfolio.directives', [
   'doubtfire.projects.states.portfolio.directives.portfolio-add-extra-files-step'
-  'doubtfire.projects.states.portfolio.directives.portfolio-grade-select-step'
   'doubtfire.projects.states.portfolio.directives.portfolio-learning-summary-report-step'
   'doubtfire.projects.states.portfolio.directives.portfolio-review-step'
   'doubtfire.projects.states.portfolio.directives.portfolio-tasks-step'
diff --git a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.coffee b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.coffee
deleted file mode 100644
index d29d0f65da..0000000000
--- a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.coffee
+++ /dev/null
@@ -1,19 +0,0 @@
-angular.module('doubtfire.projects.states.portfolio.directives.portfolio-grade-select-step', [])
-
-#
-# Allows students to select the target grade they are hoping
-# to achieve with their portfolio
-#
-.directive('portfolioGradeSelectStep', ->
-  restrict: 'E'
-  replace: true
-  templateUrl: 'projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.tpl.html'
-  controller: ($scope, newProjectService, gradeService) ->
-    $scope.grades = gradeService.grades
-    $scope.agreedToAssessmentCriteria = $scope.projectHasLearningSummaryReport()
-    $scope.chooseGrade = (idx) ->
-      $scope.project.submittedGrade = idx
-      newProjectService.update($scope.project).subscribe((project) ->
-        $scope.project.refreshBurndownChartData()
-      )
-)
diff --git a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.html b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.html
new file mode 100644
index 0000000000..63385d6e5d
--- /dev/null
+++ b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.html
@@ -0,0 +1,96 @@
+<div id="portfolio-state" class="project-portfolio-wizard w-full">
+  <mat-card class="max-w-7xl mx-auto">
+    <!-- Main Header -->
+    <mat-card-header>
+      <mat-card-title class="grade-card-title">
+        <h3>Select Grade</h3>
+      </mat-card-title>
+    </mat-card-header>
+
+    <mat-card-content>
+      <p class="m-4">
+        In preparing your portfolio, you need to undertake a self-assessment. Use the unit's
+        assessment criteria to determine the grade your portfolio should be awarded.
+      </p>
+
+      <!-- Warning Card -->
+      <mat-card class="mt-4 mx-2">
+        <mat-card-header class="bg-red-500 text-white">
+          <mat-card-title class="flex flex-row items-center gap-2">
+            <mat-icon class="warning-icon">warning</mat-icon>
+            Read the assessment criteria
+          </mat-card-title>
+        </mat-card-header>
+
+        <mat-card-content class="bg-red-500 text-white">
+          <p class="m-3">
+            Make sure that you have reviewed the Assessment Criteria for the grade you are applying
+            for. Each grade will have a list of criteria that you can use to determine if you meet
+            the requirements to achieve that grade.
+          </p>
+        </mat-card-content>
+
+        <mat-card-actions>
+          <mat-checkbox [(ngModel)]="agreedToAssessmentCriteria">
+            I have read the Assessment Criteria for this unit
+          </mat-checkbox>
+        </mat-card-actions>
+      </mat-card>
+
+      <!-- Grade Selection -->
+
+      @if (agreedToAssessmentCriteria) {
+        <mat-card class="mt-4 mx-2">
+          <mat-card-header>
+            <mat-card-title class="flex flex-row items-center gap-2">
+              Grade Application
+            </mat-card-title>
+          </mat-card-header>
+
+          <mat-card-content>
+            <p class="m-3">
+              Select the <strong>grade</strong> you are applying for {{ unit.code }}
+              {{ unit.name }} below.
+            </p>
+          </mat-card-content>
+
+          <mat-card-content class="text-center">
+            <mat-button-toggle-group
+              hideSingleSelectionIndicator
+              [ngModel]="project.submittedGrade"
+            >
+              @for (grade of gradeValues; track grade) {
+                <mat-button-toggle
+                  [value]="grade"
+                  class="p-2 py-4"
+                  (click)="updateSubmittedGrade(grade)"
+                >
+                  <f-grade-icon [grade]="grade"></f-grade-icon>
+                </mat-button-toggle>
+              }
+            </mat-button-toggle-group>
+
+            <p class="mt-4 text-gray-600">
+              Make sure your <strong>Learning Summary Report</strong> justifies how your portfolio
+              demonstrates you have
+              <strong>met all unit learning outcomes to a {{ targetGrade }} level</strong>
+            </p>
+          </mat-card-content>
+        </mat-card>
+      }
+    </mat-card-content>
+
+    <!-- Footer Buttons -->
+    <mat-card-actions class="flex justify-between">
+      <button mat-raised-button color="primary" (click)="goToPreviousStep()">Back</button>
+      <button
+        mat-raised-button
+        color="primary"
+        [disabled]="!agreedToAssessmentCriteria"
+        (click)="goToNextStep()"
+      >
+        Next
+      </button>
+    </mat-card-actions>
+  </mat-card>
+</div>
diff --git a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.scss b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.ts b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.ts
new file mode 100644
index 0000000000..cce8ee1748
--- /dev/null
+++ b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.ts
@@ -0,0 +1,57 @@
+import {Component, Injector, Input} from '@angular/core';
+import {Project, Unit} from 'src/app/api/models/doubtfire-model';
+import {ProjectService} from 'src/app/api/services/project.service';
+import {GradeService} from 'src/app/common/services/grade.service';
+
+@Component({
+  selector: 'f-portfolio-grade-select-step',
+  templateUrl: 'portfolio-grade-select-step.component.html',
+  styleUrls: ['portfolio-grade-select-step.component.scss'],
+})
+export class PortfolioGradeSelectStepComponent {
+  @Input() project: Project;
+  @Input() unit: Unit;
+
+  public agreedToAssessmentCriteria: boolean = false;
+
+  constructor(
+    private gradeService: GradeService,
+    private injector: Injector,
+    private projectService: ProjectService,
+  ) {
+    this.$scope = this.injector.get('$scope');
+  }
+
+  public get gradeValues() {
+    return this.gradeService.gradeValues;
+  }
+
+  updateSubmittedGrade(newGrade: number): void {
+    const previousSubmittedGrade = this.project.submittedGrade;
+    this.project.submittedGrade = newGrade;
+
+    this.projectService.update(this.project).subscribe(
+      (project) => {
+        project.refreshBurndownChartData?.();
+      },
+      (error) => {
+        this.project.submittedGrade = previousSubmittedGrade;
+        console.error('Error updating target grade:', error);
+      },
+    );
+  }
+
+  // TODO: remove this once parent component has been migrated
+  private $scope: any;
+  goToNextStep(): void {
+    if (typeof this.$scope?.advanceActiveTab === 'function') {
+      this.$scope.advanceActiveTab(1);
+    }
+  }
+
+  goToPreviousStep(): void {
+    if (typeof this.$scope?.advanceActiveTab === 'function') {
+      this.$scope.advanceActiveTab(-1);
+    }
+  }
+}
diff --git a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.scss b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.scss
deleted file mode 100644
index bfc229c4b1..0000000000
--- a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.project-portfolio-wizard .portfolio-grade-select-step {
-  .confirm-read-assessment-criteria {
-    font-size: 1.2em;
-  }
-  .select-the-grade {
-    .btn {
-      padding: 1em;
-    }
-  }
-}
diff --git a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.tpl.html b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.tpl.html
deleted file mode 100644
index 5e512edf25..0000000000
--- a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.tpl.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h3 class="panel-title">Select Grade</h3>
-  </div>
-  <div class="panel-body">
-    <p>
-      In preparing your portfolio, you need to undertake a self assessment. Use the unit's assessment criteria to
-      determine the grade your portfolio should be awarded.
-    </p>
-    <div class="card card-danger">
-      <div class="card-heading">
-        <h4><i class="fa fa-warning"></i> Read the assessment criteria</h4>
-        Make sure that you have reviewed the Assessment Criteria for the grade you are applying for. Each grade will
-        have a list of criteria that you can use to determine if you meet the requirements to achieve that grade.
-      </div>
-      <div class="card-body text-center" style="font-size: 1.25em">
-        <input type="checkbox" class="pointer" id="agree-read" ng-model="agreedToAssessmentCriteria" />
-        <label class="pointer" for="agree-read">I have read the Assessment Criteria for this unit</label>
-      </div>
-    </div>
-    <!--/confirm-read-assessment-criteria-->
-    <div class="card card-default" collapse="!agreedToAssessmentCriteria">
-      <div class="card-heading">
-        <h4>Grade Application</h4>
-        Select the <strong>grade</strong> you are applying for {{unit.name}} below.
-      </div>
-      <div class="card-body text-center">
-        <div class="btn-group">
-          <label
-            ng-repeat="grade in grades"
-            ng-if="$index != 4"
-            ng-click="chooseGrade($index); status.isopen=false"
-            class="btn btn-default col-sm-3"
-            ng-model="project.submittedGrade"
-            btn-radio="{{$index}}"
-          >
-            <f-grade-icon
-              [grade]="grade"
-              class="text-{{project.submittedGrade == grades.indexOf(grade) ? 'success' : 'muted'}}"
-            ></f-grade-icon>
-          </label>
-        </div>
-        <p class="help-block">
-          Make sure your <strong>Learning Summary Report</strong> justifies how your portfolio demonstrates you have
-          <strong>met all unit learning outcomes to a {{targetGrade}} level</strong>
-        </p>
-      </div>
-    </div>
-    <!--/select-the-grade-->
-  </div>
-  <!--/content-->
-  <div class="panel-footer clearfix">
-    <button class="btn btn-primary pull-left" ng-click="advanceActiveTab(-1)">
-      <i class="fa fa-arrow-left"></i> Back
-    </button>
-    <button class="btn btn-primary pull-right" ng-disabled="!agreedToAssessmentCriteria" ng-click="advanceActiveTab(1)">
-      Next <i class="fa fa-arrow-right"></i>
-    </button>
-  </div>
-</div>
diff --git a/src/app/projects/states/portfolio/portfolio.tpl.html b/src/app/projects/states/portfolio/portfolio.tpl.html
index be61edec29..934f90e76f 100644
--- a/src/app/projects/states/portfolio/portfolio.tpl.html
+++ b/src/app/projects/states/portfolio/portfolio.tpl.html
@@ -7,7 +7,11 @@
     </tab>
   </tabset><!--/tabs-->
   <portfolio-welcome-step ng-if="activeTab == tabs.welcomeStep"></portfolio-welcome-step>
-  <portfolio-grade-select-step ng-if="activeTab == tabs.gradeStep"></portfolio-grade-select-step>
+  <f-portfolio-grade-select-step
+      [project]="project"
+      [unit]="unit"
+      ng-if="activeTab == tabs.gradeStep">
+    </f-portfolio-grade-select-step>
   <portfolio-learning-summary-report-step ng-if="activeTab == tabs.summaryStep"></portfolio-learning-summary-report-step>
   <portfolio-add-extra-files-step ng-if="activeTab == tabs.otherFilesStep"></portfolio-add-extra-files-step>
   <portfolio-review-step ng-if="activeTab == tabs.reviewStep"></portfolio-review-step>

From 8d36c94f03563a0924cfeb7d2d9e8dd911b65960 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 8 Oct 2025 09:22:49 +1100
Subject: [PATCH 586/776] fix: add assess in portfolio tasks as completed tasks
 in burndown chart

---
 src/app/api/models/project.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index 167aeb1ec5..1064fb3c5b 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -413,7 +413,7 @@ export class Project extends Entity {
     const tasks = this.tasks;
 
     const readyOrCompleteTasks = tasks.filter((task) =>
-      ['ready_for_feedback', 'discuss', 'demonstrate', 'complete'].includes(task.status),
+      ['ready_for_feedback', 'discuss', 'demonstrate', 'complete', 'assess_in_portfolio'].includes(task.status),
     );
     let lastTargetDate: Date;
 

From 2b4afe24e3f8139fec23337facc7656eec9a9d3a Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 13 Oct 2025 10:21:09 +1100
Subject: [PATCH 587/776] feat: add tutor times summary download (#1015)

* feat: add tutor times summary download

* fix: typo

* feat: add calendar view of marking sessions

* refactor: simplify date in filename

* refactor: remove get tutors call

* refactor: custom number of days visible, show today at the end

* refactor: date pickers to filter sessions

* refactor: clean up ui

* refactor: create tutor times analytics component

* refactor: add loading spinner

* refactor: fix timezone issues

* refactor: improve ui

* chore: update endpoint

* feat: toggle hide sessions during tutorials

* chore: remove button

* refactor: implement marking session entity

* chore: remove unused code

* chore: remove comment
---
 package-lock.json                             |  64 +++++
 package.json                                  |   1 +
 src/app/api/models/marking-session.ts         |  40 +++
 src/app/api/models/unit.ts                    |  59 +++-
 .../api/services/marking-session.service.ts   |  39 +++
 src/app/doubtfire-angular.module.ts           |   7 +
 .../analytics-tutor-times.component.html      |  97 +++++++
 .../analytics-tutor-times.component.scss      |   0
 .../analytics-tutor-times.component.ts        | 253 ++++++++++++++++++
 .../unit-analytics-route.component.html       |  34 ++-
 .../unit-analytics-route.component.ts         |  11 +-
 src/styles.scss                               |   6 +
 12 files changed, 596 insertions(+), 15 deletions(-)
 create mode 100644 src/app/api/models/marking-session.ts
 create mode 100644 src/app/api/services/marking-session.service.ts
 create mode 100644 src/app/units/states/analytics/directives/analytics-tutor-times.component.html
 create mode 100644 src/app/units/states/analytics/directives/analytics-tutor-times.component.scss
 create mode 100644 src/app/units/states/analytics/directives/analytics-tutor-times.component.ts

diff --git a/package-lock.json b/package-lock.json
index 4b1491ce8c..cd419cdb8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,7 @@
         "@uirouter/core": "^6.1.0",
         "@uirouter/rx": "^1.0.0",
         "angular": "1.5.11",
+        "angular-calendar": "^0.31.1",
         "angular-filter": "0.5.17",
         "angular-markdown-filter": "1.3.2",
         "angular-md5": "0.1.10",
@@ -4632,6 +4633,12 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/@mattlewis92/dom-autoscroller": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@mattlewis92/dom-autoscroller/-/dom-autoscroller-2.4.2.tgz",
+      "integrity": "sha512-YbrUWREPGEjE/FU6foXcAT1YbVwqD/jkYnY1dFb0o4AxtP3s4xKBthlELjndZih8uwsDWgQZx1eNskRNe2BgZQ==",
+      "license": "MIT"
+    },
     "node_modules/@ngneat/hotkeys": {
       "version": "4.0.0",
       "license": "MIT",
@@ -6410,6 +6417,39 @@
       "version": "1.5.11",
       "license": "MIT"
     },
+    "node_modules/angular-calendar": {
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/angular-calendar/-/angular-calendar-0.31.1.tgz",
+      "integrity": "sha512-pjSIpoAaUzS/gx+14eOr4hPZhlQ8HxpiZypCSGqJNptq5PD+vOdVQ3h/Aaqnk86GraVcAQPXqfu64MtdKwTVNw==",
+      "license": "MIT",
+      "dependencies": {
+        "@scarf/scarf": "^1.1.1",
+        "angular-draggable-droppable": "^8.0.0",
+        "angular-resizable-element": "^7.0.0",
+        "calendar-utils": "^0.10.4",
+        "positioning": "^2.0.1",
+        "tslib": "^2.4.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mattlewis92"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=15.0.0"
+      }
+    },
+    "node_modules/angular-draggable-droppable": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/angular-draggable-droppable/-/angular-draggable-droppable-8.0.0.tgz",
+      "integrity": "sha512-+gpSNBbygjV1pxTxsM3UPJKcXHXJabYoTtKcgQe74rGnb1umKc07XCBD1qDzvlG/kocthvhQ12qfYOYzHnE3ZA==",
+      "license": "MIT",
+      "dependencies": {
+        "@mattlewis92/dom-autoscroller": "^2.4.2",
+        "tslib": "^2.4.1"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=15.0.0"
+      }
+    },
     "node_modules/angular-filter": {
       "version": "0.5.17",
       "license": "MIT",
@@ -6443,6 +6483,18 @@
         "nvd3": "^1.7.1"
       }
     },
+    "node_modules/angular-resizable-element": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/angular-resizable-element/-/angular-resizable-element-7.0.2.tgz",
+      "integrity": "sha512-/BGuNiA38n9klexHO1xgnsA3VYigj9v+jUGjKtBRgfB26bCxZKsNWParSu2k3EqbATrfAJC4Nl8f7cORpJFf4w==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=15.0.0"
+      }
+    },
     "node_modules/angular-resource": {
       "version": "1.5.11",
       "license": "MIT"
@@ -7573,6 +7625,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/calendar-utils": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.10.4.tgz",
+      "integrity": "sha512-gBK4xCJ42yjaUKwuUha6cZOfxAmGzvSgbdAaX3xLRioeKbYoOK1x1qeD6dch72rsMZlTgATPbBBx42bnkStqgQ==",
+      "license": "MIT"
+    },
     "node_modules/call-bind": {
       "version": "1.0.7",
       "license": "MIT",
@@ -17668,6 +17726,12 @@
         "npm": ">=1.0.0"
       }
     },
+    "node_modules/positioning": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/positioning/-/positioning-2.0.1.tgz",
+      "integrity": "sha512-DsAgM42kV/ObuwlRpAzDTjH9E8fGKkMDJHWFX+kfNXSxh7UCCQxEmdjv/Ws5Ft1XDnt3JT8fIDYeKNSE2TbttA==",
+      "license": "MIT"
+    },
     "node_modules/posix-character-classes": {
       "version": "0.1.1",
       "dev": true,
diff --git a/package.json b/package.json
index 056ce41ad1..f9eb667eef 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "@uirouter/core": "^6.1.0",
     "@uirouter/rx": "^1.0.0",
     "angular": "1.5.11",
+    "angular-calendar": "^0.31.1",
     "angular-filter": "0.5.17",
     "angular-markdown-filter": "1.3.2",
     "angular-md5": "0.1.10",
diff --git a/src/app/api/models/marking-session.ts b/src/app/api/models/marking-session.ts
new file mode 100644
index 0000000000..8bfbe3a446
--- /dev/null
+++ b/src/app/api/models/marking-session.ts
@@ -0,0 +1,40 @@
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {User} from './doubtfire-model';
+import {Unit} from './unit';
+
+export class MarkingSession extends Entity {
+  id: number;
+
+  // Marking tutor
+  user: User;
+
+  unit: Unit;
+
+  startTime: Date;
+  endTime: Date;
+  duringTutorial: boolean;
+  durationMinutes: number;
+
+  // Aggregated session activities count
+  commentsAdded: number;
+  assessments: number;
+  submissionsOpened: number;
+
+  constructor(data?: Unit) {
+    super();
+    if (data) {
+      this.unit = data;
+    } else {
+      console.error('Failed to get unit');
+    }
+  }
+
+  public override toJson<T extends Entity>(
+    mappingData: EntityMapping<T>,
+    ignoreKeys?: string[],
+  ): object {
+    return {
+      markingSession: super.toJson(mappingData, ignoreKeys),
+    };
+  }
+}
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 6f4a2b0622..b144a53bb3 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -30,8 +30,10 @@ import {LearningOutcome} from './learning-outcome';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {D2lAssessmentMapping} from './d2l/d2l_assessment_mapping';
 import {SidekiqJob} from './sidekiq-job';
-import {HttpClient} from '@angular/common/http';
+import {HttpClient, HttpParams} from '@angular/common/http';
 import {TaskPrerequisiteService} from '../services/task-prerequisite.service';
+import {MarkingSession} from './marking-session';
+import {MarkingSessionService} from '../services/marking-session.service';
 
 export class Unit extends Entity {
   id: number;
@@ -603,6 +605,61 @@ export class Unit extends Entity {
     );
   }
 
+  public getUserMarkingSessions(startDate?: Date, endDate?: Date): Observable<MarkingSession[]> {
+    let params = new HttpParams();
+    if (startDate) {
+      params = params.set(
+        'start_date',
+        `${startDate.getFullYear()}-${(startDate.getMonth() + 1).toString().padStart(2, '0')}-${startDate.getDate().toString().padStart(2, '0')}`,
+      );
+    }
+
+    if (endDate) {
+      params = params.set(
+        'end_date',
+        `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')}`,
+      );
+    }
+
+    // TODO: we should cache the data by the same start/end date
+    const markingSessionService = AppInjector.get(MarkingSessionService);
+    return markingSessionService.fetchAll(
+      {
+        unitId: this.id,
+      },
+      {params, constructorParams: this},
+    );
+  }
+
+  public downloadTutorTimesSummaryCsv(
+    startDate?: Date,
+    endDate?: Date,
+    ignoreSessionsDuringTutorials?: boolean,
+  ): Observable<SidekiqJob> {
+    let params = new HttpParams();
+
+    if (startDate) {
+      params = params.set(
+        'start_date',
+        `${startDate.getFullYear()}-${(startDate.getMonth() + 1).toString().padStart(2, '0')}-${startDate.getDate().toString().padStart(2, '0')}`,
+      );
+    }
+
+    if (endDate) {
+      params = params.set(
+        'end_date',
+        `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')}`,
+      );
+    }
+
+    params = params.set('ignore_sessions_during_tutorials', ignoreSessionsDuringTutorials ?? false);
+
+    return AppInjector.get(HttpClient).get<SidekiqJob>(
+      `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/tutor_times_summary`,
+      {params},
+    );
+  }
+
   public hasD2lMapping(): boolean {
     const doubtfireConstants = AppInjector.get(DoubtfireConstants);
     return (
diff --git a/src/app/api/services/marking-session.service.ts b/src/app/api/services/marking-session.service.ts
new file mode 100644
index 0000000000..f1ce830a02
--- /dev/null
+++ b/src/app/api/services/marking-session.service.ts
@@ -0,0 +1,39 @@
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import {Unit} from 'src/app/api/models/doubtfire-model';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {MarkingSession} from '../models/marking-session';
+
+@Injectable()
+export class MarkingSessionService extends CachedEntityService<MarkingSession> {
+  protected readonly endpointFormat = 'units/:unitId:/marking_sessions/:id:';
+
+  constructor(httpClient: HttpClient) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys(
+      'id',
+      'startTime',
+      'endTime',
+      'duringTutorial',
+      'durationMinutes',
+
+      'commentsAdded',
+      'assessments',
+      'submissionsOpened',
+
+      {
+        keys: ['user', 'user_id'],
+        toEntityFn: (data: object, _key: string, markingSession: MarkingSession) => {
+          const userRole = markingSession.unit.staff.find((s) => s.user.id === data['user_id']);
+          return userRole.user;
+        },
+      },
+    );
+  }
+
+  public createInstanceFrom(json: object, other?: Unit): MarkingSession {
+    return new MarkingSession(other);
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 369039dfbc..47e4679234 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -111,6 +111,8 @@ import {MatDatepickerModule} from '@angular/material/datepicker';
 
 import {DateFnsAdapter, MAT_DATE_FNS_FORMATS} from '@angular/material-date-fns-adapter';
 import {enAU} from 'date-fns/locale';
+import {CalendarModule, DateAdapter as CalendarDateAdapter} from 'angular-calendar';
+import {adapterFactory} from 'angular-calendar/date-adapters/date-fns';
 
 import {doubtfireStates} from './doubtfire.states';
 import {MatTableModule} from '@angular/material/table';
@@ -289,6 +291,8 @@ import {UnitStaffEditorComponent} from './units/states/edit/directives/unit-staf
 import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
 import {UnitDetailsEditorComponent} from './units/states/edit/directives/unit-details-editor/unit-details-editor.component';
 import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component';
+import {AnalyticsTutorTimesComponent} from './units/states/analytics/directives/analytics-tutor-times.component';
+import {MarkingSessionService} from './api/services/marking-session.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -441,6 +445,7 @@ const MY_DATE_FORMAT = {
     GroupSetSelectorComponent,
     UnitDetailsEditorComponent,
     PortfolioGradeSelectStepComponent,
+    AnalyticsTutorTimesComponent,
   ],
   // Services we provide
   providers: [
@@ -529,6 +534,7 @@ const MY_DATE_FORMAT = {
     SidekiqJobService,
     LtiService,
     TaskPrerequisiteService,
+    MarkingSessionService,
   ],
   imports: [
     FlexLayoutModule,
@@ -590,6 +596,7 @@ const MY_DATE_FORMAT = {
     MatDatepickerModule,
     MatNativeDateModule,
     MatDialogModuleNew,
+    CalendarModule.forRoot({provide: CalendarDateAdapter, useFactory: adapterFactory}),
   ],
 })
 
diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
new file mode 100644
index 0000000000..faef0eaab1
--- /dev/null
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
@@ -0,0 +1,97 @@
+<mat-card appearance="outlined" class="p-[16px]">
+  <mat-card-header class="flex justify-between mb-4">
+    <mat-card-title>
+      <h2>Tutor Times Session Summary</h2>
+    </mat-card-title>
+
+    <button
+      mat-button
+      (click)="getTutorTimesSummary()"
+      matTooltip="Download CSV summary for the selected date range"
+      matTooltipShowDelay="1000"
+      matTooltipPosition="above"
+    >
+      <mat-icon>download</mat-icon> Download Summary
+    </button>
+  </mat-card-header>
+
+  <div class="flex flex-col items-center justify-center">
+    <div class="flex flex-row gap-2 mb-5">
+      <button mat-raised-button color="primary" (click)="goPreviousWeek()" class="w-40">
+        Previous
+      </button>
+      <button mat-raised-button (click)="goTodayWeek()">Today</button>
+      <button mat-raised-button color="primary" (click)="goNextWeek()" class="w-40">Next</button>
+    </div>
+    <div class="flex flex-row gap-2 mb-5">
+      <mat-form-field appearance="outline">
+        <mat-label>Choose a date</mat-label>
+        <input
+          matInput
+          [matDatepicker]="startdatepicker"
+          [(ngModel)]="tutorTimeSummaryStartDate"
+          (dateChange)="onDateChange($event)"
+        />
+        <mat-hint>Sessions from this day onward</mat-hint>
+        <mat-datepicker-toggle matIconSuffix [for]="startdatepicker"></mat-datepicker-toggle>
+        <mat-datepicker #startdatepicker></mat-datepicker>
+      </mat-form-field>
+
+      <mat-form-field appearance="outline">
+        <mat-label>Choose a date</mat-label>
+        <input
+          matInput
+          [matDatepicker]="enddatepicker"
+          [(ngModel)]="tutorTimeSummaryEndDate"
+          (dateChange)="onDateChange($event)"
+        />
+        <mat-hint>Sessions up to this day</mat-hint>
+        <mat-datepicker-toggle matIconSuffix [for]="enddatepicker"></mat-datepicker-toggle>
+        <mat-datepicker #enddatepicker></mat-datepicker>
+      </mat-form-field>
+    </div>
+    <div class="flex w-full justify-end mb-2">
+      <mat-slide-toggle
+        labelPosition="before"
+        [(ngModel)]="hideSessionsDuringTutorials"
+        (toggleChange)="onToggleChangeHideSessionsDuringTutorial()"
+        >Hide sessions during tutorials</mat-slide-toggle
+      >
+    </div>
+  </div>
+
+  <ng-template #eventTooltipTemplate let-event="event">
+    <div class="z-50 bg-[rgba(25,25,25,0.8)] text-white p-2 rounded">
+      <strong
+        >{{ event.name }} ({{ event.duration }} minutes)
+        {{ event.duringTutorial ? 'T' : '' }}</strong
+      ><br />
+      Assessments: {{ event.assessments || 0 }}<br />
+      Comments: {{ event.comments_added || 0 }}<br />
+      Submissions opened: {{ event.submissions_opened || 0 }} <br />
+      During Tutorial?: {{ event.duringTutorial ? 'yes' : 'no' }}
+    </div>
+  </ng-template>
+
+  <div class="relative">
+    @if (isLoading) {
+      <mat-progress-spinner
+        class="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50"
+        mode="indeterminate"
+      >
+      </mat-progress-spinner>
+    }
+
+    <mwl-calendar-week-view
+      [viewDate]="viewDate"
+      [events]="filteredEvents"
+      (eventClicked)="eventClicked($event)"
+      [tooltipTemplate]="eventTooltipTemplate"
+      [hourDuration]="60"
+      [hourSegments]="1"
+      [weekStartsOn]="0"
+      [daysInWeek]="daysInWeek"
+      (beforeViewRender)="beforeViewRender($event)"
+    />
+  </div>
+</mat-card>
diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.scss b/src/app/units/states/analytics/directives/analytics-tutor-times.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
new file mode 100644
index 0000000000..19735552cc
--- /dev/null
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -0,0 +1,253 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {MatDatepickerInputEvent} from '@angular/material/datepicker';
+import {CalendarEvent} from 'angular-calendar';
+import {Observable} from 'rxjs';
+import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
+import {Unit} from 'src/app/api/models/unit';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-analytics-tutor-times',
+  templateUrl: 'analytics-tutor-times.component.html',
+  styleUrls: ['analytics-tutor-times.component.scss'],
+})
+export class AnalyticsTutorTimesComponent implements OnInit {
+  @Input() unit: Unit;
+
+  @Input() downloadCsvFn!: (
+    newJob: Observable<SidekiqJob>,
+    title: string,
+    filename: string,
+  ) => void;
+
+  selectedUserId: number | null = null;
+
+  viewDate = new Date();
+  events = [];
+  filteredEvents = [];
+
+  tutorTimeSummaryStartDate: Date;
+  tutorTimeSummaryEndDate: Date;
+  daysInWeek: number = 7;
+
+  hideSessionsDuringTutorials: boolean = false;
+
+  public canLoadSessions: boolean = false;
+  public isLoading: boolean = false;
+
+  constructor(
+    private alertService: AlertService,
+    private sidekiqProgressModalService: SidekiqProgressModalService,
+    private fileDownloaderService: FileDownloaderService,
+  ) {}
+
+  ngOnInit(): void {
+    if (!this.sidekiqProgressModalService || !this.fileDownloaderService) {
+      // NOTE: Our `downloadCsvFn` callback requires these services because it calls `this` context
+      console.error('Failed to load tutor times analytics');
+    }
+
+    this.tutorTimeSummaryEndDate = new Date();
+    this.tutorTimeSummaryEndDate.setHours(0, 0, 0, 0);
+
+    this.tutorTimeSummaryStartDate = new Date(this.tutorTimeSummaryEndDate);
+    this.tutorTimeSummaryStartDate.setDate(this.tutorTimeSummaryEndDate.getDate() - 7);
+
+    const startOfWeek = new Date(this.viewDate);
+    startOfWeek.setDate(this.viewDate.getDate() - this.daysInWeek + 1);
+
+    this.viewDate = startOfWeek;
+
+    this.canLoadSessions = true;
+    this.getMarkingSesssions();
+  }
+
+  goPreviousWeek() {
+    this.canLoadSessions = true;
+    this.viewDate = new Date(this.viewDate.getTime() - this.daysInWeek * 24 * 60 * 60 * 1000);
+  }
+
+  goNextWeek() {
+    this.canLoadSessions = true;
+    this.viewDate = new Date(this.viewDate.getTime() + this.daysInWeek * 24 * 60 * 60 * 1000);
+  }
+
+  goTodayWeek() {
+    this.canLoadSessions = true;
+
+    this.tutorTimeSummaryEndDate = new Date();
+    this.tutorTimeSummaryStartDate = new Date(
+      this.tutorTimeSummaryEndDate.getTime() - 7 * 24 * 60 * 60 * 1000,
+    );
+    this.daysInWeek = 7;
+
+    this.viewDate = new Date();
+    const startOfWeek = new Date();
+    startOfWeek.setDate(this.viewDate.getDate() - this.daysInWeek + 1);
+
+    this.viewDate = startOfWeek;
+  }
+
+  public onToggleChangeHideSessionsDuringTutorial() {
+    setTimeout(() => {
+      this.applyFilters();
+    });
+  }
+
+  applyFilters() {
+    this.filteredEvents = this.events.filter(
+      (e) =>
+        (this.selectedUserId === null || e['user_id'] === this.selectedUserId) &&
+        (!this.hideSessionsDuringTutorials || !e['duringTutorial']),
+    );
+  }
+
+  onDateChange(_event: MatDatepickerInputEvent<Date>) {
+    if (!this.tutorTimeSummaryStartDate || !this.tutorTimeSummaryEndDate) {
+      return;
+    }
+
+    // Includes both the selected start & end days
+    const diffDays =
+      Math.floor(
+        (this.tutorTimeSummaryEndDate.getTime() - this.tutorTimeSummaryStartDate.getTime()) /
+          (1000 * 60 * 60 * 24),
+      ) + 1;
+
+    if (diffDays > 366) {
+      this.alertService.error('You cannot select more than a year', 3000);
+      return;
+    }
+    console.log('diff days', diffDays);
+    if (diffDays < 1) {
+      this.tutorTimeSummaryStartDate = this.tutorTimeSummaryEndDate;
+      this.alertService.error('End date must be on or after the start date');
+      return;
+    }
+    this.canLoadSessions = true;
+    this.daysInWeek = diffDays;
+    this.viewDate = new Date(this.tutorTimeSummaryStartDate);
+  }
+
+  beforeViewRender(event): void {
+    console.log(event.period.start);
+    console.log(event.period.end);
+
+    this.tutorTimeSummaryStartDate = event.period.start;
+    this.tutorTimeSummaryEndDate = event.period.end;
+
+    this.getMarkingSesssions();
+  }
+
+  public getTutorTimesSummary() {
+    const start = `${this.tutorTimeSummaryStartDate.getFullYear()}-${(this.tutorTimeSummaryStartDate.getMonth() + 1).toString().padStart(2, '0')}-${this.tutorTimeSummaryStartDate.getDate().toString().padStart(2, '0')}`;
+    const end = `${this.tutorTimeSummaryEndDate.getFullYear()}-${(this.tutorTimeSummaryEndDate.getMonth() + 1).toString().padStart(2, '0')}-${this.tutorTimeSummaryEndDate.getDate().toString().padStart(2, '0')}`;
+
+    this.downloadCsvFn(
+      this.unit.downloadTutorTimesSummaryCsv(
+        this.tutorTimeSummaryStartDate,
+        this.tutorTimeSummaryEndDate,
+        this.hideSessionsDuringTutorials,
+      ),
+      'Tutor Times Summary CSV',
+      `${this.unit.code}-tutor-times-summary-${start}-to-${end}-${!this.hideSessionsDuringTutorials ? 'incl-tutorials' : ''}.csv`,
+    );
+  }
+
+  public getMarkingSesssions() {
+    if (!this.canLoadSessions) {
+      return;
+    }
+
+    this.canLoadSessions = false;
+    this.isLoading = true;
+    this.unit
+      .getUserMarkingSessions(this.tutorTimeSummaryStartDate, this.tutorTimeSummaryEndDate)
+      .subscribe({
+        next: (data) => {
+          this.isLoading = false;
+          this.canLoadSessions = false;
+          this.events = data.map((session) => {
+            const tutor = this.unit.staff.find((t) => t.user.id === session.user.id);
+
+            const primary = this.stringToHexColor(tutor.user.firstName);
+            const secondary = this.stringToHexColor(tutor.user.firstName);
+            return {
+              start: new Date(session.startTime),
+              end: new Date(session.endTime),
+              title: `${tutor?.user.firstName} (${session.durationMinutes}m) ${session.duringTutorial ? '(T)' : ''}`,
+              color: {primary: secondary, secondary: primary},
+              user_id: session.user.id,
+              comments_added: session.commentsAdded,
+              assessments: session.assessments,
+              submissions_opened: session.submissionsOpened,
+              duration: session.durationMinutes,
+              duringTutorial: session.duringTutorial,
+              name: tutor?.user.firstName,
+            };
+          });
+
+          this.filteredEvents = this.events.filter(
+            (row) => this.selectedUserId === null || row['user_id'] === this.selectedUserId,
+          );
+
+          console.log(data);
+        },
+        error: (error) => {
+          this.canLoadSessions = false;
+
+          console.error(error);
+        },
+      });
+  }
+
+  eventClicked({event}: {event: CalendarEvent}): void {
+    if (event['user_id'] !== undefined) {
+      if (this.selectedUserId === null) {
+        this.selectedUserId = Number(event['user_id']);
+      } else {
+        this.selectedUserId = null;
+      }
+      this.applyFilters();
+    }
+  }
+
+  private stringToHexColor(
+    name: string,
+    opts?: {hue?: [number, number]; sat?: [number, number]; lit?: [number, number]},
+  ): string {
+    const options = {
+      hue: opts?.hue || [0, 360],
+      sat: opts?.sat || [40, 70], // lower saturation → softer color
+      lit: opts?.lit || [75, 90], // higher lightness → pastel tone
+    };
+
+    const range = (hash: number, min: number, max: number) => {
+      const diff = max - min;
+      const x = ((hash % diff) + diff) % diff;
+      return x + min;
+    };
+
+    let hash = 0;
+    for (let i = 0; i < name.length; i++) {
+      hash = name.charCodeAt(i) + ((hash << 5) - hash);
+      hash = hash & hash;
+    }
+
+    const h = range(hash, options.hue[0], options.hue[1]);
+    const s = range(hash, options.sat[0], options.sat[1]) / 100;
+    const l = range(hash, options.lit[0], options.lit[1]) / 100;
+
+    const a = s * Math.min(l, 1 - l);
+    const f = (n: number) => {
+      const k = (n + h / 30) % 12;
+      const color = l - a * Math.max(-1, Math.min(k - 3, 9 - k, 1));
+      return Math.round(255 * color);
+    };
+
+    const toHex = (c: number) => c.toString(16).padStart(2, '0');
+    return `#${toHex(f(0))}${toHex(f(8))}${toHex(f(4))}`;
+  }
+}
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.html b/src/app/units/states/analytics/unit-analytics-route.component.html
index 361c9ce18c..9388fae8d0 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.html
+++ b/src/app/units/states/analytics/unit-analytics-route.component.html
@@ -1,16 +1,24 @@
 <h1>Unit Statistics</h1>
 
-<div class="flex gap-2">
-  <button mat-button (click)="getTaskCompletionCsv()">
-    <mat-icon>download</mat-icon> Task Completion Stats
-  </button>
-  <button mat-button (click)="getTutorAssessmentCsv()">
-    <mat-icon>download</mat-icon> Tutor Assessment Stats
-  </button>
-  <button mat-button (click)="getTasksAwaitingFeedbackCsv()">
-    <mat-icon>download</mat-icon> Tasks Awaiting Feedback
-  </button>
-  <button mat-button (click)="getTaskAssessmentCountCsv()">
-    <mat-icon>download</mat-icon> Task Assessment Counts
-  </button>
+<div class="flex flex-col gap-4">
+  <mat-card appearance="outlined" class="mt-4 p-[16px]">
+    <mat-card-content class="flex gap-2">
+      <button mat-button (click)="getTaskCompletionCsv()">
+        <mat-icon>download</mat-icon> Task Completion Stats
+      </button>
+      <button mat-button (click)="getTutorAssessmentCsv()">
+        <mat-icon>download</mat-icon> Tutor Assessment Stats
+      </button>
+      <button mat-button (click)="getTasksAwaitingFeedbackCsv()">
+        <mat-icon>download</mat-icon> Tasks Awaiting Feedback
+      </button>
+      <button mat-button (click)="getTaskAssessmentCountCsv()">
+        <mat-icon>download</mat-icon> Task Assessment Counts
+      </button>
+    </mat-card-content>
+  </mat-card>
+
+  @if (role === 'Convenor') {
+    <f-analytics-tutor-times [unit]="unit" [downloadCsvFn]="downloadCsv"></f-analytics-tutor-times>
+  }
 </div>
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.ts b/src/app/units/states/analytics/unit-analytics-route.component.ts
index 12e4770d84..73419c4dfe 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.ts
+++ b/src/app/units/states/analytics/unit-analytics-route.component.ts
@@ -1,7 +1,10 @@
-import {Component, Input} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
+import {MatDatepickerInputEvent} from '@angular/material/datepicker';
+import {CalendarEvent} from 'angular-calendar';
 import {Observable} from 'rxjs';
 import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
 import {Unit} from 'src/app/api/models/unit';
+import {UserService} from 'src/app/api/services/user.service';
 import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
 import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 import {AlertService} from 'src/app/common/services/alert.service';
@@ -18,8 +21,14 @@ export class UnitAnalyticsComponent {
     private sidekiqProgressModalService: SidekiqProgressModalService,
     private alertsService: AlertService,
     private fileDownloaderService: FileDownloaderService,
+    private userService: UserService,
+    private alertService: AlertService,
   ) {}
 
+  get role() {
+    return this.unit.staff.find((s) => s.user.id === this.userService.currentUser.id)?.role;
+  }
+
   public getTaskCompletionCsv() {
     this.downloadCsv(
       this.unit.downloadTaskCompletionCsv(),
diff --git a/src/styles.scss b/src/styles.scss
index b0756f5acd..7eec75221c 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -4,6 +4,7 @@
 @include mat.core();
 
 @import './theme.scss';
+@import '../node_modules/angular-calendar/css/angular-calendar.css';
 
 @tailwind base;
 @tailwind components;
@@ -35,3 +36,8 @@
     }
   }
 }
+
+.mat-mdc-progress-spinner circle,
+.mat-spinner circle {
+  stroke: #ddd !important;
+}

From 376dad3125ed6757b997ef25e5866a43cb7919d0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 13 Oct 2025 10:22:11 +1100
Subject: [PATCH 588/776] chore(release): 10.0.0-48

---
 CHANGELOG.md      | 12 ++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae329af052..f2b6a8e01e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 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.
 
+## [10.0.0-48](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-47...v10.0.0-48) (2025-10-12)
+
+
+### Features
+
+* add tutor times summary download ([#1015](https://github.com/b0ink/doubtfire-deploy/issues/1015)) ([2b4afe2](https://github.com/b0ink/doubtfire-deploy/commit/2b4afe24e3f8139fec23337facc7656eec9a9d3a))
+
+
+### Bug Fixes
+
+* add assess in portfolio tasks as completed tasks in burndown chart ([8d36c94](https://github.com/b0ink/doubtfire-deploy/commit/8d36c94f03563a0924cfeb7d2d9e8dd911b65960))
+
 ## [10.0.0-47](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-46...v10.0.0-47) (2025-09-25)
 
 
diff --git a/package-lock.json b/package-lock.json
index cd419cdb8b..df15a9fd8a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-47",
+  "version": "10.0.0-48",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-47",
+      "version": "10.0.0-48",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index f9eb667eef..f481fc788f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-47",
+  "version": "10.0.0-48",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From bb548b92d04bb7b8665444e7935317bc4b6a0981 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 13 Oct 2025 10:42:50 +1100
Subject: [PATCH 589/776] feat: display session start and end time

---
 .../directives/analytics-tutor-times.component.html    |  1 +
 .../directives/analytics-tutor-times.component.ts      | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
index faef0eaab1..2a8dccf5e1 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
@@ -66,6 +66,7 @@ <h2>Tutor Times Session Summary</h2>
         >{{ event.name }} ({{ event.duration }} minutes)
         {{ event.duringTutorial ? 'T' : '' }}</strong
       ><br />
+      {{ event.startHour }} — {{ event.endHour }}<br />
       Assessments: {{ event.assessments || 0 }}<br />
       Comments: {{ event.comments_added || 0 }}<br />
       Submissions opened: {{ event.submissions_opened || 0 }} <br />
diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
index 19735552cc..a21aa9d230 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -177,6 +177,16 @@ export class AnalyticsTutorTimesComponent implements OnInit {
             return {
               start: new Date(session.startTime),
               end: new Date(session.endTime),
+              startHour: new Date(session.startTime).toLocaleTimeString([], {
+                hour: '2-digit',
+                minute: '2-digit',
+                hour12: false,
+              }),
+              endHour: new Date(session.endTime).toLocaleTimeString([], {
+                hour: '2-digit',
+                minute: '2-digit',
+                hour12: false,
+              }),
               title: `${tutor?.user.firstName} (${session.durationMinutes}m) ${session.duringTutorial ? '(T)' : ''}`,
               color: {primary: secondary, secondary: primary},
               user_id: session.user.id,

From a251c4f024b6dd9fa17b87cbafe3e0903dc18372 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 13 Oct 2025 10:44:02 +1100
Subject: [PATCH 590/776] chore(release): 10.0.0-49

---
 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 f2b6a8e01e..0f0f746ac0 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.
 
+## [10.0.0-49](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-48...v10.0.0-49) (2025-10-12)
+
+
+### Features
+
+* display session start and end time ([bb548b9](https://github.com/b0ink/doubtfire-deploy/commit/bb548b92d04bb7b8665444e7935317bc4b6a0981))
+
 ## [10.0.0-48](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-47...v10.0.0-48) (2025-10-12)
 
 
diff --git a/package-lock.json b/package-lock.json
index df15a9fd8a..df3e8388b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-48",
+  "version": "10.0.0-49",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-48",
+      "version": "10.0.0-49",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index f481fc788f..2d1bf66d8f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-48",
+  "version": "10.0.0-49",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 9a7a860fe799e351831e2a3f9701792792b76b38 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 13 Oct 2025 11:44:54 +1100
Subject: [PATCH 591/776] feat: jplag base code (#1010)

* feat: jplag base code

* chore: reword base code description
---
 src/app/api/models/task-definition.ts               |  1 +
 src/app/api/services/task-definition.service.ts     |  1 +
 .../task-definition-upload.component.html           | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 0810326cdd..30aff474bf 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -54,6 +54,7 @@ export class TaskDefinition extends Entity {
   similarityLanguage: string = 'c';
   hasJplagReport: boolean;
   assessInPortfolioOnly: boolean;
+  useResourcesForJplagBaseCode: boolean;
 
   public readonly taskPrerequisitesCache: EntityCache<TaskPrerequisite> =
     new EntityCache<TaskPrerequisite>();
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 7692ab936b..63708814f8 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -136,6 +136,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
           });
         },
       },
+      'useResourcesForJplagBaseCode',
     );
 
     this.mapping.mapAllKeysToJsonExcept(
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
index 48d7fd0080..28015f48b3 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-upload/task-definition-upload.component.html
@@ -113,4 +113,17 @@
       <input matInput [(ngModel)]="taskDefinition.plagiarismWarnPct" type="number" />
     </mat-form-field>
   </div>
+  <div class="flex flex-grow">
+    <div class="basis-1/2">
+      <mat-slide-toggle [(ngModel)]="taskDefinition.useResourcesForJplagBaseCode">
+        Use Task Resources for JPlag Base Code</mat-slide-toggle
+      >
+      <p>
+        Base code is a common framework included in all submissions. When enabled, student code
+        matching this base code will be ignored during JPlag similarity checks. The base code will
+        be automatically extracted from the task resources.
+      </p>
+    </div>
+    <div class="basis-1/2"></div>
+  </div>
 }

From 059d54f5450da29b3e21a2b893116decd8df1879 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 13 Oct 2025 11:45:26 +1100
Subject: [PATCH 592/776] chore(release): 10.0.0-50

---
 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 0f0f746ac0..28de2191c2 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.
 
+## [10.0.0-50](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-49...v10.0.0-50) (2025-10-13)
+
+
+### Features
+
+* jplag base code ([#1010](https://github.com/b0ink/doubtfire-deploy/issues/1010)) ([9a7a860](https://github.com/b0ink/doubtfire-deploy/commit/9a7a860fe799e351831e2a3f9701792792b76b38))
+
 ## [10.0.0-49](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-48...v10.0.0-49) (2025-10-12)
 
 
diff --git a/package-lock.json b/package-lock.json
index df3e8388b7..19dd45e590 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-49",
+  "version": "10.0.0-50",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-49",
+      "version": "10.0.0-50",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 2d1bf66d8f..dcc5e480c8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-49",
+  "version": "10.0.0-50",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 173d8c25375e231b25e64a04c1e3d2aedf741300 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 14 Oct 2025 18:00:11 +1100
Subject: [PATCH 593/776] fix: unlock tasks when prerequisite requires rff and
 task is in aip state

---
 src/app/api/models/task-prerequisite.ts                          | 1 +
 .../task-definition-prerequisites.component.ts                   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/app/api/models/task-prerequisite.ts b/src/app/api/models/task-prerequisite.ts
index 43450deedf..510d6ce3b6 100644
--- a/src/app/api/models/task-prerequisite.ts
+++ b/src/app/api/models/task-prerequisite.ts
@@ -21,6 +21,7 @@ export class TaskPrerequisite extends Entity {
 
   public readonly STATES: Partial<Record<TaskStatusEnum, number>> = {
     ready_for_feedback: 1,
+    assess_in_portfolio: 1,
     discuss: 2,
     demonstrate: 2,
     complete: 3,
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 1e11eed7ff..eff30b4bd3 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -35,6 +35,7 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
 
   public readonly STATES: Partial<Record<TaskStatusEnum, number>> = {
     ready_for_feedback: 1,
+    assess_in_portfolio: 1,
     discuss: 2,
     demonstrate: 2,
     complete: 3,

From 267fa1b27515184149543afdb2e87fbe9c915ef8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 14 Oct 2025 18:03:40 +1100
Subject: [PATCH 594/776] chore(release): 10.0.0-51

---
 CHANGELOG.md      | 7 +++++++
 package-lock.json | 4 ++--
 package.json      | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28de2191c2..08159fda97 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.
 
+## [10.0.0-51](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-50...v10.0.0-51) (2025-10-14)
+
+
+### Bug Fixes
+
+* unlock tasks when prerequisite requires rff and task is in aip state ([173d8c2](https://github.com/b0ink/doubtfire-deploy/commit/173d8c25375e231b25e64a04c1e3d2aedf741300))
+
 ## [10.0.0-50](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-49...v10.0.0-50) (2025-10-13)
 
 
diff --git a/package-lock.json b/package-lock.json
index 19dd45e590..38c5bd3f5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-50",
+  "version": "10.0.0-51",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-50",
+      "version": "10.0.0-51",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index dcc5e480c8..d45df0c039 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-50",
+  "version": "10.0.0-51",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",
@@ -16,8 +16,8 @@
     "lint": "ng lint",
     "serve:angular17": "export NODE_OPTIONS=--max_old_space_size=4096 && ng serve --poll=2000 --configuration $NODE_ENV --proxy-config proxy.conf.json",
     "serve:angular17-compose": "export NODE_OPTIONS=--max_old_space_size=4096 && ng serve --configuration $NODE_ENV --proxy-config proxy-compose.conf.json",
-    "start": "npm-run-all -l -s build:angular1 serve:angular17",
-    "start-compose": "npm-run-all -l -s build:angular1 serve:angular17-compose",
+    "start": "npm-run-all -l -s build:angular1 -p watch:angular1 serve:angular17",
+    "start-compose": "npm-run-all -l -s build:angular1 -p watch:angular1 serve:angular17-compose",
     "watch:angular1": "grunt delta",
     "deploy:build2api": "ng build --delete-output-path=true --optimization=true --configuration production --output-path dist",
     "deploy": "run-s -l build:angular1 deploy:build2api",

From 5c0b528d774cac7d73de28e6e9ec16c9d109e955 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 15 Oct 2025 10:03:30 +1100
Subject: [PATCH 595/776] chore: filter out sessions with less than 1 minute
 duration

---
 .../analytics-tutor-times.component.ts        | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
index a21aa9d230..3572e946ea 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -8,6 +8,25 @@ import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloa
 import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 
+interface SessionEvent {
+  start: Date;
+  end: Date;
+  startHour: string;
+  endHour: string;
+  title: string;
+  color: {
+    primary: string;
+    secondary: string;
+  };
+  userId: number;
+  commentsAdded: number;
+  assessments: number;
+  submissionsOpened: number;
+  duration: number;
+  duringTutorial: boolean;
+  tutorName: string;
+}
+
 @Component({
   selector: 'f-analytics-tutor-times',
   templateUrl: 'analytics-tutor-times.component.html',
@@ -25,7 +44,7 @@ export class AnalyticsTutorTimesComponent implements OnInit {
   selectedUserId: number | null = null;
 
   viewDate = new Date();
-  events = [];
+  events: SessionEvent[] = [];
   filteredEvents = [];
 
   tutorTimeSummaryStartDate: Date;
@@ -100,7 +119,8 @@ export class AnalyticsTutorTimesComponent implements OnInit {
     this.filteredEvents = this.events.filter(
       (e) =>
         (this.selectedUserId === null || e['user_id'] === this.selectedUserId) &&
-        (!this.hideSessionsDuringTutorials || !e['duringTutorial']),
+        (!this.hideSessionsDuringTutorials || !e['duringTutorial']) &&
+        e.duration >= 1,
     );
   }
 
@@ -120,7 +140,6 @@ export class AnalyticsTutorTimesComponent implements OnInit {
       this.alertService.error('You cannot select more than a year', 3000);
       return;
     }
-    console.log('diff days', diffDays);
     if (diffDays < 1) {
       this.tutorTimeSummaryStartDate = this.tutorTimeSummaryEndDate;
       this.alertService.error('End date must be on or after the start date');
@@ -189,21 +208,17 @@ export class AnalyticsTutorTimesComponent implements OnInit {
               }),
               title: `${tutor?.user.firstName} (${session.durationMinutes}m) ${session.duringTutorial ? '(T)' : ''}`,
               color: {primary: secondary, secondary: primary},
-              user_id: session.user.id,
-              comments_added: session.commentsAdded,
+              userId: session.user.id,
+              commentsAdded: session.commentsAdded,
               assessments: session.assessments,
-              submissions_opened: session.submissionsOpened,
+              submissionsOpened: session.submissionsOpened,
               duration: session.durationMinutes,
               duringTutorial: session.duringTutorial,
-              name: tutor?.user.firstName,
+              tutorName: tutor?.user.firstName,
             };
           });
 
-          this.filteredEvents = this.events.filter(
-            (row) => this.selectedUserId === null || row['user_id'] === this.selectedUserId,
-          );
-
-          console.log(data);
+          this.applyFilters();
         },
         error: (error) => {
           this.canLoadSessions = false;

From 5c0c9974569e720a6c95aa8333c2a38d0ab4a1b0 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 15 Oct 2025 11:40:19 +1100
Subject: [PATCH 596/776] fix: filter out students from unit staff editor
 (#1018)

---
 .../unit-staff-editor/unit-staff-editor.component.ts         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
index f64d62d921..f161c384aa 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
@@ -145,7 +145,10 @@ export class UnitStaffEditorComponent implements OnInit {
     this.filteredStaff = this.staff.filter(
       (staff) =>
         staff.matches(this.searchTerm.toLowerCase()) && // Find by name
-        !this.unit.staff.find((listStaff) => staff.id === listStaff.user.id), // Not already assigned to the unit
+        !this.unit.staff.find((listStaff) => staff.id === listStaff.user.id) && // Not already assigned to the unit
+        // Filter out students from the staff search
+        // NOTE: This is a hotfix to an issue where loading the inbox populates this.staff with students...
+        staff.isStaff,
     );
   }
 

From 4487865ed551af44adcad8de01f062cdc258dc11 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:45:35 +1100
Subject: [PATCH 597/776] refactor: send timezone of client to the api (#1019)

---
 src/app/api/models/unit.ts                            | 11 ++++++++++-
 .../directives/analytics-tutor-times.component.ts     | 11 ++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index b144a53bb3..37b27568a4 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -605,7 +605,11 @@ export class Unit extends Entity {
     );
   }
 
-  public getUserMarkingSessions(startDate?: Date, endDate?: Date): Observable<MarkingSession[]> {
+  public getUserMarkingSessions(
+    startDate?: Date,
+    endDate?: Date,
+    timezone?: string,
+  ): Observable<MarkingSession[]> {
     let params = new HttpParams();
     if (startDate) {
       params = params.set(
@@ -621,6 +625,8 @@ export class Unit extends Entity {
       );
     }
 
+    params = params.set('timezone', timezone);
+
     // TODO: we should cache the data by the same start/end date
     const markingSessionService = AppInjector.get(MarkingSessionService);
     return markingSessionService.fetchAll(
@@ -634,6 +640,7 @@ export class Unit extends Entity {
   public downloadTutorTimesSummaryCsv(
     startDate?: Date,
     endDate?: Date,
+    timezone?: string,
     ignoreSessionsDuringTutorials?: boolean,
   ): Observable<SidekiqJob> {
     let params = new HttpParams();
@@ -652,6 +659,8 @@ export class Unit extends Entity {
       );
     }
 
+    params = params.set('timezone', timezone);
+
     params = params.set('ignore_sessions_during_tutorials', ignoreSessionsDuringTutorials ?? false);
 
     return AppInjector.get(HttpClient).get<SidekiqJob>(
diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
index 3572e946ea..dc6aa29351 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -164,14 +164,17 @@ export class AnalyticsTutorTimesComponent implements OnInit {
     const start = `${this.tutorTimeSummaryStartDate.getFullYear()}-${(this.tutorTimeSummaryStartDate.getMonth() + 1).toString().padStart(2, '0')}-${this.tutorTimeSummaryStartDate.getDate().toString().padStart(2, '0')}`;
     const end = `${this.tutorTimeSummaryEndDate.getFullYear()}-${(this.tutorTimeSummaryEndDate.getMonth() + 1).toString().padStart(2, '0')}-${this.tutorTimeSummaryEndDate.getDate().toString().padStart(2, '0')}`;
 
+    const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
     this.downloadCsvFn(
       this.unit.downloadTutorTimesSummaryCsv(
         this.tutorTimeSummaryStartDate,
         this.tutorTimeSummaryEndDate,
+        tz,
         this.hideSessionsDuringTutorials,
       ),
       'Tutor Times Summary CSV',
-      `${this.unit.code}-tutor-times-summary-${start}-to-${end}-${!this.hideSessionsDuringTutorials ? 'incl-tutorials' : ''}.csv`,
+      `${this.unit.code}-tutor-times-summary-${start}-to-${end}-${tz}-${!this.hideSessionsDuringTutorials ? 'incl-tutorials' : ''}.csv`,
     );
   }
 
@@ -180,10 +183,12 @@ export class AnalyticsTutorTimesComponent implements OnInit {
       return;
     }
 
+    const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
     this.canLoadSessions = false;
     this.isLoading = true;
     this.unit
-      .getUserMarkingSessions(this.tutorTimeSummaryStartDate, this.tutorTimeSummaryEndDate)
+      .getUserMarkingSessions(this.tutorTimeSummaryStartDate, this.tutorTimeSummaryEndDate, tz)
       .subscribe({
         next: (data) => {
           this.isLoading = false;
@@ -222,7 +227,7 @@ export class AnalyticsTutorTimesComponent implements OnInit {
         },
         error: (error) => {
           this.canLoadSessions = false;
-
+          this.alertService.error(`Failed to load sessions: ${error}`, 6000);
           console.error(error);
         },
       });

From e3fbe4404661eb16b9c0e5ba19a1369dac1fb5b0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:11:24 +1100
Subject: [PATCH 598/776] feat: download marking sessions for tutor

---
 src/app/api/models/unit.ts                    | 29 +++++++++++++++++++
 .../analytics-tutor-times.component.html      | 29 +++++++++++++------
 .../analytics-tutor-times.component.ts        | 19 ++++++++++++
 3 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 37b27568a4..8306a94f12 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -669,6 +669,35 @@ export class Unit extends Entity {
     );
   }
 
+  public downloadMyTutorTimeSessionsCsv(
+    startDate?: Date,
+    endDate?: Date,
+    timezone?: string,
+  ): Observable<SidekiqJob> {
+    let params = new HttpParams();
+
+    if (startDate) {
+      params = params.set(
+        'start_date',
+        `${startDate.getFullYear()}-${(startDate.getMonth() + 1).toString().padStart(2, '0')}-${startDate.getDate().toString().padStart(2, '0')}`,
+      );
+    }
+
+    if (endDate) {
+      params = params.set(
+        'end_date',
+        `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')}`,
+      );
+    }
+
+    params = params.set('timezone', timezone);
+
+    return AppInjector.get(HttpClient).get<SidekiqJob>(
+      `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/my_marking_sessions`,
+      {params},
+    );
+  }
+
   public hasD2lMapping(): boolean {
     const doubtfireConstants = AppInjector.get(DoubtfireConstants);
     return (
diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
index 2a8dccf5e1..ba944fc26c 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
@@ -4,15 +4,26 @@
       <h2>Tutor Times Session Summary</h2>
     </mat-card-title>
 
-    <button
-      mat-button
-      (click)="getTutorTimesSummary()"
-      matTooltip="Download CSV summary for the selected date range"
-      matTooltipShowDelay="1000"
-      matTooltipPosition="above"
-    >
-      <mat-icon>download</mat-icon> Download Summary
-    </button>
+    <div class="flex gap-2">
+      <button
+        mat-button
+        (click)="getTutorTimesSummary()"
+        matTooltip="Download CSV summary for the selected date range"
+        matTooltipShowDelay="1000"
+        matTooltipPosition="above"
+      >
+        <mat-icon>download</mat-icon> Download Summary
+      </button>
+      <button
+        mat-button
+        (click)="getMyTutorTimesSessions()"
+        matTooltip="Download CSV of your tutor sessions for the selected date range"
+        matTooltipShowDelay="1000"
+        matTooltipPosition="above"
+      >
+        <mat-icon>download</mat-icon> Download My Sessions
+      </button>
+    </div>
   </mat-card-header>
 
   <div class="flex flex-col items-center justify-center">
diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
index dc6aa29351..7e99793801 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -4,6 +4,7 @@ import {CalendarEvent} from 'angular-calendar';
 import {Observable} from 'rxjs';
 import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
 import {Unit} from 'src/app/api/models/unit';
+import {UserService} from 'src/app/api/services/user.service';
 import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
 import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 import {AlertService} from 'src/app/common/services/alert.service';
@@ -60,6 +61,7 @@ export class AnalyticsTutorTimesComponent implements OnInit {
     private alertService: AlertService,
     private sidekiqProgressModalService: SidekiqProgressModalService,
     private fileDownloaderService: FileDownloaderService,
+    private userService: UserService,
   ) {}
 
   ngOnInit(): void {
@@ -178,6 +180,23 @@ export class AnalyticsTutorTimesComponent implements OnInit {
     );
   }
 
+  public getMyTutorTimesSessions() {
+    const start = `${this.tutorTimeSummaryStartDate.getFullYear()}-${(this.tutorTimeSummaryStartDate.getMonth() + 1).toString().padStart(2, '0')}-${this.tutorTimeSummaryStartDate.getDate().toString().padStart(2, '0')}`;
+    const end = `${this.tutorTimeSummaryEndDate.getFullYear()}-${(this.tutorTimeSummaryEndDate.getMonth() + 1).toString().padStart(2, '0')}-${this.tutorTimeSummaryEndDate.getDate().toString().padStart(2, '0')}`;
+
+    const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+    this.downloadCsvFn(
+      this.unit.downloadMyTutorTimeSessionsCsv(
+        this.tutorTimeSummaryStartDate,
+        this.tutorTimeSummaryEndDate,
+        tz,
+      ),
+      'My Marking Sessions CSV',
+      `${this.unit.code}-${this.userService.currentUser.name}-sessions-${start}-to-${end}-${tz}}.csv`,
+    );
+  }
+
   public getMarkingSesssions() {
     if (!this.canLoadSessions) {
       return;

From 89560205d7316c53d77f376b5f7cfff5bf99e9c6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:23:36 +1100
Subject: [PATCH 599/776] fix: display tutor name

---
 .../analytics/directives/analytics-tutor-times.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
index ba944fc26c..717fac9603 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
@@ -74,7 +74,7 @@ <h2>Tutor Times Session Summary</h2>
   <ng-template #eventTooltipTemplate let-event="event">
     <div class="z-50 bg-[rgba(25,25,25,0.8)] text-white p-2 rounded">
       <strong
-        >{{ event.name }} ({{ event.duration }} minutes)
+        >{{ event.tutorName }} ({{ event.duration }} minutes)
         {{ event.duringTutorial ? 'T' : '' }}</strong
       ><br />
       {{ event.startHour }} — {{ event.endHour }}<br />

From 4435fea9daaa3566ec9f1fb86aea9caad7645ce0 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:25:16 +1100
Subject: [PATCH 600/776] refactor: expand hour segments ui

---
 .../analytics/directives/analytics-tutor-times.component.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
index 717fac9603..e2123b30c3 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
@@ -100,8 +100,10 @@ <h2>Tutor Times Session Summary</h2>
       (eventClicked)="eventClicked($event)"
       [tooltipTemplate]="eventTooltipTemplate"
       [hourDuration]="60"
-      [hourSegments]="1"
+      [hourSegments]="4"
       [weekStartsOn]="0"
+      [hourSegmentHeight]="15"
+      [minimumEventHeight]="5"
       [daysInWeek]="daysInWeek"
       (beforeViewRender)="beforeViewRender($event)"
     />

From 697daf26693f20f61dcfbbeb0597a02715c9512d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:41:55 +1100
Subject: [PATCH 601/776] fix: re-enable user filtering on click

---
 .../directives/analytics-tutor-times.component.ts      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
index 7e99793801..a60a756699 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -120,8 +120,8 @@ export class AnalyticsTutorTimesComponent implements OnInit {
   applyFilters() {
     this.filteredEvents = this.events.filter(
       (e) =>
-        (this.selectedUserId === null || e['user_id'] === this.selectedUserId) &&
-        (!this.hideSessionsDuringTutorials || !e['duringTutorial']) &&
+        (this.selectedUserId === null || e.userId === this.selectedUserId) &&
+        (!this.hideSessionsDuringTutorials || !e.duringTutorial) &&
         e.duration >= 1,
     );
   }
@@ -252,10 +252,10 @@ export class AnalyticsTutorTimesComponent implements OnInit {
       });
   }
 
-  eventClicked({event}: {event: CalendarEvent}): void {
-    if (event['user_id'] !== undefined) {
+  eventClicked({event}: {event: SessionEvent}): void {
+    if (event.userId !== undefined) {
       if (this.selectedUserId === null) {
-        this.selectedUserId = Number(event['user_id']);
+        this.selectedUserId = Number(event.userId);
       } else {
         this.selectedUserId = null;
       }

From 7ea20939f45b013a56cc3405faaf0855ebe9926a Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 16 Oct 2025 15:18:48 +1100
Subject: [PATCH 602/776] refactor: collapse related tutorial list

---
 .../task-definition-who.component.html        | 37 ++++++++++++++++---
 .../task-definition-who.component.ts          |  5 +++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.html
index 814e814197..5d93345d7f 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.html
@@ -13,7 +13,11 @@
 <div class="flex flex-row gap-10">
   <mat-form-field appearance="outline" class="basis-1/2">
     <mat-label>Tutorial Stream - Which tutor provides feedback?</mat-label>
-    <mat-select required [(value)]="taskDefinition.tutorialStream">
+    <mat-select
+      required
+      [(value)]="taskDefinition.tutorialStream"
+      (selectionChange)="onTutorialStreamChange()"
+    >
       @for (stream of unit.tutorialStreams; track stream) {
   <mat-option [value]="stream">{{ stream.name }}</mat-option>
 }
@@ -23,11 +27,32 @@
   <span class="flex-grow">
     <strong class="">Related tutorials</strong>
     <ul>
-      @for (tutorial of taskDefinition.tutorialStream?.tutorialsIn(unit); track tutorial) {
-  <li>
-        {{ tutorial?.abbreviation }} {{ tutorial.tutor?.name }}
-      </li>
-}
+      @for (
+        tutorial of taskDefinition.tutorialStream?.tutorialsIn(unit)
+          | slice: 0 : (showAllTutorials ? undefined : 3);
+        track tutorial
+      ) {
+        <li>{{ tutorial?.abbreviation }} {{ tutorial.tutor?.name }}</li>
+      }
+
+      @if (!showAllTutorials && taskDefinition.tutorialStream?.tutorialsIn(unit)?.length > 3) {
+        <li class="mt-1">
+          +{{ taskDefinition.tutorialStream.tutorialsIn(unit).length - 3 }} more tutorials
+        </li>
+      }
+      @if (taskDefinition.tutorialStream?.tutorialsIn(unit).length > 3) {
+        <div class="mt-4">
+          @if (!showAllTutorials) {
+            <button mat-button color="primary" (click)="showAllTutorials = true">
+              View all tutorials
+            </button>
+          } @else {
+            <button mat-button color="warn" (click)="showAllTutorials = false">
+              Collapse list
+            </button>
+          }
+        </div>
+      }
     </ul>
   </span>
 </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.ts
index 9732998592..53c87c7bf1 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.ts
@@ -10,7 +10,12 @@ import { Unit } from 'src/app/api/models/unit';
 export class TaskDefinitionWhoComponent {
   @Input() taskDefinition: TaskDefinition;
 
+  showAllTutorials: boolean = false;
   public get unit(): Unit {
     return this.taskDefinition?.unit;
   }
+
+  onTutorialStreamChange() {
+    this.showAllTutorials = false;
+  }
 }

From 4384b376eaedf8ab66febec4c0ada53111311ff0 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 17 Oct 2025 09:38:43 +1100
Subject: [PATCH 603/776] feat: campus timezone (#1022)

---
 .../campus-list/campus-list.component.html    | 24 +++++++++++++++++++
 .../campus-list/campus-list.component.ts      |  4 +++-
 src/app/api/models/campus/campus.ts           |  1 +
 src/app/api/services/campus.service.ts        |  2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.html b/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.html
index 3fe38272ec..6fed39bc24 100644
--- a/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.html
+++ b/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.html
@@ -83,6 +83,30 @@ <h1 class="mb-1">Campuses</h1>
       </td>
     </ng-container>
 
+    <!-- Timezone Column -->
+    <ng-container [formGroup]="formData" matColumnDef="timezone">
+      <th mat-header-cell *matHeaderCellDef mat-sort-header>Timezone</th>
+      <td mat-cell *matCellDef="let campus">
+        @if (!editing(campus)) {
+          <div>
+            {{ campus.timezone }}
+          </div>
+        } @else {
+          <mat-form-field appearance="outline" class="data-entry">
+            <mat-label>Timezone</mat-label>
+
+            <input matInput formControlName="timezone" />
+          </mat-form-field>
+        }
+      </td>
+      <td mat-footer-cell *matFooterCellDef>
+        <mat-form-field appearance="outline" class="data-entry">
+          <mat-label>Timezone</mat-label>
+          <input matInput formControlName="timezone" placeholder="Eg. Australia/Melbourne" />
+        </mat-form-field>
+      </td>
+    </ng-container>
+
     <!-- Active Column -->
     <ng-container [formGroup]="formData" matColumnDef="active">
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Active</th>
diff --git a/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.ts b/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.ts
index 3ab6b9e71e..1fa8871cc3 100644
--- a/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.ts
+++ b/src/app/admin/institution-settings/campuses/campus-list/campus-list.component.ts
@@ -18,7 +18,7 @@ export class CampusListComponent extends EntityFormComponent<Campus> {
   syncModes = ['timetable', 'automatic', 'manual'];
 
   // Set up the table
-  columns: string[] = ['name', 'abbreviation', 'mode', 'active', 'options'];
+  columns: string[] = ['name', 'abbreviation', 'mode', 'timezone', 'active', 'options'];
   campuses: Campus[] = new Array<Campus>();
   dataSource = new MatTableDataSource(this.campuses);
 
@@ -33,6 +33,7 @@ export class CampusListComponent extends EntityFormComponent<Campus> {
         abbreviation: new UntypedFormControl('', [Validators.required]),
         name: new UntypedFormControl('', [Validators.required]),
         mode: new UntypedFormControl('', [Validators.required]),
+        timezone: new UntypedFormControl('', [Validators.required]),
         active: new UntypedFormControl(false),
       },
       'Campus',
@@ -91,6 +92,7 @@ export class CampusListComponent extends EntityFormComponent<Campus> {
       case 'name':
       case 'abbreviation':
       case 'mode':
+      case 'timezone':
       case 'active':
         return super.sortTableData(sort);
     }
diff --git a/src/app/api/models/campus/campus.ts b/src/app/api/models/campus/campus.ts
index 164b3704f6..9491e29e53 100644
--- a/src/app/api/models/campus/campus.ts
+++ b/src/app/api/models/campus/campus.ts
@@ -7,6 +7,7 @@ export class Campus extends Entity {
   name: string;
   mode: campusModes;
   abbreviation: string;
+  timezone: string;
 
   public override toJson<T extends Entity>(mappingData: EntityMapping<T>, ignoreKeys?: string[]): object {
     return {
diff --git a/src/app/api/services/campus.service.ts b/src/app/api/services/campus.service.ts
index ddf3e95942..d46d793cc3 100644
--- a/src/app/api/services/campus.service.ts
+++ b/src/app/api/services/campus.service.ts
@@ -11,7 +11,7 @@ export class CampusService extends CachedEntityService<Campus> {
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
 
-    this.mapping.addKeys('id', 'name', 'mode', 'abbreviation', 'active');
+    this.mapping.addKeys('id', 'name', 'mode', 'abbreviation', 'active', 'timezone');
 
     this.mapping.mapAllKeysToJsonExcept('id');
   }

From 1b08535443ffc7723d018c518cf7d77b12920a0e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 17 Oct 2025 10:08:20 +1100
Subject: [PATCH 604/776] refactor: enable marking sessions calendar for tutors

---
 .../analytics-tutor-times.component.html      | 21 +++++++++++--------
 .../analytics-tutor-times.component.ts        |  4 ++++
 .../unit-analytics-route.component.html       |  4 +---
 .../unit-analytics-route.component.ts         |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
index e2123b30c3..d826a68de2 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
@@ -5,15 +5,18 @@ <h2>Tutor Times Session Summary</h2>
     </mat-card-title>
 
     <div class="flex gap-2">
-      <button
-        mat-button
-        (click)="getTutorTimesSummary()"
-        matTooltip="Download CSV summary for the selected date range"
-        matTooltipShowDelay="1000"
-        matTooltipPosition="above"
-      >
-        <mat-icon>download</mat-icon> Download Summary
-      </button>
+      @if (role === 'Convenor') {
+        <button
+          mat-button
+          (click)="getTutorTimesSummary()"
+          matTooltip="Download CSV summary for the selected date range"
+          matTooltipShowDelay="1000"
+          matTooltipPosition="above"
+        >
+          <mat-icon>download</mat-icon> Download Summary
+        </button>
+      }
+
       <button
         mat-button
         (click)="getMyTutorTimesSessions()"
diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
index a60a756699..b8d6ac3574 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -64,6 +64,10 @@ export class AnalyticsTutorTimesComponent implements OnInit {
     private userService: UserService,
   ) {}
 
+  get role() {
+    return this.unit.staff.find((s) => s.user.id === this.userService.currentUser.id)?.role;
+  }
+
   ngOnInit(): void {
     if (!this.sidekiqProgressModalService || !this.fileDownloaderService) {
       // NOTE: Our `downloadCsvFn` callback requires these services because it calls `this` context
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.html b/src/app/units/states/analytics/unit-analytics-route.component.html
index 9388fae8d0..40017c59e7 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.html
+++ b/src/app/units/states/analytics/unit-analytics-route.component.html
@@ -18,7 +18,5 @@ <h1>Unit Statistics</h1>
     </mat-card-content>
   </mat-card>
 
-  @if (role === 'Convenor') {
-    <f-analytics-tutor-times [unit]="unit" [downloadCsvFn]="downloadCsv"></f-analytics-tutor-times>
-  }
+  <f-analytics-tutor-times [unit]="unit" [downloadCsvFn]="downloadCsv"></f-analytics-tutor-times>
 </div>
diff --git a/src/app/units/states/analytics/unit-analytics-route.component.ts b/src/app/units/states/analytics/unit-analytics-route.component.ts
index 73419c4dfe..4c8e068722 100644
--- a/src/app/units/states/analytics/unit-analytics-route.component.ts
+++ b/src/app/units/states/analytics/unit-analytics-route.component.ts
@@ -61,7 +61,7 @@ export class UnitAnalyticsComponent {
     );
   }
 
-  private downloadCsv(newJob: Observable<SidekiqJob>, title: string, filename: string) {
+  public downloadCsv(newJob: Observable<SidekiqJob>, title: string, filename: string) {
     newJob.subscribe({
       next: (job) => {
         if (!job || !job.id) {

From b972dde2047172cc45f1756d866e07f54c8a355d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 17 Oct 2025 12:00:03 +1100
Subject: [PATCH 605/776] chore(release): 10.0.0-52

---
 CHANGELOG.md      | 15 +++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08159fda97..e1c0f0d73d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 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.
 
+## [10.0.0-52](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-51...v10.0.0-52) (2025-10-17)
+
+
+### Features
+
+* campus timezone ([#1022](https://github.com/b0ink/doubtfire-deploy/issues/1022)) ([4384b37](https://github.com/b0ink/doubtfire-deploy/commit/4384b376eaedf8ab66febec4c0ada53111311ff0))
+* download marking sessions for tutor ([e3fbe44](https://github.com/b0ink/doubtfire-deploy/commit/e3fbe4404661eb16b9c0e5ba19a1369dac1fb5b0))
+
+
+### Bug Fixes
+
+* display tutor name ([8956020](https://github.com/b0ink/doubtfire-deploy/commit/89560205d7316c53d77f376b5f7cfff5bf99e9c6))
+* filter out students from unit staff editor ([#1018](https://github.com/b0ink/doubtfire-deploy/issues/1018)) ([5c0c997](https://github.com/b0ink/doubtfire-deploy/commit/5c0c9974569e720a6c95aa8333c2a38d0ab4a1b0))
+* re-enable user filtering on click ([697daf2](https://github.com/b0ink/doubtfire-deploy/commit/697daf26693f20f61dcfbbeb0597a02715c9512d))
+
 ## [10.0.0-51](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-50...v10.0.0-51) (2025-10-14)
 
 
diff --git a/package-lock.json b/package-lock.json
index 38c5bd3f5f..5a2e04aac3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-51",
+  "version": "10.0.0-52",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-51",
+      "version": "10.0.0-52",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index d45df0c039..3356d560a7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-51",
+  "version": "10.0.0-52",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 3b684a3395c9ccdfb412ff439a08e2ab88f808d7 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 17 Oct 2025 13:50:45 +1100
Subject: [PATCH 606/776] refactor: include all submitted tasks in portfolio
 task list (#1023)

* refactor: include all submitted tasks in portfolio task list

* refactor: fetch tasks included in portfolio from api

* refactor: reword

* refactor: reword

* refactor: show warning if no tasks found

* refactor: wording

* refactor: add error alert
---
 src/app/api/models/project.ts                 |  9 +++++
 src/app/doubtfire-angular.module.ts           |  2 ++
 src/app/doubtfire-angularjs.module.ts         |  6 ++++
 .../portfolio-included-tasks.component.html   | 26 ++++++++++++++
 .../portfolio-included-tasks.component.scss   |  0
 .../portfolio-included-tasks.component.ts     | 36 +++++++++++++++++++
 .../portfolio-review-step.tpl.html            | 22 +++++-------
 .../states/portfolio/portfolio.coffee         |  2 +-
 8 files changed, 89 insertions(+), 14 deletions(-)
 create mode 100644 src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.html
 create mode 100644 src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.scss
 create mode 100644 src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.ts

diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index 1064fb3c5b..df3c3cda26 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -528,4 +528,13 @@ export class Project extends Entity {
       }),
     );
   }
+
+  public tasksIncludedInPortfolioUrl(): string {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/projects/${this.id}/portfolio_tasks`;
+  }
+
+  public getTasksIncludedInPortfolio(): Observable<number[]> {
+    const httpClient = AppInjector.get(HttpClient);
+    return httpClient.get<number[]>(this.tasksIncludedInPortfolioUrl());
+  }
 }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 47e4679234..12f65dc8a5 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -293,6 +293,7 @@ import {UnitDetailsEditorComponent} from './units/states/edit/directives/unit-de
 import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component';
 import {AnalyticsTutorTimesComponent} from './units/states/analytics/directives/analytics-tutor-times.component';
 import {MarkingSessionService} from './api/services/marking-session.service';
+import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -446,6 +447,7 @@ const MY_DATE_FORMAT = {
     UnitDetailsEditorComponent,
     PortfolioGradeSelectStepComponent,
     AnalyticsTutorTimesComponent,
+    PortfolioIncludedTasksComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 963bf7d209..886886135c 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -230,6 +230,7 @@ import {UnitStaffEditorComponent} from './units/states/edit/directives/unit-staf
 import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-selector.component';
 import {UnitDetailsEditorComponent} from './units/states/edit/directives/unit-details-editor/unit-details-editor.component';
 import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component';
+import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
 
 export const DoubtfireAngularJSModule = angular
   .module('doubtfire', [
@@ -557,3 +558,8 @@ DoubtfireAngularJSModule.directive(
   'groupSetSelector',
   downgradeComponent({component: GroupSetSelectorComponent}),
 );
+
+DoubtfireAngularJSModule.directive(
+  'fPortfolioIncludedTasks',
+  downgradeComponent({component: PortfolioIncludedTasksComponent}),
+);
diff --git a/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.html b/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.html
new file mode 100644
index 0000000000..7444d7176c
--- /dev/null
+++ b/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.html
@@ -0,0 +1,26 @@
+@if (loading) {
+  <div class="w-full flex flex-col gap-5 justify-center items-center min-h-[150px]">
+    <div>Loading tasks...</div>
+    <mat-progress-spinner mode="indeterminate"> </mat-progress-spinner>
+  </div>
+} @else {
+  @if (tasksInPortfolio.length === 0) {
+    <div class="w-full p-4 flex flex-col justify-center items-center h-full text-gray-400">
+      <mat-icon class="scale-125">assignment_late</mat-icon>
+      <p class="p-4">No tasks found</p>
+    </div>
+  } @else {
+    <ol>
+      @for (task of tasksInPortfolio; track task) {
+        <li class="my-2">
+          <div class="flex justify-between">
+            <div class="flex gap-2 items-center">
+              <div>{{ task.definition.abbreviation }} &mdash; {{ task.definition.name }}</div>
+            </div>
+            <status-icon [status]="task.status"></status-icon>
+          </div>
+        </li>
+      }
+    </ol>
+  }
+}
diff --git a/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.scss b/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.ts b/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.ts
new file mode 100644
index 0000000000..e425d93976
--- /dev/null
+++ b/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component.ts
@@ -0,0 +1,36 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {Project} from 'src/app/api/models/project';
+import {Task} from 'src/app/api/models/task';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-portfolio-included-tasks',
+  templateUrl: 'portfolio-included-tasks.component.html',
+  styleUrls: ['portfolio-included-tasks.component.scss'],
+})
+export class PortfolioIncludedTasksComponent implements OnInit {
+  @Input() project: Project;
+
+  constructor(private alertService: AlertService) {}
+
+  loading: boolean = false;
+
+  tasksInPortfolio: Task[] = [];
+  ngOnInit() {
+    this.loading = true;
+    this.project.getTasksIncludedInPortfolio().subscribe({
+      next: (tasks) => {
+        for (const taskId of tasks) {
+          const task = this.project.tasks.find((t) => t.id === taskId);
+          if (task) {
+            this.tasksInPortfolio.push(task);
+          }
+        }
+        this.loading = false;
+      },
+      error: (error) => {
+        this.alertService.error(`Failed to get tasks for portfolio: ${error}`, 6000);
+      },
+    });
+  }
+}
diff --git a/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-review-step.tpl.html b/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-review-step.tpl.html
index ba23ed6f53..00dffc0906 100644
--- a/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-review-step.tpl.html
+++ b/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-review-step.tpl.html
@@ -51,19 +51,15 @@ <h4>Portfolio Processing</h4>
           <li ng-repeat="file in extraFiles()"><i class="fa fa-file-{{file.kind}}-o"></i> {{file.name}}</li>
         </ol>
       </div>
-      <div ng-show="selectedTasks().length > 0">
-        <p>
-          You have included <strong>{{selectedTasks().length}} tasks</strong> in your portfolio. If you wish to add or
-          remove some of these tasks, please review the <em>Select Tasks</em> step to adjust your alignments of each
-          task to the unit's learning outcomes. Each task will be attached in the order below:
-        </p>
-        <ol>
-          <li ng-repeat="task in selectedTasks()">
-            <label class="label label-info">{{task.definition.abbreviation}}</label>
-            {{task.definition.name}}
-          </li>
-        </ol>
-      </div>
+      <p>
+        Only submitted tasks will be included in your portfolio. If a task is missing from the list,
+        ensure that you have submitted it before compiling your portfolio. All feedback and comments
+        for each task will appear in the final portfolio, so you can add any additional comments now
+        if there's something you'd like to address.
+        <p>The following tasks will be included
+        automatically in this order:</p>
+      </p>
+      <f-portfolio-included-tasks [project]="project"></f-portfolio-included-tasks>
     </div>
     <div class="card card-default" ng-show="canCompilePortfolio">
       <div class="card-heading">
diff --git a/src/app/projects/states/portfolio/portfolio.coffee b/src/app/projects/states/portfolio/portfolio.coffee
index 63e93ea961..01b6bf8972 100644
--- a/src/app/projects/states/portfolio/portfolio.coffee
+++ b/src/app/projects/states/portfolio/portfolio.coffee
@@ -82,7 +82,7 @@ angular.module('doubtfire.projects.states.portfolio', [
   # Gets selected tasks in the task selector
   $scope.selectedTasks = ->
     # Filter by included in portfolio
-    tasks = _.filter $scope.project.tasks, (t) -> t.includeInPortfolio
+    tasks = $scope.project.tasks
     tasks = _.filter tasks, (t) -> !_.includes(newTaskService.toBeWorkedOn, t.status)
     _.sortBy tasks, (t) -> t.definition.seq
 

From ea42bd63d82f082689bc860b53f43b4ffb5f50e8 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 17 Oct 2025 13:52:04 +1100
Subject: [PATCH 607/776] chore(release): 10.0.0-53

---
 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 e1c0f0d73d..0d250861d3 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.
 
+## [10.0.0-53](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-52...v10.0.0-53) (2025-10-17)
+
 ## [10.0.0-52](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-51...v10.0.0-52) (2025-10-17)
 
 
diff --git a/package-lock.json b/package-lock.json
index 5a2e04aac3..e94c4152ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-52",
+  "version": "10.0.0-53",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-52",
+      "version": "10.0.0-53",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 3356d560a7..52bf9d5075 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-52",
+  "version": "10.0.0-53",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From b67810743c18b4f178a07421f0c9acde6b8b989a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 17 Oct 2025 14:20:52 +1100
Subject: [PATCH 608/776] refactor: number list

---
 .../portfolio-welcome-step/portfolio-welcome-step.tpl.html     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/projects/states/portfolio/directives/portfolio-welcome-step/portfolio-welcome-step.tpl.html b/src/app/projects/states/portfolio/directives/portfolio-welcome-step/portfolio-welcome-step.tpl.html
index 524101329b..51297a7060 100644
--- a/src/app/projects/states/portfolio/directives/portfolio-welcome-step/portfolio-welcome-step.tpl.html
+++ b/src/app/projects/states/portfolio/directives/portfolio-welcome-step/portfolio-welcome-step.tpl.html
@@ -4,10 +4,9 @@ <h3 class="panel-title">Portfolio Preparation</h3>
   </div>
   <div class="panel-body">
     <p>Preparing your portfolio involves 5 steps:</p>
-    <ol>
+    <ol class="list-decimal list-inside space-y-2">
       <li>Select your <strong>Grade</strong> you are applying for</li>
       <li>Upload your <strong>Learning Summary Report</strong></li>
-      <li>Select the <strong>Tasks</strong> you want included</li>
       <li>Upload any <strong>Other Resources</strong> you want to add</li>
       <li><strong>Compile</strong> your resources into your portfolio and review</li>
     </ol>

From 2eec7ce1ecc229f672e7f02a27c76ffce4f45291 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 17 Oct 2025 15:10:13 +1100
Subject: [PATCH 609/776] chore: add margin

---
 .../portfolio-welcome-step/portfolio-welcome-step.tpl.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/portfolio/directives/portfolio-welcome-step/portfolio-welcome-step.tpl.html b/src/app/projects/states/portfolio/directives/portfolio-welcome-step/portfolio-welcome-step.tpl.html
index 51297a7060..cb062284f1 100644
--- a/src/app/projects/states/portfolio/directives/portfolio-welcome-step/portfolio-welcome-step.tpl.html
+++ b/src/app/projects/states/portfolio/directives/portfolio-welcome-step/portfolio-welcome-step.tpl.html
@@ -4,7 +4,7 @@ <h3 class="panel-title">Portfolio Preparation</h3>
   </div>
   <div class="panel-body">
     <p>Preparing your portfolio involves 5 steps:</p>
-    <ol class="list-decimal list-inside space-y-2">
+    <ol class="list-decimal list-inside space-y-2 ml-4">
       <li>Select your <strong>Grade</strong> you are applying for</li>
       <li>Upload your <strong>Learning Summary Report</strong></li>
       <li>Upload any <strong>Other Resources</strong> you want to add</li>

From 3b225388981272f14ab2f2f17af1df8be10ecbcc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 17 Oct 2025 15:11:05 +1100
Subject: [PATCH 610/776] chore(release): 10.0.0-54

---
 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 0d250861d3..f710943bd7 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.
 
+## [10.0.0-54](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-53...v10.0.0-54) (2025-10-17)
+
 ## [10.0.0-53](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-52...v10.0.0-53) (2025-10-17)
 
 ## [10.0.0-52](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-51...v10.0.0-52) (2025-10-17)
diff --git a/package-lock.json b/package-lock.json
index e94c4152ee..7b09dfd70d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-53",
+  "version": "10.0.0-54",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-53",
+      "version": "10.0.0-54",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 52bf9d5075..6eb504c354 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-53",
+  "version": "10.0.0-54",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 8a1dd1ac806c5acbbf8d1ccf7bdcb6af1c68dd14 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 17 Oct 2025 15:23:49 +1100
Subject: [PATCH 611/776] fix: typo

---
 .../analytics/directives/analytics-tutor-times.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
index b8d6ac3574..b9606b7fc7 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -197,7 +197,7 @@ export class AnalyticsTutorTimesComponent implements OnInit {
         tz,
       ),
       'My Marking Sessions CSV',
-      `${this.unit.code}-${this.userService.currentUser.name}-sessions-${start}-to-${end}-${tz}}.csv`,
+      `${this.unit.code}-${this.userService.currentUser.name}-sessions-${start}-to-${end}-${tz}.csv`,
     );
   }
 

From c49ffeddedb2b79c39252770692e7df9dcd97bfc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sun, 19 Oct 2025 13:02:30 +1100
Subject: [PATCH 612/776] fix: display correct marking session details

---
 .../analytics/directives/analytics-tutor-times.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
index d826a68de2..dbd2f4302a 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.html
@@ -82,8 +82,8 @@ <h2>Tutor Times Session Summary</h2>
       ><br />
       {{ event.startHour }} — {{ event.endHour }}<br />
       Assessments: {{ event.assessments || 0 }}<br />
-      Comments: {{ event.comments_added || 0 }}<br />
-      Submissions opened: {{ event.submissions_opened || 0 }} <br />
+      Comments: {{ event.commentsAdded || 0 }}<br />
+      Submissions opened: {{ event.submissionsOpened || 0 }} <br />
       During Tutorial?: {{ event.duringTutorial ? 'yes' : 'no' }}
     </div>
   </ng-template>

From 3858e3792fef3f0542d954e213987484ac97a990 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 20 Oct 2025 13:06:08 +1100
Subject: [PATCH 613/776] feat: display task count in inbox (#1025)

* feat: display number of tasks in inbox

* chore: only display task count if not empty
---
 .../directives/staff-task-list/staff-task-list.component.html  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index 2291a5e7a6..2a36a9704f 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -200,6 +200,9 @@
   <!--/search-options-->
   @if (filteredTasks) {
     <cdk-virtual-scroll-viewport class="tasks-viewport scrollable" itemSize="60">
+      @if (filteredTasks.length) {
+        <div class="w-full text-gray-400 text-center mt-4">{{ filteredTasks.length }} Tasks</div>
+      }
       <mat-list class="m-0 p-0">
         <mat-list-item
           class="clearfix"

From e74b84f8f8b4096a24af224de41d1bd9e8700cee Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 20 Oct 2025 16:22:26 +1100
Subject: [PATCH 614/776] refactor: scrollable calendar (#1027)

---
 .../analytics-tutor-times.component.scss         | 16 ++++++++++++++++
 .../analytics-tutor-times.component.ts           |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.scss b/src/app/units/states/analytics/directives/analytics-tutor-times.component.scss
index e69de29bb2..2ce45fc98d 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.scss
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.scss
@@ -0,0 +1,16 @@
+.cal-week-view {
+  position: relative;
+  max-height: 750px;
+  overflow-y: scroll;
+  overscroll-behavior: contain;
+}
+
+.cal-day-headers {
+  position: sticky;
+  top: 0;
+  right: 0;
+  z-index: 2;
+  background-color: white;
+  width: 100%;
+  min-height: 35px;
+}
diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
index b9606b7fc7..9b65234bbd 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -1,6 +1,5 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {Component, Input, OnInit, ViewEncapsulation} from '@angular/core';
 import {MatDatepickerInputEvent} from '@angular/material/datepicker';
-import {CalendarEvent} from 'angular-calendar';
 import {Observable} from 'rxjs';
 import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
 import {Unit} from 'src/app/api/models/unit';
@@ -32,6 +31,7 @@ interface SessionEvent {
   selector: 'f-analytics-tutor-times',
   templateUrl: 'analytics-tutor-times.component.html',
   styleUrls: ['analytics-tutor-times.component.scss'],
+  encapsulation: ViewEncapsulation.None,
 })
 export class AnalyticsTutorTimesComponent implements OnInit {
   @Input() unit: Unit;

From f751ef30a66f4ff3638252443737767441795e1e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:32:47 +1100
Subject: [PATCH 615/776] chore(release): 10.0.0-55

---
 CHANGELOG.md      | 13 +++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f710943bd7..22fec1df51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 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.
 
+## [10.0.0-55](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-54...v10.0.0-55) (2025-10-20)
+
+
+### Features
+
+* display task count in inbox ([#1025](https://github.com/b0ink/doubtfire-deploy/issues/1025)) ([3858e37](https://github.com/b0ink/doubtfire-deploy/commit/3858e3792fef3f0542d954e213987484ac97a990))
+
+
+### Bug Fixes
+
+* display correct marking session details ([c49ffed](https://github.com/b0ink/doubtfire-deploy/commit/c49ffeddedb2b79c39252770692e7df9dcd97bfc))
+* typo ([8a1dd1a](https://github.com/b0ink/doubtfire-deploy/commit/8a1dd1ac806c5acbbf8d1ccf7bdcb6af1c68dd14))
+
 ## [10.0.0-54](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-53...v10.0.0-54) (2025-10-17)
 
 ## [10.0.0-53](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-52...v10.0.0-53) (2025-10-17)
diff --git a/package-lock.json b/package-lock.json
index 7b09dfd70d..1a5c744864 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-54",
+  "version": "10.0.0-55",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-54",
+      "version": "10.0.0-55",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 6eb504c354..d9ba47fd69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-54",
+  "version": "10.0.0-55",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From a4aa3525d07868d6085f331adbac481a86313291 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 21 Oct 2025 13:16:52 +1100
Subject: [PATCH 616/776] refactor: require comment for assess in portfolio
 tasks submitting for feedback (#1026)

* refactor: require comment for assess in portfolio tasks submitting for feedback

* chore: fix comment

* chore: fix indentation

* fix: condition

* chore: update character count text color

* chore: add tooltip
---
 .../upload-submission-modal.coffee            | 10 ++++----
 .../upload-submission-modal.tpl.html          | 24 ++++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index 486ae9bcbb..b6bcd6b50e 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -70,6 +70,8 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       $scope.uploader.payload.contributions = mapTeamToPayload() if _.includes(states.shown, 'group')
       $scope.uploader.payload.trigger = 'need_help' if $scope.submissionType == 'need_help'
       $scope.uploader.payload.trigger = 'assess_in_portfolio' if $scope.submissionType == 'assess_in_portfolio' || $scope.task.status == 'assess_in_portfolio'
+      if $scope.comment? and $scope.comment.trim() isnt ''
+        $scope.uploader.payload.comment = $scope.comment
     onSuccess: (response) ->
       # Ensure our response contains the data we're expecting
       if typeof response is 'object' and response? and response.id? and response.project_id? and response.status?
@@ -88,9 +90,9 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
     onComplete: ->
       return unless $scope.uploader.response? and $scope.uploader.response.id?
       $modalInstance.close(task)
-      unless $scope.task.isTestSubmission
+      # unless $scope.task.isTestSubmission
         # Add comment if requested
-        task.addComment($scope.comment) if $scope.comment.trim().length > 0
+        # task.addComment($scope.comment) if $scope.comment.trim().length > 0
       # Broadcast that upload is complete
       $rootScope.$broadcast('TaskSubmissionUploadComplete', task)
       # Perform as timeout to show 'Upload Complete'
@@ -176,8 +178,8 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
     back: ->
       false
     submit: ->
-      # Disable if no comment is supplied with need_help
-      !$scope.uploader.isReady || ($scope.comment.trim().length == 0 && $scope.submissionType == 'need_help')
+      # Disable if no comment is supplied with need_help, or if submitting for feedback and task is assess in portfolio only
+      !$scope.uploader.isReady or ($scope.comment.trim().length < 25 && ($scope.submissionType == 'ready_for_feedback' && $scope.task.definition.assessInPortfolioOnly) || $scope.submissionType == 'need_help')
     cancel: ->
       # Can't cancel whilst uploading
       $scope.uploader.isUploading
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 89067b9b11..49fb538af6 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -83,23 +83,25 @@ <h4>
       ng-class="{'state-hidden-left': isHidden('comments').left,
                  'state-hidden-right': isHidden('comments').right}">
       <div class="card card-default">
-        <div class="card-heading">
-          <h4 ng-show="submissionType == 'need_help'">
-            What do you need help with?
-          </h4>
-          <h4 ng-hide="submissionType == 'need_help'">
-            Final comments
-          </h4>
-          <span ng-show="submissionType == 'need_help'">
+        <div class="card-heading" ng-show="submissionType == 'need_help'">
+          <h4>What do you need help with?</h4>
+          <span>
             Supply a comment on what you would like help on for this task so your tutor can assist you.
           </span>
-          <span ng-hide="submissionType == 'need_help'">
+        </div>
+        <div class="card-heading" ng-show="submissionType == 'ready_for_feedback'">
+          <h4>Final comments</h4>
+          <span ng-show="task.definition.assessInPortfolioOnly">
+              Please supply a comment specifying which areas of your submission you would like feedback on.
+          </span>
+          <span ng-show="!task.definition.assessInPortfolioOnly">
             Supply an <strong>optional</strong> comment about this submission for your tutor to read as they assess.
           </span>
         </div><!--/card-heading-->
         <div class="card-body">
-          <textarea ng-model="comment" class="form-control input-lg" rows="3" placeholder="{{submissionType == 'need_help' ? 'I need help with...' : 'Make a comment...'}}">
+          <textarea ng-model="comment" class="form-control input-lg" rows="3" placeholder="{{submissionType == 'need_help' ? 'I need help with...' : submissionType == 'ready_for_feedback' && task.definition.assessInPortfolioOnly ? 'I would like feedback with...' : 'Make a comment...'}}">
           </textarea>
+          <div class="w-full text-right py-2 text-gray-400">Character count: {{comment.length}} <span ng-show="submissionType == 'need_help' || (submissionType=='ready_for_feedback' && task.definition.assessInPortfolioOnly)">(Min. 25)</span></div>
         </div>
       </div><!--/card-comments-->
       <div class="card card-default" ng-show="privacyPolicy.privacy">
@@ -138,7 +140,7 @@ <h4>Plagiarism and Collusion</h4>
     <i class="fa fa-arrow-right"></i>
   </button>
   <!--/next-button-->
-  <button class="btn btn-success" ng-click="uploadButtonClicked()" ng-disabled="shouldDisableBtn.submit()" ng-show="shouldShowBtn.submit()">
+  <button tooltip="{{submissionType == 'need_help' || (submissionType=='ready_for_feedback' && task.definition.assessInPortfolioOnly) ? 'This submission requires a comment' : ''}}" class="btn btn-success" ng-click="uploadButtonClicked()" ng-disabled="shouldDisableBtn.submit()" ng-show="shouldShowBtn.submit()">
     <i class="fa fa-upload"></i> Upload Submission
   </button>
   <!--/upload-button-->

From 32e03d111e61df42a9c67cb9e68d271f9300d5bc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 23 Oct 2025 22:12:12 +1100
Subject: [PATCH 617/776] fix: ensure grade has been selected

---
 .../portfolio-grade-select-step.component.html              | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.html b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.html
index 63385d6e5d..575a9f5faf 100644
--- a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.html
+++ b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.html
@@ -86,7 +86,11 @@ <h3>Select Grade</h3>
       <button
         mat-raised-button
         color="primary"
-        [disabled]="!agreedToAssessmentCriteria"
+        [disabled]="
+          !agreedToAssessmentCriteria ||
+          project.submittedGrade === null ||
+          project.submittedGrade === undefined
+        "
         (click)="goToNextStep()"
       >
         Next

From 623d5084c66e5b46a2bf80c34e56158c65834082 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 23 Oct 2025 22:12:38 +1100
Subject: [PATCH 618/776] chore: display error on failed grade change

---
 .../portfolio-grade-select-step.component.ts                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.ts b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.ts
index cce8ee1748..ea3330fd40 100644
--- a/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.ts
+++ b/src/app/projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component.ts
@@ -1,6 +1,7 @@
 import {Component, Injector, Input} from '@angular/core';
 import {Project, Unit} from 'src/app/api/models/doubtfire-model';
 import {ProjectService} from 'src/app/api/services/project.service';
+import {AlertService} from 'src/app/common/services/alert.service';
 import {GradeService} from 'src/app/common/services/grade.service';
 
 @Component({
@@ -18,6 +19,7 @@ export class PortfolioGradeSelectStepComponent {
     private gradeService: GradeService,
     private injector: Injector,
     private projectService: ProjectService,
+    private alertService: AlertService,
   ) {
     this.$scope = this.injector.get('$scope');
   }
@@ -37,6 +39,7 @@ export class PortfolioGradeSelectStepComponent {
       (error) => {
         this.project.submittedGrade = previousSubmittedGrade;
         console.error('Error updating target grade:', error);
+        this.alertService.error(`Could not update grade: ${error}`, 6000);
       },
     );
   }

From 15d596fdc5464285d2a2ed11e2eb60eb0154846f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 23 Oct 2025 22:16:24 +1100
Subject: [PATCH 619/776] chore(release): 10.0.0-56

---
 CHANGELOG.md      |  7 +++++++
 package-lock.json | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 package.json      |  4 +++-
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22fec1df51..3a671c033c 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.
 
+## [10.0.0-56](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-55...v10.0.0-56) (2025-10-23)
+
+
+### Bug Fixes
+
+* ensure grade has been selected ([32e03d1](https://github.com/b0ink/doubtfire-deploy/commit/32e03d111e61df42a9c67cb9e68d271f9300d5bc))
+
 ## [10.0.0-55](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-54...v10.0.0-55) (2025-10-20)
 
 
diff --git a/package-lock.json b/package-lock.json
index 1a5c744864..237e8df708 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-55",
+  "version": "10.0.0-56",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-55",
+      "version": "10.0.0-56",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
@@ -25,6 +25,7 @@
         "@angular/upgrade": "^17.3.6",
         "@ctrl/ngx-emoji-mart": "^9.2.0",
         "@ngneat/hotkeys": "^4.0.0",
+        "@ngstack/code-editor": "7.3.0",
         "@uirouter/angular": "^13.0",
         "@uirouter/angular-hybrid": "^17.1.0",
         "@uirouter/angularjs": "^1.0.30",
@@ -60,6 +61,7 @@
         "lottie-web": "^5.12.2",
         "marked": "^11.1.0",
         "moment": "^2.29.4",
+        "monaco-editor": "^0.54.0",
         "ng-csv": "0.2.3",
         "ng-file-upload": "~5.0.9",
         "ng-flex-layout": "^17.3.7-beta.1",
@@ -4646,6 +4648,19 @@
         "tslib": "^2.0.0"
       }
     },
+    "node_modules/@ngstack/code-editor": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/@ngstack/code-editor/-/code-editor-7.3.0.tgz",
+      "integrity": "sha512-ZqjRynFAA74sVGF5bHecwjXQf5vOM7+bkCd++mNlVGjCq6qVY0TtM7+9pCiCIvzVBn3++9KNDhlpDSq1m5WIYA==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.5.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=17.1.1",
+        "@angular/core": ">=17.1.1"
+      }
+    },
     "node_modules/@ngtools/webpack": {
       "version": "17.3.7",
       "dev": true,
@@ -9239,6 +9254,12 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
+    "node_modules/dompurify": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz",
+      "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==",
+      "license": "(MPL-2.0 OR Apache-2.0)"
+    },
     "node_modules/domutils": {
       "version": "3.1.0",
       "dev": true,
@@ -15744,6 +15765,28 @@
         "node": "*"
       }
     },
+    "node_modules/monaco-editor": {
+      "version": "0.54.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.54.0.tgz",
+      "integrity": "sha512-hx45SEUoLatgWxHKCmlLJH81xBo0uXP4sRkESUpmDQevfi+e7K1VuiSprK6UpQ8u4zOcKNiH0pMvHvlMWA/4cw==",
+      "license": "MIT",
+      "dependencies": {
+        "dompurify": "3.1.7",
+        "marked": "14.0.0"
+      }
+    },
+    "node_modules/monaco-editor/node_modules/marked": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-14.0.0.tgz",
+      "integrity": "sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==",
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/morgan": {
       "version": "1.10.0",
       "dev": true,
diff --git a/package.json b/package.json
index d9ba47fd69..212482a3f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-55",
+  "version": "10.0.0-56",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",
@@ -44,6 +44,7 @@
     "@angular/upgrade": "^17.3.6",
     "@ctrl/ngx-emoji-mart": "^9.2.0",
     "@ngneat/hotkeys": "^4.0.0",
+    "@ngstack/code-editor": "7.3.0",
     "@uirouter/angular": "^13.0",
     "@uirouter/angular-hybrid": "^17.1.0",
     "@uirouter/angularjs": "^1.0.30",
@@ -79,6 +80,7 @@
     "lottie-web": "^5.12.2",
     "marked": "^11.1.0",
     "moment": "^2.29.4",
+    "monaco-editor": "^0.54.0",
     "ng-csv": "0.2.3",
     "ng-file-upload": "~5.0.9",
     "ng-flex-layout": "^17.3.7-beta.1",

From 7b3759ca0e302598cbd0db1e17e696706ab3f784 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 28 Oct 2025 08:59:15 +1100
Subject: [PATCH 620/776] refactor: use students preferred name in task
 comments (#1028)

* refactor: use students preferred name in task comments

* refactor: use users preferred name
---
 src/app/api/services/task-comment.service.ts                  | 2 +-
 .../projects/states/staff-notes/staff-notes.component.html    | 4 ++--
 .../task-comments-viewer/task-comments-viewer.component.html  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index afeb1f38ca..b804b164b4 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -57,7 +57,7 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
         keys: 'author',
         toEntityFn: (data: object, key: string, comment: TaskComment) => {
           const user = this.userService.cache.getOrCreate(data[key]?.id, userService, data[key]);
-          comment.initials = `${user.firstName[0]}${user.lastName[0]}`.toUpperCase();
+          comment.initials = `${user.preferredName[0]}${user.lastName[0]}`.toUpperCase();
           return user;
         },
       },
diff --git a/src/app/projects/states/staff-notes/staff-notes.component.html b/src/app/projects/states/staff-notes/staff-notes.component.html
index 4d1b6fb978..9c89b3a391 100644
--- a/src/app/projects/states/staff-notes/staff-notes.component.html
+++ b/src/app/projects/states/staff-notes/staff-notes.component.html
@@ -1,7 +1,7 @@
 <div class="flex flex-col h-full">
   @if (!loadingStaffNotes && project?.staffNoteCount === 0) {
     <div class="flex justify-center items-center w-full h-full text-gray-300">
-      No staff notes for {{ project.student.firstName }} {{ project.student.lastName }}
+      No staff notes for {{ project.student.preferredName }} {{ project.student.lastName }}
     </div>
   }
   <div #staffNotesContainer class="flex-1 overflow-auto p-4">
@@ -20,7 +20,7 @@
               <div class="flex flex-col">
                 @if (note.replyTo) {
                   <span class="font-medium">
-                    Replying to {{ note.replyTo.user.firstName }}
+                    Replying to {{ note.replyTo.user.preferredName }}
                     {{ note.replyTo.user.lastName }} ({{ note.replyTo.user.nickname }})
                   </span>
                   <span class="text-base text-gray-600">{{ note.replyTo.note }}</span>
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index ff7197b321..e0c2b036de 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -38,7 +38,7 @@
             *ngIf="comment.shouldShowTimestamp"
             [ngClass]="{own: comment.authorIsMe}"
           >
-            {{ comment.author.firstName }} {{ comment.author.lastName }}
+            {{ comment.author.preferredName }} {{ comment.author.lastName }}
             {{ comment.createdAt | humanizedDate }}
           </p>
           <div
@@ -163,7 +163,7 @@
                   </f-scorm-extension-comment>
                 </div>
 
-               <div
+                <div
                   *ngSwitchCase="'text'"
                   class="comment-text"
                   [matTooltip]="comment.createdAt | humanizedDate"

From 2712a68f6031794c571a7ee5866c653bf67de1dd Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 29 Oct 2025 09:54:36 +1100
Subject: [PATCH 621/776] fix: typo

---
 .../directives/task-due-card/task-due-card.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
index 3f3d5c6c6b..9b40ddb5d6 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-due-card/task-due-card.component.html
@@ -129,7 +129,7 @@
         <mat-card-content class="bg-red-50" [hidden]="task?.inDiscussState()">
           <!--Past deadline and not submitted-->
           <p class="p-2">
-            @if (task?.taskDefinition?.unit.markLateSubmissionsAsAssessInPortfolio) {
+            @if (task?.definition?.unit.markLateSubmissionsAsAssessInPortfolio) {
               You should have completed this task by
               <strong>{{ task?.localDueDateString() }}</strong
               >. This task is now past the deadline and can only be submitted directly for your

From 10711a468effe77f33125ac1ba164a8b4a349c1d Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 29 Oct 2025 10:05:04 +1100
Subject: [PATCH 622/776] chore: update task status from latest submission
 details (#1031)

---
 src/app/api/models/task.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 63843d7b88..c920e985a7 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -570,6 +570,9 @@ export class Task extends Entity {
           this.hasPdf = response['has_pdf'];
           this.processingPdf = response['processing_pdf'];
           this.submissionDate = MappingFunctions.mapDate(response, 'submission_date', this);
+          if (response['task_status'] && TaskStatus.STATUS_KEYS.includes(response['task_status'])) {
+            this.status = response['task_status'];
+          }
           return this;
         }),
       );

From 07de5b1e34f78f83c1418399f45e8c754aea530a Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 29 Oct 2025 10:05:17 +1100
Subject: [PATCH 623/776] fix: enable submission button for 'need help' trigger
 (#1034)

---
 .../upload-submission-modal/upload-submission-modal.coffee      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index b6bcd6b50e..961c65be99 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -179,7 +179,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       false
     submit: ->
       # Disable if no comment is supplied with need_help, or if submitting for feedback and task is assess in portfolio only
-      !$scope.uploader.isReady or ($scope.comment.trim().length < 25 && ($scope.submissionType == 'ready_for_feedback' && $scope.task.definition.assessInPortfolioOnly) || $scope.submissionType == 'need_help')
+      !$scope.uploader.isReady or ($scope.comment.trim().length < 25 && (($scope.submissionType == 'ready_for_feedback' && $scope.task.definition.assessInPortfolioOnly) || $scope.submissionType == 'need_help') )
     cancel: ->
       # Can't cancel whilst uploading
       $scope.uploader.isUploading

From f682901287ddf087e91db732cb91749718d36a25 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 29 Oct 2025 11:09:43 +1100
Subject: [PATCH 624/776] refactor: replace task definition editor with
 vertical stepper (#1032)

* refactor: replace task def editor with vertical stepper

* chore: capitalise labels

* fix: typo

* fix: typo
---
 .../task-definition-editor.component.html     | 282 ++++++------------
 1 file changed, 84 insertions(+), 198 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 75b9583484..7744269ca5 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -2,218 +2,104 @@
   <h3>Details for {{ taskDefinition.abbreviation }} - {{ taskDefinition.name }}</h3>
   <mat-divider></mat-divider>
 </div>
-<div class="flex flex-row">
-  <div class="flex-col grow mr-4">
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          1
-        </div>
-      </div>
 
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task details</h3>
-        <p class="font-normal text-gray-700">Name the task and set target grade</p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-general [taskDefinition]="taskDefinition"></f-task-definition-general>
-        </div>
-      </div>
+<mat-stepper orientation="vertical" #stepper>
+  <mat-step>
+    <ng-template matStepLabel matStepperIcon="1">Task Details</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">Name the task and set target grade</p>
+      <f-task-definition-general [taskDefinition]="taskDefinition"></f-task-definition-general>
     </div>
+  </mat-step>
 
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          2
-        </div>
-      </div>
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Task Learning Outcomes</h3>
-        <p class="font-normal text-gray-700">Add learning outcomes for this task</p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-learning-outcome-editor [context]="taskDefinition"></f-learning-outcome-editor>
-        </div>
-      </div>
+  <mat-step>
+    <ng-template matStepLabel>Task Learning Outcomes</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">Add learning outcomes for this task</p>
+      <f-learning-outcome-editor [context]="taskDefinition"></f-learning-outcome-editor>
     </div>
-
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          3
-        </div>
-      </div>
-
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Inbox</h3>
-        <p class="font-normal text-gray-700">
-          Who assesses {{ unit.hasGroupwork() ? 'and submits ' : '' }}this task?
-        </p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-who [taskDefinition]="taskDefinition"></f-task-definition-who>
-        </div>
-      </div>
+  </mat-step>
+
+  <mat-step>
+    <ng-template matStepLabel>Inbox</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">
+        Who assesses {{ unit.hasGroupwork() ? 'and submits ' : '' }}this task?
+      </p>
+      <f-task-definition-who [taskDefinition]="taskDefinition"></f-task-definition-who>
     </div>
+  </mat-step>
 
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          4
-        </div>
-      </div>
-
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Due dates</h3>
-        <p class="font-normal text-gray-700">When is this task due?</p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-dates [taskDefinition]="taskDefinition"></f-task-definition-dates>
-        </div>
-      </div>
+  <mat-step>
+    <ng-template matStepLabel>Due Dates</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">When is the task due?</p>
+      <f-task-definition-dates [taskDefinition]="taskDefinition"></f-task-definition-dates>
     </div>
+  </mat-step>
 
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          5
-        </div>
-      </div>
-
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Upload requirements</h3>
-        <p class="font-normal text-gray-700">What do students need to upload?</p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-upload [taskDefinition]="taskDefinition"></f-task-definition-upload>
-        </div>
-      </div>
+  <mat-step>
+    <ng-template matStepLabel>Upload Requirements</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">What do students need to upload?</p>
+      <f-task-definition-upload [taskDefinition]="taskDefinition"></f-task-definition-upload>
     </div>
+  </mat-step>
 
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          6
-        </div>
-      </div>
-
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
-          Task description and resources
-        </h3>
-        <p class="font-normal text-gray-700">Upload task descriptions and resources</p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-resources
-            [taskDefinition]="taskDefinition"
-          ></f-task-definition-resources>
-        </div>
-      </div>
+  <mat-step>
+    <ng-template matStepLabel>Task Resources</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">Upload task descriptions and resources</p>
+      <f-task-definition-resources [taskDefinition]="taskDefinition"></f-task-definition-resources>
     </div>
-
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          7
-        </div>
-      </div>
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Prerequisite Tasks</h3>
-        <p class="font-normal text-gray-700">
-          Select which tasks need to be submitted before
-          <span class="font-bold">{{ taskDefinition.abbreviation }} {{ taskDefinition.name }}</span>
-          can be submitted
-        </p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-prerequisites [taskDefinition]="taskDefinition" [staffView]="true">
-          </f-task-definition-prerequisites>
-        </div>
-      </div>
-    </div>
-
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          8
-        </div>
-      </div>
-
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">
-          Task assessment automation
-        </h3>
-        <p class="font-normal text-gray-700" *ngIf="!overseerEnabled">Automation is not enabled</p>
-        <p class="font-normal text-gray-700" *ngIf="overseerEnabled">
-          Configure automated assessment
-        </p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6" *ngIf="overseerEnabled">
-          <f-task-definition-overseer
-            [taskDefinition]="taskDefinition"
-          ></f-task-definition-overseer>
-        </div>
-      </div>
+  </mat-step>
+
+  <mat-step>
+    <ng-template matStepLabel>Prerequisite Tasks</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">
+        Select which tasks need to be submitted before
+        <span class="font-bold">{{ taskDefinition.abbreviation }} {{ taskDefinition.name }}</span>
+        can be submitted
+      </p>
+
+      <f-task-definition-prerequisites [taskDefinition]="taskDefinition" [staffView]="true">
+      </f-task-definition-prerequisites>
     </div>
-
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          9
-        </div>
-      </div>
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">SCORM test</h3>
-        <p class="font-normal text-gray-700">
-          Upload the corresponding SCORM 2004 test (e.g. Numbas)
-        </p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <f-task-definition-scorm [taskDefinition]="taskDefinition"></f-task-definition-scorm>
-        </div>
-      </div>
+  </mat-step>
+
+  @if (overseerEnabled) {
+    <mat-step>
+      <ng-template matStepLabel>Task Assessment Automation</ng-template>
+      <div class="pt-[12px]">
+        <p class="font-normal text-gray-500 pb-2">Configure automated assessment</p>
+        <f-task-definition-overseer [taskDefinition]="taskDefinition"></f-task-definition-overseer>
+      </div>
+    </mat-step>
+  }
+
+  <mat-step>
+    <ng-template matStepLabel>SCORM Test</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">
+        Upload the corresponding SCORM 2004 test (e.g. Numbas)
+      </p>
+      <f-task-definition-scorm [taskDefinition]="taskDefinition"></f-task-definition-scorm>
     </div>
+  </mat-step>
 
-    <div class="flex mt-10">
-      <div class="mr-6">
-        <div
-          class="font-bold text-formatif-blue text-3xl rounded-full bg-formatif-blue-lighter flex items-center justify-center w-16 h-16"
-        >
-          10
-        </div>
-      </div>
-
-      <div class="w-full">
-        <h3 class="mb-1 text-2xl font-bold tracking-tight text-gray-900">Optional settings</h3>
-        <p class="font-normal text-gray-700">Apply other options</p>
-        <div class="bg-white border border-gray-200 rounded-xl shadow p-6">
-          <mat-expansion-panel>
-            <mat-expansion-panel-header>
-              <mat-panel-title> Options </mat-panel-title>
-            </mat-expansion-panel-header>
-            <f-task-definition-options
-              [taskDefinition]="taskDefinition"
-            ></f-task-definition-options>
-          </mat-expansion-panel>
-        </div>
-      </div>
-
-      <div class="place-content-end">
-        <div class="sticky bottom-16">
-          <button mat-fab color="primary" (click)="save()">
-            <mat-icon>save</mat-icon>
-          </button>
-        </div>
-      </div>
+  <mat-step>
+    <ng-template matStepLabel>Optional Settings</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">Apply other options</p>
+      <f-task-definition-options [taskDefinition]="taskDefinition"></f-task-definition-options>
     </div>
+  </mat-step>
+</mat-stepper>
+<div class="flex w-full justify-end place-content-end mb-5">
+  <div class="sticky bottom-16">
+    <button mat-fab color="primary" (click)="save()">
+      <mat-icon>save</mat-icon>
+    </button>
   </div>
 </div>

From ec0af0cbe47392d6542d9741e1131954195d407f Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 30 Oct 2025 10:52:19 +1100
Subject: [PATCH 625/776] feat: open similarities from project dashboard
 (#1035)

* feat: open similarities from project dashboard

* chore: add task similarity view component
---
 src/app/doubtfire-angularjs.module.ts                       | 6 ++++++
 .../directives/task-dashboard/task-dashboard.coffee         | 2 +-
 .../directives/task-dashboard/task-dashboard.tpl.html       | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 886886135c..ab7736ca88 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -231,6 +231,7 @@ import {GroupSetSelectorComponent} from './groups/group-set-selector/group-set-s
 import {UnitDetailsEditorComponent} from './units/states/edit/directives/unit-details-editor/unit-details-editor.component';
 import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component';
 import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
+import {TaskSimilarityViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component';
 
 export const DoubtfireAngularJSModule = angular
   .module('doubtfire', [
@@ -563,3 +564,8 @@ DoubtfireAngularJSModule.directive(
   'fPortfolioIncludedTasks',
   downgradeComponent({component: PortfolioIncludedTasksComponent}),
 );
+
+DoubtfireAngularJSModule.directive(
+  'fTaskSimilarityView',
+  downgradeComponent({component: TaskSimilarityViewComponent}),
+);
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
index 8fe60b7574..f70113800c 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
@@ -25,7 +25,7 @@ angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard',
     # Is the current user a tutor?
     $scope.tutor = $stateParams.tutor
     # the ways in which the dashboard can be viewed
-    $scope.dashboardViews = ["details", "submission", "task"]
+    $scope.dashboardViews = ["details", "submission", "task", "similarities"]
 
     # set the current dashboard view to details by default
     updateCurrentView = ->
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index d845a5bcd9..16d998bc0a 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -22,6 +22,9 @@
           <li ng-show="task.definition.hasTaskSheet">
             <a ng-click="setSelectedDashboardView('task')">View Task Sheet</a>
           </li>
+          <li ng-show="tutor">
+            <a ng-click="setSelectedDashboardView('similarities')">View Similarities</a>
+          </li>
           <li class="divider" ng-show="task.hasPdf"></li>
           <li ng-show="task.hasPdf">
             <a ng-click="downloadSubmission()">Download Submission PDF</a>
@@ -88,6 +91,9 @@
     <!-- <pdf-viewer-panel [pdf-url]="urls.taskSubmissionPdfUrl"></pdf-viewer-panel> -->
     <f-pdf-viewer [pdf-url]="urls.taskSubmissionPdfUrl"></f-pdf-viewer>
   </div>
+  <div class="panel-body" ng-if="isCurrentView('similarities')">
+    <f-task-similarity-view [task]="task"></f-task-similarity-view>
+  </div>
   <!--/panel-body-->
   <div class="panel-body text-muted no-pdf" ng-show="isCurrentView('submission') && !task.hasPdf">
     <i class="fa fa-file-pdf-o"></i>

From fa722e6b6dedb140ebbd411ce41745a9b9e81859 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:00:51 +1100
Subject: [PATCH 626/776] chore(release): 10.0.0-57

---
 CHANGELOG.md      | 13 +++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a671c033c..e80c7c93d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 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.
 
+## [10.0.0-57](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-56...v10.0.0-57) (2025-10-30)
+
+
+### Features
+
+* open similarities from project dashboard ([#1035](https://github.com/b0ink/doubtfire-deploy/issues/1035)) ([ec0af0c](https://github.com/b0ink/doubtfire-deploy/commit/ec0af0cbe47392d6542d9741e1131954195d407f))
+
+
+### Bug Fixes
+
+* enable submission button for 'need help' trigger ([#1034](https://github.com/b0ink/doubtfire-deploy/issues/1034)) ([07de5b1](https://github.com/b0ink/doubtfire-deploy/commit/07de5b1e34f78f83c1418399f45e8c754aea530a))
+* typo ([2712a68](https://github.com/b0ink/doubtfire-deploy/commit/2712a68f6031794c571a7ee5866c653bf67de1dd))
+
 ## [10.0.0-56](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-55...v10.0.0-56) (2025-10-23)
 
 
diff --git a/package-lock.json b/package-lock.json
index 237e8df708..c74890a9cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-56",
+  "version": "10.0.0-57",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-56",
+      "version": "10.0.0-57",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 212482a3f5..bfd5a18315 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-56",
+  "version": "10.0.0-57",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 4d0fbb2b032ee3d28cf102f0026b0b576065f130 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 1 Nov 2025 12:37:29 +1100
Subject: [PATCH 627/776] refactor: imply portfolio has been submitted (#1037)

---
 .../portfolio-review-step/portfolio-review-step.tpl.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-review-step.tpl.html b/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-review-step.tpl.html
index 00dffc0906..4a9a098324 100644
--- a/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-review-step.tpl.html
+++ b/src/app/projects/states/portfolio/directives/portfolio-review-step/portfolio-review-step.tpl.html
@@ -87,7 +87,14 @@ <h4>Create Your Portfolio</h4>
       <div class="card-heading">
         <h4>Download Portfolio</h4>
       </div>
-      <div class="card-body">This is the <strong>exact same document</strong> your assessor will see</div>
+      <div class="card-body">
+        <p class="p-2">
+          This is the <strong>exact same document</strong> your assessor will see.
+        </p>
+        <p class="p-2">
+          <strong>You're done!</strong> There's nothing left for you to do. Your portfolio has been submitted.
+        </p>
+      </div>
       <div class="card-footer">
         <button class="btn btn-danger" ng-click="deletePortfolio()">
           <i class="fa fa-trash-o"></i> Delete Portfolio

From 8bda18b89b7ffbb9e55e7c49ea540c43d3d45a7d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 1 Nov 2025 12:38:15 +1100
Subject: [PATCH 628/776] chore(release): 10.0.0-58

---
 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 e80c7c93d2..cb40436959 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.
 
+## [10.0.0-58](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-57...v10.0.0-58) (2025-11-01)
+
 ## [10.0.0-57](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-56...v10.0.0-57) (2025-10-30)
 
 
diff --git a/package-lock.json b/package-lock.json
index c74890a9cb..52d3b0a995 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-57",
+  "version": "10.0.0-58",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-57",
+      "version": "10.0.0-58",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index bfd5a18315..830c9eee29 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-57",
+  "version": "10.0.0-58",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 951cf1837690a178c6c67657400ad5c72320b3a5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:21:30 +1100
Subject: [PATCH 629/776] chore: ensure student selects grade before confirming
 learning summary report

---
 src/app/projects/states/portfolio/portfolio.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/projects/states/portfolio/portfolio.coffee b/src/app/projects/states/portfolio/portfolio.coffee
index 01b6bf8972..0224ae100d 100644
--- a/src/app/projects/states/portfolio/portfolio.coffee
+++ b/src/app/projects/states/portfolio/portfolio.coffee
@@ -89,6 +89,8 @@ angular.module('doubtfire.projects.states.portfolio', [
   # Jump to a step
   if $scope.project.portfolioAvailable or $scope.project.compilePortfolio
     $scope.setActiveTab $scope.tabs.reviewStep
+  else if not $scope.project.submittedGrade?
+    $scope.setActiveTab $scope.tabs.welcomeStep
   else if $scope.projectHasDraftLearningSummaryReport
     $scope.setActiveTab $scope.tabs.summaryStep
   else if $scope.projectHasLearningSummaryReport()

From c5397fc5c444e76b431aa5d6487553c60e711c2e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:46:08 +1100
Subject: [PATCH 630/776] fix: require comment for new evidence

---
 .../upload-submission-modal/upload-submission-modal.coffee      | 2 +-
 .../upload-submission-modal/upload-submission-modal.tpl.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index 961c65be99..f60a2a7b48 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -179,7 +179,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       false
     submit: ->
       # Disable if no comment is supplied with need_help, or if submitting for feedback and task is assess in portfolio only
-      !$scope.uploader.isReady or ($scope.comment.trim().length < 25 && (($scope.submissionType == 'ready_for_feedback' && $scope.task.definition.assessInPortfolioOnly) || $scope.submissionType == 'need_help') )
+      !$scope.uploader.isReady or ($scope.comment.trim().length < 25 && ((($scope.submissionType == 'ready_for_feedback' || $scope.submissionType == 'reupload_evidence') && $scope.task.definition.assessInPortfolioOnly) || $scope.submissionType == 'need_help') )
     cancel: ->
       # Can't cancel whilst uploading
       $scope.uploader.isUploading
diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 49fb538af6..7cc0372a34 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -101,7 +101,7 @@ <h4>Final comments</h4>
         <div class="card-body">
           <textarea ng-model="comment" class="form-control input-lg" rows="3" placeholder="{{submissionType == 'need_help' ? 'I need help with...' : submissionType == 'ready_for_feedback' && task.definition.assessInPortfolioOnly ? 'I would like feedback with...' : 'Make a comment...'}}">
           </textarea>
-          <div class="w-full text-right py-2 text-gray-400">Character count: {{comment.length}} <span ng-show="submissionType == 'need_help' || (submissionType=='ready_for_feedback' && task.definition.assessInPortfolioOnly)">(Min. 25)</span></div>
+          <div class="w-full text-right py-2 text-gray-400">Character count: {{comment.length}} <span ng-show="submissionType == 'need_help' || ((submissionType=='ready_for_feedback' || submissionType=='reupload_evidence) && task.definition.assessInPortfolioOnly)">(Min. 25)</span></div>
         </div>
       </div><!--/card-comments-->
       <div class="card card-default" ng-show="privacyPolicy.privacy">

From 58ec499a8d59c7202f591de661551d8a32c37527 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:47:50 +1100
Subject: [PATCH 631/776] fix: require comment for new evidence

---
 .../upload-submission-modal/upload-submission-modal.tpl.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 7cc0372a34..65695e16ec 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -140,7 +140,7 @@ <h4>Plagiarism and Collusion</h4>
     <i class="fa fa-arrow-right"></i>
   </button>
   <!--/next-button-->
-  <button tooltip="{{submissionType == 'need_help' || (submissionType=='ready_for_feedback' && task.definition.assessInPortfolioOnly) ? 'This submission requires a comment' : ''}}" class="btn btn-success" ng-click="uploadButtonClicked()" ng-disabled="shouldDisableBtn.submit()" ng-show="shouldShowBtn.submit()">
+  <button tooltip="{{submissionType == 'need_help' || ((submissionType=='ready_for_feedback' || submissionType=='reupload_evidence') && task.definition.assessInPortfolioOnly) ? 'This submission requires a comment' : ''}}" class="btn btn-success" ng-click="uploadButtonClicked()" ng-disabled="shouldDisableBtn.submit()" ng-show="shouldShowBtn.submit()">
     <i class="fa fa-upload"></i> Upload Submission
   </button>
   <!--/upload-button-->

From 8f599725d670f37d50d015692be7d58f163eab8d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 4 Nov 2025 21:57:19 +1100
Subject: [PATCH 632/776] chore(release): 10.0.0-59

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb40436959..d8a6450419 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+## [10.0.0-59](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-58...v10.0.0-59) (2025-11-04)
+
+
+### Bug Fixes
+
+* require comment for new evidence ([58ec499](https://github.com/b0ink/doubtfire-deploy/commit/58ec499a8d59c7202f591de661551d8a32c37527))
+* require comment for new evidence ([c5397fc](https://github.com/b0ink/doubtfire-deploy/commit/c5397fc5c444e76b431aa5d6487553c60e711c2e))
+
 ## [10.0.0-58](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-57...v10.0.0-58) (2025-11-01)
 
 ## [10.0.0-57](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-56...v10.0.0-57) (2025-10-30)
diff --git a/package-lock.json b/package-lock.json
index 52d3b0a995..19cbbb3eb4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-58",
+  "version": "10.0.0-59",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-58",
+      "version": "10.0.0-59",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 830c9eee29..c3df336ac0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-58",
+  "version": "10.0.0-59",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From c67ceaa84d02bb71626890fc28bb4aaea164b952 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:34:31 +1100
Subject: [PATCH 633/776] feat: upload grades csv (#1038)

* feat: upload grades csv

* chore: remove debug
---
 src/app/api/models/unit.ts                    |  4 ++
 src/app/doubtfire-angular.module.ts           |  2 +
 src/app/doubtfire-angularjs.module.ts         |  6 ++
 .../states/portfolios/portfolios.tpl.html     |  1 +
 .../upload-grades.component.html              |  3 +
 .../upload-grades.component.scss              |  0
 .../upload-grades/upload-grades.component.ts  | 55 +++++++++++++++++++
 7 files changed, 71 insertions(+)
 create mode 100644 src/app/units/states/portfolios/upload-grades/upload-grades.component.html
 create mode 100644 src/app/units/states/portfolios/upload-grades/upload-grades.component.scss
 create mode 100644 src/app/units/states/portfolios/upload-grades/upload-grades.component.ts

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 8306a94f12..0caa668085 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -414,6 +414,10 @@ export class Unit extends Entity {
     }/learning_alignments/csv.json`;
   }
 
+  public get gradesCSVUploadUrl(): string {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.id}/grades/csv`;
+  }
+
   public taskStatusFactor(td: TaskDefinition): number {
     return 1;
   }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 12f65dc8a5..ee3dcd3889 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -294,6 +294,7 @@ import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/dir
 import {AnalyticsTutorTimesComponent} from './units/states/analytics/directives/analytics-tutor-times.component';
 import {MarkingSessionService} from './api/services/marking-session.service';
 import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
+import {UploadGradesComponent} from './units/states/portfolios/upload-grades/upload-grades.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -448,6 +449,7 @@ const MY_DATE_FORMAT = {
     PortfolioGradeSelectStepComponent,
     AnalyticsTutorTimesComponent,
     PortfolioIncludedTasksComponent,
+    UploadGradesComponent,
   ],
   // Services we provide
   providers: [
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index ab7736ca88..8187457400 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -232,6 +232,7 @@ import {UnitDetailsEditorComponent} from './units/states/edit/directives/unit-de
 import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/directives/portfolio-grade-select-step/portfolio-grade-select-step.component';
 import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
 import {TaskSimilarityViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component';
+import {UploadGradesComponent} from './units/states/portfolios/upload-grades/upload-grades.component';
 
 export const DoubtfireAngularJSModule = angular
   .module('doubtfire', [
@@ -569,3 +570,8 @@ DoubtfireAngularJSModule.directive(
   'fTaskSimilarityView',
   downgradeComponent({component: TaskSimilarityViewComponent}),
 );
+
+DoubtfireAngularJSModule.directive(
+  'fUploadGrades',
+  downgradeComponent({component: UploadGradesComponent}),
+);
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index 98a6c019f7..376277513e 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -240,6 +240,7 @@ <h4 class="panel-title">Mark Portfolios</h4>
         <button ng-click="downloadGrades()" style="padding-right: 1rem">
           <i class="fa fa-download"></i> Download Grades
         </button>
+        <f-upload-grades [unit]="unit"></f-upload-grades>
         <button ng-if="hasD2lMapping()" ng-click="transferToD2L()">
           <i class="fa fa-upload"></i> Transfer Grades to D2L
         </button>
diff --git a/src/app/units/states/portfolios/upload-grades/upload-grades.component.html b/src/app/units/states/portfolios/upload-grades/upload-grades.component.html
new file mode 100644
index 0000000000..c63db48f51
--- /dev/null
+++ b/src/app/units/states/portfolios/upload-grades/upload-grades.component.html
@@ -0,0 +1,3 @@
+<button (click)="uploadGradesCSV()" class="pr-4">
+  <i class="fa fa-upload"></i> Upload Grades CSV
+</button>
diff --git a/src/app/units/states/portfolios/upload-grades/upload-grades.component.scss b/src/app/units/states/portfolios/upload-grades/upload-grades.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/portfolios/upload-grades/upload-grades.component.ts b/src/app/units/states/portfolios/upload-grades/upload-grades.component.ts
new file mode 100644
index 0000000000..5d8e9a0020
--- /dev/null
+++ b/src/app/units/states/portfolios/upload-grades/upload-grades.component.ts
@@ -0,0 +1,55 @@
+import {Component, Inject, Input, OnInit} from '@angular/core';
+import {csvResultModalService, csvUploadModalService} from 'src/app/ajs-upgraded-providers';
+import {SidekiqJob} from 'src/app/api/models/sidekiq-job';
+import {Unit} from 'src/app/api/models/unit';
+import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-upload-grades',
+  templateUrl: 'upload-grades.component.html',
+  styleUrl: 'upload-grades.component.scss',
+})
+export class UploadGradesComponent implements OnInit {
+  @Input() unit: Unit;
+
+  constructor(
+    @Inject(csvUploadModalService) private csvUploadModal: any,
+    private sidekiqModalService: SidekiqProgressModalService,
+    @Inject(csvResultModalService) private csvResultModal: any,
+    private alertService: AlertService,
+  ) {}
+
+  public ngOnInit(): void {
+    if (!this.unit) {
+      return console.error(`Invalid unit`);
+    }
+  }
+
+  public uploadGradesCSV() {
+    this.csvUploadModal.show(
+      'Upload Student Grades as CSV',
+      'Import student grades',
+      {
+        file: {name: 'Feedback Templates CSV Data', type: 'csv'},
+      },
+      this.unit.gradesCSVUploadUrl,
+      (response: SidekiqJob) => {
+        if (!response) {
+          this.alertService.error('Failed to import grades', 6000);
+          return;
+        }
+
+        this.sidekiqModalService.show('Import student grades', response.id).subscribe({
+          next: (job) => {
+            this.csvResultModal.show('Student grade import results', JSON.parse(job.result));
+          },
+          error: (error) => {
+            console.error(error);
+            this.alertService.error('Failed to import grades', 6000);
+          },
+        });
+      },
+    );
+  }
+}

From dd2582e2b418318dec015c715086cbfc679b48ac Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:36:07 +1100
Subject: [PATCH 634/776] chore(release): 10.0.0-60

---
 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 d8a6450419..4650b3c42e 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.
 
+## [10.0.0-60](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-59...v10.0.0-60) (2025-11-05)
+
+
+### Features
+
+* upload grades csv ([#1038](https://github.com/b0ink/doubtfire-deploy/issues/1038)) ([c67ceaa](https://github.com/b0ink/doubtfire-deploy/commit/c67ceaa84d02bb71626890fc28bb4aaea164b952))
+
 ## [10.0.0-59](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-58...v10.0.0-59) (2025-11-04)
 
 
diff --git a/package-lock.json b/package-lock.json
index 19cbbb3eb4..a2fb633540 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-59",
+  "version": "10.0.0-60",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-59",
+      "version": "10.0.0-60",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index c3df336ac0..be72c68d67 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-59",
+  "version": "10.0.0-60",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 8bcffda3dfb73873c48d68fcce4e82920be19b4f Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 6 Nov 2025 15:26:35 +1100
Subject: [PATCH 635/776] refactor: overseer sidekiq (#1029)

* refactor: use sidekiq jobs for pulling overseer images

* refactor: overseer execution script editor

* chore: remove overseer view

* refactor: increase size of script editor

* chore: add icon for incomplete overseer runs

* chore: add typing

* refactor: format assessment comment layout

* refactor: enable test submissions if script exists
---
 .../overseer-image-list.component.html        | 35 +++++++++---
 .../overseer-image-list.component.ts          | 30 +++++++++--
 .../models/overseer/overseer-assessment.ts    | 28 +++++-----
 src/app/api/models/task-definition.ts         |  1 +
 .../services/overseer-assessment.service.ts   |  5 +-
 .../api/services/overseer-image.service.ts    | 15 ++----
 .../api/services/task-definition.service.ts   |  1 +
 src/app/common/footer/footer.component.html   |  4 ++
 src/app/common/footer/footer.component.ts     |  6 +++
 src/app/doubtfire-angular.module.ts           |  7 ++-
 .../task-assessment-comment.component.html    | 19 ++++---
 .../task-comments-viewer.component.html       |  5 +-
 .../task-submission-history.component.html    | 53 +++++++++++-------
 ...verseer-script-editor-modal.component.html | 14 +++++
 ...verseer-script-editor-modal.component.scss |  0
 .../overseer-script-editor-modal.component.ts | 54 +++++++++++++++++++
 .../overseer-script-editor-modal.service.ts   | 28 ++++++++++
 .../task-definition-overseer.component.html   | 21 +++-----
 .../task-definition-overseer.component.ts     | 27 ++++++----
 19 files changed, 260 insertions(+), 93 deletions(-)
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.html
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.scss
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.service.ts

diff --git a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html
index d2e70e730d..bf6ca86233 100644
--- a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html
+++ b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html
@@ -1,3 +1,9 @@
+<ng-template #textDialog let-data>
+  <mat-card class="p-4 max-w-[600px]">
+    <pre>{{ data.text }}</pre>
+  </mat-card>
+</ng-template>
+
 <div class="overseer-image-list-container">
   <div class="header">
     <div>
@@ -5,7 +11,13 @@ <h3>Overseer Images</h3>
       <p>Add new image or modify existing ones used for automated task analysis</p>
     </div>
   </div>
-  <table mat-table [dataSource]="dataSource" matSort (matSortChange)="sortTableData($event)" class="f-table">
+  <table
+    mat-table
+    [dataSource]="dataSource"
+    matSort
+    (matSortChange)="sortTableData($event)"
+    class="f-table"
+  >
     <!-- Name Column -->
     <ng-container [formGroup]="formData" matColumnDef="name">
       <th mat-header-cell *matHeaderCellDef mat-sort-header>Name</th>
@@ -51,7 +63,9 @@ <h3>Overseer Images</h3>
       <th mat-header-cell *matHeaderCellDef></th>
       <td mat-cell *matCellDef="let overseerImage">
         <div class="right" *ngIf="!editing(overseerImage); else edit">
-          <button mat-flat-button color="primary" (click)="pullOverseerImage(overseerImage)">Pull</button>
+          <button mat-flat-button color="primary" (click)="pullOverseerImage(overseerImage)">
+            Pull
+          </button>
         </div>
       </td>
       <td mat-footer-cell *matFooterCellDef></td>
@@ -62,7 +76,7 @@ <h3>Overseer Images</h3>
       <th mat-header-cell *matHeaderCellDef>Last Pulled</th>
       <td mat-cell *matCellDef="let overseerImage">
         <div class="right" *ngIf="!editing(overseerImage); else edit">
-          {{ overseerImage.lastPulledDate }}
+          {{ overseerImage.lastPulledDate | humanizedDate }}
         </div>
       </td>
       <td mat-footer-cell *matFooterCellDef></td>
@@ -80,10 +94,10 @@ <h3>Overseer Images</h3>
               overseerImage.pulledImageStatus === 'success'
                 ? 'green'
                 : overseerImage.pulledImageStatus === 'loading'
-                ? 'orange'
-                : overseerImage.pulledImageStatus === 'failed'
-                ? 'red'
-                : ''
+                  ? 'orange'
+                  : overseerImage.pulledImageStatus === 'failed'
+                    ? 'red'
+                    : ''
           }"
         >
           <button
@@ -100,6 +114,7 @@ <h3>Overseer Images</h3>
             class="status-icon"
             *ngIf="overseerImage.pulledImageStatus === 'failed'"
             [matTooltip]="overseerImage.pulledImageText"
+            (click)="showDialog(overseerImage)"
           >
             <mat-icon>error_outline</mat-icon>
           </button>
@@ -113,7 +128,11 @@ <h3>Overseer Images</h3>
       <th mat-header-cell *matHeaderCellDef></th>
       <td mat-cell *matCellDef="let overseerImage">
         <div class="right" *ngIf="!editing(overseerImage); else edit">
-          <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu">
+          <button
+            mat-icon-button
+            [matMenuTriggerFor]="menu"
+            aria-label="Example icon-button with a menu"
+          >
             <mat-icon>more_vert</mat-icon>
           </button>
           <mat-menu #menu="matMenu">
diff --git a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.ts b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.ts
index 703054827e..526660962d 100644
--- a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.ts
+++ b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.ts
@@ -1,17 +1,24 @@
-import {Component, ViewChild} from '@angular/core';
+import {AfterViewInit, Component, TemplateRef, ViewChild} from '@angular/core';
 import {MatTableDataSource, MatTable} from '@angular/material/table';
 import {OverseerImage, OverseerImageService} from 'src/app/api/models/doubtfire-model';
 import {EntityFormComponent} from 'src/app/common/entity-form/entity-form.component';
 import {UntypedFormControl, Validators} from '@angular/forms';
 import {MatSort, Sort} from '@angular/material/sort';
 import {AlertService} from 'src/app/common/services/alert.service';
+import {MatDialog} from '@angular/material/dialog';
+import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
 
 @Component({
   selector: 'overseer-image-list',
   templateUrl: 'overseer-image-list.component.html',
   styleUrls: ['overseer-image-list.component.scss'],
 })
-export class OverseerImageListComponent extends EntityFormComponent<OverseerImage> {
+export class OverseerImageListComponent
+  extends EntityFormComponent<OverseerImage>
+  implements AfterViewInit
+{
+  @ViewChild('textDialog') textDialog!: TemplateRef<any>;
+
   @ViewChild(MatTable, {static: true}) table: MatTable<any>;
   @ViewChild(MatSort, {static: true}) sort: MatSort;
 
@@ -26,6 +33,8 @@ export class OverseerImageListComponent extends EntityFormComponent<OverseerImag
   constructor(
     private overseerImageService: OverseerImageService,
     private alerts: AlertService,
+    private dialog: MatDialog,
+    private sidekiqProgressModalService: SidekiqProgressModalService,
   ) {
     super(
       {
@@ -69,8 +78,15 @@ export class OverseerImageListComponent extends EntityFormComponent<OverseerImag
   pullOverseerImage(image: OverseerImage) {
     this.loading = true;
     image.pulledImageStatus = 'loading';
-    this.overseerImageService.pullDockerImage(image).subscribe((response) => {
-      this.loading = false;
+    this.overseerImageService.pullDockerImage(image).subscribe((job) => {
+      this.sidekiqProgressModalService
+        .show(`Pulling image ${image.name} (${image.tag})`, job.id)
+        .subscribe((_job) => {
+          this.overseerImageService.fetch(image.id).subscribe((newImage) => {
+            console.log(newImage);
+            this.loading = false;
+          });
+        });
     });
   }
 
@@ -96,4 +112,10 @@ export class OverseerImageListComponent extends EntityFormComponent<OverseerImag
         return super.sortTableData(sort);
     }
   }
+
+  public showDialog(image: OverseerImage) {
+    this.dialog.open(this.textDialog, {
+      data: {text: image.pulledImageText},
+    });
+  }
 }
diff --git a/src/app/api/models/overseer/overseer-assessment.ts b/src/app/api/models/overseer/overseer-assessment.ts
index 7ca6d62464..dcffd8fd4f 100644
--- a/src/app/api/models/overseer/overseer-assessment.ts
+++ b/src/app/api/models/overseer/overseer-assessment.ts
@@ -1,30 +1,34 @@
-import { Entity, EntityMapping } from 'ngx-entity-service';
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {Task} from '../doubtfire-model';
 
 export class OverseerAssessment extends Entity {
   id: number;
   timestamp: Date;
   timestampString: string;
-  content?: [{ label: string; result: string }];
-  task?: any;
-  taskStatus?: any;
-  submissionStatus?: any;
-  createdAt?: any;
-  updatedAt?: any;
-  taskId?: any;
+  content?: [{label: string; result: string}];
+  task?: Task;
+  taskStatus?: string;
+  submissionStatus?: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+  taskId?: number;
 
   label: string;
 
-  constructor(task?: object) {
+  constructor(task?: Task) {
     super();
 
-    if ( task ) {
+    if (task) {
       this.task = task;
     }
   }
 
-  public override toJson<T extends Entity>(mappingData: EntityMapping<T>, ignoreKeys?: string[]): object {
+  public override toJson<T extends Entity>(
+    mappingData: EntityMapping<T>,
+    ignoreKeys?: string[],
+  ): object {
     return {
-      overseer_assessment: super.toJson(mappingData, ignoreKeys)
+      overseer_assessment: super.toJson(mappingData, ignoreKeys),
     };
   }
 }
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 30aff474bf..e82ae135f0 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -47,6 +47,7 @@ export class TaskDefinition extends Entity {
   scormTimeDelayEnabled: boolean;
   scormAttemptLimit: number = 0;
   hasTaskAssessmentResources: boolean;
+  hasTaskAssessmentScript: boolean;
   isGraded: boolean;
   maxQualityPts: number;
   overseerImageId: number;
diff --git a/src/app/api/services/overseer-assessment.service.ts b/src/app/api/services/overseer-assessment.service.ts
index cfb21c8879..2226887caf 100644
--- a/src/app/api/services/overseer-assessment.service.ts
+++ b/src/app/api/services/overseer-assessment.service.ts
@@ -4,6 +4,7 @@ import {Observable} from 'rxjs';
 import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiUrl';
 import {OverseerAssessment} from '../models/overseer/overseer-assessment';
+import {Task} from '../models/doubtfire-model';
 
 @Injectable()
 export class OverseerAssessmentService extends EntityService<OverseerAssessment> {
@@ -37,13 +38,13 @@ export class OverseerAssessmentService extends EntityService<OverseerAssessment>
     return new OverseerAssessment(other);
   }
 
-  public queryForTask(task: any): Observable<OverseerAssessment[]> {
+  public queryForTask(task: Task): Observable<OverseerAssessment[]> {
     const pathIds = {
       project_id: task.project.id,
       td_id: task.definition.id,
     };
 
-    return this.query(pathIds, task);
+    return this.query(pathIds);
   }
 
   public triggerOverseer(assessment: OverseerAssessment): Observable<OverseerAssessment> {
diff --git a/src/app/api/services/overseer-image.service.ts b/src/app/api/services/overseer-image.service.ts
index ebb5558b3a..7edc65932f 100644
--- a/src/app/api/services/overseer-image.service.ts
+++ b/src/app/api/services/overseer-image.service.ts
@@ -4,6 +4,7 @@ import {OverseerImage} from 'src/app/api/models/doubtfire-model';
 import {Injectable} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiUrl';
+import {SidekiqJob} from '../models/sidekiq-job';
 
 @Injectable()
 export class OverseerImageService extends CachedEntityService<OverseerImage> {
@@ -25,16 +26,10 @@ export class OverseerImageService extends CachedEntityService<OverseerImage> {
     this.mapping.mapAllKeysToJsonExcept('id');
   }
 
-  public pullDockerImage(image: OverseerImage): Observable<OverseerImage> {
-    return super
-      .put(image, {
-        endpointFormat: this.pullImageEndpointFormat,
-      })
-      .pipe(
-        switchMap((response) => {
-          return super.update(image);
-        }),
-      );
+  public pullDockerImage(image: OverseerImage): Observable<SidekiqJob> {
+    return super.put(image, {
+      endpointFormat: this.pullImageEndpointFormat,
+    });
   }
 
   public createInstanceFrom(json: object, other?: any): OverseerImage {
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 63708814f8..06bea8da49 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -114,6 +114,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskSheet',
       'hasTaskResources',
       'hasTaskAssessmentResources',
+      'hasTaskAssessmentScript',
       'scormEnabled',
       'hasScormData',
       'scormAllowReview',
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 6fa4a27af5..8fd9e50a33 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -188,6 +188,10 @@
           <mat-icon matListItemIcon aria-label="View Similarities">crisis_alert</mat-icon>
           View similarities
         </button>
+        <button mat-menu-item (click)="viewOverseer()">
+          <mat-icon matListItemIcon aria-label="View Overseer">preview</mat-icon>
+          View overseer
+        </button>
         <mat-divider></mat-divider>
         <button mat-menu-item (click)="selectedTask?.updateTaskStatus('assess_in_portfolio')">
           <mat-icon matListItemIcon aria-label="Switch to Assess in Portfolio"
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index a53bc9700e..7e38438381 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -4,6 +4,7 @@ import {Task} from 'src/app/api/models/task';
 import {SelectedTaskService} from 'src/app/projects/states/dashboard/selected-task.service';
 import {TaskService} from 'src/app/api/services/task.service';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
+import {TaskAssessmentModalService} from '../modals/task-assessment-modal/task-assessment-modal.service';
 
 @Component({
   selector: 'f-footer',
@@ -15,6 +16,7 @@ export class FooterComponent implements OnInit {
     public selectedTaskService: SelectedTaskService,
     public taskService: TaskService,
     private fileDownloader: FileDownloaderService,
+    private taskAssessmentModal: TaskAssessmentModalService,
   ) {}
 
   selectedTask$: Observable<Task>;
@@ -97,6 +99,10 @@ export class FooterComponent implements OnInit {
     this.selectedTaskService.showSimilarity();
   }
 
+  viewOverseer() {
+    this.taskAssessmentModal.show(this.selectedTask);
+  }
+
   viewStaffNotes() {
     this.selectedTaskService.showStaffNotes();
   }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index ee3dcd3889..318c601b35 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -294,6 +294,8 @@ import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/dir
 import {AnalyticsTutorTimesComponent} from './units/states/analytics/directives/analytics-tutor-times.component';
 import {MarkingSessionService} from './api/services/marking-session.service';
 import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
+import {OverseerScriptEditorModalComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component';
+import {CodeEditorModule} from '@ngstack/code-editor';
 import {UploadGradesComponent} from './units/states/portfolios/upload-grades/upload-grades.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
@@ -449,10 +451,10 @@ const MY_DATE_FORMAT = {
     PortfolioGradeSelectStepComponent,
     AnalyticsTutorTimesComponent,
     PortfolioIncludedTasksComponent,
-    UploadGradesComponent,
+    OverseerScriptEditorModalComponent,
   ],
-  // Services we provide
   providers: [
+    // Services we provide
     AlertService,
     MarkedPipe,
     CampusService,
@@ -601,6 +603,7 @@ const MY_DATE_FORMAT = {
     MatNativeDateModule,
     MatDialogModuleNew,
     CalendarModule.forRoot({provide: CalendarDateAdapter, useFactory: adapterFactory}),
+    CodeEditorModule.forRoot(),
   ],
 })
 
diff --git a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html
index d30837fce0..7cdf8e89ee 100644
--- a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html
@@ -1,16 +1,15 @@
 <div fxLayout="row" fxLayoutAlign="space-evenly center">
   <div fxLayout="column" fxLayoutAlign="space-around center">
-    @if ((comment.assessment_result && comment.assessment_result.is_successful)) {
-    <div>
-      <hr class="hr-text" data-content="Assessment Summary" />
-      <div class="markdown-to-html" [innerHTML]="comment.text | marked"></div>
-      <button mat-button (click)="showTaskAssessmentResult()">view report</button>
-      <hr class="hr-fade" />
-    </div>
-    } @else {
-
-    <hr class="hr-text" data-content="Tests in Progress" />
+    @if (comment.assessment_result && comment.assessment_result.is_successful) {
+      <div>
+        <hr class="hr-text" data-content="Assessment Summary" />
+        <pre class="overflow-x-scroll scrollbar-gutter-stable">{{ comment.text }}</pre>
 
+        <button mat-button (click)="showTaskAssessmentResult()">View report</button>
+        <hr class="hr-fade" />
+      </div>
+    } @else {
+      <hr class="hr-text" data-content="Tests in Progress" />
     }
   </div>
 </div>
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index e0c2b036de..8cbc442d50 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -127,7 +127,10 @@
                 <hr class="hr-text" [attr.data-content]="comment.text" />
               </div>
 
-              <div *ngSwitchCase="'assessment'" class="comment-assessment">
+              <div
+                *ngSwitchCase="'assessment'"
+                class="comment-assessment overflow-x-scroll max-w-[350px] mx-auto"
+              >
                 <app-task-assessment-comment
                   [task]="task"
                   [comment]="comment"
diff --git a/src/app/tasks/task-submission-history/task-submission-history.component.html b/src/app/tasks/task-submission-history/task-submission-history.component.html
index 4f261b27bd..c561635816 100644
--- a/src/app/tasks/task-submission-history/task-submission-history.component.html
+++ b/src/app/tasks/task-submission-history/task-submission-history.component.html
@@ -1,27 +1,42 @@
-<div class="submission-wrap">
-  <div class="submission-main">
-    <div class="submission-sidenav panel panel-primary">
-      <div class="panel-heading panel-title submission-heading">Submissions</div>
-      <mat-list class="list-group">
+<div class="">
+  <div class="flex">
+    <div class="w-[300px]">
+      <div class="">Submissions</div>
+      <mat-list class="">
         @for (tab of tabs; track tab) {
-  <mat-list-item class="list-group-item"
-          [class.selected]="tab.timestampString === selectedTab.timestampString"
-         
-          (click)="openSubmission(tab)">
-          <div style="-webkit-box-flex: 1; flex: 1;">{{tab.timestamp | date: 'dd/MM/yy, hh:mm a'}}</div>
-           &nbsp; <status-icon [status]="tab.taskStatus" ></status-icon>
-        </mat-list-item>
-}
+          <mat-list-item
+            [class.selected]="tab.timestampString === selectedTab.timestampString"
+            (click)="openSubmission(tab)"
+          >
+            <div class="flex gap-5 justify-between items-center">
+              <div>
+                {{ tab.timestamp | humanizedDate }}
+              </div>
+              @if (tab.status === 'pre_queued') {
+                <mat-icon>schedule</mat-icon>
+              } @else {
+                <status-icon [status]="tab.taskStatus"></status-icon>
+              }
+            </div>
+          </mat-list-item>
+        }
       </mat-list>
     </div>
-    <div class="submisson-result">
+    <div class="w-full">
       <mat-tab-group dynamicHeight>
         @for (selTab of selectedTab.content; track selTab) {
-  <mat-tab label="{{selTab.label}}">
-          <pre class="terminal-output">{{selTab.result}} </pre>
-          <button mat-button mat-flat-button [hidden]="selTab.label !== 'Error'" (click)="triggerOverseer(selectedTab)">Run Again</button>
-        </mat-tab>
-}
+          <mat-tab label="{{ selTab.label }}">
+            <pre class="terminal-output">{{ selTab.result }} </pre>
+            <button
+              mat-button
+              mat-flat-button
+              [hidden]="selTab.label !== 'Error'"
+              (click)="triggerOverseer(selectedTab)"
+            >
+              Run Again
+            </button>
+          </mat-tab>
+        }
       </mat-tab-group>
     </div>
   </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.html
new file mode 100644
index 0000000000..1d6a563570
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.html
@@ -0,0 +1,14 @@
+<div class="p-10 w-full">
+  <div class="w-full text-center">
+    <p>{{ data.taskDefinition.abbreviation }} {{ data.taskDefinition.name }}</p>
+    <p>Overseer script</p>
+  </div>
+  <div class="flex justify-end">
+    <button mat-icon-button (click)="save()">
+      <mat-icon>save</mat-icon>
+    </button>
+  </div>
+  @if (!loading) {
+    <ngs-code-editor class="w-full h-[70vh]" [codeModel]="model" readOnly></ngs-code-editor>
+  }
+</div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts
new file mode 100644
index 0000000000..f64d3b4763
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts
@@ -0,0 +1,54 @@
+import {HttpClient} from '@angular/common/http';
+import {Component, Inject, OnInit} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {CodeModel} from '@ngstack/code-editor';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {OverseerScriptEditorModalData} from './overseer-script-editor-modal.service';
+
+@Component({
+  selector: 'f-overseer-script-editor-modal',
+  templateUrl: './overseer-script-editor-modal.component.html',
+  styleUrls: ['./overseer-script-editor-modal.component.scss'],
+})
+export class OverseerScriptEditorModalComponent implements OnInit {
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public data: OverseerScriptEditorModalData,
+    public dialogRef: MatDialogRef<OverseerScriptEditorModalData>,
+    private httpClient: HttpClient,
+  ) {}
+
+  public model: CodeModel = {
+    language: 'shell',
+    uri: 'run.sh',
+    value: '',
+  };
+
+  scriptContent: string;
+
+  loading: boolean = false;
+  ngOnInit() {
+    this.loading = true;
+    // TODO: move to taskDefinition model
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.data.taskDefinition.unit.id}/task_definitions/${this.data.taskDefinition.id}/overseer_script`;
+    this.httpClient.get(url).subscribe((data: string) => {
+      this.model.value = data;
+      this.loading = false;
+    });
+  }
+
+  save() {
+    console.log(this.model.value);
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.data.taskDefinition.unit.id}/task_definitions/${this.data.taskDefinition.id}/overseer_script`;
+
+    this.httpClient.put(url, {script_content: this.model.value}).subscribe({
+      next: (result) => {
+        console.log(result);
+        this.dialogRef.close();
+      },
+      error: (error) => {
+        console.error(error);
+      },
+    });
+  }
+}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.service.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.service.ts
new file mode 100644
index 0000000000..c238db3eaf
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.service.ts
@@ -0,0 +1,28 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {OverseerScriptEditorModalComponent} from './overseer-script-editor-modal.component';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+
+export interface OverseerScriptEditorModalData {
+  taskDefinition: TaskDefinition;
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class OverseerScriptEditorModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(taskDefinition: TaskDefinition) {
+    const _dialogRef = this.dialog.open<
+      OverseerScriptEditorModalComponent,
+      OverseerScriptEditorModalData
+    >(OverseerScriptEditorModalComponent, {
+      data: {
+        taskDefinition: taskDefinition,
+      },
+      width: '100%',
+      maxWidth: '1200px',
+    });
+  }
+}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
index bf187030aa..0e5c521bcb 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
@@ -18,6 +18,10 @@
     <mat-hint>Docker image for Overseer</mat-hint>
   </mat-form-field>
 
+  <button mat-flat-button color="primary" (click)="editScript()" class="flex-grow me-4">
+    <mat-icon>upload_file</mat-icon> Edit Execution Script
+  </button>
+
   <f-file-drop
     mode="event"
     (filesDropped)="uploadOverseerResources($event)"
@@ -26,12 +30,7 @@
   />
   @if (taskDefinition.hasTaskAssessmentResources) {
     <div class="flex flex-row gap-4 pt-4">
-      <button
-        mat-flat-button
-        color="warn"
-        (click)="removeOverseerResources()"
-        class="grow me-4"
-      >
+      <button mat-flat-button color="warn" (click)="removeOverseerResources()" class="grow me-4">
         Delete Overseer Resources Zip
       </button>
       <button
@@ -49,19 +48,13 @@
     <button
       mat-flat-button
       color="primary"
-      [disabled]="!taskDefinition.id || !taskDefinition.hasTaskAssessmentResources"
+      [disabled]="!taskDefinition.id || !taskDefinition.hasTaskAssessmentScript"
       (click)="testSubmission()"
       class="flex-grow me-4"
     >
       <mat-icon>upload_file</mat-icon> Test Submission
     </button>
-    <button
-      mat-flat-button
-      color="accent"
-      [disabled]="!currentUserTask"
-      (click)="testSubmissionHistory()"
-      class="flex-grow ms-4"
-    >
+    <button mat-flat-button color="accent" (click)="testSubmissionHistory()" class="flex-grow ms-4">
       <mat-icon>preview</mat-icon> Submission History
     </button>
   </div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
index 597296d707..ea0f92ba89 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
@@ -1,5 +1,5 @@
-import { Component, Input, OnChanges } from '@angular/core';
-import { Observable } from 'rxjs';
+import {Component, Input, OnChanges} from '@angular/core';
+import {Observable} from 'rxjs';
 import {
   OverseerAssessment,
   OverseerImage,
@@ -8,13 +8,14 @@ import {
   User,
   UserService,
 } from 'src/app/api/models/doubtfire-model';
-import { TaskDefinition } from 'src/app/api/models/task-definition';
-import { Unit } from 'src/app/api/models/unit';
-import { TaskDefinitionService } from 'src/app/api/services/task-definition.service';
-import { FileDownloaderService } from 'src/app/common/file-downloader/file-downloader.service';
-import { TaskAssessmentModalService } from 'src/app/common/modals/task-assessment-modal/task-assessment-modal.service';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { TaskSubmissionService } from 'src/app/common/services/task-submission.service';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {Unit} from 'src/app/api/models/unit';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import {TaskAssessmentModalService} from 'src/app/common/modals/task-assessment-modal/task-assessment-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {TaskSubmissionService} from 'src/app/common/services/task-submission.service';
+import {OverseerScriptEditorModalService} from './overseer-script-editor-modal/overseer-script-editor-modal.service';
 
 @Component({
   selector: 'f-task-definition-overseer',
@@ -34,6 +35,7 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
     private userService: UserService,
     private taskDefinitionService: TaskDefinitionService,
     private fileDownloaderService: FileDownloaderService,
+    private overseerScriptEditorModal: OverseerScriptEditorModalService,
   ) {}
 
   public get overseerEnabled(): boolean {
@@ -73,6 +75,10 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
     this.currentUserTask.presentTaskSubmissionModal(this.currentUserTask.status, false, true);
   }
 
+  editScript() {
+    this.overseerScriptEditorModal.show(this.taskDefinition);
+  }
+
   testSubmissionHistory() {
     this.modalService.show(this.currentUserTask);
   }
@@ -93,7 +99,7 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
       next: () => {
         this.alerts.success('Deleted Overseer Resources', 2000);
         this.taskDefinition.hasTaskAssessmentResources = false;
-      }
+      },
     });
   }
 
@@ -104,7 +110,6 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
     );
   }
 
-
   public uploadOverseerResources(files: FileList) {
     const validFiles = Array.from(files as ArrayLike<File>).filter(
       (f) => f.type === 'application/zip' || f.type === 'application/x-zip-compressed',

From 1a4a3f6c64743f7fd7e9d96697bdfa4cdb792c8e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 6 Nov 2025 15:36:36 +1100
Subject: [PATCH 636/776] chore(release): 10.0.0-61

---
 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 4650b3c42e..c2462bcfcf 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.
 
+## [10.0.0-61](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-60...v10.0.0-61) (2025-11-06)
+
 ## [10.0.0-60](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-59...v10.0.0-60) (2025-11-05)
 
 
diff --git a/package-lock.json b/package-lock.json
index a2fb633540..0f3a3c3b45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-60",
+  "version": "10.0.0-61",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-60",
+      "version": "10.0.0-61",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index be72c68d67..09053700c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-60",
+  "version": "10.0.0-61",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 29fbc1498b0d48811cb59c5f2a66871fbac06849 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 6 Nov 2025 15:59:27 +1100
Subject: [PATCH 637/776] feat: restrict assessments to tutors in the same
 tutorial stream (#1033)

* feat: restrict assessments to tutors in the same tutorial stream

* refactor: unselect tasks that are locked to a tutorial stream
---
 src/app/api/models/task-definition.ts              |  1 +
 src/app/api/services/task-definition.service.ts    |  1 +
 .../tutor-discussion.component.html                |  6 +++++-
 .../tutor-discussion/tutor-discussion.component.ts | 14 ++++++++++++++
 .../task-definition-who.component.html             |  6 ++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index e82ae135f0..1560b94909 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -56,6 +56,7 @@ export class TaskDefinition extends Entity {
   hasJplagReport: boolean;
   assessInPortfolioOnly: boolean;
   useResourcesForJplagBaseCode: boolean;
+  lockAssessmentsToTutorialStream: boolean;
 
   public readonly taskPrerequisitesCache: EntityCache<TaskPrerequisite> =
     new EntityCache<TaskPrerequisite>();
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 06bea8da49..cb36d3cc32 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -138,6 +138,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
         },
       },
       'useResourcesForJplagBaseCode',
+      'lockAssessmentsToTutorialStream',
     );
 
     this.mapping.mapAllKeysToJsonExcept(
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 0c669784dd..89cf35865f 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -81,7 +81,11 @@
           class="clearfix w-full"
           style="padding: 0; height: 60px"
           togglePosition="before"
-          [selected]="task.status === 'discuss' || attendance"
+          [selected]="
+            (task.status === 'discuss' || attendance) &&
+            (!task.definition.lockAssessmentsToTutorialStream ||
+              currentUserTutorsInStream(task.definition.tutorialStream))
+          "
         >
           @if (task) {
             <div class="w-full" id="{{ task.id }}">
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 445eb16cc3..567988d53d 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -12,6 +12,7 @@ import {
   TaskDefinition,
   TaskService,
   TaskStatusEnum,
+  TutorialStream,
   Unit,
   UnitService,
   UserService,
@@ -69,6 +70,19 @@ export class TutorDiscussionComponent implements AfterViewInit {
     private taskService: TaskService,
   ) {}
 
+  public currentUserTutorsInStream(tutorialStream: TutorialStream): boolean {
+    const user = this.userService.currentUser;
+    const tutorials = this.unit.tutorials.filter(
+      (t) =>
+        t.tutorialStream.abbreviation === tutorialStream.abbreviation &&
+        t.tutorialStream.name === tutorialStream.name,
+    );
+    if (tutorials.some((t) => t.tutor.id === user.id)) {
+      return true;
+    }
+    return false;
+  }
+
   onTabChange(event: MatTabChangeEvent): void {
     if (event.index === 0) {
       this.showComments();
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.html
index 5d93345d7f..f36a92f380 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component.html
@@ -56,3 +56,9 @@
     </ul>
   </span>
 </div>
+
+<div>
+  <mat-slide-toggle [(ngModel)]="taskDefinition.lockAssessmentsToTutorialStream"
+    >Only allow tutors in this tutorial stream to assess this task</mat-slide-toggle
+  >
+</div>

From 8a56b651ec2f032585de734d8e5f66908fa7098a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 6 Nov 2025 16:28:29 +1100
Subject: [PATCH 638/776] chore(release): 10.0.0-62

---
 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 c2462bcfcf..7fde181cd4 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.
 
+## [10.0.0-62](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-61...v10.0.0-62) (2025-11-06)
+
+
+### Features
+
+* restrict assessments to tutors in the same tutorial stream ([#1033](https://github.com/b0ink/doubtfire-deploy/issues/1033)) ([29fbc14](https://github.com/b0ink/doubtfire-deploy/commit/29fbc1498b0d48811cb59c5f2a66871fbac06849))
+
 ## [10.0.0-61](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-60...v10.0.0-61) (2025-11-06)
 
 ## [10.0.0-60](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-59...v10.0.0-60) (2025-11-05)
diff --git a/package-lock.json b/package-lock.json
index 0f3a3c3b45..8087a7e128 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-61",
+  "version": "10.0.0-62",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-61",
+      "version": "10.0.0-62",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 09053700c4..21346adcca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-61",
+  "version": "10.0.0-62",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 24f358ecae920e3eeb2f8b50e181be0ae68afde2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 30 Sep 2025 13:39:20 +1000
Subject: [PATCH 639/776] refactor: replace range datepickers with three
 separate datepickers

---
 .../task-definition-dates.component.html      | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-dates/task-definition-dates.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-dates/task-definition-dates.component.html
index a2285a0969..c6a3eb74c6 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-dates/task-definition-dates.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-dates/task-definition-dates.component.html
@@ -1,43 +1,43 @@
 <div class="flex flex-row gap-4">
-  <mat-form-field appearance="outline" class="basis-1/2">
-    <mat-label>Start date to suggested completion date</mat-label>
-    <mat-date-range-input
-      [rangePicker]="picker"
-      [comparisonStart]="taskDefinition.targetDate"
-      [comparisonEnd]="taskDefinition.dueDate"
-    >
-      <input matStartDate placeholder="Start date" [(ngModel)]="taskDefinition.startDate" name="startDate" required />
-      <input matEndDate placeholder="Target date" [(ngModel)]="taskDefinition.targetDate" name="targetDate" required />
-    </mat-date-range-input>
-
-    <mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
-    <mat-date-range-picker #picker></mat-date-range-picker>
+  <mat-form-field appearance="outline" class="basis-1/3">
+    <mat-label>Start Date</mat-label>
+    <input
+      matInput
+      placeholder="Start date"
+      [matDatepicker]="startdatepicker"
+      [(ngModel)]="taskDefinition.startDate"
+      required
+    />
+    <mat-datepicker-toggle matIconSuffix [for]="startdatepicker"></mat-datepicker-toggle>
+    <mat-datepicker #startdatepicker></mat-datepicker>
+    <mat-hint>Suggested date for students to begin the task.</mat-hint>
   </mat-form-field>
 
-  <mat-form-field appearance="outline" class="basis-1/2">
-    <mat-label>Suggestion completion date to final feedback </mat-label>
-    <mat-date-range-input
-      [rangePicker]="duePicker"
-      [comparisonStart]="taskDefinition.startDate"
-      [comparisonEnd]="taskDefinition.targetDate"
-    >
-      <input
-        matStartDate
-        placeholder="Target date"
-        [(ngModel)]="taskDefinition.targetDate"
-        name="targetDate"
-        required
-      />
-      <input
-        matEndDate
-        placeholder="Final feedback date"
-        [(ngModel)]="taskDefinition.dueDate"
-        name="dueDate"
-        required
-      />
-    </mat-date-range-input>
+  <mat-form-field appearance="outline" class="basis-1/3">
+    <mat-label>Target Date</mat-label>
+    <input
+      matInput
+      placeholder="Target date"
+      [matDatepicker]="targetdatepicker"
+      [(ngModel)]="taskDefinition.targetDate"
+      required
+    />
+    <mat-datepicker-toggle matIconSuffix [for]="targetdatepicker"></mat-datepicker-toggle>
+    <mat-datepicker #targetdatepicker></mat-datepicker>
+    <mat-hint>Recommended target date for students to complete the task.</mat-hint>
+  </mat-form-field>
 
-    <mat-datepicker-toggle matIconSuffix [for]="duePicker"></mat-datepicker-toggle>
-    <mat-date-range-picker #duePicker></mat-date-range-picker>
+  <mat-form-field appearance="outline" class="basis-1/3">
+    <mat-label>Final Feedback Date</mat-label>
+    <input
+      placeholder="Final feedback date"
+      matInput
+      [matDatepicker]="finaldatepicker"
+      [(ngModel)]="taskDefinition.dueDate"
+      required
+    />
+    <mat-datepicker-toggle matIconSuffix [for]="finaldatepicker"></mat-datepicker-toggle>
+    <mat-datepicker #finaldatepicker></mat-datepicker>
+    <mat-hint>Final deadline for receiving feedback.</mat-hint>
   </mat-form-field>
 </div>

From 6c4931bd40e94b9a2fbafe3b0b6c9d8670564c74 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 7 Nov 2025 15:17:53 +1100
Subject: [PATCH 640/776] chore: replace doubtfire with ontrack

---
 src/app/common/file-uploader/file-uploader.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/file-uploader/file-uploader.coffee b/src/app/common/file-uploader/file-uploader.coffee
index c492dac115..89c0c17755 100644
--- a/src/app/common/file-uploader/file-uploader.coffee
+++ b/src/app/common/file-uploader/file-uploader.coffee
@@ -263,7 +263,7 @@ angular.module('doubtfire.common.file-uploader', ["ngFileUpload"])
               response = JSON.parse xhr.responseText
             catch e
               if xhr.status is 0
-                response = { error: 'Could not connect to the Doubtfire server' }
+                response = { error: 'Could not connect to the OnTrack server' }
               else
                 response = xhr.responseText
             # Success (20x success range)

From 5b4b097a9b189e5a816695cce7438104f1144283 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:21:56 +1100
Subject: [PATCH 641/776] feat: open project dashboard from portfolios view

(#1040)
---
 src/app/units/states/portfolios/portfolios.coffee   | 4 ++++
 src/app/units/states/portfolios/portfolios.tpl.html | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/src/app/units/states/portfolios/portfolios.coffee b/src/app/units/states/portfolios/portfolios.coffee
index e87a17027d..d13cca4433 100644
--- a/src/app/units/states/portfolios/portfolios.coffee
+++ b/src/app/units/states/portfolios/portfolios.coffee
@@ -149,4 +149,8 @@ angular.module('doubtfire.units.states.portfolios', [])
 
   $scope.transferToD2L = ->
     D2lTransferModal.open($scope.unit)
+
+  $scope.openProject = ($event, project) ->
+    $event.stopPropagation()
+    window.open("/projects/#{project.id}/dashboard/?tutor=true", "_blank")
 )
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index 376277513e..34d00d5d7f 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -214,6 +214,13 @@ <h4 class="panel-title">Mark Portfolios</h4>
               {{student.hasPortfolio ? "Yes" : "No"}}
             </td>
             <td>{{student.grade}}</td>
+            <td
+              class="hover:bg-gray-300 text-center"
+              ng-click="openProject($event, student)"
+              tooltip="View student project in new tab"
+            >
+              <i class="fa fa-arrow-right"></i>
+            </td>
           </tr>
         </tbody>
       </table>

From 770b1718f307f6dbb835bef706bff1aa46bb68d5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:23:30 +1100
Subject: [PATCH 642/776] chore(release): 10.0.0-63

---
 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 7fde181cd4..25972b520c 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.
 
+## [10.0.0-63](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-62...v10.0.0-63) (2025-11-10)
+
+
+### Features
+
+* open project dashboard from portfolios view ([5b4b097](https://github.com/b0ink/doubtfire-deploy/commit/5b4b097a9b189e5a816695cce7438104f1144283)), closes [#1040](https://github.com/b0ink/doubtfire-deploy/issues/1040)
+
 ## [10.0.0-62](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-61...v10.0.0-62) (2025-11-06)
 
 
diff --git a/package-lock.json b/package-lock.json
index 8087a7e128..ac840fcd6d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-62",
+  "version": "10.0.0-63",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-62",
+      "version": "10.0.0-63",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 21346adcca..47621b97b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-62",
+  "version": "10.0.0-63",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 9ab015d168cf7e421500910766b9e6fb0bf907f5 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 10 Nov 2025 16:49:02 +1100
Subject: [PATCH 643/776] fix: avoid calling window to open project in new tab

---
 src/app/units/states/portfolios/portfolios.coffee | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/portfolios/portfolios.coffee b/src/app/units/states/portfolios/portfolios.coffee
index d13cca4433..62c70a04f3 100644
--- a/src/app/units/states/portfolios/portfolios.coffee
+++ b/src/app/units/states/portfolios/portfolios.coffee
@@ -152,5 +152,9 @@ angular.module('doubtfire.units.states.portfolios', [])
 
   $scope.openProject = ($event, project) ->
     $event.stopPropagation()
-    window.open("/projects/#{project.id}/dashboard/?tutor=true", "_blank")
+    # HACK: avoids using window.open() to prevent AngularJS error
+    link = document.createElement('a')
+    link.href = "/projects/#{project.id}/dashboard/?tutor=true"
+    link.target = '_blank'
+    link.click()
 )

From 7d1dbc33476cd669ab5217cfd70a53017c557d6e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 11 Nov 2025 12:04:28 +1100
Subject: [PATCH 644/776] refactor: move overseer script url to task definition
 model

---
 src/app/api/models/task-definition.ts         |  4 ++
 .../overseer-script-editor-modal.component.ts | 40 +++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 1560b94909..814c7a9c53 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -276,6 +276,10 @@ export class TaskDefinition extends Entity {
     }/task_assessment_resources.json`;
   }
 
+  public get taskOverseerExecutionScriptUrl() {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${this.id}/overseer_script`;
+  }
+
   public getJplagReportUrl() {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.unit.id}/task_definitions/${this.id}/jplag_report`;
   }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts
index f64d3b4763..ddcf7c1d40 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts
@@ -2,8 +2,7 @@ import {HttpClient} from '@angular/common/http';
 import {Component, Inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {CodeModel} from '@ngstack/code-editor';
-import {AppInjector} from 'src/app/app-injector';
-import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {AlertService} from 'src/app/common/services/alert.service';
 import {OverseerScriptEditorModalData} from './overseer-script-editor-modal.service';
 
 @Component({
@@ -16,6 +15,7 @@ export class OverseerScriptEditorModalComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public data: OverseerScriptEditorModalData,
     public dialogRef: MatDialogRef<OverseerScriptEditorModalData>,
     private httpClient: HttpClient,
+    private alertService: AlertService,
   ) {}
 
   public model: CodeModel = {
@@ -29,26 +29,26 @@ export class OverseerScriptEditorModalComponent implements OnInit {
   loading: boolean = false;
   ngOnInit() {
     this.loading = true;
-    // TODO: move to taskDefinition model
-    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.data.taskDefinition.unit.id}/task_definitions/${this.data.taskDefinition.id}/overseer_script`;
-    this.httpClient.get(url).subscribe((data: string) => {
-      this.model.value = data;
-      this.loading = false;
-    });
+    this.httpClient
+      .get(this.data.taskDefinition.taskOverseerExecutionScriptUrl)
+      .subscribe((data: string) => {
+        this.model.value = data;
+        this.loading = false;
+      });
   }
 
   save() {
-    console.log(this.model.value);
-    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.data.taskDefinition.unit.id}/task_definitions/${this.data.taskDefinition.id}/overseer_script`;
-
-    this.httpClient.put(url, {script_content: this.model.value}).subscribe({
-      next: (result) => {
-        console.log(result);
-        this.dialogRef.close();
-      },
-      error: (error) => {
-        console.error(error);
-      },
-    });
+    this.httpClient
+      .put(this.data.taskDefinition.taskOverseerExecutionScriptUrl, {
+        script_content: this.model.value,
+      })
+      .subscribe({
+        next: (_result) => {
+          this.dialogRef.close();
+        },
+        error: (error) => {
+          this.alertService.error(`Failed to save script: ${error}`, 6000);
+        },
+      });
   }
 }

From 8eaffbcb65b835d615646d4c9560cbf1881deeb9 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 11 Nov 2025 12:17:16 +1100
Subject: [PATCH 645/776] refactor: base64 encode overseer script before
 sending to server

---
 .../overseer-script-editor-modal.component.ts            | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts
index ddcf7c1d40..128e2410f0 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component.ts
@@ -38,9 +38,12 @@ export class OverseerScriptEditorModalComponent implements OnInit {
   }
 
   save() {
+    const scriptOriginal = this.model.value;
+    const scriptEncoded = this.base64UrlEncode(scriptOriginal);
+
     this.httpClient
       .put(this.data.taskDefinition.taskOverseerExecutionScriptUrl, {
-        script_content: this.model.value,
+        script_content: scriptEncoded,
       })
       .subscribe({
         next: (_result) => {
@@ -51,4 +54,8 @@ export class OverseerScriptEditorModalComponent implements OnInit {
         },
       });
   }
+
+  private base64UrlEncode(str) {
+    return btoa(str).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+  }
 }

From 40f2640e6579536cef8e82e9476733083b82bac1 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 13 Nov 2025 08:15:27 +1100
Subject: [PATCH 646/776] fix: use new google fonts api for proper weight
 loading (#1039)

---
 src/index.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/index.html b/src/index.html
index 2e715e206f..af609f230c 100644
--- a/src/index.html
+++ b/src/index.html
@@ -18,7 +18,10 @@
       href="https://fonts.googleapis.com/icon?family=Material+Icons|Material+Icons+Outlined"
       rel="stylesheet"
     />
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inter" />
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Inter:wght@400;700;800&display=swap"
+    />
     <title ng-bind="externalName.value">Loading...</title>
 
     <!-- Nice favicons for all devices -->

From 5aef6cfddaf61408e6f3169002f9b8ce00b7dfac Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 13 Nov 2025 15:09:02 +1100
Subject: [PATCH 647/776] chore: specify only time exceeded tasks are updated

---
 .../unit-details-editor/unit-details-editor.component.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.ts b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.ts
index 0ea300bf8e..7ac7161a73 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.ts
@@ -90,7 +90,7 @@ export class UnitDetailsEditorComponent implements OnInit {
       const modal = this.confirmationModal.show(
         'Enable Assess in Portfolio?',
         `Are you sure you want to enable "Assess in Portfolio" for late submissions?
-        This will update any existing Time/Feedback Exceeded tasks to the "Assess in Portfolio" state.
+        This will update any existing Time Exceeded tasks to the "Assess in Portfolio" state.
         You will not be able to disable this setting while any tasks remain in the "Assess in Portfolio" state.`,
         () => {
           this.unit.markLateSubmissionsAsAssessInPortfolio = true;

From f505823498bd52f6282d613512c085f8978f48b7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 25 Nov 2025 12:58:21 +1100
Subject: [PATCH 648/776] chore(release): 10.0.0-64

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25972b520c..e1e42ecd66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+## [10.0.0-64](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-63...v10.0.0-64) (2025-11-25)
+
+
+### Bug Fixes
+
+* avoid calling window to open project in new tab ([9ab015d](https://github.com/b0ink/doubtfire-deploy/commit/9ab015d168cf7e421500910766b9e6fb0bf907f5))
+* use new google fonts api for proper weight loading ([#1039](https://github.com/b0ink/doubtfire-deploy/issues/1039)) ([40f2640](https://github.com/b0ink/doubtfire-deploy/commit/40f2640e6579536cef8e82e9476733083b82bac1))
+
 ## [10.0.0-63](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-62...v10.0.0-63) (2025-11-10)
 
 
diff --git a/package-lock.json b/package-lock.json
index ac840fcd6d..99a5447d53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-63",
+  "version": "10.0.0-64",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-63",
+      "version": "10.0.0-64",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 47621b97b8..2945358894 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-63",
+  "version": "10.0.0-64",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From bdcd75d91d5ddc7d9a60317bd91289a7242251e1 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 25 Nov 2025 13:11:37 +1100
Subject: [PATCH 649/776] fix: typo

---
 .../upload-submission-modal/upload-submission-modal.tpl.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
index 65695e16ec..bfda995467 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.tpl.html
@@ -101,7 +101,7 @@ <h4>Final comments</h4>
         <div class="card-body">
           <textarea ng-model="comment" class="form-control input-lg" rows="3" placeholder="{{submissionType == 'need_help' ? 'I need help with...' : submissionType == 'ready_for_feedback' && task.definition.assessInPortfolioOnly ? 'I would like feedback with...' : 'Make a comment...'}}">
           </textarea>
-          <div class="w-full text-right py-2 text-gray-400">Character count: {{comment.length}} <span ng-show="submissionType == 'need_help' || ((submissionType=='ready_for_feedback' || submissionType=='reupload_evidence) && task.definition.assessInPortfolioOnly)">(Min. 25)</span></div>
+          <div class="w-full text-right py-2 text-gray-400">Character count: {{comment.length}} <span ng-show="submissionType == 'need_help' || ((submissionType=='ready_for_feedback' || submissionType=='reupload_evidence') && task.definition.assessInPortfolioOnly)">(Min. 25)</span></div>
         </div>
       </div><!--/card-comments-->
       <div class="card card-default" ng-show="privacyPolicy.privacy">

From 665d6ae86b65e9e8ba83df1ad3d4a053a4553851 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 25 Nov 2025 13:11:44 +1100
Subject: [PATCH 650/776] chore(release): 10.0.0-65

---
 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 e1e42ecd66..6935c31476 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.
 
+## [10.0.0-65](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-64...v10.0.0-65) (2025-11-25)
+
+
+### Bug Fixes
+
+* typo ([bdcd75d](https://github.com/b0ink/doubtfire-deploy/commit/bdcd75d91d5ddc7d9a60317bd91289a7242251e1))
+
 ## [10.0.0-64](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-63...v10.0.0-64) (2025-11-25)
 
 
diff --git a/package-lock.json b/package-lock.json
index 99a5447d53..c30263893b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-64",
+  "version": "10.0.0-65",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-64",
+      "version": "10.0.0-65",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 2945358894..fb458e4b24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-64",
+  "version": "10.0.0-65",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 0611be04e8fe7e75ae07504945a2984839475e3a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 28 Nov 2025 15:27:41 +1100
Subject: [PATCH 651/776] fix: correctly set rollover end date

---
 .../directives/unit-dates-selector/unit-dates-selector.coffee | 4 ++--
 .../unit-dates-selector/unit-dates-selector.tpl.html          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.coffee b/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.coffee
index 07569a20a0..1542d89d20 100644
--- a/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.coffee
+++ b/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.coffee
@@ -62,8 +62,8 @@ angular.module('doubtfire.units.states.rollover.directives.unit-dates-selector',
         }
       else
         body = {
-          start_date: $scope.saveData.startDate
-          end_date: $scope.saeData.endDate
+          start_date: $scope.saveData.startDate,
+          end_date: $scope.saveData.endDate
         }
       $scope.unit.rolloverTo(body).subscribe({
         next: (response) ->
diff --git a/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.tpl.html b/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.tpl.html
index c3be994325..fdfe7f5f21 100644
--- a/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.tpl.html
+++ b/src/app/units/states/rollover/directives/unit-dates-selector/unit-dates-selector.tpl.html
@@ -39,11 +39,11 @@ <h3 class="panel-title">Copy {{unit.code}} {{unit.nameAndPeriod}}</h3>
           <label class="col-sm-2 control-label" for="enddate">End Date</label>
           <div class="col-sm-9">
             <div class="col-sm-4 input-group">
-              <input datepicker-popup="{{format}}" id="enddate" type="text" class="form-control" ng-model="unit.endDate" is-open="calOptions.endOpened" ng-required="true" close-text="Close" ng-if="!saveData.toPeriod" />
+              <input datepicker-popup="yyyy-MM-dd" id="enddate" type="text" class="form-control" ng-model="saveData.endDate" is-open="calOptions.endOpened" ng-required="true" placeholder="yyyy-MM-dd" close-text="Close" ng-if="!saveData.toPeriod" />
               <input
                 type="text"
                 class="form-control"
-                id="startdate"
+                id="enddate"
                 value="{{saveData.toPeriod.endDate | date}}"
                 ng-disabled="true"
                 ng-if="saveData.toPeriod"

From 730ffd0c3f79a5ad42c0c59c2f2c2a901ab0d702 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 1 Dec 2025 13:50:42 +1100
Subject: [PATCH 652/776] feat: discussion prompts (#1042)

* feat: init discussion prompts ui

* refactor: improve tutor discussion ui

* refactor: display discussion prompts in tutor discussion view

* refactor: reword weight to priority
---
 src/app/api/models/discussion-prompt.ts       |  59 +++++++
 src/app/api/models/task-definition.ts         |   5 +
 .../api/services/discussion-prompt.service.ts | 128 +++++++++++++++
 .../api/services/task-definition.service.ts   |   1 +
 src/app/common/footer/footer.component.html   |  13 ++
 src/app/common/footer/footer.component.ts     |   4 +
 src/app/doubtfire-angular.module.ts           |   9 +
 .../discussion-prompts-view.component.html    |  11 ++
 .../discussion-prompts-view.component.scss    |   0
 .../discussion-prompts-view.component.ts      |  11 ++
 .../task-dashboard.component.html             |   7 +
 .../states/dashboard/selected-task.service.ts |   5 +
 .../discussion-prompts.component.html         |  21 +++
 .../discussion-prompts.component.scss         |   0
 .../discussion-prompts.component.ts           |  50 ++++++
 .../tutor-discussion.component.html           |  15 +-
 .../tutor-discussion.component.ts             |   7 +
 ...finition-discussion-prompts.component.html | 107 ++++++++++++
 ...finition-discussion-prompts.component.scss |   0
 ...definition-discussion-prompts.component.ts | 155 ++++++++++++++++++
 .../task-definition-editor.component.html     |  12 ++
 21 files changed, 614 insertions(+), 6 deletions(-)
 create mode 100644 src/app/api/models/discussion-prompt.ts
 create mode 100644 src/app/api/services/discussion-prompt.service.ts
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.html
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.scss
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.ts
 create mode 100644 src/app/projects/states/discussion-prompts/discussion-prompts.component.html
 create mode 100644 src/app/projects/states/discussion-prompts/discussion-prompts.component.scss
 create mode 100644 src/app/projects/states/discussion-prompts/discussion-prompts.component.ts
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.html
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.scss
 create mode 100644 src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.ts

diff --git a/src/app/api/models/discussion-prompt.ts b/src/app/api/models/discussion-prompt.ts
new file mode 100644
index 0000000000..e984847084
--- /dev/null
+++ b/src/app/api/models/discussion-prompt.ts
@@ -0,0 +1,59 @@
+import {Entity} from 'ngx-entity-service';
+import {AppInjector} from 'src/app/app-injector';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {DiscussionPromptService} from '../services/discussion-prompt.service';
+import {Project, TaskDefinition, Unit, User} from './doubtfire-model';
+
+export class DiscussionPrompt extends Entity {
+  id: number;
+  unit: Unit;
+  taskDefinition: TaskDefinition;
+  project: Project | null;
+  createdBy: User;
+  content: string;
+  priority: number;
+  discussedAt: Date;
+
+  public readonly PRIORITY = {
+    1: 'Low',
+    2: 'Medium',
+    3: 'High',
+  } as const;
+
+  constructor(data?: Project | TaskDefinition | Unit) {
+    super();
+    if (data) {
+      if (data instanceof Project) {
+        this.project = data;
+      } else if (data instanceof TaskDefinition) {
+        this.taskDefinition = data;
+      } else if (data instanceof Unit) {
+        this.unit = data;
+      }
+    } else {
+      console.error('Failed to get project');
+    }
+  }
+
+  public get priorityLabel() {
+    return this.PRIORITY[this.priority] ?? this.priority;
+  }
+
+  public delete() {
+    const discussionPromptService: DiscussionPromptService =
+      AppInjector.get(DiscussionPromptService);
+    discussionPromptService
+      .delete(
+        {task_definition_id: this.taskDefinition.id, id: this.id},
+        {cache: this.taskDefinition.discussionPromptsCache},
+      )
+      .subscribe({
+        next: (_response: object) => {
+          AppInjector.get(AlertService).success('Successfully deleted discussion note', 4000);
+        },
+        error: (error: any) => {
+          AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
+        },
+      });
+  }
+}
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 814c7a9c53..d3aa2a4317 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -8,6 +8,7 @@ import {TaskDefinitionService} from '../services/task-definition.service';
 import {Grade, GroupSet, LearningOutcome, Project, TutorialStream, Unit} from './doubtfire-model';
 import {Task} from './doubtfire-model';
 import {TaskPrerequisite} from './task-prerequisite';
+import {DiscussionPrompt} from './discussion-prompt';
 
 export type UploadRequirement = {
   key: string;
@@ -57,10 +58,14 @@ export class TaskDefinition extends Entity {
   assessInPortfolioOnly: boolean;
   useResourcesForJplagBaseCode: boolean;
   lockAssessmentsToTutorialStream: boolean;
+  discussionPromptsCount: number;
 
   public readonly taskPrerequisitesCache: EntityCache<TaskPrerequisite> =
     new EntityCache<TaskPrerequisite>();
 
+  public readonly discussionPromptsCache: EntityCache<DiscussionPrompt> =
+    new EntityCache<DiscussionPrompt>();
+
   public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
     new EntityCache<LearningOutcome>();
 
diff --git a/src/app/api/services/discussion-prompt.service.ts b/src/app/api/services/discussion-prompt.service.ts
new file mode 100644
index 0000000000..c102fbcbf1
--- /dev/null
+++ b/src/app/api/services/discussion-prompt.service.ts
@@ -0,0 +1,128 @@
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {CachedEntityService, RequestOptions} from 'ngx-entity-service';
+import {Observable} from 'rxjs';
+import {
+  Project,
+  ProjectService,
+  TaskDefinition,
+  Unit,
+  UserService,
+} from 'src/app/api/models/doubtfire-model';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {DiscussionPrompt} from '../models/discussion-prompt';
+
+@Injectable()
+export class DiscussionPromptService extends CachedEntityService<DiscussionPrompt> {
+  protected readonly endpointFormat =
+    'task_definitions/:task_definition_id:/discussion_prompts/:id:';
+
+  protected readonly projectEndpointFormat = 'projects/:projectId:/discussion_prompts';
+  protected readonly taskDefinitionProjectEndpointFormat =
+    'projects/:projectId:/discussion_prompts';
+  protected readonly taskDefinitionEndpointFormat =
+    'task_definitions/:taskDefinitionId:/discussion_prompts';
+
+  constructor(
+    httpClient: HttpClient,
+    private userService: UserService,
+    private projectService: ProjectService,
+  ) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys(
+      'id',
+      'content',
+      'priority',
+      {
+        keys: ['createdBy', 'created_by_id'],
+        toEntityFn: (data: object, key: string, prompt: DiscussionPrompt) => {
+          if (prompt.project) {
+            return prompt.project.unit.staff.find((s) => s.user.id === data['created_by_id']).user;
+          } else if (prompt.taskDefinition) {
+            return prompt.taskDefinition.unit.staff.find((s) => s.user.id === data['created_by_id'])
+              ?.user;
+          } else if (prompt.unit) {
+            return prompt.unit.staff.find((s) => s.user.id === data['created_by_id'])?.user;
+          }
+        },
+      },
+      {
+        keys: ['taskDefinition', 'task_definition_id'],
+        toEntityFn: (data: object, key: string, entity: DiscussionPrompt) => {
+          if (entity.project) {
+            return entity.project.unit.taskDef(data[key]);
+          } else if (entity.unit) {
+            return entity.unit.taskDef(data[key]);
+          }
+          return entity.taskDefinition;
+        },
+        toJsonFn: (entity: DiscussionPrompt, key: string) => {
+          return entity.taskDefinition?.id;
+        },
+      },
+    );
+
+    this.mapping.addJsonKey('project', 'taskDefinition', 'unit', 'createdBy');
+  }
+
+  public createInstanceFrom(
+    _json: object,
+    other?: Project | Unit | TaskDefinition,
+  ): DiscussionPrompt {
+    return new DiscussionPrompt(other);
+  }
+
+  // TODO: loadDiscussionPromptsForProject and overload for loadTaskDefinitionDiscussionPrompts()
+
+  public loadDiscussionPromptsForPoject(project: Project) {
+    const options: RequestOptions<DiscussionPrompt> = {
+      endpointFormat: this.taskDefinitionProjectEndpointFormat,
+      cacheBehaviourOnGet: 'cacheQuery',
+      constructorParams: project,
+    };
+
+    return super.fetchAll(
+      {
+        projectId: project?.id,
+      },
+      options,
+    );
+  }
+
+  public loadDiscussionPrompts(
+    project: Project,
+    taskDefinition?: TaskDefinition,
+    useFetch: boolean = true,
+  ): Observable<DiscussionPrompt[]> {
+    const options: RequestOptions<DiscussionPrompt> = {
+      endpointFormat: project
+        ? taskDefinition
+          ? this.taskDefinitionProjectEndpointFormat
+          : this.projectEndpointFormat
+        : this.taskDefinitionEndpointFormat,
+      cache: taskDefinition.discussionPromptsCache,
+      sourceCache: taskDefinition.discussionPromptsCache,
+      // cacheBehaviourOnGet: 'cacheQuery',
+      constructorParams: project ? project : taskDefinition,
+    };
+
+    if (useFetch) {
+      return super.fetchAll(
+        {
+          projectId: project?.id,
+          taskDefinitionId: taskDefinition?.id,
+        },
+        options,
+      );
+    } else {
+      return super.query(
+        {
+          projectId: project?.id,
+          taskDefinitionId: taskDefinition?.id,
+        },
+        options,
+      );
+    }
+  }
+}
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index cb36d3cc32..59664c143a 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -125,6 +125,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'maxQualityPts',
       'overseerImageId',
       'assessmentEnabled',
+      'discussionPromptsCount',
       {
         keys: 'ilos',
         toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 8fd9e50a33..e7d84ac5e5 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -128,6 +128,19 @@
         </div>
       }
       @if (selectedTask?.project) {
+        @if (selectedTask?.definition.discussionPromptsCount) {
+          <button
+            mat-icon-button
+            matTooltip="Discussion Prompts"
+            matTooltipPosition="above"
+            aria-label="View discussion prompts"
+            class="button small-button"
+            (click)="viewDiscussionPrompts()"
+          >
+            <mat-icon class="small-icon">forum</mat-icon>
+          </button>
+        }
+
         <div class="relative inline-block">
           @if (selectedTask.project.staffNoteCount > 0) {
             <div [matBadge]="selectedTask.project.staffNoteCount"></div>
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 7e38438381..295b8612ee 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -107,6 +107,10 @@ export class FooterComponent implements OnInit {
     this.selectedTaskService.showStaffNotes();
   }
 
+  viewDiscussionPrompts() {
+    this.selectedTaskService.showDiscussionPrompts();
+  }
+
   getJplagReport() {
     if (!this.selectedTask?.definition) {
       return;
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 318c601b35..7938a4e274 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -297,6 +297,10 @@ import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/direc
 import {OverseerScriptEditorModalComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component';
 import {CodeEditorModule} from '@ngstack/code-editor';
 import {UploadGradesComponent} from './units/states/portfolios/upload-grades/upload-grades.component';
+import {DiscussionPromptService} from './api/services/discussion-prompt.service';
+import {DiscussionPromptsComponent} from './projects/states/discussion-prompts/discussion-prompts.component';
+import {TaskDefinitionDiscussionPromptsComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component';
+import {DiscussionPromptsViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -452,6 +456,10 @@ const MY_DATE_FORMAT = {
     AnalyticsTutorTimesComponent,
     PortfolioIncludedTasksComponent,
     OverseerScriptEditorModalComponent,
+    UploadGradesComponent,
+    DiscussionPromptsComponent,
+    TaskDefinitionDiscussionPromptsComponent,
+    DiscussionPromptsViewComponent,
   ],
   providers: [
     // Services we provide
@@ -541,6 +549,7 @@ const MY_DATE_FORMAT = {
     LtiService,
     TaskPrerequisiteService,
     MarkingSessionService,
+    DiscussionPromptService,
   ],
   imports: [
     FlexLayoutModule,
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.html
new file mode 100644
index 0000000000..8cc634a7fd
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.html
@@ -0,0 +1,11 @@
+<div class="p-4 h-[calc(100%-50px)]">
+  <div class="flex items-center">
+    <mat-icon class="mr-2">comment</mat-icon>
+    <h1 class="mat-headline m-0">Discussion Prompts for {{ project?.student?.name }}</h1>
+  </div>
+
+  <f-discussion-prompts
+    [project]="project"
+    [taskDefinition]="taskDefinition"
+  ></f-discussion-prompts>
+</div>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.scss b/src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.ts
new file mode 100644
index 0000000000..6156a4b191
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component.ts
@@ -0,0 +1,11 @@
+import {Component, Input} from '@angular/core';
+
+@Component({
+  selector: 'f-discussion-prompts-view',
+  templateUrl: './discussion-prompts-view.component.html',
+  styleUrls: ['./discussion-prompts-view.component.scss'],
+})
+export class DiscussionPromptsViewComponent {
+  @Input() project;
+  @Input() taskDefinition;
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
index 705ab5b6d3..df91328f92 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
@@ -19,6 +19,13 @@
     <ng-template [ngSwitchCase]="DashboardViews.staff_notes">
       <f-staff-notes-view [project]="task.project"></f-staff-notes-view>
     </ng-template>
+
+    <ng-template [ngSwitchCase]="DashboardViews.discussion_prompts">
+      <f-discussion-prompts-view
+        [project]="task.project"
+        [taskDefinition]="task.definition"
+      ></f-discussion-prompts-view>
+    </ng-template>
   </ng-container>
 
   <!-- The PDF Viewer -->
diff --git a/src/app/projects/states/dashboard/selected-task.service.ts b/src/app/projects/states/dashboard/selected-task.service.ts
index 31b5dd8716..204714694e 100644
--- a/src/app/projects/states/dashboard/selected-task.service.ts
+++ b/src/app/projects/states/dashboard/selected-task.service.ts
@@ -9,6 +9,7 @@ export enum DashboardViews {
   task,
   similarity,
   staff_notes,
+  discussion_prompts,
 }
 
 @Injectable({
@@ -66,6 +67,10 @@ export class SelectedTaskService {
     this.currentView$.next(DashboardViews.staff_notes);
   }
 
+  public showDiscussionPrompts() {
+    this.currentView$.next(DashboardViews.discussion_prompts);
+  }
+
   public showSubmission() {
     if (!this.task$.value) return;
     this.currentPdfUrl$.next(this.task$.value.submissionUrl(false));
diff --git a/src/app/projects/states/discussion-prompts/discussion-prompts.component.html b/src/app/projects/states/discussion-prompts/discussion-prompts.component.html
new file mode 100644
index 0000000000..5dcbbf84ff
--- /dev/null
+++ b/src/app/projects/states/discussion-prompts/discussion-prompts.component.html
@@ -0,0 +1,21 @@
+<div class="flex flex-col w-full p-5 gap-5">
+  @for (prompt of discussionPrompts; track prompt) {
+    <mat-card appearance="outlined">
+      <mat-card-content class="flex gap-5 items-center justify-evenly">
+        <div
+          class="rounded-full p-5 flex justify-center items-center bg-gray-200 max-h-8 w-32"
+          [matTooltip]="prompt.taskDefinition.name"
+          matTooltipPosition="above"
+        >
+          {{ prompt.taskDefinition.abbreviation }}
+        </div>
+        <div class="w-full">
+          {{ prompt.content }}
+        </div>
+        <div class="w-32 text-center">
+          {{ prompt.priorityLabel }}
+        </div>
+      </mat-card-content>
+    </mat-card>
+  }
+</div>
diff --git a/src/app/projects/states/discussion-prompts/discussion-prompts.component.scss b/src/app/projects/states/discussion-prompts/discussion-prompts.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/discussion-prompts/discussion-prompts.component.ts b/src/app/projects/states/discussion-prompts/discussion-prompts.component.ts
new file mode 100644
index 0000000000..2e384498af
--- /dev/null
+++ b/src/app/projects/states/discussion-prompts/discussion-prompts.component.ts
@@ -0,0 +1,50 @@
+import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core';
+import {DiscussionPrompt} from 'src/app/api/models/discussion-prompt';
+import {Project, TaskDefinition, UserService} from 'src/app/api/models/doubtfire-model';
+import {StaffNote} from 'src/app/api/models/staff-note';
+import {DiscussionPromptService} from 'src/app/api/services/discussion-prompt.service';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-discussion-prompts',
+  templateUrl: './discussion-prompts.component.html',
+  styleUrl: './discussion-prompts.component.scss',
+})
+export class DiscussionPromptsComponent implements OnInit {
+  @ViewChild('staffNotesContainer') staffNotesContainer!: ElementRef;
+  @ViewChild('staffNoteEditor', {static: false}) staffNoteEditor!: ElementRef<HTMLTextAreaElement>;
+
+  @Input() project: Project;
+  @Input() taskDefinition: TaskDefinition;
+
+  loadingStaffNotes: boolean = true;
+
+  noteText: string = '';
+
+  editingNote?: StaffNote;
+  editingNoteText?: string = '';
+
+  replyingToNote?: StaffNote;
+
+  hoveredNoteId: number | null = null;
+
+  discussionPrompts: DiscussionPrompt[] = [];
+
+  constructor(
+    private userService: UserService,
+    private discussionPromptService: DiscussionPromptService,
+    private alertService: AlertService,
+    private confirmationModalService: ConfirmationModalService,
+  ) {}
+  ngOnInit(): void {
+    console.log('task def?', this.taskDefinition);
+    this.loadingStaffNotes = true;
+    this.discussionPromptService
+      .loadDiscussionPromptsForPoject(this.project)
+      .subscribe((prompts) => {
+        console.log(prompts);
+        this.discussionPrompts = prompts;
+      });
+  }
+}
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 89cf35865f..f38d42764b 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -79,7 +79,7 @@
         <mat-list-option
           [value]="task"
           class="clearfix w-full"
-          style="padding: 0; height: 60px"
+          style="padding: 0; min-height: 60px; height: min-content"
           togglePosition="before"
           [selected]="
             (task.status === 'discuss' || attendance) &&
@@ -103,12 +103,12 @@
                   }"
                 ></span>
                 <user-icon class="self-center" [user]="project?.student" [size]="30"> </user-icon>
-                <div class="truncate flex-1 mt-0" [hidden]="isNarrow">
-                  <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
-                  <div class="truncate mb-0 text-[12px]">
+                <div class="flex-1 mt-0 whitespace-normal break-words" [hidden]="isNarrow">
+                  <h4 class="text-[15px] mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
+                  <span class="mb-0 text-[12px] inline">
                     {{ task.definition.abbreviation }} -
                     {{ getTargetTradeString(task.definition.targetGrade) }} Task
-                  </div>
+                  </span>
                 </div>
                 @if (task.hasGrade()) {
                   <div matTooltip="The grade assigned to the submission" matTooltipPosition="above">
@@ -215,7 +215,8 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
     <mat-tab-group dynamicHeight (selectedTabChange)="onTabChange($event)">
       <mat-tab label="Task Comments"></mat-tab>
 
-      <mat-tab [matTooltip]="project?.staffNoteCount" label="Staff Notes"></mat-tab>
+      <mat-tab [matBadge]="project?.staffNoteCount" label="Staff Notes"></mat-tab>
+      <mat-tab label="Discussion Prompts"></mat-tab>
     </mat-tab-group>
 
     @if (footerTabView === TutorDiscussionTabView.SHOW_COMMENTS) {
@@ -235,6 +236,8 @@ <h4 class="text-[15px] -mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
       </div>
     } @else if (footerTabView === TutorDiscussionTabView.SHOW_STAFF_NOTES) {
       <f-staff-notes class="min-h-[350px]" [project]="project"></f-staff-notes>
+    } @else if (footerTabView === TutorDiscussionTabView.SHOW_DISCUSSION_PROMPTS) {
+      <f-discussion-prompts class="min-h-[350px]" [project]="project"></f-discussion-prompts>
     }
   }
 </div>
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 567988d53d..801482ec4d 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -23,6 +23,7 @@ import {GradeService} from 'src/app/common/services/grade.service';
 enum TutorDiscussionTabView {
   SHOW_COMMENTS,
   SHOW_STAFF_NOTES,
+  SHOW_DISCUSSION_PROMPTS,
 }
 @Component({
   selector: 'f-tutor-discussion',
@@ -88,6 +89,8 @@ export class TutorDiscussionComponent implements AfterViewInit {
       this.showComments();
     } else if (event.index === 1) {
       this.showStaffNotes();
+    } else if (event.index === 2) {
+      this.showDiscussionPrompts();
     }
   }
 
@@ -99,6 +102,10 @@ export class TutorDiscussionComponent implements AfterViewInit {
     this.footerTabView = TutorDiscussionTabView.SHOW_STAFF_NOTES;
   }
 
+  public showDiscussionPrompts() {
+    this.footerTabView = TutorDiscussionTabView.SHOW_DISCUSSION_PROMPTS;
+  }
+
   public ngAfterViewInit(): void {
     this.authService.afterAuthCall((result) => {
       if (!result) {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.html
new file mode 100644
index 0000000000..86d762974e
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.html
@@ -0,0 +1,107 @@
+<div class="flex flex-col">
+  <div class="flex-grow flex flex-row">
+    <table mat-table [dataSource]="dataSource">
+      <ng-container matColumnDef="content">
+        <th mat-header-cell *matHeaderCellDef>Discussion Prompt</th>
+        <td mat-cell *matCellDef="let prompt" class="py-5">
+          @if (!editing(prompt)) {
+            {{ prompt.content }}
+          } @else {
+            <mat-form-field appearance="outline" class="w-full">
+              <mat-label>Discussion Prompt</mat-label>
+              <textarea matInput required pattern=".*\S.*" [(ngModel)]="prompt.content"></textarea>
+            </mat-form-field>
+          }
+        </td>
+      </ng-container>
+
+      <ng-container matColumnDef="priority">
+        <th mat-header-cell *matHeaderCellDef>Priority</th>
+        <td mat-cell *matCellDef="let prompt">
+          @if (!editing(prompt)) {
+            {{ prompt.priorityLabel }}
+          } @else {
+            <div class="flex flex-col justify-start">
+              <mat-form-field appearance="outline">
+                <mat-label>Priority</mat-label>
+
+                <mat-select matInput placeholder="Priority" [(ngModel)]="prompt.weight">
+                  <mat-option [value]="3">High</mat-option>
+                  <mat-option [value]="2">Medium</mat-option>
+                  <mat-option [value]="1">Low</mat-option>
+                </mat-select>
+              </mat-form-field>
+            </div>
+          }
+        </td>
+      </ng-container>
+
+      <ng-container matColumnDef="actions">
+        <th mat-header-cell *matHeaderCellDef>Actions</th>
+        <td mat-cell *matCellDef="let prompt">
+          <div class="flex">
+            @if (editing(prompt)) {
+              <button mat-icon-button (click)="cancelEdit()">
+                <mat-icon>close</mat-icon>
+              </button>
+              <button mat-icon-button (click)="submit()">
+                <mat-icon>save</mat-icon>
+              </button>
+            } @else {
+              <button mat-icon-button (click)="flagEdit(prompt)">
+                <mat-icon>edit</mat-icon>
+              </button>
+              <button mat-icon-button (click)="deletePrompt(prompt)">
+                <mat-icon>delete</mat-icon>
+              </button>
+            }
+          </div>
+        </td>
+      </ng-container>
+
+      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+      <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+    </table>
+    @if (!dataSource.data.length) {
+      <div class="w-full text-center text-gray-400 m-5">No discussion prompts</div>
+    }
+  </div>
+  @if (!creatingNewDiscussionPrompt) {
+    <div class="flex justify-center m-5">
+      <button mat-raised-button color="primary" (click)="createNewDiscussionPrompt()">
+        Add Discussion Prompt
+      </button>
+    </div>
+  }
+
+  @if (creatingNewDiscussionPrompt) {
+    <mat-card>
+      <mat-card-content>
+        <div class="flex flex-row w-full gap-5">
+          <mat-form-field appearance="outline" class="w-full">
+            <mat-label>Discussion Prompt</mat-label>
+            <textarea
+              matInput
+              required
+              pattern=".*\S.*"
+              [(ngModel)]="newDiscussionPromptContent"
+            ></textarea>
+          </mat-form-field>
+          <mat-form-field appearance="outline" class="w-full max-w-lg max-h-16">
+            <mat-label>Priority</mat-label>
+
+            <mat-select matInput placeholder="Priority" [(ngModel)]="newDiscussionPromptWeight">
+              <mat-option [value]="3">High</mat-option>
+              <mat-option [value]="2">Medium</mat-option>
+              <mat-option [value]="1">Low</mat-option>
+            </mat-select>
+          </mat-form-field>
+        </div>
+        <div class="flex justify-end">
+          <button mat-button (click)="cancelNewDiscussionPrompt()">Cancel</button>
+          <button mat-raised-button color="primary" (click)="addNewPrompt()">Save</button>
+        </div>
+      </mat-card-content>
+    </mat-card>
+  }
+</div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.ts
new file mode 100644
index 0000000000..149682d55d
--- /dev/null
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.ts
@@ -0,0 +1,155 @@
+import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
+import {UntypedFormControl, Validators} from '@angular/forms';
+import {MatTableDataSource} from '@angular/material/table';
+import {Observable, Subscription} from 'rxjs';
+import {DiscussionPrompt} from 'src/app/api/models/discussion-prompt';
+import {Task} from 'src/app/api/models/task';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {TaskPrerequisite} from 'src/app/api/models/task-prerequisite';
+import {Unit} from 'src/app/api/models/unit';
+import {DiscussionPromptService} from 'src/app/api/services/discussion-prompt.service';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {TaskPrerequisiteService} from 'src/app/api/services/task-prerequisite.service';
+import {EntityFormComponent} from 'src/app/common/entity-form/entity-form.component';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-task-definition-discussion-prompts',
+  templateUrl: 'task-definition-discussion-prompts.component.html',
+  styleUrls: ['task-definition-discussion-prompts.component.scss'],
+})
+export class TaskDefinitionDiscussionPromptsComponent
+  extends EntityFormComponent<DiscussionPrompt>
+  implements OnInit, OnChanges
+{
+  @Input() taskDefinition: TaskDefinition;
+  @Input() staffView: boolean;
+  @Input() task: Task;
+
+  displayedColumns: string[] = ['content', 'priority', 'actions'];
+
+  private prereqSub?: Subscription;
+
+  public dataSource = new MatTableDataSource<DiscussionPrompt>();
+
+  creatingNewDiscussionPrompt: boolean = false;
+
+  newDiscussionPromptContent: string;
+  newDiscussionPromptWeight: number = 2;
+
+  constructor(
+    private taskDefinitionService: TaskDefinitionService,
+    private alertService: AlertService,
+    private taskPrerequisiteService: TaskPrerequisiteService,
+    private discussionPromptService: DiscussionPromptService,
+  ) {
+    super(
+      {
+        content: new UntypedFormControl('', [Validators.required]),
+        priority: new UntypedFormControl('', [Validators.required]),
+      },
+      'Discussion Prompt',
+    );
+  }
+  public get unit(): Unit {
+    return this.taskDefinition?.unit;
+  }
+
+  public get prerequisites(): Observable<TaskPrerequisite[]> {
+    return this.taskDefinition.taskPrerequisitesCache.values;
+  }
+
+  ngOnInit(): void {
+    this.prereqSub = this.taskDefinition.discussionPromptsCache.values.subscribe((values) => {
+      this.dataSource.data = values;
+    });
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (
+      changes.taskDefinition &&
+      changes.taskDefinition.previousValue?.id !== changes.taskDefinition.currentValue?.id
+    ) {
+      this.prereqSub?.unsubscribe();
+      this.prereqSub = this.taskDefinition.discussionPromptsCache.values.subscribe((values) => {
+        this.dataSource.data = values;
+      });
+      this.fetchDiscussionPrompts();
+    }
+  }
+
+  private fetchDiscussionPrompts() {
+    const taskDefinition = this.taskDefinition;
+    this.discussionPromptService.loadDiscussionPrompts(null, taskDefinition).subscribe({
+      next: (data) => {
+        this.dataSource.data = data;
+      },
+      error: (error) => {
+        this.alertService.error(`Failed to load discussion promnpts: ${error}`);
+      },
+    });
+  }
+
+  public addNewPrompt() {
+    const content = this.newDiscussionPromptContent;
+    const priority = this.newDiscussionPromptWeight;
+    this.discussionPromptService
+      .create(
+        {
+          task_definition_id: this.taskDefinition.id,
+          content: content,
+          priority: priority,
+        },
+        {
+          cache: this.taskDefinition.discussionPromptsCache,
+          constructorParams: this.taskDefinition,
+        },
+      )
+      .subscribe({
+        next: (_result) => {
+          this.cancelNewDiscussionPrompt();
+          this.prereqSub?.unsubscribe();
+          this.prereqSub = this.taskDefinition.discussionPromptsCache.values.subscribe((values) => {
+            this.dataSource.data = values;
+          });
+          this.alertService.success(`Succesfully created prompt`, 3000);
+        },
+        error: (error) => {
+          this.alertService.error(`Failed to create prompt: ${error}`, 6000);
+        },
+      });
+  }
+
+  public deletePrompt(prompt: DiscussionPrompt) {
+    prompt.delete();
+  }
+
+  createNewDiscussionPrompt() {
+    this.creatingNewDiscussionPrompt = true;
+  }
+
+  cancelNewDiscussionPrompt() {
+    this.creatingNewDiscussionPrompt = false;
+    this.newDiscussionPromptContent = '';
+    this.newDiscussionPromptWeight = 2;
+  }
+
+  submit() {
+    this.discussionPromptService
+      .put({
+        id: this.selected.id,
+        task_definition_id: this.taskDefinition.id,
+        content: this.selected.content,
+        priority: this.selected.priority,
+      })
+      .subscribe({
+        next: (_response) => {
+          this.cancelEdit();
+          this.alertService.success('Successfully saved prompt', 3000);
+        },
+        error: (error) => {
+          this.alertService.error(`Failed to update prompt: ${error}`, 6000);
+        },
+      });
+  }
+}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index 7744269ca5..a13d096675 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -68,6 +68,18 @@ <h3>Details for {{ taskDefinition.abbreviation }} - {{ taskDefinition.name }}</h
     </div>
   </mat-step>
 
+  <mat-step>
+    <ng-template matStepLabel>Discussion Prompts</ng-template>
+    <div class="pt-[12px]">
+      <p class="font-normal text-gray-500 pb-2">
+        Discussion prompts for tutors to use when discussing student tasks in class
+      </p>
+
+      <f-task-definition-discussion-prompts [taskDefinition]="taskDefinition" [staffView]="true">
+      </f-task-definition-discussion-prompts>
+    </div>
+  </mat-step>
+
   @if (overseerEnabled) {
     <mat-step>
       <ng-template matStepLabel>Task Assessment Automation</ng-template>

From 95480e1cd2c128c3a90a8beac5d575bdef590f1d Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 3 Dec 2025 11:55:01 +1100
Subject: [PATCH 653/776] refactor: require confirmation for deleting comment
 (#1059)

---
 .../comment-bubble-action.component.ts          | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/comment-bubble-action/comment-bubble-action.component.ts b/src/app/tasks/task-comments-viewer/comment-bubble-action/comment-bubble-action.component.ts
index 4c53949ae3..5b62675292 100644
--- a/src/app/tasks/task-comments-viewer/comment-bubble-action/comment-bubble-action.component.ts
+++ b/src/app/tasks/task-comments-viewer/comment-bubble-action/comment-bubble-action.component.ts
@@ -1,6 +1,7 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { TaskComment } from 'src/app/api/models/doubtfire-model';
-import { TaskCommentComposerData } from '../../task-comment-composer/task-comment-composer.component';
+import {Component, OnInit, Input} from '@angular/core';
+import {TaskComment} from 'src/app/api/models/doubtfire-model';
+import {TaskCommentComposerData} from '../../task-comment-composer/task-comment-composer.component';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
 
 @Component({
   selector: 'comment-bubble-action',
@@ -11,7 +12,7 @@ export class CommentBubbleActionComponent implements OnInit {
   @Input() comment: TaskComment;
   @Input() sharedData: TaskCommentComposerData;
 
-  constructor() {}
+  constructor(private confirmationModalService: ConfirmationModalService) {}
   ngOnInit() {}
 
   reply() {
@@ -19,6 +20,12 @@ export class CommentBubbleActionComponent implements OnInit {
   }
 
   delete() {
-    this.comment.delete();
+    this.confirmationModalService.show(
+      `Delete comment`,
+      `Are you sure you want to delete this comment?`,
+      () => {
+        this.comment.delete();
+      },
+    );
   }
 }

From 6538d8612e756cdb099874ec55208837731e92e2 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 3 Dec 2025 11:55:44 +1100
Subject: [PATCH 654/776] refactor: render overseer comments as is (#1058)

---
 .../task-assessment-comment.component.html     | 18 +++++++++---------
 .../task-assessment-comment.component.ts       |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html
index 7cdf8e89ee..d6d344fc06 100644
--- a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html
@@ -1,15 +1,15 @@
 <div fxLayout="row" fxLayoutAlign="space-evenly center">
   <div fxLayout="column" fxLayoutAlign="space-around center">
-    @if (comment.assessment_result && comment.assessment_result.is_successful) {
-      <div>
-        <hr class="hr-text" data-content="Assessment Summary" />
-        <pre class="overflow-x-scroll scrollbar-gutter-stable">{{ comment.text }}</pre>
+    <!-- @if (comment.assessment_result && comment.assessment_result.is_successful) { -->
+    <div>
+      <hr class="hr-text" data-content="Assessment Summary" />
+      <pre class="overflow-x-scroll scrollbar-gutter-stable">{{ comment.text }}</pre>
 
-        <button mat-button (click)="showTaskAssessmentResult()">View report</button>
-        <hr class="hr-fade" />
-      </div>
-    } @else {
+      <button mat-button (click)="showTaskAssessmentResult()">View report</button>
+      <hr class="hr-fade" />
+    </div>
+    <!-- } @else {
       <hr class="hr-text" data-content="Tests in Progress" />
-    }
+    } -->
   </div>
 </div>
diff --git a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.ts b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.ts
index 44e22eea8b..ed2e404b26 100644
--- a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.ts
@@ -46,7 +46,7 @@ export class TaskAssessmentCommentComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.update();
+    // this.update();
   }
 
   get message() {

From e454166455d0af105bd9ef037ff7a19c2180e915 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 3 Dec 2025 11:56:10 +1100
Subject: [PATCH 655/776] chore(release): 10.0.0-66

---
 CHANGELOG.md      | 12 ++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6935c31476..aa893a612a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 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.
 
+## [10.0.0-66](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-65...v10.0.0-66) (2025-12-03)
+
+
+### Features
+
+* discussion prompts ([#1042](https://github.com/b0ink/doubtfire-deploy/issues/1042)) ([730ffd0](https://github.com/b0ink/doubtfire-deploy/commit/730ffd0c3f79a5ad42c0c59c2f2c2a901ab0d702))
+
+
+### Bug Fixes
+
+* correctly set rollover end date ([0611be0](https://github.com/b0ink/doubtfire-deploy/commit/0611be04e8fe7e75ae07504945a2984839475e3a))
+
 ## [10.0.0-65](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-64...v10.0.0-65) (2025-11-25)
 
 
diff --git a/package-lock.json b/package-lock.json
index c30263893b..184b9874da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-65",
+  "version": "10.0.0-66",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-65",
+      "version": "10.0.0-66",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index fb458e4b24..307e43542b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-65",
+  "version": "10.0.0-66",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 6651279c49f431dbddf6fd5d810440ae7b3b9898 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 3 Dec 2025 14:33:08 +1100
Subject: [PATCH 656/776] feat: allow sidekiq web access (#1053)

---
 ngsw-config.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ngsw-config.json b/ngsw-config.json
index 8c80cd0891..5c8069284f 100644
--- a/ngsw-config.json
+++ b/ngsw-config.json
@@ -47,5 +47,14 @@
       }
     }
   ],
-  "navigationUrls": ["/**", "!/**/*.*", "!/**/*__*", "!/**/*__*/**", "!/JPlag/**", "!/JPlag"]
+  "navigationUrls": [
+    "/**",
+    "!/**/*.*",
+    "!/**/*__*",
+    "!/**/*__*/**",
+    "!/JPlag/**",
+    "!/JPlag",
+    "!/sidekiq/**",
+    "!/sidekiq"
+  ]
 }

From 8db864661ec58c111bd611e9a33c65f11db59f3d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 3 Dec 2025 14:33:23 +1100
Subject: [PATCH 657/776] chore(release): 10.0.0-67

---
 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 aa893a612a..eb4dacb6a1 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.
 
+## [10.0.0-67](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-66...v10.0.0-67) (2025-12-03)
+
+
+### Features
+
+* allow sidekiq web access ([#1053](https://github.com/b0ink/doubtfire-deploy/issues/1053)) ([6651279](https://github.com/b0ink/doubtfire-deploy/commit/6651279c49f431dbddf6fd5d810440ae7b3b9898))
+
 ## [10.0.0-66](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-65...v10.0.0-66) (2025-12-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index 184b9874da..452c2770cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-66",
+  "version": "10.0.0-67",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-66",
+      "version": "10.0.0-67",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 307e43542b..377855c416 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-66",
+  "version": "10.0.0-67",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From fbc63b0308d87d921e1d74788e8da6031443e57e Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:40:42 +1100
Subject: [PATCH 658/776] fix: only trim if valid

---
 src/app/api/models/user/user.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/api/models/user/user.ts b/src/app/api/models/user/user.ts
index 03a281bf12..b11826505a 100644
--- a/src/app/api/models/user/user.ts
+++ b/src/app/api/models/user/user.ts
@@ -54,7 +54,7 @@ export class User extends Entity {
   }
 
   public get preferredName(): string {
-    const nickname = this.nickname.trim();
+    const nickname = this.nickname?.trim();
     const firstName = this.firstName.trim();
     if (nickname) {
       return nickname;

From 520be4a74735e9dd9fe9ab511208b48e2fcff152 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:43:11 +1100
Subject: [PATCH 659/776] chore(release): 10.0.0-68

---
 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 eb4dacb6a1..6bf63acef3 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.
 
+## [10.0.0-68](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-67...v10.0.0-68) (2025-12-08)
+
+
+### Bug Fixes
+
+* only trim if valid ([fbc63b0](https://github.com/b0ink/doubtfire-deploy/commit/fbc63b0308d87d921e1d74788e8da6031443e57e))
+
 ## [10.0.0-67](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-66...v10.0.0-67) (2025-12-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index 452c2770cb..7d80fd42ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-67",
+  "version": "10.0.0-68",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-67",
+      "version": "10.0.0-68",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 377855c416..5bd6fc814f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-67",
+  "version": "10.0.0-68",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 2674d4e5ade26e5420b87518f4cd9da909ec7246 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 9 Dec 2025 11:20:45 +1100
Subject: [PATCH 660/776] feat: display number of stuff notes in tutor
 discussion

---
 .../states/tutor-discussion/tutor-discussion.component.html  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index f38d42764b..87703c8b6b 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -215,7 +215,10 @@ <h4 class="text-[15px] mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
     <mat-tab-group dynamicHeight (selectedTabChange)="onTabChange($event)">
       <mat-tab label="Task Comments"></mat-tab>
 
-      <mat-tab [matBadge]="project?.staffNoteCount" label="Staff Notes"></mat-tab>
+      <mat-tab
+        [matBadge]="project?.staffNoteCount"
+        label="Staff Notes{{ project?.staffNoteCount ? ' (' + project.staffNoteCount + ')' : '' }}"
+      ></mat-tab>
       <mat-tab label="Discussion Prompts"></mat-tab>
     </mat-tab-group>
 

From 15365ed4f42af790af9a9ae24dae42f041dff1df Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 12 Dec 2025 12:26:45 +1100
Subject: [PATCH 661/776] feat: attention required task status (#1061)

* feat: init discuss check task status

* refactor: add discuss check status

* refactor: add discuss and check marking button

* refactor: add warning badge to discuss check tasks

* refactor: update discuss check status description

* refactor: update discuss check description

* chore: ensure discuss check status does not unlock requisite tasks

* refactor: rename to off track

* refactor: rename to attention required

* refactor: update status colors

* refactor: rename to attention required internally

* chore: update assess in portfolio color
---
 src/app/api/models/task-prerequisite.ts       |  1 +
 src/app/api/models/task-status.ts             | 84 +++++++++++++++----
 src/app/common/footer/footer.component.html   | 45 ++++++----
 .../status-icon/status-icon.component.scss    |  3 +
 .../tutor-discussion.component.html           |  6 +-
 .../tutor-discussion.component.ts             |  1 +
 ...task-definition-prerequisites.component.ts |  1 +
 src/styles/common/task-status-colors.scss     | 12 ++-
 src/styles/mixins/task-list.scss              |  6 ++
 .../mixins/task-status-colors-generator.scss  |  3 +
 src/styles/modules/project-task-bar.scss      |  6 ++
 src/styles/modules/task-status.scss           | 14 ++++
 12 files changed, 144 insertions(+), 38 deletions(-)

diff --git a/src/app/api/models/task-prerequisite.ts b/src/app/api/models/task-prerequisite.ts
index 510d6ce3b6..9645adfe5b 100644
--- a/src/app/api/models/task-prerequisite.ts
+++ b/src/app/api/models/task-prerequisite.ts
@@ -23,6 +23,7 @@ export class TaskPrerequisite extends Entity {
     ready_for_feedback: 1,
     assess_in_portfolio: 1,
     discuss: 2,
+    attention_required: 0,
     demonstrate: 2,
     complete: 3,
   };
diff --git a/src/app/api/models/task-status.ts b/src/app/api/models/task-status.ts
index 4bff84e86c..0933627924 100644
--- a/src/app/api/models/task-status.ts
+++ b/src/app/api/models/task-status.ts
@@ -1,4 +1,4 @@
-import { Task } from './task';
+import {Task} from './task';
 
 export type TaskStatusEnum =
   | 'not_started'
@@ -13,14 +13,15 @@ export type TaskStatusEnum =
   | 'complete'
   | 'fail'
   | 'time_exceeded'
-  | 'assess_in_portfolio';
+  | 'assess_in_portfolio'
+  | 'attention_required';
 
 export type TaskStatusUiData = {
   status: TaskStatusEnum;
   icon: string;
   label: string;
   class: string;
-  help: { detail: string; reason: string; action: string };
+  help: {detail: string; reason: string; action: string};
 };
 
 export class TaskStatus {
@@ -38,6 +39,7 @@ export class TaskStatus {
     'fail',
     'time_exceeded',
     'assess_in_portfolio',
+    'attention_required',
   ];
 
   public static readonly VALID_TOP_TASKS: TaskStatusEnum[] = [
@@ -48,6 +50,7 @@ export class TaskStatus {
     'fix_and_resubmit',
     'ready_for_feedback',
     'discuss',
+    'attention_required',
     'demonstrate',
   ];
 
@@ -60,6 +63,7 @@ export class TaskStatus {
     'fail',
     'time_exceeded',
     'assess_in_portfolio',
+    'attention_required',
   ];
 
   public static readonly FINAL_STATUSES: TaskStatusEnum[] = [
@@ -70,11 +74,25 @@ export class TaskStatus {
     'assess_in_portfolio',
   ];
 
-  public static readonly GRADEABLE_STATUSES: TaskStatusEnum[] = ['fail', 'discuss', 'demonstrate', 'complete'];
+  public static readonly GRADEABLE_STATUSES: TaskStatusEnum[] = [
+    'fail',
+    'discuss',
+    'demonstrate',
+    'complete',
+  ];
 
-  public static readonly TO_BE_WORKED_ON: TaskStatusEnum[] = ['not_started', 'redo', 'need_help', 'working_on_it'];
+  public static readonly TO_BE_WORKED_ON: TaskStatusEnum[] = [
+    'not_started',
+    'redo',
+    'need_help',
+    'working_on_it',
+  ];
 
-  public static readonly DISCUSSION_STATES: TaskStatusEnum[] = ['discuss', 'demonstrate'];
+  public static readonly DISCUSSION_STATES: TaskStatusEnum[] = [
+    'discuss',
+    'attention_required',
+    'demonstrate',
+  ];
 
   public static readonly STATE_THAT_ALLOWS_EXTENSION: TaskStatusEnum[] = [
     'not_started',
@@ -112,6 +130,7 @@ export class TaskStatus {
     'discuss',
     'demonstrate',
     'complete',
+    'attention_required',
   ];
 
   public static readonly FEEDBACK_TEMPLATE_STATUSES: TaskStatusEnum[] = [
@@ -120,9 +139,13 @@ export class TaskStatus {
     'fix_and_resubmit',
     'redo',
     'feedback_exceeded',
+    'attention_required',
   ];
 
-  public static readonly LEARNING_WEIGHT: Map<TaskStatusEnum, number> = new Map<TaskStatusEnum, number>([
+  public static readonly LEARNING_WEIGHT: Map<TaskStatusEnum, number> = new Map<
+    TaskStatusEnum,
+    number
+  >([
     ['fail', 0.0],
     ['not_started', 0.0],
     ['working_on_it', 0.0],
@@ -135,10 +158,14 @@ export class TaskStatus {
     ['demonstrate', 0.8],
     ['complete', 1.0],
     ['time_exceeded', 0.3],
-    ['assess_in_portfolio', 0.0],
+    ['assess_in_portfolio', 1.0],
+    ['attention_required', 0.1],
   ]);
 
-  public static readonly STATUS_ACRONYM: Map<TaskStatusEnum, string> = new Map<TaskStatusEnum, string>([
+  public static readonly STATUS_ACRONYM: Map<TaskStatusEnum, string> = new Map<
+    TaskStatusEnum,
+    string
+  >([
     ['ready_for_feedback', 'RFF'],
     ['not_started', 'NOS'],
     ['working_on_it', 'WRK'],
@@ -152,6 +179,7 @@ export class TaskStatus {
     ['fail', 'FAL'],
     ['time_exceeded', 'TIE'],
     ['assess_in_portfolio', 'AIP'],
+    ['attention_required', 'AR'],
   ]);
 
   // Which status should not show up in the task status drop down... for students
@@ -172,6 +200,7 @@ export class TaskStatus {
     ['time_exceeded', ['ready_for_feedback', 'not_started', 'working_on_it', 'need_help']],
     ['fail', ['ready_for_feedback', 'not_started', 'working_on_it', 'need_help']],
     ['assess_in_portfolio', ['not_started']],
+    ['attention_required', ['ready_for_feedback', 'not_started', 'working_on_it', 'need_help']],
   ]);
 
   public static readonly STATUS_LABELS = new Map<TaskStatusEnum, string>([
@@ -188,6 +217,7 @@ export class TaskStatus {
     ['fail', 'Fail'],
     ['time_exceeded', 'Time Exceeded'],
     ['assess_in_portfolio', 'Assess in Portfolio'],
+    ['attention_required', 'Attention Required'],
   ]);
 
   public static readonly STATUS_ICONS = new Map<TaskStatusEnum, string>([
@@ -204,6 +234,7 @@ export class TaskStatus {
     ['fail', 'fa fa-times'],
     ['time_exceeded', 'fa fa-clock-o'],
     ['assess_in_portfolio', 'fa fa-folder-open'],
+    ['attention_required', 'fa fa-commenting'],
   ]);
 
   // Please make sure this matches task-status-colors.less
@@ -220,7 +251,8 @@ export class TaskStatus {
     ['complete', '#5BB75B'],
     ['fail', '#d93713'],
     ['time_exceeded', '#d93713'],
-    ['assess_in_portfolio', '#91b891'],
+    ['assess_in_portfolio', '#f2d85c'],
+    ['attention_required', '#f1814d'],
   ]);
 
   public static readonly STATUS_SEQ = new Map<TaskStatusEnum, number>([
@@ -237,6 +269,7 @@ export class TaskStatus {
     ['demonstrate', 11],
     ['complete', 12],
     ['assess_in_portfolio', 13],
+    ['attention_required', 14],
   ]);
 
   public static readonly SWITCHABLE_STATES = {
@@ -244,6 +277,7 @@ export class TaskStatus {
     tutor: [
       'complete',
       'discuss',
+      'attention_required',
       'demonstrate',
       'fix_and_resubmit',
       'redo',
@@ -258,14 +292,16 @@ export class TaskStatus {
   // action = action student can take
   public static readonly HELP_DESCRIPTIONS = new Map<
     TaskStatusEnum,
-    { detail: string; reason: string; action: string }
+    {detail: string; reason: string; action: string}
   >([
     [
       'ready_for_feedback',
       {
         detail: 'Submitted this task for feedback',
-        reason: 'You have finished working on the task and have uploaded it for your tutor to assess.',
-        action: 'No further action is required. Your tutor will change this task status once they have assessed it.',
+        reason:
+          'You have finished working on the task and have uploaded it for your tutor to assess.',
+        action:
+          'No further action is required. Your tutor will change this task status once they have assessed it.',
       },
     ],
     [
@@ -289,7 +325,8 @@ export class TaskStatus {
       {
         detail: 'Need help for the task',
         reason: 'You are working on the task but would like some help to get it complete.',
-        action: 'Upload the task with what you have completed so far and add a comment on what you would like help on.',
+        action:
+          'Upload the task with what you have completed so far and add a comment on what you would like help on.',
       },
     ],
     [
@@ -306,7 +343,8 @@ export class TaskStatus {
       'feedback_exceeded',
       {
         detail: 'Feedback will no longer be given',
-        reason: 'This work is not complete to an acceptable standard and your tutor will not reassess it again.',
+        reason:
+          'This work is not complete to an acceptable standard and your tutor will not reassess it again.',
         action:
           "It is now your responsibility to ensure this task is at an adequate standard in your portfolio. You should fix your work according to your tutor's prior feedback and include a corrected version in your portfolio.",
       },
@@ -329,6 +367,16 @@ export class TaskStatus {
         action: 'For this to be marked as complete, attend class and discuss it with your tutor.',
       },
     ],
+    [
+      'attention_required',
+      {
+        detail: 'Your work is off track and needs focused discussion.',
+        reason:
+          'It seems you have misunderstood some key requirements for this task. Previous feedback has not led to sufficient progress.',
+        action:
+          'Attend class so your tutor can go through your work in detail and help you get back on track.',
+      },
+    ],
     [
       'demonstrate',
       {
@@ -343,7 +391,8 @@ export class TaskStatus {
       {
         detail: 'You are finished with this task 🎉',
         reason: 'Your tutor is happy with your work and it has been discussed with them.',
-        action: 'No further action required. Move onto the next task, or go party if everything is done.',
+        action:
+          'No further action required. Move onto the next task, or go party if everything is done.',
       },
     ],
     [
@@ -359,7 +408,8 @@ export class TaskStatus {
       'time_exceeded',
       {
         detail: 'Time limit exceeded',
-        reason: 'This work was submitted after the deadline, having missed both the target date and deadline.',
+        reason:
+          'This work was submitted after the deadline, having missed both the target date and deadline.',
         action:
           'Work submitted after the feedback deadline will not be checked by tutors prior to the portfolio assessment. You will need to ensure this task is at an adequate standard in your portfolio.',
       },
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index e7d84ac5e5..a31bf9fac8 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -14,18 +14,32 @@
   <div class="flex w-full">
     <f-user-badge fxFlex fxFlexAlign="start start" [selectedTask]="selectedTask"></f-user-badge>
 
-    <span class="center-buttons flex justify-center">
-      <button
-        [disabled]="selectedTask === undefined"
-        mat-icon-button
-        matTooltip="Mark as Redo"
-        matTooltipPosition="above"
-        aria-label=""
-        class="button"
-        (click)="selectedTask?.updateTaskStatus('redo')"
-      >
-        <mat-icon>undo</mat-icon>
-      </button>
+    <span class="center-buttons flex justify-around gap-5">
+      <div>
+        <button
+          [disabled]="selectedTask === undefined"
+          mat-icon-button
+          matTooltip="Mark as Redo"
+          matTooltipPosition="above"
+          aria-label=""
+          class="button"
+          (click)="selectedTask?.updateTaskStatus('redo')"
+        >
+          <mat-icon>undo</mat-icon>
+        </button>
+
+        <button
+          [disabled]="selectedTask === undefined"
+          mat-icon-button
+          matTooltip="Mark as Attention Required"
+          matTooltipPosition="above"
+          aria-label=""
+          class="button"
+          (click)="selectedTask?.updateTaskStatus('attention_required')"
+        >
+          <mat-icon>sms_failed</mat-icon>
+        </button>
+      </div>
       <button
         [disabled]="selectedTask === undefined"
         mat-icon-button
@@ -37,7 +51,7 @@
       >
         <mat-icon>construction</mat-icon>
       </button>
-      <span class="w-3"></span>
+
       @if (selectedTask && selectedTask.suggestedTaskStatus) {
         <button
           mat-icon-button
@@ -52,7 +66,6 @@
         >
           <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
         </button>
-        <span class="w-3"></span>
       }
       @if (selectedTask?.definition?.assessInPortfolioOnly) {
         <button
@@ -92,7 +105,9 @@
         <mat-icon>question_answer</mat-icon>
       </button>
 
-      <div class="ml-5 border-l-2 border-gray-300">
+      <mat-divider [vertical]="true"></mat-divider>
+
+      <div class="w-[120px] flex justify-start">
         <button
           [disabled]="selectedTask === undefined"
           mat-icon-button
diff --git a/src/app/common/status-icon/status-icon.component.scss b/src/app/common/status-icon/status-icon.component.scss
index 687ebb7ed0..ee89d37718 100644
--- a/src/app/common/status-icon/status-icon.component.scss
+++ b/src/app/common/status-icon/status-icon.component.scss
@@ -50,4 +50,7 @@
   &.fail {
     @include status-icon('fail');
   }
+  &.attention-required {
+    @include status-icon('attention-required');
+  }
 }
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 87703c8b6b..9c262fcede 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -119,9 +119,9 @@ <h4 class="text-[15px] mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
                 }
                 <status-icon
                   [hidden]="isNarrow"
-                  matBadge="{{ task.qualityPts }}/{{ task.definition.maxQualityPts }}"
-                  [matBadgeHidden]="!task.hasQualityPoints() || !task.qualityPts"
-                  matBadgePosition="before"
+                  matBadge="{{ task.status === 'attention_required' ? '!' : '' }}"
+                  matBadgePosition="after"
+                  matBadgeColor="warn"
                   [status]="task.status"
                   class="ml-3"
                 ></status-icon>
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 801482ec4d..f08edf198c 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -352,6 +352,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
     'demonstrate',
     'ready_for_feedback',
     'discuss',
+    'attention_required',
     'need_help',
     // 'complete',
     'fix_and_resubmit',
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index eff30b4bd3..2528ffcd6d 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -37,6 +37,7 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
     ready_for_feedback: 1,
     assess_in_portfolio: 1,
     discuss: 2,
+    attention_required: 0,
     demonstrate: 2,
     complete: 3,
   };
diff --git a/src/styles/common/task-status-colors.scss b/src/styles/common/task-status-colors.scss
index 563e2cf038..3e045a4406 100644
--- a/src/styles/common/task-status-colors.scss
+++ b/src/styles/common/task-status-colors.scss
@@ -85,9 +85,15 @@ $task-status-colors: (
     fore: $task-status-foreground-color-light,
   ),
   assess-in-portfolio: (
-    base: #91b891,
-    dark: darken(#91b891, 15%),
-    light: lighten(#91b891, 15%),
+    base: #f2d85c,
+    dark: darken(#f2d85c, 15%),
+    light: lighten(#f2d85c, 15%),
+    fore: $task-status-foreground-color-dark,
+  ),
+  attention-required: (
+    base: #f1814d,
+    dark: darken(#f1814d, 15%),
+    light: lighten(#f1814d, 15%),
     fore: $task-status-foreground-color-light,
   ),
 );
diff --git a/src/styles/mixins/task-list.scss b/src/styles/mixins/task-list.scss
index 5684822871..63af66d655 100644
--- a/src/styles/mixins/task-list.scss
+++ b/src/styles/mixins/task-list.scss
@@ -81,6 +81,9 @@
       &.assess-in-portfolio {
         @include custom-box-shadow(lighten(task-status-color('assess-in-portfolio'), 15%));
       }
+      &.attention-required {
+        @include custom-box-shadow(lighten(task-status-color('attention-required'), 15%));
+      }
     }
     &.selected {
       &.ready-for-feedback {
@@ -122,6 +125,9 @@
       &.assess-in-portfolio {
         @include custom-box-shadow(task-status-color('assess-in-portfolio'));
       }
+      &.attention-required {
+        @include custom-box-shadow(task-status-color('attention-required'));
+      }
     }
     .task-badges {
       width: 50px;
diff --git a/src/styles/mixins/task-status-colors-generator.scss b/src/styles/mixins/task-status-colors-generator.scss
index 4d0646ecd6..6f2b97e2c5 100644
--- a/src/styles/mixins/task-status-colors-generator.scss
+++ b/src/styles/mixins/task-status-colors-generator.scss
@@ -62,3 +62,6 @@
 @mixin task-status-color-assess-in-portfolio {
   @include task-status-color('assess-in-portfolio');
 }
+@mixin task-status-color-attention-required {
+  @include task-status-color('attention-required');
+}
diff --git a/src/styles/modules/project-task-bar.scss b/src/styles/modules/project-task-bar.scss
index 78d15e07f6..d3af788607 100644
--- a/src/styles/modules/project-task-bar.scss
+++ b/src/styles/modules/project-task-bar.scss
@@ -76,6 +76,12 @@
 .progress-bar-complete {
   @include task-status-color-complete;
 }
+.progress-bar-assess-in-portfolio {
+  @include task-status-color-assess-in-portfolio;
+}
+.progress-bar-attention-required {
+  @include task-status-color-attention-required;
+}
 
 .progress-bar-not-started {
   @include task-status-color-not-started;
diff --git a/src/styles/modules/task-status.scss b/src/styles/modules/task-status.scss
index ba7252f899..6ed7ea0f57 100644
--- a/src/styles/modules/task-status.scss
+++ b/src/styles/modules/task-status.scss
@@ -41,6 +41,9 @@
   &.assess-in-portfolio {
     @include task-status-color-assess-in-portfolio;
   }
+  &.attention-required {
+    @include task-status-color-attention-required;
+  }
 
   &.ready-for-feedback:hover {
     background-color: task-status-color('ready-for-feedback');
@@ -81,6 +84,9 @@
   &.assess-in-portfolio:hover {
     background-color: task-status-color('assess-in-portfolio');
   }
+  &.attention-required:hover {
+    background-color: task-status-color('attention-required');
+  }
 }
 
 .task-status > .btn-default {
@@ -149,6 +155,11 @@
   &.assess-in-portfolio:hover {
     @include task-status-color-assess-in-portfolio;
   }
+  &.attention-required,
+  &.attention-required.active,
+  &.attention-required:hover {
+    @include task-status-color-attention-required;
+  }
 
   &.ready-for-feedback {
     background-color: lighten(task-status-color('ready-for-feedback'), 15%);
@@ -189,6 +200,9 @@
   &.assess-in-portfolio {
     background-color: lighten(task-status-color('assess-in-portfolio'), 15%);
   }
+  &.attention-required {
+    background-color: lighten(task-status-color('attention-required'), 15%);
+  }
 }
 
 i.task-status-icon {

From 7cb8fc7471f0402c562fb8a0b87df672ceb22ea3 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 5 Jan 2026 15:01:53 +1100
Subject: [PATCH 662/776] feat: overseer pipeline (#1064)

* feat: init overseer pipeline ui

* chore: init drag and drop steps panel

* feat: init overseer-step crud

* feat: use new monaco editor package

* refactor: clean up ui

* feat: get list of overseer resource files

* chore: allow no input file

* feat: allow partial input output diff check

* feat: allow deleting of overseer steps

* feat: overseer step result model

* refactor: improve overseer report view

* refactor: organise imports

* refactor: retrieve feedback message

* refactor: expose overseer assessment details to task comment

* feat: dropdown for command language

* fix: set fixed height size

* chore: show overseer reports to students

* build: ensure monaco editor is packed correctly

* refactor: lazy load step results for overseer assessments

* refactor: align default feedback messages with the backend

* refactor: improve assessment comment ui

* chore: ignore old assessment script

* refactor: hide test result until report is ready

* fix: use new overseer report component for test submission history

* chore: allow for overseer report refresh

* refactor: reduce icon size

* refactor: auto expand selected overseer report

* chore: enable submission history if project is valid

* chore: delete new step

* chore: set correct overseer steps when changing task definition

* feat: add overseer task status result

* chore: add hint explaining test submissions can be used before enabling overseer

* refactor: hide overseer steps until docker image has been selected

* chore: move overseer editor to original place

* refactor: ensure task definition is saved before adding overseer steps

* chore: show delete and save buttons when step is selected

* refactor: use seconds for overseer timeout

* refactor: show status dropdown only when halting step

* refactor: cleanup

* chore: render diff if overseer step is null

* refactor: remove debug

* chore: show empty overseer reports
---
 angular.json                                  |   8 +
 package-lock.json                             |  47 +--
 package.json                                  |   3 +-
 .../models/overseer/overseer-assessment.ts    |  23 +-
 .../models/overseer/overseer-step-result.ts   |  35 ++
 src/app/api/models/overseer/overseer-step.ts  |  75 ++++
 src/app/api/models/task-definition.ts         |   4 +
 src/app/api/models/task.ts                    |   6 +-
 .../services/overseer-assessment.service.ts   |  28 +-
 .../services/overseer-step-result.service.ts  |  52 +++
 src/app/api/services/overseer-step.service.ts |  47 +++
 src/app/api/services/task-comment.service.ts  |   5 +
 .../api/services/task-definition.service.ts   |  18 +
 src/app/common/footer/footer.component.ts     |   6 +-
 .../task-assessment-modal.component.html      |  16 +-
 .../task-assessment-modal.component.ts        |   7 +-
 .../task-assessment-modal.service.ts          |  35 +-
 src/app/doubtfire-angular.module.ts           |  13 +-
 src/app/doubtfire-angularjs.module.ts         |   6 +
 .../task-overseer-report.component.html       | 167 ++++++++
 .../task-overseer-report.component.scss       |   0
 .../task-overseer-report.component.ts         | 145 +++++++
 .../task-dashboard/task-dashboard.coffee      |   2 +-
 .../task-dashboard.component.html             |   4 +
 .../task-dashboard/task-dashboard.tpl.html    |  14 +-
 .../states/dashboard/selected-task.service.ts |   5 +
 .../task-assessment-comment.component.html    |  58 ++-
 .../task-assessment-comment.component.scss    |  56 ---
 .../task-assessment-comment.component.ts      |  24 +-
 .../task-definition-overseer.component.html   | 376 +++++++++++++++++-
 .../task-definition-overseer.component.scss   |  50 +++
 .../task-definition-overseer.component.ts     | 206 +++++++++-
 32 files changed, 1383 insertions(+), 158 deletions(-)
 create mode 100644 src/app/api/models/overseer/overseer-step-result.ts
 create mode 100644 src/app/api/models/overseer/overseer-step.ts
 create mode 100644 src/app/api/services/overseer-step-result.service.ts
 create mode 100644 src/app/api/services/overseer-step.service.ts
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.html
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.scss
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.ts

diff --git a/angular.json b/angular.json
index cf6bc6bd32..0d892151bd 100644
--- a/angular.json
+++ b/angular.json
@@ -29,8 +29,16 @@
                 "input": "./JPlag-Report-Viewer",
                 "output": "/JPlag",
                 "glob": "**/!(*.gitignore|README.md|.git)"
+              },
+              {
+                "glob": "**/*",
+                "input": "./node_modules/monaco-editor/min",
+                "output": "/assets/monaco/min/"
               }
             ],
+            "loader": {
+              ".ttf": "binary"
+            },
             "styles": [
               "src/theme.scss",
               "src/styles.scss",
diff --git a/package-lock.json b/package-lock.json
index 7d80fd42ec..05dae886a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,7 +61,7 @@
         "lottie-web": "^5.12.2",
         "marked": "^11.1.0",
         "moment": "^2.29.4",
-        "monaco-editor": "^0.54.0",
+        "monaco-editor": "^0.44.0",
         "ng-csv": "0.2.3",
         "ng-file-upload": "~5.0.9",
         "ng-flex-layout": "^17.3.7-beta.1",
@@ -69,6 +69,7 @@
         "ngx-bootstrap": "^6.1.0",
         "ngx-entity-service": "^0.0.41",
         "ngx-lottie": "^11.0.2",
+        "ngx-monaco-editor-v2": "^17.0.1",
         "nvd3": "1.8.6",
         "qrcode": "^1.5.4",
         "rxjs": "~7.4.0",
@@ -9254,12 +9255,6 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/dompurify": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz",
-      "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==",
-      "license": "(MPL-2.0 OR Apache-2.0)"
-    },
     "node_modules/domutils": {
       "version": "3.1.0",
       "dev": true,
@@ -15766,26 +15761,10 @@
       }
     },
     "node_modules/monaco-editor": {
-      "version": "0.54.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.54.0.tgz",
-      "integrity": "sha512-hx45SEUoLatgWxHKCmlLJH81xBo0uXP4sRkESUpmDQevfi+e7K1VuiSprK6UpQ8u4zOcKNiH0pMvHvlMWA/4cw==",
-      "license": "MIT",
-      "dependencies": {
-        "dompurify": "3.1.7",
-        "marked": "14.0.0"
-      }
-    },
-    "node_modules/monaco-editor/node_modules/marked": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-14.0.0.tgz",
-      "integrity": "sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==",
-      "license": "MIT",
-      "bin": {
-        "marked": "bin/marked.js"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
+      "version": "0.44.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz",
+      "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==",
+      "license": "MIT"
     },
     "node_modules/morgan": {
       "version": "1.10.0",
@@ -16126,6 +16105,20 @@
         "lottie-web": ">=5.9.2"
       }
     },
+    "node_modules/ngx-monaco-editor-v2": {
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/ngx-monaco-editor-v2/-/ngx-monaco-editor-v2-17.0.1.tgz",
+      "integrity": "sha512-GP+Ni6zKFQjF/ve5ZQtfE9eRLKL4GxMvdmDTrla1x6F5pSIcYGCcjZ4gQ1/AHMa5dgarfs+Et+1bBtAOJtI6KA==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^17.0.3",
+        "@angular/core": "^17.0.3",
+        "monaco-editor": "^0.44.0"
+      }
+    },
     "node_modules/nice-napi": {
       "version": "1.0.2",
       "dev": true,
diff --git a/package.json b/package.json
index 5bd6fc814f..d3eeccad5d 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "lottie-web": "^5.12.2",
     "marked": "^11.1.0",
     "moment": "^2.29.4",
-    "monaco-editor": "^0.54.0",
+    "monaco-editor": "^0.44.0",
     "ng-csv": "0.2.3",
     "ng-file-upload": "~5.0.9",
     "ng-flex-layout": "^17.3.7-beta.1",
@@ -88,6 +88,7 @@
     "ngx-bootstrap": "^6.1.0",
     "ngx-entity-service": "^0.0.41",
     "ngx-lottie": "^11.0.2",
+    "ngx-monaco-editor-v2": "^17.0.1",
     "nvd3": "1.8.6",
     "qrcode": "^1.5.4",
     "rxjs": "~7.4.0",
diff --git a/src/app/api/models/overseer/overseer-assessment.ts b/src/app/api/models/overseer/overseer-assessment.ts
index dcffd8fd4f..005b6be09f 100644
--- a/src/app/api/models/overseer/overseer-assessment.ts
+++ b/src/app/api/models/overseer/overseer-assessment.ts
@@ -1,20 +1,28 @@
-import {Entity, EntityMapping} from 'ngx-entity-service';
+import {Entity, EntityCache, EntityMapping} from 'ngx-entity-service';
 import {Task} from '../doubtfire-model';
+import {OverseerStepResult} from './overseer-step-result';
 
 export class OverseerAssessment extends Entity {
   id: number;
+  // overseerStepId: number;
   timestamp: Date;
   timestampString: string;
   content?: [{label: string; result: string}];
   task?: Task;
   taskStatus?: string;
-  submissionStatus?: string;
+  submissionStatus?: 'queued' | 'executing' | 'passed' | 'failed' | 'error';
   createdAt?: Date;
   updatedAt?: Date;
   taskId?: number;
 
+  totalSteps: number;
+  passedSteps: number;
+
   label: string;
 
+  public readonly stepResultsCache: EntityCache<OverseerStepResult> =
+    new EntityCache<OverseerStepResult>();
+
   constructor(task?: Task) {
     super();
 
@@ -31,4 +39,15 @@ export class OverseerAssessment extends Entity {
       overseer_assessment: super.toJson(mappingData, ignoreKeys),
     };
   }
+
+  public get stepsSkipped() {
+    return this.task?.definition.overseerStepsCache.currentValues.filter(
+      (step) =>
+        !this.stepResultsCache.currentValues.find((result) => result.overseerStepId === step.id),
+    );
+  }
+
+  public get reportReady() {
+    return this.submissionStatus === 'passed' || this.submissionStatus === 'failed';
+  }
 }
diff --git a/src/app/api/models/overseer/overseer-step-result.ts b/src/app/api/models/overseer/overseer-step-result.ts
new file mode 100644
index 0000000000..2a44371825
--- /dev/null
+++ b/src/app/api/models/overseer/overseer-step-result.ts
@@ -0,0 +1,35 @@
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {OverseerAssessment} from './overseer-assessment';
+import {OverseerStep} from './overseer-step';
+
+export class OverseerStepResult extends Entity {
+  id: number;
+  overseerAssessment: OverseerAssessment;
+  overseerStep: OverseerStep;
+  overseerStepId: number;
+
+  exitStatus: number;
+  pass: boolean;
+  stdout: string;
+  stdin: string;
+  expectedOutput: string;
+  stdoutSha256: string;
+  stdinSha256: string;
+  expectedOutputSha256: string;
+  feedbackMessage: string;
+
+  constructor(oa?: OverseerAssessment, os?: OverseerStep) {
+    super();
+    this.overseerAssessment = oa;
+    // this.overseerStep = os;
+  }
+
+  public override toJson<T extends Entity>(
+    mappingData: EntityMapping<T>,
+    ignoreKeys?: string[],
+  ): object {
+    return {
+      overseer_step_result: super.toJson(mappingData, ignoreKeys),
+    };
+  }
+}
diff --git a/src/app/api/models/overseer/overseer-step.ts b/src/app/api/models/overseer/overseer-step.ts
new file mode 100644
index 0000000000..5d2a03ee28
--- /dev/null
+++ b/src/app/api/models/overseer/overseer-step.ts
@@ -0,0 +1,75 @@
+import {Entity, EntityMapping} from 'ngx-entity-service';
+import {TaskDefinition} from '../task-definition';
+import {TaskStatus, TaskStatusEnum} from '../task-status';
+import {OverseerStepService} from '../../services/overseer-step.service';
+import {AppInjector} from 'src/app/app-injector';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+export class OverseerStep extends Entity {
+  id: number;
+  taskDefinition: TaskDefinition;
+
+  name: string;
+  description: string;
+
+  // Shown to the student's
+  displayName: string;
+  displayDescription: string;
+
+  runCommand: string;
+  commandLanguage: string;
+  timeout: number;
+  sortOrder: number;
+  stepType: 'status_check' | 'output_diff';
+  partialOutputDiff: boolean;
+  stdinInputFile: string;
+  expectedOutputFile: string;
+
+  feedbackMessage: string;
+  statusOnSuccess: TaskStatusEnum | 'no_change';
+  statusOnFailure: TaskStatusEnum | 'no_change';
+
+  haltOnSuccess: boolean;
+  haltOnFailure: boolean;
+
+  showExpectedOutput: boolean;
+  showStdin: boolean;
+  showStdout: boolean;
+
+  enabled: boolean;
+
+  // showStdOutToStudent: boolean
+
+  constructor(td?: TaskDefinition) {
+    super();
+    this.taskDefinition = td;
+  }
+
+  public override toJson<T extends Entity>(
+    mappingData: EntityMapping<T>,
+    ignoreKeys?: string[],
+  ): object {
+    return {
+      overseer_step: super.toJson(mappingData, ignoreKeys),
+    };
+  }
+
+  public delete() {
+    const overseerStepService: OverseerStepService = AppInjector.get(OverseerStepService);
+    overseerStepService
+      .delete(
+        {
+          id: this.id,
+        },
+        {cache: this.taskDefinition.overseerStepsCache, endpointFormat: 'overseer_steps/:id:'},
+      )
+      .subscribe({
+        next: (_response: object) => {
+          AppInjector.get(AlertService).success('Successfully deleted overseer step', 4000);
+        },
+        error: (error) => {
+          AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
+        },
+      });
+  }
+}
diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index d3aa2a4317..4a47a7ab96 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -9,6 +9,7 @@ import {Grade, GroupSet, LearningOutcome, Project, TutorialStream, Unit} from '.
 import {Task} from './doubtfire-model';
 import {TaskPrerequisite} from './task-prerequisite';
 import {DiscussionPrompt} from './discussion-prompt';
+import {OverseerStep} from './overseer/overseer-step';
 
 export type UploadRequirement = {
   key: string;
@@ -59,6 +60,7 @@ export class TaskDefinition extends Entity {
   useResourcesForJplagBaseCode: boolean;
   lockAssessmentsToTutorialStream: boolean;
   discussionPromptsCount: number;
+  overseerResourceFiles: string[] = [];
 
   public readonly taskPrerequisitesCache: EntityCache<TaskPrerequisite> =
     new EntityCache<TaskPrerequisite>();
@@ -69,6 +71,8 @@ export class TaskDefinition extends Entity {
   public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
     new EntityCache<LearningOutcome>();
 
+  public readonly overseerStepsCache: EntityCache<OverseerStep> = new EntityCache<OverseerStep>();
+
   readonly unit: Unit;
 
   constructor(unit: Unit) {
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index c920e985a7..d624a8285d 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -579,11 +579,7 @@ export class Task extends Entity {
   }
 
   public get overseerEnabled(): boolean {
-    return (
-      this.unit.overseerEnabled &&
-      this.definition.assessmentEnabled &&
-      this.definition.hasTaskAssessmentResources
-    );
+    return this.unit.overseerEnabled && this.definition.assessmentEnabled;
   }
 
   public get scormEnabled(): boolean {
diff --git a/src/app/api/services/overseer-assessment.service.ts b/src/app/api/services/overseer-assessment.service.ts
index 2226887caf..df897e43be 100644
--- a/src/app/api/services/overseer-assessment.service.ts
+++ b/src/app/api/services/overseer-assessment.service.ts
@@ -5,6 +5,7 @@ import {HttpClient} from '@angular/common/http';
 import API_URL from 'src/app/config/constants/apiUrl';
 import {OverseerAssessment} from '../models/overseer/overseer-assessment';
 import {Task} from '../models/doubtfire-model';
+import {OverseerStepResultService} from './overseer-step-result.service';
 
 @Injectable()
 export class OverseerAssessmentService extends EntityService<OverseerAssessment> {
@@ -13,7 +14,10 @@ export class OverseerAssessmentService extends EntityService<OverseerAssessment>
   protected readonly triggerEndpointFormat =
     'projects/:project_id:/task_def_id/:td_id:/overseer_assessment/:id:/trigger';
 
-  constructor(httpClient: HttpClient) {
+  constructor(
+    httpClient: HttpClient,
+    private overseerStepResultService: OverseerStepResultService,
+  ) {
     super(httpClient, API_URL);
 
     this.mapping.addKeys(
@@ -31,6 +35,24 @@ export class OverseerAssessmentService extends EntityService<OverseerAssessment>
         },
       },
       ['timestampString', 'submission_timestamp'],
+      {
+        keys: 'overseerStepResults',
+        toEntityOp: (data: object, key: string, overseerAssesment: OverseerAssessment) => {
+          data[key]?.forEach((overseerStep) => {
+            overseerAssesment.stepResultsCache.getOrCreate(
+              overseerStep['id'],
+              this.overseerStepResultService,
+              overseerStep,
+              {
+                constructorParams: overseerAssesment,
+              },
+            );
+          });
+        },
+      },
+      'overseerStepId',
+      'totalSteps',
+      'passedSteps',
     );
   }
 
@@ -44,7 +66,9 @@ export class OverseerAssessmentService extends EntityService<OverseerAssessment>
       td_id: task.definition.id,
     };
 
-    return this.query(pathIds);
+    return this.query(pathIds, {
+      constructorParams: task,
+    });
   }
 
   public triggerOverseer(assessment: OverseerAssessment): Observable<OverseerAssessment> {
diff --git a/src/app/api/services/overseer-step-result.service.ts b/src/app/api/services/overseer-step-result.service.ts
new file mode 100644
index 0000000000..f7e873281b
--- /dev/null
+++ b/src/app/api/services/overseer-step-result.service.ts
@@ -0,0 +1,52 @@
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {OverseerAssessment} from '../models/doubtfire-model';
+import {OverseerStepResult} from '../models/overseer/overseer-step-result';
+import {Observable} from 'rxjs';
+
+@Injectable()
+export class OverseerStepResultService extends CachedEntityService<OverseerStepResult> {
+  protected readonly endpointFormat =
+    'units/:unitId:/task_definitions/:taskDefId:/overseer_step_results/:id:';
+
+  constructor(httpClient: HttpClient) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys(
+      'id',
+      'overseerStepId',
+      'exitStatus',
+      'pass',
+      'feedbackMessage',
+      'stdout',
+      'stdin',
+      'expectedOutput',
+      'stdoutSha256',
+      'stdinSha256',
+      'expectedOutputSha256',
+    );
+
+    this.mapping.mapAllKeysToJsonExcept('id');
+  }
+
+  public createInstanceFrom(json: object, other?: any): OverseerStepResult {
+    return new OverseerStepResult(other as OverseerAssessment);
+  }
+
+  public getOverseerStepResults(assessment: OverseerAssessment): Observable<OverseerStepResult[]> {
+    const pathIds = {
+      projectId: assessment.task.project.id,
+      taskDefId: assessment.task.definition.id,
+      id: assessment.id,
+    };
+
+    return this.query(pathIds, {
+      endpointFormat:
+        'projects/:projectId:/task_definitions/:taskDefId:/overseer_assessments_results/:id:',
+      constructorParams: assessment.task,
+      cache: assessment.stepResultsCache,
+    });
+  }
+}
diff --git a/src/app/api/services/overseer-step.service.ts b/src/app/api/services/overseer-step.service.ts
new file mode 100644
index 0000000000..6df6323294
--- /dev/null
+++ b/src/app/api/services/overseer-step.service.ts
@@ -0,0 +1,47 @@
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {CachedEntityService} from 'ngx-entity-service';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {OverseerStep} from '../models/overseer/overseer-step';
+import {TaskDefinition} from '../models/task-definition';
+
+@Injectable()
+export class OverseerStepService extends CachedEntityService<OverseerStep> {
+  protected readonly endpointFormat =
+    'units/:unitId:/task_definitions/:taskDefId:/overseer_steps/:id:';
+
+  constructor(httpClient: HttpClient) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys(
+      'id',
+      // 'taskDefinition',
+      'name',
+      'description',
+      'displayName',
+      'displayDescription',
+      'runCommand',
+      'timeout',
+      'sortOrder',
+      'stepType',
+      'partialOutputDiff',
+      'stdinInputFile',
+      'expectedOutputFile',
+      'feedbackMessage',
+      'statusOnSuccess',
+      'statusOnFailure',
+      'haltOnSuccess',
+      'haltOnFailure',
+      'showExpectedOutput',
+      'showStdin',
+      'showStdout',
+      'enabled',
+    );
+
+    this.mapping.mapAllKeysToJsonExcept('id');
+  }
+
+  public createInstanceFrom(json: object, other?: any): OverseerStep {
+    return new OverseerStep(other as TaskDefinition);
+  }
+}
diff --git a/src/app/api/services/task-comment.service.ts b/src/app/api/services/task-comment.service.ts
index b804b164b4..6761bc715c 100644
--- a/src/app/api/services/task-comment.service.ts
+++ b/src/app/api/services/task-comment.service.ts
@@ -120,6 +120,11 @@ export class TaskCommentService extends CachedEntityService<TaskComment> {
 
       // Scorm Extension Comments
       ['taskScormExtensions', 'scorm_extensions'],
+      'overseerAssessmentId',
+      'overseerPassedSteps',
+      'overseerTotalSteps',
+      'overseerInProgress',
+      'overseerStatus',
     );
 
     this.mapping.addJsonKey('granted');
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 59664c143a..8e98e8175d 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -15,6 +15,7 @@ import {TaskPrerequisiteService} from './task-prerequisite.service';
 import {TaskPrerequisite} from '../models/task-prerequisite';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {SidekiqJob} from '../models/sidekiq-job';
+import {OverseerStepService} from './overseer-step.service';
 
 @Injectable()
 export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
@@ -24,6 +25,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
     httpClient: HttpClient,
     private learningOutcomeService: LearningOutcomeService,
     private taskPrerequisiteService: TaskPrerequisiteService,
+    private overseerStepService: OverseerStepService,
   ) {
     super(httpClient, API_URL);
 
@@ -140,6 +142,22 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       },
       'useResourcesForJplagBaseCode',
       'lockAssessmentsToTutorialStream',
+      {
+        keys: 'overseerSteps',
+        toEntityOp: (data: object, key: string, taskDefinition: TaskDefinition) => {
+          data[key]?.forEach((overseerStep) => {
+            taskDefinition.overseerStepsCache.getOrCreate(
+              overseerStep['id'],
+              this.overseerStepService,
+              overseerStep,
+              {
+                constructorParams: taskDefinition,
+              },
+            );
+          });
+        },
+      },
+      'overseerResourceFiles',
     );
 
     this.mapping.mapAllKeysToJsonExcept(
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 295b8612ee..fa44839024 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -99,8 +99,12 @@ export class FooterComponent implements OnInit {
     this.selectedTaskService.showSimilarity();
   }
 
+  // viewOverseer() {
+  //   this.taskAssessmentModal.show(this.selectedTask);
+  // }
+
   viewOverseer() {
-    this.taskAssessmentModal.show(this.selectedTask);
+    this.selectedTaskService.showOverseerReports();
   }
 
   viewStaffNotes() {
diff --git a/src/app/common/modals/task-assessment-modal/task-assessment-modal.component.html b/src/app/common/modals/task-assessment-modal/task-assessment-modal.component.html
index 080a65cfd6..4ac4445bfb 100644
--- a/src/app/common/modals/task-assessment-modal/task-assessment-modal.component.html
+++ b/src/app/common/modals/task-assessment-modal/task-assessment-modal.component.html
@@ -1,14 +1,20 @@
 <div class="submission-history-modal">
   <h3 mat-dialog-title class="panel-title">Overseer Assessment</h3>
   <mat-dialog-content style="height: calc(100% - 7em)">
-    <task-submission-history [task]="task" (hasNoData)="setNoDataFlag($event)" [refreshTrigger]="refreshTrigger">
-    </task-submission-history>
+    <f-task-overseer-report [task]="task" [loadOverseerAssessmentId]="overseerAssessmentId">
+    </f-task-overseer-report>
   </mat-dialog-content>
   <div mat-dialog-actions style="float: right">
     @if (noDataFlag) {
-    <button mat-button mat-raised-button color="primary" style="margin-right: 6px" (click)="resfreshChildComponent()">
-      <i class="fa fa-refresh"></i> Refresh
-    </button>
+      <button
+        mat-button
+        mat-raised-button
+        color="primary"
+        style="margin-right: 6px"
+        (click)="resfreshChildComponent()"
+      >
+        <i class="fa fa-refresh"></i> Refresh
+      </button>
     }
     <button mat-dialog-close mat-stroked-button color="warn">Cancel</button>
   </div>
diff --git a/src/app/common/modals/task-assessment-modal/task-assessment-modal.component.ts b/src/app/common/modals/task-assessment-modal/task-assessment-modal.component.ts
index 06c8fb3246..13bd6e9236 100644
--- a/src/app/common/modals/task-assessment-modal/task-assessment-modal.component.ts
+++ b/src/app/common/modals/task-assessment-modal/task-assessment-modal.component.ts
@@ -2,6 +2,7 @@ import {Component, OnInit, Inject, Input} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {Subject} from 'rxjs';
 import {Task} from 'src/app/api/models/doubtfire-model';
+import {TaskAssessmentModalData} from './task-assessment-modal.service';
 
 @Component({
   selector: 'task-assessment-modal',
@@ -10,16 +11,18 @@ import {Task} from 'src/app/api/models/doubtfire-model';
 })
 export class TaskAssessmentModalComponent implements OnInit {
   @Input() task: Task;
+  @Input() overseerAssessmentId?: number;
   noDataFlag: boolean;
   refreshTrigger: Subject<boolean> = new Subject();
 
   constructor(
     public dialogRef: MatDialogRef<TaskAssessmentModalComponent>,
-    @Inject(MAT_DIALOG_DATA) public data: any,
+    @Inject(MAT_DIALOG_DATA) public data: TaskAssessmentModalData,
   ) {}
 
   ngOnInit() {
-    this.task = this.data;
+    this.task = this.data.task;
+    this.overseerAssessmentId = this.data.overseerAssessmentId;
   }
 
   setNoDataFlag($event) {
diff --git a/src/app/common/modals/task-assessment-modal/task-assessment-modal.service.ts b/src/app/common/modals/task-assessment-modal/task-assessment-modal.service.ts
index 927c861a04..31e9bc54c9 100644
--- a/src/app/common/modals/task-assessment-modal/task-assessment-modal.service.ts
+++ b/src/app/common/modals/task-assessment-modal/task-assessment-modal.service.ts
@@ -1,21 +1,30 @@
-import { Injectable } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
+import {Injectable} from '@angular/core';
+import {MatDialogRef, MAT_DIALOG_DATA, MatDialog} from '@angular/material/dialog';
 import {TaskAssessmentModalComponent} from './task-assessment-modal.component';
+import {Task} from 'src/app/api/models/task';
+
+export interface TaskAssessmentModalData {
+  task: Task;
+  overseerAssessmentId: number;
+}
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class TaskAssessmentModalService {
-  constructor(
-    public dialog: MatDialog,
-    ) { }
+  constructor(public dialog: MatDialog) {}
 
-  public show(task: any) {
-    let dialogRef: MatDialogRef<TaskAssessmentModalComponent, any>;
-    dialogRef = this.dialog.open(TaskAssessmentModalComponent, {
-      data: task,
-      width: '80%',
-      panelClass: 'submission-history-modal'
-    });
+  public show(task: Task, overseerAssessmentId?: number) {
+    this.dialog.open<TaskAssessmentModalComponent, TaskAssessmentModalData>(
+      TaskAssessmentModalComponent,
+      {
+        data: {
+          task: task,
+          overseerAssessmentId,
+        },
+        width: '80%',
+        panelClass: 'submission-history-modal',
+      },
+    );
   }
 }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 7938a4e274..86b5fc459d 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -43,9 +43,13 @@ import {UIRouterUpgradeModule} from '@uirouter/angular-hybrid';
 import {MatDialogModule as MatDialogModuleNew} from '@angular/material/dialog';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {AlertComponent} from 'src/app/common/services/alert.service';
+import {MatSidenavModule} from '@angular/material/sidenav';
 
 import {setTheme} from 'ngx-bootstrap/utils';
 
+import {CodeEditorModule} from '@ngstack/code-editor';
+import {MonacoEditorModule} from 'ngx-monaco-editor-v2';
+
 import {AboutDoubtfireModalService} from 'src/app/common/modals/about-doubtfire-modal/about-doubtfire-modal.service';
 import {
   D2lUnitDetailsFormComponent,
@@ -295,12 +299,14 @@ import {AnalyticsTutorTimesComponent} from './units/states/analytics/directives/
 import {MarkingSessionService} from './api/services/marking-session.service';
 import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
 import {OverseerScriptEditorModalComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component';
-import {CodeEditorModule} from '@ngstack/code-editor';
 import {UploadGradesComponent} from './units/states/portfolios/upload-grades/upload-grades.component';
 import {DiscussionPromptService} from './api/services/discussion-prompt.service';
 import {DiscussionPromptsComponent} from './projects/states/discussion-prompts/discussion-prompts.component';
 import {TaskDefinitionDiscussionPromptsComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component';
 import {DiscussionPromptsViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component';
+import {OverseerStepService} from './api/services/overseer-step.service';
+import {TaskOverseerReportComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component';
+import {OverseerStepResultService} from './api/services/overseer-step-result.service';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -460,6 +466,7 @@ const MY_DATE_FORMAT = {
     DiscussionPromptsComponent,
     TaskDefinitionDiscussionPromptsComponent,
     DiscussionPromptsViewComponent,
+    TaskOverseerReportComponent,
   ],
   providers: [
     // Services we provide
@@ -550,6 +557,8 @@ const MY_DATE_FORMAT = {
     TaskPrerequisiteService,
     MarkingSessionService,
     DiscussionPromptService,
+    OverseerStepService,
+    OverseerStepResultService,
   ],
   imports: [
     FlexLayoutModule,
@@ -613,6 +622,8 @@ const MY_DATE_FORMAT = {
     MatDialogModuleNew,
     CalendarModule.forRoot({provide: CalendarDateAdapter, useFactory: adapterFactory}),
     CodeEditorModule.forRoot(),
+    MatSidenavModule,
+    MonacoEditorModule.forRoot(),
   ],
 })
 
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 8187457400..8d0fee5456 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -233,6 +233,7 @@ import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/dir
 import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
 import {TaskSimilarityViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component';
 import {UploadGradesComponent} from './units/states/portfolios/upload-grades/upload-grades.component';
+import {TaskOverseerReportComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component';
 
 export const DoubtfireAngularJSModule = angular
   .module('doubtfire', [
@@ -575,3 +576,8 @@ DoubtfireAngularJSModule.directive(
   'fUploadGrades',
   downgradeComponent({component: UploadGradesComponent}),
 );
+
+DoubtfireAngularJSModule.directive(
+  'fTaskOverseerReport',
+  downgradeComponent({component: TaskOverseerReportComponent}),
+);
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.html
new file mode 100644
index 0000000000..5609881791
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.html
@@ -0,0 +1,167 @@
+<div class="flex justify-end mb-5">
+  <button mat-stroked-button (click)="loadAssessments(true)">Refresh</button>
+</div>
+<mat-accordion>
+  @for (oa of overseerAssessments; track oa; let idx = $index) {
+    <mat-expansion-panel
+      [attr.id]="'oa-panel-' + oa.id"
+      (opened)="onAssessmentOpen(oa)"
+      [disabled]="!oa.reportReady"
+      [expanded]="oa.id === loadOverseerAssessmentId && oa.reportReady"
+    >
+      <mat-expansion-panel-header class="flex justify-between items-center">
+        <mat-panel-title class="flex items-center gap-5">
+          <status-icon [status]="oa.taskStatus"> </status-icon>
+          Submission {{ idx + 1 }}: {{ oa.timestamp | humanizedDate }}
+          @if (idx === 0) {
+            <span class="text-gray-500">(Most recent)</span>
+          }
+        </mat-panel-title>
+        @if (oa.reportReady) {
+          <div class="flex gap-5 items-center">
+            <span class="text-gray-500"> {{ oa.passedSteps }} / {{ oa.totalSteps }}</span>
+            @if (oa.passedSteps === oa.totalSteps) {
+              <mat-icon color="primary">done</mat-icon>
+            } @else {
+              <mat-icon color="warn">cancel</mat-icon>
+            }
+          </div>
+        } @else {
+          <div class="flex gap-5 uppercase items-center">
+            Tests In Progress
+            <mat-progress-spinner [diameter]="25" mode="indeterminate"></mat-progress-spinner>
+          </div>
+        }
+      </mat-expansion-panel-header>
+
+      <mat-accordion>
+        @for (result of oa.stepResultsCache.values | async; track result.id; let idx = $index) {
+          <mat-expansion-panel>
+            <mat-expansion-panel-header class="flex justify-between items-center">
+              <mat-panel-title>
+                Step {{ idx + 1 }}: {{ result.overseerStep?.displayName }}</mat-panel-title
+              >
+              @if (result.pass) {
+                <mat-icon color="primary">done</mat-icon>
+              } @else {
+                <mat-icon color="warn">cancel</mat-icon>
+              }
+            </mat-expansion-panel-header>
+
+            <!-- <p>Exit Status: {{ result.exitStatus }}</p> -->
+            <!-- <p>Pass?: {{ result.pass }}</p> -->
+
+            @if (!result.pass) {
+              <p class="text-gray-500 text-left w-full tracking-wide p-2 text-normal">
+                {{ result.feedbackMessage }}
+              </p>
+            }
+
+            @if (
+              result.expectedOutput &&
+              result.expectedOutput !== result.stdout &&
+              (result.overseerStep?.stepType === 'output_diff' || !result.overseerStep)
+            ) {
+              <div class="flex gap-2 mb-5 w-fill justify-center items-center">
+                <button
+                  mat-stroked-button
+                  [color]="viewOutput === 'your_output' ? 'primary' : undefined"
+                  (click)="submissionOutput()"
+                >
+                  Your Output
+                </button>
+
+                <button
+                  mat-stroked-button
+                  [color]="viewOutput === 'expected_output' ? 'primary' : undefined"
+                  (click)="expectedOutput()"
+                >
+                  Expected Output
+                </button>
+                <button
+                  mat-stroked-button
+                  [color]="viewOutput === 'diff' ? 'primary' : undefined"
+                  (click)="diff()"
+                >
+                  Diff
+                </button>
+
+                <button
+                  mat-stroked-button
+                  [color]="viewOutput === 'split_diff' ? 'primary' : undefined"
+                  (click)="splitDiff()"
+                >
+                  Split Diff
+                </button>
+              </div>
+              @if (viewOutput === 'diff' || viewOutput === 'split_diff') {
+                @if (result.expectedOutput !== result.stdout) {
+                  <ngx-monaco-diff-editor
+                    [options]="diffEditorOptions"
+                    [originalModel]="{
+                      language: 'plaintext',
+                      code: result.expectedOutput
+                    }"
+                    [modifiedModel]="{
+                      language: 'plainttext',
+                      code: result.stdout
+                    }"
+                  ></ngx-monaco-diff-editor>
+                }
+              } @else if (viewOutput === 'your_output') {
+                <ngx-monaco-editor
+                  class="w-full p-5"
+                  [options]="editorOptions"
+                  [(ngModel)]="result.stdout"
+                ></ngx-monaco-editor>
+              } @else if (viewOutput === 'expected_output') {
+                <ngx-monaco-editor
+                  class="w-full p-5"
+                  [options]="editorOptions"
+                  [(ngModel)]="result.expectedOutput"
+                ></ngx-monaco-editor>
+              }
+            } @else if (result.stdout) {
+              <pre
+                class="max-w-full max-h-72 overflow-scroll whitespace-pre-wrap break-words scrollbar-gutter-stable"
+              ><code>{{result.stdout}}</code></pre>
+            } @else if (result.pass) {
+              <div class="uppercase text-gray-400 text-center w-full tracking-wide">SUCCESS</div>
+              <div class="uppercase text-gray-200 text-center w-full tracking-wide p-2 text-normal">
+                (No Output)
+              </div>
+            }
+          </mat-expansion-panel>
+        }
+        @if (loadingAssessments.has(oa.id)) {
+          <div class="w-full flex justify-center items-center">
+            <mat-progress-spinner mode="indeterminate"></mat-progress-spinner>
+          </div>
+        } @else {
+          @for (skipped of oa.stepsSkipped; track skipped.id; let idx = $index) {
+            <!-- TODO: filter oa.stepsSkipped, if this overseer assessment passed, then we can ignore this (dont render) skipped step -->
+            <!-- TODO: because it proably means the test was added after the assessment -->
+            <mat-expansion-panel disabled>
+              <mat-expansion-panel-header class="flex justify-between items-center">
+                <mat-panel-title>
+                  Step {{ oa.stepResultsCache.currentValues.length + idx + 1 }}:
+                  {{ skipped?.displayName ?? '-' }}
+                  <span class="italic ml-5">(Skipped)</span>
+                </mat-panel-title>
+
+                <mat-icon class="opacity-80">pause</mat-icon>
+              </mat-expansion-panel-header>
+            </mat-expansion-panel>
+          }
+        }
+      </mat-accordion>
+    </mat-expansion-panel>
+  } @empty {
+    <div class="flex flex-col w-full h-full justify-center items-center text-[#c5c5c5]">
+      <mat-icon style="height: 120px; width: 120px; font-size: 120px; color: #c5c5c5"
+        >subtitles_off</mat-icon
+      >
+      <div>No submission reports for this task.</div>
+    </div>
+  }
+</mat-accordion>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.scss b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.ts
new file mode 100644
index 0000000000..cf4c5a86ed
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.ts
@@ -0,0 +1,145 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {OverseerAssessment} from 'src/app/api/models/doubtfire-model';
+import {Task} from 'src/app/api/models/task';
+import {OverseerAssessmentService} from 'src/app/api/services/overseer-assessment.service';
+import {OverseerStepResultService} from 'src/app/api/services/overseer-step-result.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {TaskSubmissionService} from 'src/app/common/services/task-submission.service';
+
+@Component({
+  selector: 'f-task-overseer-report',
+  templateUrl: './task-overseer-report.component.html',
+  styleUrl: './task-overseer-report.component.scss',
+})
+export class TaskOverseerReportComponent implements OnInit {
+  @Input() task: Task;
+  @Input() loadOverseerAssessmentId?: number;
+
+  constructor(
+    private alerts: AlertService,
+    private submissions: TaskSubmissionService,
+    private overseerAssessmentService: OverseerAssessmentService,
+    private overseerStepResultsService: OverseerStepResultService,
+  ) {}
+
+  public viewOutput: 'your_output' | 'expected_output' | 'diff' | 'split_diff' = 'your_output';
+
+  stdoutOptions = {
+    theme: 'vs-dark',
+    language: 'plaintext',
+    renderMinimap: false,
+    lineNumbers: false,
+
+    minimap: {
+      enabled: false,
+    },
+  };
+  editorOptions = {
+    theme: 'vs',
+    language: 'text',
+    renderMinimap: false,
+    minimap: {
+      enabled: false,
+    },
+    readOnly: true,
+  };
+
+  diffEditorOptions = {
+    theme: 'vs',
+    language: 'plaintext',
+    renderMinimap: false,
+    readOnly: true,
+    domReadOnly: true,
+    renderMarginRevertIcon: false,
+    enableSplitViewResizing: false,
+    useInlineViewWhenSpaceIsLimited: false,
+    renderSideBySideInlineBreakpoint: 1000,
+    renderSideBySide: true,
+    compactMode: true,
+    minimap: {
+      enabled: false,
+    },
+    lineNumbers: 'off',
+  };
+
+  diff() {
+    this.diffEditorOptions.renderSideBySide = false;
+    this.diffEditorOptions.compactMode = true;
+    this.diffEditorOptions = {...this.diffEditorOptions};
+    this.viewOutput = 'diff';
+  }
+
+  splitDiff() {
+    this.diffEditorOptions.renderSideBySide = true;
+    this.diffEditorOptions.compactMode = false;
+    this.diffEditorOptions = {...this.diffEditorOptions};
+    setTimeout(() => {
+      this.viewOutput = 'split_diff';
+    }, 100);
+  }
+
+  submissionOutput() {
+    this.viewOutput = 'your_output';
+  }
+
+  expectedOutput() {
+    this.viewOutput = 'expected_output';
+  }
+
+  public overseerAssessments: OverseerAssessment[] = [];
+
+  ngOnInit(): void {
+    this.loadAssessments();
+  }
+
+  loadAssessments(isRefresh: boolean = false) {
+    if (isRefresh) {
+      this.loadOverseerAssessmentId = null;
+    }
+    this.overseerAssessmentService.queryForTask(this.task).subscribe({
+      next: (assessments) => {
+        this.overseerAssessments = assessments;
+        for (const oa of this.overseerAssessments) {
+          for (const result of oa.stepResultsCache.currentValues) {
+            result.overseerStep = this.task.definition.overseerStepsCache.currentValues.find(
+              (step) => step.id === result.overseerStepId,
+            );
+          }
+        }
+      },
+      error: (error) => {
+        this.alerts.error(`Failed to load overseer reports: ${error}`, 6000);
+      },
+    });
+  }
+
+  loadingAssessments = new Set<number>();
+
+  onAssessmentOpen(overseerAssesment: OverseerAssessment) {
+    if (this.loadOverseerAssessmentId === overseerAssesment.id) {
+      setTimeout(() => {
+        const el = document.getElementById(`oa-panel-${overseerAssesment.id}`);
+        el?.scrollIntoView({behavior: 'smooth', block: 'start'});
+      }, 250);
+    }
+
+    this.loadingAssessments.add(overseerAssesment.id);
+
+    this.overseerStepResultsService.getOverseerStepResults(overseerAssesment).subscribe({
+      next: () => {
+        for (const oa of this.overseerAssessments) {
+          for (const result of oa.stepResultsCache.currentValues) {
+            result.overseerStep = this.task.definition.overseerStepsCache.currentValues.find(
+              (step) => step.id === result.overseerStepId,
+            );
+          }
+        }
+        this.loadingAssessments.delete(overseerAssesment.id);
+      },
+      error: (error) => {
+        console.error(error);
+        this.loadingAssessments.delete(overseerAssesment.id);
+      },
+    });
+  }
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
index f70113800c..a5d9df4511 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.coffee
@@ -25,7 +25,7 @@ angular.module('doubtfire.projects.states.dashboard.directives.task-dashboard',
     # Is the current user a tutor?
     $scope.tutor = $stateParams.tutor
     # the ways in which the dashboard can be viewed
-    $scope.dashboardViews = ["details", "submission", "task", "similarities"]
+    $scope.dashboardViews = ["details", "submission", "task", "similarities", "overseer"]
 
     # set the current dashboard view to details by default
     updateCurrentView = ->
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
index df91328f92..fc861e5b34 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
@@ -16,6 +16,10 @@
       <f-task-similarity-view [task]="task"></f-task-similarity-view>
     </ng-template>
 
+    <ng-template [ngSwitchCase]="DashboardViews.overseer">
+      <f-task-overseer-report [task]="task"></f-task-overseer-report>
+    </ng-template>
+
     <ng-template [ngSwitchCase]="DashboardViews.staff_notes">
       <f-staff-notes-view [project]="task.project"></f-staff-notes-view>
     </ng-template>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
index 16d998bc0a..45893297a0 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.tpl.html
@@ -2,7 +2,9 @@
   <div class="panel-heading" ng-show="task">
     <div class="panel-title">
       <span ng-hide="tutor || showFooter">{{task.definition.name}}</span>
-      <span ng-show="tutor || showFooter" style="display: inline-flex">{{task.definition.name}} </span>
+      <span ng-show="tutor || showFooter" style="display: inline-flex"
+        >{{task.definition.name}}
+      </span>
       <div
         class="dropdown pull-right"
         dropdown
@@ -25,6 +27,9 @@
           <li ng-show="tutor">
             <a ng-click="setSelectedDashboardView('similarities')">View Similarities</a>
           </li>
+          <li ng-if="overseerEnabled()">
+            <a ng-click="setSelectedDashboardView('overseer')">View Overseer Reports</a>
+          </li>
           <li class="divider" ng-show="task.hasPdf"></li>
           <li ng-show="task.hasPdf">
             <a ng-click="downloadSubmission()">Download Submission PDF</a>
@@ -32,9 +37,9 @@
           <li ng-show="task.hasPdf">
             <a ng-click="downloadSubmittedFiles()">Download Submitted Files</a>
           </li>
-          <li ng-if="overseerEnabled()">
+          <!-- <li ng-if="overseerEnabled()">
             <a ng-click="showSubmissionHistoryModal()">Execution History</a>
-          </li>
+          </li> -->
         </ul>
       </div>
       <!--/download-dropdown-->
@@ -94,6 +99,9 @@
   <div class="panel-body" ng-if="isCurrentView('similarities')">
     <f-task-similarity-view [task]="task"></f-task-similarity-view>
   </div>
+  <div class="panel-body" ng-if="isCurrentView('overseer')">
+    <f-task-overseer-report [task]="task" class="max-w-full"></f-task-overseer-report>
+  </div>
   <!--/panel-body-->
   <div class="panel-body text-muted no-pdf" ng-show="isCurrentView('submission') && !task.hasPdf">
     <i class="fa fa-file-pdf-o"></i>
diff --git a/src/app/projects/states/dashboard/selected-task.service.ts b/src/app/projects/states/dashboard/selected-task.service.ts
index 204714694e..3385019a77 100644
--- a/src/app/projects/states/dashboard/selected-task.service.ts
+++ b/src/app/projects/states/dashboard/selected-task.service.ts
@@ -10,6 +10,7 @@ export enum DashboardViews {
   similarity,
   staff_notes,
   discussion_prompts,
+  overseer,
 }
 
 @Injectable({
@@ -67,6 +68,10 @@ export class SelectedTaskService {
     this.currentView$.next(DashboardViews.staff_notes);
   }
 
+  public showOverseerReports() {
+    this.currentView$.next(DashboardViews.overseer);
+  }
+
   public showDiscussionPrompts() {
     this.currentView$.next(DashboardViews.discussion_prompts);
   }
diff --git a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html
index d6d344fc06..4feda189a2 100644
--- a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html
+++ b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.html
@@ -1,15 +1,49 @@
-<div fxLayout="row" fxLayoutAlign="space-evenly center">
-  <div fxLayout="column" fxLayoutAlign="space-around center">
-    <!-- @if (comment.assessment_result && comment.assessment_result.is_successful) { -->
-    <div>
-      <hr class="hr-text" data-content="Assessment Summary" />
-      <pre class="overflow-x-scroll scrollbar-gutter-stable">{{ comment.text }}</pre>
-
-      <button mat-button (click)="showTaskAssessmentResult()">View report</button>
-      <hr class="hr-fade" />
+<div class="flex flex-col justify-center items-center overflow-hidden w-full mx-auto">
+  <!-- TODO: dont render this comment if we're still in pre_queued and the submission timestamp is over 1 hour etc -->
+  <div class="flex justify-center items-center text-center text-[#9696969d] opacity-80 w-full">
+    <div
+      class="flex-grow h-px bg-gradient-to-r from-transparent via-gray-400/60 to-transparent w-full"
+    ></div>
+
+    <div class="flex items-center gap-2 px-2 bg-white whitespace-nowrap">
+      @if (comment.overseerStatus === 'pre_queued') {
+        Tests In Progress
+      } @else if (comment.overseerStatus === 'passed') {
+        Tests Passed {{ comment.overseerPassedSteps }} / {{ comment.overseerTotalSteps }}
+      } @else if (comment.overseerStatus === 'failed') {
+        Tests Failed {{ comment.overseerPassedSteps }} / {{ comment.overseerTotalSteps }}
+      }
     </div>
-    <!-- } @else {
-      <hr class="hr-text" data-content="Tests in Progress" />
-    } -->
+
+    <div
+      class="flex-grow h-px bg-gradient-to-r from-transparent via-gray-400/60 to-transparent w-full"
+    ></div>
   </div>
+
+  @if (comment.overseerStatus === 'passed') {
+    <mat-icon
+      class="my-2 text-green-500 opacity-70"
+      style="width: 35px; height: 35px; font-size: 35px"
+      >check_circle</mat-icon
+    >
+  } @else if (comment.overseerStatus === 'failed') {
+    <mat-icon
+      color="warn"
+      class="my-2 opacity-70"
+      style="width: 35px; height: 35px; font-size: 35px"
+      >highlight_off_outline</mat-icon
+    >
+  } @else if (comment.overseerStatus === 'pre_queued') {
+    <mat-progress-spinner [diameter]="25" mode="indeterminate"></mat-progress-spinner>
+  }
+
+  @if (comment.overseerStatus !== 'pre_queued') {
+    <button
+      mat-stroked-button
+      (click)="showTaskAssessmentResult(comment.overseerAssessmentId)"
+      class="mb-2"
+    >
+      View report
+    </button>
+  }
 </div>
diff --git a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.scss b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.scss
index 816d3724e7..e69de29bb2 100644
--- a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.scss
+++ b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.scss
@@ -1,56 +0,0 @@
-div {
-  width: 100%;
-}
-
-p {
-  color: #2c2c2c;
-  text-align: center;
-}
-
-hr {
-  width: 100%;
-}
-
-.hr-fade {
-  background: linear-gradient(to right, transparent, #9696969d, transparent);
-  width: 100%;
-  margin-top: 1px;
-}
-
-.fade-text {
-  color: #9696969d;
-  opacity: 0.8;
-}
-
-.hr-text {
-  margin: 0;
-  line-height: 1em;
-  position: relative;
-  outline: 0;
-  border: 0;
-  color: black;
-  text-align: center;
-  height: 1.5em;
-  opacity: 0.8;
-  &:before {
-    content: "";
-    background: linear-gradient(to right, transparent, #9696969d, transparent);
-    position: absolute;
-    left: 0;
-    top: 50%;
-    width: 100%;
-    height: 1px;
-  }
-  &:after {
-    content: attr(data-content);
-    position: relative;
-    display: inline-block;
-    color: black;
-
-    padding: 0 0.5em;
-    line-height: 1.5em;
-
-    color: #9696969d;
-    background-color: #fff;
-  }
-}
diff --git a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.ts b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.ts
index ed2e404b26..a57f866649 100644
--- a/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.ts
+++ b/src/app/tasks/task-comments-viewer/task-assessment-comment/task-assessment-comment.component.ts
@@ -1,8 +1,11 @@
-import { Component, OnInit, Input, Inject } from '@angular/core';
-import { TaskSubmissionService, TaskAssessmentResult } from 'src/app/common/services/task-submission.service';
-import { TaskAssessmentModalService } from 'src/app/common/modals/task-assessment-modal/task-assessment-modal.service';
-import { Task } from 'src/app/api/models/doubtfire-model';
-import { AlertService } from 'src/app/common/services/alert.service';
+import {Component, OnInit, Input, Inject} from '@angular/core';
+import {
+  TaskSubmissionService,
+  TaskAssessmentResult,
+} from 'src/app/common/services/task-submission.service';
+import {TaskAssessmentModalService} from 'src/app/common/modals/task-assessment-modal/task-assessment-modal.service';
+import {Task} from 'src/app/api/models/doubtfire-model';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 export interface User {
   id: number;
@@ -23,6 +26,11 @@ export interface TaskAssessmentComment {
   recipient_read_time?: Date;
   // new fields that extend regular Comment Interface. TODO: create a separate Comment entity and extend it.
   assessment_result?: TaskAssessmentResult;
+  overseerAssessmentId: number;
+  overseerPassedSteps: number;
+  overseerTotalSteps: number;
+  overseerInProgress: boolean;
+  overseerStatus: string;
 }
 
 @Component({
@@ -53,12 +61,12 @@ export class TaskAssessmentCommentComponent implements OnInit {
     return this.comment.assessment_result.assessment_output;
   }
 
-  showTaskAssessmentResult() {
-    this.modalService.show(this.task);
+  showTaskAssessmentResult(overseerAssessmentId?: number) {
+    this.modalService.show(this.task, overseerAssessmentId);
   }
 
   scroll(el: HTMLElement) {
-    el.scrollIntoView({ behavior: 'smooth' });
+    el.scrollIntoView({behavior: 'smooth'});
   }
 
   update(): void {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
index 0e5c521bcb..fb78832932 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
@@ -1,12 +1,19 @@
 <div class="flex flex-col gap-4">
-  <mat-checkbox
-    matInput
-    required
-    [(ngModel)]="taskDefinition.assessmentEnabled"
-    [disabled]="!overseerEnabled"
-  >
-    Automation Enabled
-  </mat-checkbox>
+  <div>
+    <mat-checkbox
+      matInput
+      required
+      [(ngModel)]="taskDefinition.assessmentEnabled"
+      [disabled]="!overseerEnabled"
+    >
+      Automation Enabled
+    </mat-checkbox>
+    <br />
+    <mat-hint>
+      You can add or modify Overseer steps while keeping this unchecked and use the test submission
+      feature. Once everything is ready, enable automation to apply it to all student submissions.
+    </mat-hint>
+  </div>
 
   <mat-form-field class="flex-grow" appearance="outline">
     <mat-label>Docker Image</mat-label>
@@ -18,10 +25,6 @@
     <mat-hint>Docker image for Overseer</mat-hint>
   </mat-form-field>
 
-  <button mat-flat-button color="primary" (click)="editScript()" class="flex-grow me-4">
-    <mat-icon>upload_file</mat-icon> Edit Execution Script
-  </button>
-
   <f-file-drop
     mode="event"
     (filesDropped)="uploadOverseerResources($event)"
@@ -48,14 +51,359 @@
     <button
       mat-flat-button
       color="primary"
-      [disabled]="!taskDefinition.id || !taskDefinition.hasTaskAssessmentScript"
+      [disabled]="!taskDefinition.id"
       (click)="testSubmission()"
       class="flex-grow me-4"
     >
       <mat-icon>upload_file</mat-icon> Test Submission
     </button>
-    <button mat-flat-button color="accent" (click)="testSubmissionHistory()" class="flex-grow ms-4">
+    <button
+      mat-flat-button
+      color="accent"
+      (click)="testSubmissionHistory()"
+      class="flex-grow ms-4"
+      [disabled]="!this.currentUserTask?.project"
+    >
       <mat-icon>preview</mat-icon> Submission History
     </button>
   </div>
 </div>
+
+<div class="mt-5"></div>
+
+@if (taskDefinition.overseerImageId) {
+  @if (!taskDefinitionHasChanges()) {
+    <div class="flex justify-end">
+      <div class="flex gap-2">
+        @if (this.selectedOverseerStep) {
+          <button mat-raised-button color="warn" (click)="deleteStep()">Delete</button>
+          <button mat-raised-button color="primary" (click)="saveStep()">Save</button>
+        }
+      </div>
+    </div>
+
+    <mat-drawer-container class="example-container">
+      <mat-drawer mode="side" opened class="min-w-[300px] border border-gray-300">
+        <div
+          class="w-[300px] px-[20px] border border-gray-300 min-h-[50px] bg-gray-300 flex justify-between items-center"
+        >
+          <div>Overseer Steps</div>
+          @if (!newOverseerStep) {
+            <button mat-icon-button (click)="addStep()"><mat-icon>add</mat-icon></button>
+          }
+        </div>
+        <div cdkDropList class="example-list" (cdkDropListDropped)="drop($event)">
+          @for (step of overseerSteps; track step.id) {
+            <div
+              class="example-box"
+              cdkDrag
+              (click)="selectStep(step)"
+              [ngClass]="{
+                'bg-gray-100': selectedOverseerStep?.id === step.id
+              }"
+            >
+              <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon>
+              {{ step.sortOrder }}. {{ step.name ?? 'Untitled Step' }}
+            </div>
+          }
+          @if (newOverseerStep) {
+            <div
+              class="example-box bg-gray-100"
+              cdkDrag
+              cdkDragDisabled
+              (click)="selectStep(newOverseerStep)"
+            >
+              <!-- <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon> -->
+              {{ newOverseerStep.sortOrder }}. {{ newOverseerStep.name || 'Untitled Step' }}
+            </div>
+          }
+
+          <!-- <div class="example-box" cdkDrag>
+        <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon>
+        1. Compile
+      </div>
+      <div class="example-box" cdkDrag>
+        <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon>
+        2. Run
+      </div>
+      <div class="example-box" cdkDrag>
+        <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon>
+        3. Compare output
+      </div>
+      <div class="example-box" cdkDrag>
+        <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon>
+        4. Search for text
+      </div> -->
+        </div>
+      </mat-drawer>
+      <mat-drawer-content>
+        @if (selectedOverseerStep) {
+          <mat-card class="w-full min-h-[350px]">
+            <!-- <mat-card-header>
+        <mat-card-title>Step 1: Compile</mat-card-title>
+      </mat-card-header> -->
+            <mat-card-content class="w-full flex flex-col">
+              <div class="flex gap-5 w-full">
+                <mat-form-field appearance="outline" class="basis-1/3">
+                  <mat-label>Step Name</mat-label>
+                  <input matInput [(ngModel)]="selectedOverseerStep.name" required />
+                  <mat-hint>Visible to staff only</mat-hint>
+                </mat-form-field>
+                <mat-form-field appearance="outline" class="w-full" required>
+                  <mat-label>Description</mat-label>
+                  <input
+                    matInput
+                    placeholder="Description"
+                    [(ngModel)]="selectedOverseerStep.description"
+                    required
+                  />
+                  <mat-hint>Visible to staff only</mat-hint>
+                </mat-form-field>
+              </div>
+
+              <mat-form-field appearance="outline" class="mt-5">
+                <mat-label>Step Type</mat-label>
+                <mat-select [(ngModel)]="selectedOverseerStep.stepType" required>
+                  <mat-option value="status_check">Custom Script</mat-option>
+                  <mat-option value="output_diff">Input/Output</mat-option>
+                </mat-select>
+              </mat-form-field>
+
+              @if (selectedOverseerStep.stepType === 'output_diff') {
+                <div class="flex gap-5 w-full">
+                  <div class="w-full">
+                    <mat-form-field appearance="outline" class="w-full">
+                      <mat-label>Script Input File</mat-label>
+                      <!-- Input for command (Standard input)-->
+                      <mat-select [(ngModel)]="selectedOverseerStep.stdinInputFile">
+                        <mat-option value="">(none)</mat-option>
+                        @for (file of taskDefinition.overseerResourceFiles; track file) {
+                          <mat-option [value]="file">{{ file }}</mat-option>
+                        }
+                      </mat-select>
+                      <mat-hint
+                        >The selected file will be passed as standard input to the program when it
+                        runs.
+                      </mat-hint>
+                    </mat-form-field>
+                    <mat-slide-toggle [(ngModel)]="selectedOverseerStep.showStdin" class="mt-2">
+                      Show input file to student
+                    </mat-slide-toggle>
+                  </div>
+                  <div class="w-full">
+                    <mat-form-field appearance="outline" class="w-full">
+                      <mat-label>Expected Output File</mat-label>
+                      <mat-select [(ngModel)]="selectedOverseerStep.expectedOutputFile" required>
+                        @for (file of taskDefinition.overseerResourceFiles; track file) {
+                          <mat-option [value]="file">{{ file }}</mat-option>
+                        }
+                      </mat-select>
+                      <mat-hint> Program output must exactly match this file to pass. </mat-hint>
+                    </mat-form-field>
+                    <mat-slide-toggle
+                      [(ngModel)]="selectedOverseerStep.showExpectedOutput"
+                      class="mt-2"
+                    >
+                      Show expected output file to student
+                    </mat-slide-toggle>
+                    <br />
+                    <mat-slide-toggle
+                      [(ngModel)]="selectedOverseerStep.partialOutputDiff"
+                      class="mt-2"
+                      >Partial Output Comparison</mat-slide-toggle
+                    >
+                    <br />
+                    <mat-hint>
+                      If enabled, test passes if the expected output appears anywhere in the
+                      student's output. Otherwise, only exact matches pass.
+                    </mat-hint>
+                  </div>
+                </div>
+                <!-- <mat-checkbox [(ngModel)]="selectedOverseerStep.showExpectedOutputToStudent">
+              Show expected output to student
+            </mat-checkbox> -->
+              }
+
+              <div class="py-2 mt-2 flex justify-between items-end">
+                <div class="pl-2">Execution Script</div>
+                <mat-form-field appearance="outline">
+                  <mat-label>Language</mat-label>
+                  <mat-select
+                    [(ngModel)]="selectedOverseerStep.commandLanguage"
+                    required
+                    (selectionChange)="onLanguageChange($event)"
+                  >
+                    @for (language of getLanguages; track language) {
+                      <mat-option [value]="language.id">{{
+                        language.id ?? language.aliases?.[0] ?? language.id
+                      }}</mat-option>
+                    }
+                  </mat-select>
+                  <mat-hint>Visual use only</mat-hint>
+                </mat-form-field>
+              </div>
+
+              <!-- <ngs-code-editor
+            class="w-full min-h-[100px] bg-gray-100 p-5"
+            [codeModel]="model"
+          ></ngs-code-editor> -->
+
+              <div class="w-full">
+                <ngx-monaco-editor
+                  #editor
+                  class="w-full"
+                  [options]="editorOptions"
+                  [(ngModel)]="selectedOverseerStep.runCommand"
+                ></ngx-monaco-editor>
+                <mat-hint class="pl-2 text-xl w-full">
+                  @if (selectedOverseerStep.stepType === 'status_check') {
+                    This step passes only if the script exits with status 0. Any non-zero exit code
+                    marks the step as failed.
+                  } @else if (selectedOverseerStep.stepType === 'output_diff') {
+                    The script output is compared against the expected output. If noisy warnings
+                    cause failures, move that logic into a separate step.
+                  }
+                </mat-hint>
+              </div>
+              <mat-form-field appearance="outline" class="w-full mt-5">
+                <mat-label>Time Limit (s)</mat-label>
+                <input
+                  matInput
+                  placeholder="60"
+                  name="Time Limit"
+                  [(ngModel)]="selectedOverseerStep.timeout"
+                  required
+                />
+                <mat-hint
+                  >How long the code can execute for before overseer automatically kills the
+                  process. A timeout will result in a failed test (Exit status 124)</mat-hint
+                >
+              </mat-form-field>
+              <div class="flex gap-5 w-full">
+                <div class="w-full">
+                  <!-- <div class="pb-2 mt-5">Success:</div> -->
+                  <div class="w-full">
+                    <mat-slide-toggle
+                      class="my-2 min-w-fit"
+                      matTooltip="Whether consecutive tasks should run even if this task fails"
+                      [(ngModel)]="selectedOverseerStep.haltOnSuccess"
+                      >Halt on success
+                    </mat-slide-toggle>
+                    @if (selectedOverseerStep.haltOnSuccess) {
+                      <mat-form-field appearance="outline" class="w-full">
+                        <mat-label>Status on Success</mat-label>
+                        <mat-select [(ngModel)]="selectedOverseerStep.statusOnSuccess" required>
+                          <mat-option value="no_change">No Change</mat-option>
+                          @for (status of statusKeys; track status) {
+                            <mat-option [value]="status">{{ statusName(status) }}</mat-option>
+                          }
+                        </mat-select>
+                      </mat-form-field>
+                    }
+                  </div>
+                </div>
+                <mat-divider [vertical]="true"></mat-divider>
+                <div class="w-full">
+                  <!-- <div class="py-2 mt-2">Fail:</div> -->
+                  <div class="w-full">
+                    <!-- On Sucesss, which status, should halt? -->
+                    <mat-slide-toggle
+                      class="my-2 min-w-fit"
+                      matTooltip="Whether consecutive tasks should run even if this task fails"
+                      [(ngModel)]="selectedOverseerStep.haltOnFailure"
+                      >Halt on failure
+                    </mat-slide-toggle>
+                    @if (selectedOverseerStep.haltOnFailure) {
+                      <mat-form-field appearance="outline" class="w-full">
+                        <!-- On Fail, which status, should halt, feedback message? -->
+                        <mat-label>Status on Fail</mat-label>
+                        <mat-select [(ngModel)]="selectedOverseerStep.statusOnFailure" required>
+                          <mat-option value="no_change">No Change</mat-option>
+                          @for (status of statusKeys; track status) {
+                            <mat-option [value]="status">{{ statusName(status) }}</mat-option>
+                          }
+                        </mat-select>
+                      </mat-form-field>
+                    }
+                  </div>
+                </div>
+              </div>
+
+              <mat-divider class="my-5"></mat-divider>
+              <div class="flex gap-5 w-full mt-5">
+                <!-- TODO: checkbox to use same as overseer step name -->
+                <mat-form-field appearance="outline" class="basis-1/3">
+                  <mat-label>Test Name</mat-label>
+                  <input
+                    matInput
+                    name="Name"
+                    [(ngModel)]="selectedOverseerStep.displayName"
+                    required
+                  />
+                  <mat-hint>Shown to student in overseer report</mat-hint>
+                </mat-form-field>
+                <mat-form-field appearance="outline" class="w-full">
+                  <mat-label>Description</mat-label>
+                  <input matInput [(ngModel)]="selectedOverseerStep.displayDescription" required />
+                  <mat-hint>Shown to student in overseer report</mat-hint>
+                </mat-form-field>
+              </div>
+              <mat-form-field appearance="outline" class="w-full mt-5" floatLabel="always">
+                <mat-label>Feedback message</mat-label>
+                <input
+                  matInput
+                  [placeholder]="getFeedbackMessagePlaceholder()"
+                  [(ngModel)]="selectedOverseerStep.feedbackMessage"
+                />
+                <mat-hint
+                  >Feedback to provide to the student if the task failed. You can leave this blank
+                  and a default will message will be used instead.</mat-hint
+                >
+              </mat-form-field>
+              <!--
+          <mat-form-field appearance="outline">
+            <mat-label>Step Visibility</mat-label>
+            <mat-select [(ngModel)]="selectedOverseerStep.visibility">
+              <mat-option value="public">Public</mat-option>
+              <mat-option value="masked">Masked</mat-option>
+              <mat-option value="hidden">Hidden</mat-option>
+            </mat-select>
+          </mat-form-field> -->
+
+              <div class="mt-5">
+                <mat-slide-toggle [(ngModel)]="selectedOverseerStep.enabled"
+                  >Enabled</mat-slide-toggle
+                >
+                <br />
+                <mat-hint>
+                  If disabled, this step will not run and will not appear in the Overseer report for
+                  students.
+                </mat-hint>
+              </div>
+
+              <div class="mt-5">
+                <mat-slide-toggle [(ngModel)]="selectedOverseerStep.showStdout"
+                  >Show output</mat-slide-toggle
+                >
+                <br />
+                <mat-hint>
+                  When enabled, students can see this step’s standard output, including script
+                  output, program output, and compile errors.
+                </mat-hint>
+              </div>
+            </mat-card-content>
+          </mat-card>
+        } @else {
+          <div class="w-full min-h-[350px] bg-gray-50 flex flex-col justify-center items-center">
+            No steps selected
+            <mat-icon style="width: 75px; height: 75px; font-size: 75px">tab_unselected</mat-icon>
+          </div>
+        }
+      </mat-drawer-content>
+    </mat-drawer-container>
+  } @else {
+    <div class="p-5 text-center text-gray-500">
+      Please save the task definition before configuring the overseer steps.
+    </div>
+  }
+}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.scss
index e69de29bb2..ff10c528b0 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.scss
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.scss
@@ -0,0 +1,50 @@
+.example-list {
+  width: 300px;
+  max-width: 100%;
+  border: solid 1px #ccc;
+  min-height: 50px;
+  height: 100%;
+  display: block;
+  background: white;
+  // border-radius: 4px;
+  overflow: hidden;
+}
+
+.example-box {
+  padding: 20px 10px;
+  border-bottom: solid 1px #ccc;
+  height: 50px;
+  color: rgba(0, 0, 0, 0.87);
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  // justify-content: space-between;
+  box-sizing: border-box;
+  cursor: pointer;
+  background: white;
+  font-size: 14px;
+  font-family: sans-serif;
+  user-select: none;
+}
+
+.cdk-drag-preview {
+  border: none;
+  box-sizing: border-box;
+  border-radius: 4px;
+  box-shadow:
+    0 5px 5px -3px rgba(0, 0, 0, 0.2),
+    0 8px 10px 1px rgba(0, 0, 0, 0.14),
+    0 3px 14px 2px rgba(0, 0, 0, 0.12);
+}
+.cdk-drag-placeholder {
+  opacity: 0;
+}
+.cdk-drag-animating {
+  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+}
+.example-box:last-child {
+  border: none;
+}
+.example-list.cdk-drop-list-dragging .example-box:not(.cdk-drag-placeholder) {
+  transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
index ea0f92ba89..07f7eb597c 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
@@ -1,32 +1,52 @@
-import {Component, Input, OnChanges} from '@angular/core';
+import {CdkDragDrop, moveItemInArray} from '@angular/cdk/drag-drop';
+import {Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild} from '@angular/core';
 import {Observable} from 'rxjs';
 import {
   OverseerAssessment,
   OverseerImage,
   OverseerImageService,
   Task,
+  TaskService,
+  TaskStatusEnum,
   User,
   UserService,
 } from 'src/app/api/models/doubtfire-model';
+import {OverseerStep} from 'src/app/api/models/overseer/overseer-step';
 import {TaskDefinition} from 'src/app/api/models/task-definition';
 import {Unit} from 'src/app/api/models/unit';
+import {OverseerStepService} from 'src/app/api/services/overseer-step.service';
 import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
 import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
 import {TaskAssessmentModalService} from 'src/app/common/modals/task-assessment-modal/task-assessment-modal.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {TaskSubmissionService} from 'src/app/common/services/task-submission.service';
 import {OverseerScriptEditorModalService} from './overseer-script-editor-modal/overseer-script-editor-modal.service';
-
+import * as monaco from 'monaco-editor';
+import {MatSelectChange} from '@angular/material/select';
 @Component({
   selector: 'f-task-definition-overseer',
   templateUrl: 'task-definition-overseer.component.html',
   styleUrls: ['task-definition-overseer.component.scss'],
 })
-export class TaskDefinitionOverseerComponent implements OnChanges {
+export class TaskDefinitionOverseerComponent implements OnChanges, OnInit {
   @Input() taskDefinition: TaskDefinition;
 
+  @ViewChild('editor') editorComponent;
+
   public currentUserTask: Task;
 
+  editorOptions = {
+    theme: 'vs',
+    language: 'shell',
+    renderMinimap: false,
+
+    minimap: {
+      enabled: false,
+    },
+  };
+
+  public stepType: 'status_check' | 'output_diff' = 'status_check';
+  public visibility = 'public';
   constructor(
     private alerts: AlertService,
     private overseerImageService: OverseerImageService,
@@ -36,8 +56,175 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
     private taskDefinitionService: TaskDefinitionService,
     private fileDownloaderService: FileDownloaderService,
     private overseerScriptEditorModal: OverseerScriptEditorModalService,
+    private overseerStepService: OverseerStepService,
+    private taskService: TaskService,
   ) {}
 
+  public get statusKeys() {
+    return this.taskService.statusKeys;
+  }
+
+  public statusName(status: TaskStatusEnum) {
+    return this.taskService.statusLabels.get(status);
+  }
+
+  public selectedOverseerStep: OverseerStep = null;
+  public newOverseerStep: OverseerStep = null;
+
+  public overseerSteps: OverseerStep[] = [];
+
+  selectStep(step: OverseerStep) {
+    this.selectedOverseerStep = step;
+    setTimeout(() => {
+      const editor = this.editorComponent?._editor;
+      if (editor) {
+        editor.revealLine(1);
+        editor.setScrollPosition({scrollTop: 0});
+      }
+    });
+  }
+
+  addStep() {
+    this.newOverseerStep = new OverseerStep(this.taskDefinition);
+    this.newOverseerStep.stepType = 'status_check';
+    this.newOverseerStep.timeout = 30;
+    this.newOverseerStep.enabled = true;
+    this.newOverseerStep.showStdout = true;
+    this.newOverseerStep.statusOnFailure = 'no_change';
+    this.newOverseerStep.statusOnSuccess = 'no_change';
+    this.newOverseerStep.commandLanguage = 'shell';
+    this.newOverseerStep.runCommand = '#!/bin/bash\n\n';
+    this.newOverseerStep.showExpectedOutput = true;
+
+    this.newOverseerStep.sortOrder = this.taskDefinition.overseerStepsCache.currentValues.length;
+    this.selectedOverseerStep = this.newOverseerStep;
+  }
+
+  getFeedbackMessagePlaceholder() {
+    // If the feedback message is blank, this is what will automatically be used
+    // (If this changes, ensure to update it in AcceptOverseerJob)
+    switch (this.selectedOverseerStep.stepType) {
+      case 'status_check':
+        return 'This test did not complete successfully. Check the output for any errors.';
+      case 'output_diff':
+        return 'Your output did not match the expected result.';
+    }
+  }
+
+  ngOnInit(): void {
+    this.taskDefinition.overseerStepsCache.values.subscribe((steps) => {
+      this.overseerSteps = [...steps];
+    });
+  }
+
+  public get getLanguages() {
+    return monaco?.languages.getLanguages() ?? [];
+  }
+
+  onLanguageChange(event: MatSelectChange) {
+    const value = event.value;
+    this.editorOptions.language = value;
+    this.editorOptions = {...this.editorOptions};
+  }
+
+  drop(event: CdkDragDrop<string[]>) {
+    if (this.newOverseerStep) {
+      this.alerts.error('Please save changes before re-ordering steps', 3000);
+      return;
+    }
+    moveItemInArray(this.overseerSteps, event.previousIndex, event.currentIndex);
+    // TODO: open endpoint to update sort orders in a single request
+    for (let i = 0; i < this.overseerSteps.length; i++) {
+      const step = this.taskDefinition.overseerStepsCache.get(this.overseerSteps[i].id);
+      if (step.sortOrder === i) {
+        // Ignore if no change
+        continue;
+      }
+      step.sortOrder = i;
+      this.overseerStepService
+        .update(
+          {
+            id: step.id,
+            unitId: this.unit.id,
+            taskDefId: this.taskDefinition.id,
+          },
+          {
+            entity: step,
+            constructorParams: this.taskDefinition,
+          },
+        )
+        .subscribe({
+          next: () => {
+            // console.log('updated!');
+          },
+          error: (error) => {
+            this.alerts.error(`Failed to update order of steps: ${error}`, 6000);
+          },
+        });
+    }
+  }
+
+  deleteStep() {
+    if (this.selectedOverseerStep && this.selectedOverseerStep === this.newOverseerStep) {
+      this.newOverseerStep = null;
+      this.selectedOverseerStep = null;
+      return;
+    }
+    this.selectedOverseerStep?.delete();
+    this.selectedOverseerStep = null;
+  }
+
+  saveStep() {
+    if (!this.selectedOverseerStep.id) {
+      // this.newOverseerStep.runCommand = this.model.value;
+      this.overseerStepService
+        .create(
+          {
+            unitId: this.unit.id,
+            taskDefId: this.taskDefinition.id,
+          },
+          {
+            entity: this.newOverseerStep,
+          },
+        )
+        .subscribe({
+          next: (result) => {
+            this.alerts.success('Added overseer step', 3000);
+            result.taskDefinition = this.taskDefinition;
+            this.taskDefinition.overseerStepsCache.add(result);
+            this.selectStep(result);
+            this.newOverseerStep = null;
+          },
+          error: (error) => {
+            console.error(error);
+            this.alerts.error(error, 3000);
+          },
+        });
+    } else {
+      this.overseerStepService
+        .update(
+          {
+            id: this.selectedOverseerStep.id,
+            unitId: this.unit.id,
+            taskDefId: this.taskDefinition.id,
+          },
+          {
+            entity: this.selectedOverseerStep,
+            cache: this.taskDefinition.overseerStepsCache,
+          },
+        )
+        .subscribe({
+          next: (result) => {
+            this.alerts.success('Saved overseer step', 3000);
+          },
+          error: (error) => {
+            console.error(error);
+            this.alerts.error(error, 3000);
+          },
+        });
+    }
+  }
+
   public get overseerEnabled(): boolean {
     return this.unit.overseerEnabled;
   }
@@ -54,12 +241,21 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
     return this.userService.currentUser;
   }
 
-  public ngOnChanges() {
+  public taskDefinitionHasChanges(): boolean {
+    return this.taskDefinition.hasChanges(this.taskDefinitionService.mapping);
+  }
+
+  public ngOnChanges(changes: SimpleChanges) {
     const proj = this.unit.findProjectForUsername(this.currentUser.username);
     if (proj) {
       this.currentUserTask = proj.findTaskForDefinition(this.taskDefinition.id);
       this.hasAnySubmissions();
     }
+    if (changes['taskDefinition']) {
+      this.taskDefinition.overseerStepsCache.values.subscribe((steps) => {
+        this.overseerSteps = [...steps];
+      });
+    }
   }
 
   testSubmission() {
@@ -69,7 +265,7 @@ export class TaskDefinitionOverseerComponent implements OnChanges {
       this.currentUserTask.definition = this.taskDefinition;
       this.currentUserTask.status = 'ready_for_feedback';
       this.currentUserTask.id = this.taskDefinition.id; // set a default id...
-      this.hasAnySubmissions();
+      // this.hasAnySubmissions();
     }
 
     this.currentUserTask.presentTaskSubmissionModal(this.currentUserTask.status, false, true);

From 4f607926e3ac305316a05607fda7f7bff7faec00 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 5 Jan 2026 15:42:12 +1100
Subject: [PATCH 663/776] feat: project task planner gantt chart (#1051)

* feat: init project plan gatt chart

* chore: set compatible version

* chore: update gantt chart package

* refactor: display task items and map prerequisites

* refactor: add task target start and due date

* refactor: show prerequisite for tasks in tooltip

* refactor: save target and due dates

* feat: display task definition dates as baseline items

* chore: remove extension

* fix: create unique baseline item

* refactor: fix timezone issues

* refactor: clean up ui buttons

* refactor: ensure timeline view shows the earliest task

* chore: always show task planner

* refactor: rename project plan

* refactor: minify ui

* chore: confirm changes

* feat: allow target grade changes

* refactor: display tasks target grade

* feat: link to task details

* refactor: remove debug

* chore: remove old task sliders

* refactor: display show date toggle

* chore: add curved links

* fix: save target dates

* chore: reverse prerequisite links

* refactor: reset target dates if task is prerequisite for another task

* chore: fix gantt chart config

* refactor: display warning if prerequisite task ends after dependent task starts

* fix: return false if no linked item

* refactor: highlight prerequisite conflicts

* refactor: move task planner into its own component

* refactor: highlight prerequisites on task hover

* chore: fix prerequisite conflicts

* feat: add status icon to task list

* chore: update bar color

* feat: display task prerequisites modal

* refactor: display dependent tasks

* fix: only use target start and end date if unit allows flexible dates

* refactor: ensure prerequisites are mapped

* chore: only update z-index of lines when hovering over

* feat: task planner card for project dashboard

* chore: add more details

* chore: add tooltip delay

* chore: add description heading

* chore: add back watch command

* refactor: use single endpoint to reset all target dates

* chore: add button to redirect to task planner

* chore: only show dates in tooltip

* refactor: set gantt view dates to latest possible end date

* feat: scroll to and highlight selected task item

* refactor: remove unused code

* refactor: remove unused code

* chore: format

* refactor: assign gantt config variable

* refactor: add oop logic + cleanup duplicated code

* fix: convert correct deadline date string

* chore: import task planner card
---
 angular.json                                  |   3 +-
 package-lock.json                             |  68 +++
 package.json                                  |   2 +
 src/app/api/models/project.ts                 |  13 +
 src/app/api/models/task.ts                    |  30 +-
 src/app/api/models/unit.ts                    |  10 +
 .../api/services/task-prerequisite.service.ts |  13 +
 src/app/api/services/task.service.ts          |   8 +
 .../task-dropdown.component.html              |  12 +-
 .../task-date-slider.component.html           |  13 +-
 src/app/doubtfire-angular.module.ts           |  36 ++
 src/app/doubtfire-angularjs.module.ts         |  18 +
 src/app/doubtfire.states.ts                   |   5 +-
 .../progress-dashboard.tpl.html               |   5 +
 .../task-planner-card.component.html          |  28 +
 .../task-planner-card.component.scss          |   0
 .../task-planner-card.component.ts            |  14 +
 .../states/plan/project-plan.component.html   |  35 +-
 .../states/plan/project-plan.component.scss   |   0
 .../states/plan/project-plan.component.ts     |  63 +-
 ...planner-prerequisites-modal.component.html |  79 +++
 ...planner-prerequisites-modal.component.scss |   0
 ...k-planner-prerequisites-modal.component.ts |  39 ++
 ...ask-planner-prerequisites-modal.service.ts |  27 +
 .../task-planner/task-planner.component.html  | 129 +++++
 .../task-planner/task-planner.component.scss  |  18 +
 .../task-planner/task-planner.component.ts    | 544 ++++++++++++++++++
 src/styles.scss                               |   1 +
 tsconfig.json                                 |   3 +-
 29 files changed, 1184 insertions(+), 32 deletions(-)
 create mode 100644 src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.html
 create mode 100644 src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.scss
 create mode 100644 src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.ts
 create mode 100644 src/app/projects/states/plan/project-plan.component.scss
 create mode 100644 src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.html
 create mode 100644 src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.scss
 create mode 100644 src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.ts
 create mode 100644 src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.service.ts
 create mode 100644 src/app/projects/states/plan/task-planner/task-planner.component.html
 create mode 100644 src/app/projects/states/plan/task-planner/task-planner.component.scss
 create mode 100644 src/app/projects/states/plan/task-planner/task-planner.component.ts

diff --git a/angular.json b/angular.json
index 0d892151bd..6a528bd8c1 100644
--- a/angular.json
+++ b/angular.json
@@ -49,7 +49,8 @@
               "./build/assets/node_modules/codemirror/lib/codemirror.css",
               "./build/assets/node_modules/codemirror/theme/xq-light.css",
               "./build/assets/node_modules/nvd3/build/nv.d3.css",
-              "node_modules/@ctrl/ngx-emoji-mart/picker.css"
+              "node_modules/@ctrl/ngx-emoji-mart/picker.css",
+              "node_modules/@worktile/gantt/styles/index.scss"
             ],
             "scripts": [
               "node_modules/moment/moment.js",
diff --git a/package-lock.json b/package-lock.json
index 05dae886a7..53f1d09af5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,6 +31,7 @@
         "@uirouter/angularjs": "^1.0.30",
         "@uirouter/core": "^6.1.0",
         "@uirouter/rx": "^1.0.0",
+        "@worktile/gantt": "^18.0.5",
         "angular": "1.5.11",
         "angular-calendar": "^0.31.1",
         "angular-filter": "0.5.17",
@@ -55,6 +56,7 @@
         "es5-shim": "^4.5.12",
         "file-saver": "^2.0.5",
         "font-awesome": "~4.7.0",
+        "html2canvas": "^1.4.1",
         "html5-qrcode": "^2.3.8",
         "jquery": "2.1.4",
         "lodash": "~4.17",
@@ -6186,6 +6188,22 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "node_modules/@worktile/gantt": {
+      "version": "18.0.5",
+      "resolved": "https://registry.npmjs.org/@worktile/gantt/-/gantt-18.0.5.tgz",
+      "integrity": "sha512-LCcWaFBmeg5u9cVDEmREHdR+qJJHE3Ld4VxdoJpTXfhDkx2f19tp0wMR9MkwOLRwwTCx/5gGJ1kTbz4P0Zfc1Q==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/cdk": ">=17.0.0",
+        "@angular/common": ">=17.0.0",
+        "@angular/core": ">=17.0.0",
+        "date-fns": ">=2.0.0",
+        "rxjs": "^6.5.0 || ^7.0.0"
+      }
+    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "dev": true,
@@ -7235,6 +7253,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "funding": [
@@ -8704,6 +8731,15 @@
         "node": ">= 8"
       }
     },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/css-loader": {
       "version": "6.10.0",
       "dev": true,
@@ -8860,6 +8896,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
       "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/kossnocorp"
@@ -12848,6 +12885,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "license": "MIT",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/html5-qrcode": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/html5-qrcode/-/html5-qrcode-2.3.8.tgz",
@@ -21515,6 +21565,15 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "dev": true,
@@ -22306,6 +22365,15 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "license": "MIT",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
     "node_modules/uuid": {
       "version": "3.4.0",
       "dev": true,
diff --git a/package.json b/package.json
index d3eeccad5d..4b9234d2b7 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "@uirouter/angularjs": "^1.0.30",
     "@uirouter/core": "^6.1.0",
     "@uirouter/rx": "^1.0.0",
+    "@worktile/gantt": "^18.0.5",
     "angular": "1.5.11",
     "angular-calendar": "^0.31.1",
     "angular-filter": "0.5.17",
@@ -74,6 +75,7 @@
     "es5-shim": "^4.5.12",
     "file-saver": "^2.0.5",
     "font-awesome": "~4.7.0",
+    "html2canvas": "^1.4.1",
     "html5-qrcode": "^2.3.8",
     "jquery": "2.1.4",
     "lodash": "~4.17",
diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index df3c3cda26..2afef9ffa2 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -537,4 +537,17 @@ export class Project extends Entity {
     const httpClient = AppInjector.get(HttpClient);
     return httpClient.get<number[]>(this.tasksIncludedInPortfolioUrl());
   }
+
+  public resetTargetDates(): Observable<Project> {
+    const projectService: ProjectService = AppInjector.get(ProjectService);
+    return projectService.update(
+      {
+        projectId: this.id,
+      },
+      {
+        endpointFormat: '/projects/:projectId:/reset_target_dates',
+        entity: this,
+      },
+    );
+  }
 }
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index d624a8285d..e2d85bf61b 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -53,6 +53,9 @@ export class Task extends Entity {
 
   pinned: boolean = false;
 
+  targetStartDate: Date;
+  targetDueDate: Date;
+
   public topWeight: number = 0;
   public readonly commentCache: EntityCache<TaskComment> = new EntityCache<TaskComment>();
 
@@ -167,7 +170,9 @@ export class Task extends Entity {
   }
 
   public localDueDate(): Date {
-    if (this.dueDate) {
+    if (this.targetDueDate && this.unit.allowFlexibleDates) {
+      return this.targetDueDate;
+    } else if (this.dueDate) {
       return this.dueDate;
     } else {
       return this.definition.localDueDate();
@@ -236,6 +241,25 @@ export class Task extends Entity {
     );
   }
 
+  public saveTargetDates(startDate: Date | string, dueDate: Date | string): Observable<Task> {
+    const taskService: TaskService = AppInjector.get(TaskService);
+
+    return taskService.update(
+      {
+        projectId: this.project.id,
+        taskDefId: this.definition.id,
+      },
+      {
+        endpointFormat: '/projects/:projectId:/task_def_id/:taskDefId:/target_dates',
+        entity: this,
+        body: {
+          target_start_date: startDate,
+          target_due_date: dueDate,
+        },
+      },
+    );
+  }
+
   /**
    * Calculate the time between two dates
    *
@@ -297,7 +321,9 @@ export class Task extends Entity {
   }
 
   public get startDate(): Date {
-    if (this.extensions < 0) {
+    if (this.targetStartDate && this.unit.allowFlexibleDates) {
+      return this.targetStartDate;
+    } else if (this.extensions < 0) {
       // If the task has an extension, the start date is the due date minus the extension
       return MappingFunctions.addWeeks(this.definition.startDate, this.extensions);
     } else {
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 0caa668085..452bbceb98 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -34,6 +34,7 @@ import {HttpClient, HttpParams} from '@angular/common/http';
 import {TaskPrerequisiteService} from '../services/task-prerequisite.service';
 import {MarkingSession} from './marking-session';
 import {MarkingSessionService} from '../services/marking-session.service';
+import {TaskPrerequisite} from './task-prerequisite';
 
 export class Unit extends Entity {
   id: number;
@@ -721,4 +722,13 @@ export class Unit extends Entity {
       }),
     );
   }
+
+  public get taskDefinitionsPrerequisitesUrl(): string {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.id}/task_prerequisites`;
+  }
+
+  public getTaskPrerequisites(): Observable<TaskPrerequisite[]> {
+    const prerequisiteService = AppInjector.get(TaskPrerequisiteService);
+    return prerequisiteService.getUnitPrerequisites(this.id);
+  }
 }
diff --git a/src/app/api/services/task-prerequisite.service.ts b/src/app/api/services/task-prerequisite.service.ts
index d3906860f8..ffb323b0d1 100644
--- a/src/app/api/services/task-prerequisite.service.ts
+++ b/src/app/api/services/task-prerequisite.service.ts
@@ -9,6 +9,8 @@ export class TaskPrerequisiteService extends CachedEntityService<TaskPrerequisit
   protected readonly endpointFormat =
     'units/:unitId:/task_definitions/:taskDefId:/prerequisites/:prerequisiteId:';
 
+  protected readonly unitEndpointFormat = 'units/:unitId:/task_prerequisites';
+
   constructor(httpClient: HttpClient) {
     super(httpClient, API_URL);
 
@@ -21,4 +23,15 @@ export class TaskPrerequisiteService extends CachedEntityService<TaskPrerequisit
   public override createInstanceFrom(json: object, other?: any): TaskPrerequisite {
     return new TaskPrerequisite(json);
   }
+
+  public getUnitPrerequisites(unitId: number) {
+    return this.fetchAll(
+      {
+        unitId: unitId,
+      },
+      {
+        endpointFormat: this.unitEndpointFormat,
+      },
+    );
+  }
 }
diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 832159ffc1..e8e51ace8b 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -47,6 +47,14 @@ export class TaskService extends CachedEntityService<Task> {
         keys: 'dueDate',
         toEntityFn: MappingFunctions.mapDateToEndOfDay,
       },
+      {
+        keys: 'targetStartDate',
+        toEntityFn: MappingFunctions.mapDateToEndOfDay,
+      },
+      {
+        keys: 'targetDueDate',
+        toEntityFn: MappingFunctions.mapDateToEndOfDay,
+      },
       'extensions',
       'scormExtensions',
       {
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index c5d1d763d4..cc8cec968f 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -63,13 +63,11 @@
         >
           <mat-icon aria-label="Dashboard icon" fontIcon="dashboard"></mat-icon> Dashboard
         </button>
-        @if (currentProject.unit.allowFlexibleDates) {
-          <mat-divider></mat-divider>
-          <button uiSref="project/plan" [uiParams]="{projectId: currentProject.id}" mat-menu-item>
-            <mat-icon aria-label="Plan icon" fontIcon="calendar_month"></mat-icon>
-            Plan Tasks
-          </button>
-        }
+        <mat-divider></mat-divider>
+        <button uiSref="project/plan" [uiParams]="{projectId: currentProject.id}" mat-menu-item>
+          <mat-icon aria-label="Plan icon" fontIcon="calendar_month"></mat-icon>
+          Task Planner
+        </button>
         <mat-divider></mat-divider>
         <button
           uiSref="projects/portfolio"
diff --git a/src/app/common/modals/date-change-modal/task-date-slider.component.html b/src/app/common/modals/date-change-modal/task-date-slider.component.html
index 43940cd1af..05f332a84e 100644
--- a/src/app/common/modals/date-change-modal/task-date-slider.component.html
+++ b/src/app/common/modals/date-change-modal/task-date-slider.component.html
@@ -18,7 +18,16 @@
     </mat-slider>
     <label class="grow-0" style="min-width: 4em">{{ task.localDueDateString() }}</label>
 
-    @if (editMode) {
+    @if (task.unit.allowFlexibleDates) {
+      <button
+        mat-stroked-button
+        uiSref="project/plan"
+        [uiParams]="{projectId: task.project.id, taskDef: task.definition.id}"
+      >
+        Edit in Task Planner
+      </button>
+    }
+    <!-- @if (editMode) {
       <button
         mat-icon-button
         aria-label="Save task due date"
@@ -56,7 +65,7 @@
       >
         <mat-icon>cancel</mat-icon>
       </button>
-    }
+    } -->
   </div>
   <div class="flex flex-row">
     @if (editMode) {
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 86b5fc459d..33c8db369b 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -300,10 +300,15 @@ import {MarkingSessionService} from './api/services/marking-session.service';
 import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
 import {OverseerScriptEditorModalComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/overseer-script-editor-modal/overseer-script-editor-modal.component';
 import {UploadGradesComponent} from './units/states/portfolios/upload-grades/upload-grades.component';
+import {GANTT_GLOBAL_CONFIG, GanttLinkLineType, NgxGanttModule} from '@worktile/gantt';
 import {DiscussionPromptService} from './api/services/discussion-prompt.service';
 import {DiscussionPromptsComponent} from './projects/states/discussion-prompts/discussion-prompts.component';
 import {TaskDefinitionDiscussionPromptsComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component';
 import {DiscussionPromptsViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component';
+import {TaskPlannerComponent} from './projects/states/plan/task-planner/task-planner.component';
+import {TaskPlannerPrerequisitesModalComponent} from './projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component';
+import {TaskPlannerPrerequisitesModalService} from './projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.service';
+import {TaskPlannerCardComponent} from './projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component';
 import {OverseerStepService} from './api/services/overseer-step.service';
 import {TaskOverseerReportComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component';
 import {OverseerStepResultService} from './api/services/overseer-step-result.service';
@@ -321,6 +326,31 @@ const MY_DATE_FORMAT = {
   },
 };
 
+const GANTT_CHART_CONFIG = {
+  provide: GANTT_GLOBAL_CONFIG,
+  useValue: {
+    // locale: 'en-US',
+    dateFormat: {
+      // timeZone: 'UTC',
+      weekStartsOn: 1,
+      week: 'w',
+      year: 'yyyy',
+      month: 'MMMM',
+      yearMonth: 'yyyy MMM',
+      yearQuarter: 'yyyy',
+    },
+    linkOptions: {
+      showArrow: true,
+      lineType: GanttLinkLineType.curve,
+    },
+    styleOptions: {
+      // lineHeight: '25',
+      // barHeight: '23',
+      // headerHeight: '50px',
+    },
+  },
+};
+
 @NgModule({
   // Components we declare
   declarations: [
@@ -466,6 +496,9 @@ const MY_DATE_FORMAT = {
     DiscussionPromptsComponent,
     TaskDefinitionDiscussionPromptsComponent,
     DiscussionPromptsViewComponent,
+    TaskPlannerComponent,
+    TaskPlannerCardComponent,
+    TaskPlannerPrerequisitesModalComponent,
     TaskOverseerReportComponent,
   ],
   providers: [
@@ -557,6 +590,8 @@ const MY_DATE_FORMAT = {
     TaskPrerequisiteService,
     MarkingSessionService,
     DiscussionPromptService,
+    GANTT_CHART_CONFIG,
+    TaskPlannerPrerequisitesModalService,
     OverseerStepService,
     OverseerStepResultService,
   ],
@@ -622,6 +657,7 @@ const MY_DATE_FORMAT = {
     MatDialogModuleNew,
     CalendarModule.forRoot({provide: CalendarDateAdapter, useFactory: adapterFactory}),
     CodeEditorModule.forRoot(),
+    NgxGanttModule,
     MatSidenavModule,
     MonacoEditorModule.forRoot(),
   ],
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 8d0fee5456..40e8930490 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -233,6 +233,9 @@ import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/dir
 import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
 import {TaskSimilarityViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component';
 import {UploadGradesComponent} from './units/states/portfolios/upload-grades/upload-grades.component';
+import {ProjectPlanComponent} from './projects/states/plan/project-plan.component';
+import {TaskPlannerComponent} from './projects/states/plan/task-planner/task-planner.component';
+import {TaskPlannerCardComponent} from './projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component';
 import {TaskOverseerReportComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component';
 
 export const DoubtfireAngularJSModule = angular
@@ -577,6 +580,21 @@ DoubtfireAngularJSModule.directive(
   downgradeComponent({component: UploadGradesComponent}),
 );
 
+DoubtfireAngularJSModule.directive(
+  'fProjectPlan',
+  downgradeComponent({component: ProjectPlanComponent}),
+);
+
+DoubtfireAngularJSModule.directive(
+  'fTaskPlanner',
+  downgradeComponent({component: TaskPlannerComponent}),
+);
+
+DoubtfireAngularJSModule.directive(
+  'fTaskPlannerCard',
+  downgradeComponent({component: TaskPlannerCardComponent}),
+);
+
 DoubtfireAngularJSModule.directive(
   'fTaskOverseerReport',
   downgradeComponent({component: TaskOverseerReportComponent}),
diff --git a/src/app/doubtfire.states.ts b/src/app/doubtfire.states.ts
index 01b722864a..f1710f6b54 100644
--- a/src/app/doubtfire.states.ts
+++ b/src/app/doubtfire.states.ts
@@ -429,8 +429,11 @@ const SuccessCloseState: NgHybridStateDeclaration = {
 const projectPlanState: NgHybridStateDeclaration = {
   name: 'project/plan',
   parent: 'projects/index',
-  url: '/plan',
+  url: '/plan?:taskDef?',
   component: ProjectPlanComponent,
+  params: {
+    taskDef: {value: null, squash: true, dynamic: true},
+  },
   // views: {
   //   main: {
   //     // Main body links to angular component
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
index 93069ef71b..b5859c8b2a 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
@@ -5,6 +5,11 @@ <h4 class="panel-title">
     </h4>
   </div><!--/panel-heading-->
   <div class="panel-body">
+    <div class="col-sm-12 col-xl-12">
+      <div class="card">
+        <f-task-planner-card [project]="project"></f-task-planner-card>
+      </div>
+    </div>
     <div class="col-sm-12 col-xl-6">
       <div class="card card-default card-sm card-target-grade">
         <div class="card-heading">
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.html b/src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.html
new file mode 100644
index 0000000000..da584e5670
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.html
@@ -0,0 +1,28 @@
+<mat-card appearance="outlined">
+  <mat-card-header>
+    <mat-card-title>Plan Your Tasks</mat-card-title>
+    <mat-card-subtitle class="mb-4">
+      <p>
+        The Task Planner shows a timeline of your tasks, their due dates, and prerequisite
+        relationships. Use it to plan when to start and submit tasks, ensuring prerequisites are
+        completed early so you have time for feedback.
+      </p>
+      @if (unit.allowFlexibleDates) {
+        <p>
+          You can set your own start and target dates. Be mindful of each task’s
+          <strong>Feedback Deadline</strong> — submissions after this date will not be checked. Aim
+          to finish at least one week before the deadline, especially if you are targeting a higher
+          grade.
+        </p>
+      }
+    </mat-card-subtitle>
+  </mat-card-header>
+  <mat-card-content>
+    <button mat-stroked-button uiSref="project/plan" [uiParams]="{projectId: project.id}">
+      <mat-icon style="width: 20px; height: 20px; font-size: 20px" aria-label="Launch icon">
+        launch
+      </mat-icon>
+      View Task Planner
+    </button>
+  </mat-card-content>
+</mat-card>
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.scss b/src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.ts b/src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.ts
new file mode 100644
index 0000000000..3af5379eec
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component.ts
@@ -0,0 +1,14 @@
+import {Component, Input} from '@angular/core';
+import {Project} from 'src/app/api/models/project';
+
+@Component({
+  selector: 'f-task-planner-card',
+  templateUrl: './task-planner-card.component.html',
+  styleUrl: './task-planner-card.component.scss',
+})
+export class TaskPlannerCardComponent {
+  @Input() project: Project;
+  public get unit() {
+    return this.project?.unit;
+  }
+}
diff --git a/src/app/projects/states/plan/project-plan.component.html b/src/app/projects/states/plan/project-plan.component.html
index d8f43331cb..cf49f02ec0 100644
--- a/src/app/projects/states/plan/project-plan.component.html
+++ b/src/app/projects/states/plan/project-plan.component.html
@@ -1,13 +1,34 @@
 <div class="flex flex-col container">
-  <h2>Plan Your Tasks</h2>
+  <h2>Task Planner</h2>
   <p>
-    View and adjust the due dates of tasks. Remember to leave time to get and respond to feedback.
+    @if (unit.allowFlexibleDates) {
+      View and adjust the due dates for your tasks. Remember to leave time to get and respond to
+      feedback.
+    } @else {
+      View the task deadlines for your project, so you can organise your work and ensure you meet
+      all submission requirements on time.
+    }
+  </p>
+  <p>
+    Click on a task in the timeline to see how it connects to other tasks. This will show you which
+    tasks must be completed before it, and which tasks depend on it being completed first.
   </p>
-  <!-- Add your project plan content here -->
+</div>
 
-  <div class="flex flex-col gap-4 mb-10">
-    @for (taskDef of taskDefs(); track $index) {
-      <f-task-date-slider [task]="project.findTaskForDefinition(taskDef.id)" showTaskAbbr="true" />
-    }
+<div class="w-full" [style.height.px]="(planner?.items.length + 2) * 43">
+  <div class="w-full flex justify-center">
+    <mat-form-field appearance="outline" class="w-full max-w-3xl">
+      <mat-label>Target Grade</mat-label>
+      <mat-select
+        [(ngModel)]="selectedTargetGrade"
+        class="w-full"
+        (selectionChange)="onTargetGradeChange($event)"
+      >
+        @for (grade of gradeValues; track grade) {
+          <mat-option [value]="grade">{{ gradeString(grade) }}</mat-option>
+        }
+      </mat-select>
+    </mat-form-field>
   </div>
+  <f-task-planner [project]="project"></f-task-planner>
 </div>
diff --git a/src/app/projects/states/plan/project-plan.component.scss b/src/app/projects/states/plan/project-plan.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/plan/project-plan.component.ts b/src/app/projects/states/plan/project-plan.component.ts
index c3002f3026..d1a9194f75 100644
--- a/src/app/projects/states/plan/project-plan.component.ts
+++ b/src/app/projects/states/plan/project-plan.component.ts
@@ -1,16 +1,44 @@
-import {Component} from '@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
+import {MatSelectChange} from '@angular/material/select';
+import {Project, ProjectService} from 'src/app/api/models/doubtfire-model';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {GradeService} from 'src/app/common/services/grade.service';
 import {GlobalStateService} from '../index/global-state.service';
-import { Project, TaskDefinition } from 'src/app/api/models/doubtfire-model';
+import {TaskPlannerComponent} from './task-planner/task-planner.component';
 
 @Component({
   selector: 'f-project-plan',
   templateUrl: 'project-plan.component.html',
-  // styleUrls: ['project-plan.component.scss']
+  styleUrls: ['project-plan.component.scss'],
 })
-export class ProjectPlanComponent {
+export class ProjectPlanComponent implements OnInit {
   public project: Project;
 
-  constructor(private globalStateService: GlobalStateService) {
+  @ViewChild(TaskPlannerComponent) planner!: TaskPlannerComponent;
+
+  public get unit() {
+    return this.project?.unit;
+  }
+
+  public get gradeValues() {
+    return this.gradeService.gradeValues;
+  }
+
+  public get gradeAcronyms() {
+    return this.gradeService.gradeAcronyms;
+  }
+
+  public gradeString(grade: number) {
+    return this.gradeService.grades[grade];
+  }
+
+  constructor(
+    private globalStateService: GlobalStateService,
+    private gradeService: GradeService,
+    private projectService: ProjectService,
+    private alertService: AlertService,
+  ) {
     this.globalStateService.currentViewAndEntitySubject$.subscribe((viewAndEntity) => {
       if (viewAndEntity.viewType === 'PROJECT' && viewAndEntity.entity) {
         this.project = viewAndEntity.entity as Project;
@@ -18,13 +46,26 @@ export class ProjectPlanComponent {
     });
   }
 
-  public taskDefs(): TaskDefinition[] {
-    if (!this.project || !this.project.unit.taskDefinitions) {
-      return [];
-    }
+  public selectedTargetGrade: number;
+
+  ngOnInit(): void {
+    this.selectedTargetGrade = this.project.targetGrade;
+  }
+
+  onTargetGradeChange(event: MatSelectChange) {
+    const previousTargetGrade = this.project.targetGrade;
+    this.project.targetGrade = event.value;
 
-    return this.project.unit.taskDefinitions.filter((taskDef) => {
-      return taskDef.targetGrade <= this.project.targetGrade;
+    this.projectService.update(this.project).subscribe({
+      next: () => {
+        this.alertService.success(`Succesfully updated target grade`, 2000);
+        this.planner.refreshItems();
+      },
+      error: (error) => {
+        this.project.targetGrade = previousTargetGrade;
+        this.selectedTargetGrade = previousTargetGrade;
+        this.alertService.error(`Failed to update target grade: ${error}`, 6000);
+      },
     });
   }
 }
diff --git a/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.html b/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.html
new file mode 100644
index 0000000000..5ea71774fd
--- /dev/null
+++ b/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.html
@@ -0,0 +1,79 @@
+<mat-card appearance="outlined">
+  <mat-card-header class="w-full flex justify-between items-center">
+    <mat-card-title class="w-full">
+      {{ taskDefinition.abbreviation }} {{ taskDefinition.name }}
+    </mat-card-title>
+    <status-icon [status]="taskDefinition.projectTask(project).status"></status-icon>
+  </mat-card-header>
+  <mat-card-content>
+    <mat-card-subtitle class="py-5"
+      >Task Description:
+      <p>{{ taskDefinition.description }}</p></mat-card-subtitle
+    >
+    <f-task-prerequisites-card
+      [taskDefinition]="taskDefinition"
+      [task]="task"
+    ></f-task-prerequisites-card>
+    @if (!task.hasPrerequisiteTasks()) {
+      <div class="p-5 w-full text-center text-gray-400">This task has no prerequisites.</div>
+    }
+    <mat-divider class="my-5"></mat-divider>
+    @if (dependents.length) {
+      <mat-card appearance="outlined" class="mt-5">
+        <mat-card-header>
+          <mat-card-title>Required by</mat-card-title>
+        </mat-card-header>
+
+        <mat-card-content>
+          <mat-card-subtitle class="mb-4">
+            <strong>{{ taskDefinition.abbreviation }} {{ taskDefinition.name }}</strong> is a
+            prerequisite for the following tasks. In some cases,
+            <strong>{{ taskDefinition.abbreviation }} {{ taskDefinition.name }}</strong> needs to
+            reach the <strong>Discuss</strong> or <strong>Complete</strong> status, which requires
+            tutor feedback. Plan ahead to avoid being locked out of submission.
+          </mat-card-subtitle>
+          <table mat-table [dataSource]="dataSource">
+            <ng-container matColumnDef="task-definition">
+              <th mat-header-cell *matHeaderCellDef>Task</th>
+              <td mat-cell *matCellDef="let link">
+                {{ link.taskDefinition?.abbreviation }} {{ link.taskDefinition?.name }}
+              </td>
+            </ng-container>
+
+            <ng-container matColumnDef="current-status">
+              <th mat-header-cell *matHeaderCellDef>Submission Open</th>
+              <td mat-cell *matCellDef="let link">
+                @if (link.taskDefinition.projectTask(project).blockedByPrerequisiteTasks()) {
+                  <mat-icon>block_outlined</mat-icon>
+                } @else {
+                  <mat-icon>check_circle</mat-icon>
+                }
+                <!-- <status-icon
+                matBadgePosition="before"
+                [status]="link.taskDefinition?.projectTask(task?.project)?.status ?? 'not_started'"
+              ></status-icon> -->
+              </td>
+            </ng-container>
+
+            <ng-container matColumnDef="required-status">
+              <th mat-header-cell *matHeaderCellDef class="whitespace-nowrap">Required Status</th>
+              <td mat-cell *matCellDef="let link">
+                <status-icon
+                  matTooltip=""
+                  matBadgePosition="before"
+                  [status]="link.taskStatus ?? 'complete'"
+                ></status-icon>
+              </td>
+            </ng-container>
+            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+            <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+          </table>
+        </mat-card-content>
+      </mat-card>
+    } @else {
+      <div class="p-5 w-full text-center text-gray-400">
+        This task is not a prerequisite for any other tasks.
+      </div>
+    }
+  </mat-card-content>
+</mat-card>
diff --git a/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.scss b/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.ts b/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.ts
new file mode 100644
index 0000000000..54f2aaadf0
--- /dev/null
+++ b/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component.ts
@@ -0,0 +1,39 @@
+import {Component, Inject, Input, OnInit} from '@angular/core';
+import {MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {MatTableDataSource} from '@angular/material/table';
+import {Project} from 'src/app/api/models/project';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {TaskPrerequisite} from 'src/app/api/models/task-prerequisite';
+
+export interface TaskPlannerPrerequisitesModalData {
+  taskDefinition: TaskDefinition;
+  project: Project;
+  dependents: TaskPrerequisite[];
+}
+
+@Component({
+  selector: 'f-task-planner-prerequisites-modal',
+  templateUrl: './task-planner-prerequisites-modal.component.html',
+  styleUrl: './task-planner-prerequisites-modal.component.scss',
+})
+export class TaskPlannerPrerequisitesModalComponent implements OnInit {
+  @Input() taskDefinition: TaskDefinition;
+  @Input() project: Project;
+  @Input() dependents: TaskPrerequisite[];
+
+  public dataSource = new MatTableDataSource<TaskPrerequisite>();
+  public displayedColumns: string[] = ['task-definition', 'current-status', 'required-status'];
+
+  public get task() {
+    return this.project?.findTaskForDefinition(this.taskDefinition?.id);
+  }
+
+  constructor(@Inject(MAT_DIALOG_DATA) public data: TaskPlannerPrerequisitesModalData) {}
+
+  ngOnInit(): void {
+    this.taskDefinition = this.data.taskDefinition;
+    this.project = this.data.project;
+    this.dependents = this.data.dependents;
+    this.dataSource.data = this.dependents;
+  }
+}
diff --git a/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.service.ts b/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.service.ts
new file mode 100644
index 0000000000..4f12f4fd1f
--- /dev/null
+++ b/src/app/projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.service.ts
@@ -0,0 +1,27 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {Project, TaskDefinition} from 'src/app/api/models/doubtfire-model';
+import {
+  TaskPlannerPrerequisitesModalComponent,
+  TaskPlannerPrerequisitesModalData,
+} from './task-planner-prerequisites-modal.component';
+import {TaskPrerequisite} from 'src/app/api/models/task-prerequisite';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TaskPlannerPrerequisitesModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(project: Project, taskDefinition: TaskDefinition, dependents: TaskPrerequisite[]) {
+    this.dialog.open<TaskPlannerPrerequisitesModalComponent, TaskPlannerPrerequisitesModalData>(
+      TaskPlannerPrerequisitesModalComponent,
+      {
+        data: {taskDefinition, project, dependents},
+        width: '100%',
+        maxWidth: '900px',
+        panelClass: 'overflow-y-auto',
+      },
+    );
+  }
+}
diff --git a/src/app/projects/states/plan/task-planner/task-planner.component.html b/src/app/projects/states/plan/task-planner/task-planner.component.html
new file mode 100644
index 0000000000..025da92aa5
--- /dev/null
+++ b/src/app/projects/states/plan/task-planner/task-planner.component.html
@@ -0,0 +1,129 @@
+<div class="flex justify-between items-center p-5">
+  <div>
+    <mat-slide-toggle [(ngModel)]="showDatesColumn">Show Task Dates</mat-slide-toggle>
+  </div>
+  @if (unit.allowFlexibleDates) {
+    <div class="flex items-center gap-2">
+      <button
+        mat-raised-button
+        (click)="confirmSaveTargetDates()"
+        color="primary"
+        [disabled]="!anyUnsavedChanges()"
+      >
+        Save Dates
+      </button>
+      <button mat-raised-button (click)="confirmResetTargetDates()">Reset To Unit Default</button>
+    </div>
+  }
+</div>
+<ngx-gantt
+  [class.flexible-dates]="overlayLines"
+  #gantt
+  [items]="items"
+  [baselineItems]="unit.allowFlexibleDates ? baselineItems : []"
+  [viewOptions]="viewOptions"
+  [draggable]="project.unit.allowFlexibleDates"
+  [viewType]="viewType"
+  [start]="earliestStartDate"
+  [end]="latestEndDate"
+  [async]="false"
+  [virtualScrollEnabled]="false"
+  [disabledLoadOnScroll]="true"
+  class="h-full overflow-hidden"
+>
+  <ngx-gantt-table>
+    <ngx-gantt-column name="Tasks" width="350px">
+      <ng-template #cell let-item="item">
+        <div
+          class="flex items-center justify-between"
+          uiSref="projects/dashboard"
+          [uiParams]="{
+            projectId: project.id,
+            taskAbbr: item.taskDefinition.abbreviation
+          }"
+        >
+          <div class="flex items-center gap-5 w-full min-w-0">
+            <f-grade-icon
+              [grade]="item.taskDefinition.targetGrade"
+              [colorful]="true"
+            ></f-grade-icon>
+            <div class="truncate w-full flex-1 min-w-0">
+              {{ item.title }}
+            </div>
+          </div>
+          <status-icon [status]="item.task.status"></status-icon>
+        </div>
+      </ng-template>
+    </ngx-gantt-column>
+
+    @if (showDatesColumn) {
+      <ngx-gantt-column name="Start Date" width="110px">
+        <ng-template #cell let-item="item" class="text-center">
+          {{ toDateString(item.start) }}
+        </ng-template>
+      </ngx-gantt-column>
+
+      <ngx-gantt-column name="Target Date" width="110px">
+        <ng-template #cell let-item="item" class="text-center">
+          {{ toDateString(item.end) }}
+        </ng-template>
+      </ngx-gantt-column>
+
+      <ngx-gantt-column name="Deadline" width="110px">
+        <ng-template #cell let-item="item" class="text-center">
+          {{ item.task.localDeadlineDate() ? toDateString(item.task.localDeadlineDate()) : 'N/A' }}
+        </ng-template>
+      </ngx-gantt-column>
+    }
+
+    <ng-template #bar let-item="item">
+      <span
+        (click)="barClick(item)"
+        [attr.data-gantt-id]="item.id"
+        (mouseover)="onBarHover(item)"
+        (mouseleave)="onBarLeave(item)"
+        class="gantt-bar w-full text-white flex gap-2 justify-between items-center p-2 h-[35px]"
+        [ngClass]="getItemClasses(item)"
+        [matTooltip]="getTooltip(item)"
+        matTooltipShowDelay="500"
+        matTooltipPosition="above"
+        ><div class="flex gap-2 items-center">
+          <div class="flex gap-2 items-center">
+            @if (unsavedChanges(item)) {
+              <mat-icon class="scale-95">change_circle</mat-icon>
+            }
+            @if (prerequisiteConflict(item)) {
+              <mat-icon
+                class="scale-90"
+                matTooltip="This task must be completed earlier because other tasks depend on it"
+                >warning</mat-icon
+              >
+            } @else if (isBlockedByPrerequisite(item)) {
+              <mat-icon
+                class="scale-90"
+                matTooltip="You will not be able to complete this task until all prerequisites are met"
+                >warning</mat-icon
+              >
+            }
+            @if (isPastFeedbackDeadline(item)) {
+              <mat-icon
+                class="scale-90"
+                matTooltip="Your planned target date is past the feedback deadline."
+                >dangerous</mat-icon
+              >
+            }
+            @if (isCloseToFeedbackDeadline(item)) {
+              <mat-icon
+                class="scale-90"
+                matTooltip="Your planned target date is close to the last date to receive feedback for this task."
+                >query_builder</mat-icon
+              >
+            }
+          </div>
+
+          &nbsp;&nbsp;{{ item.title }}
+        </div>
+      </span>
+    </ng-template>
+  </ngx-gantt-table>
+</ngx-gantt>
diff --git a/src/app/projects/states/plan/task-planner/task-planner.component.scss b/src/app/projects/states/plan/task-planner/task-planner.component.scss
new file mode 100644
index 0000000000..ddf668e57b
--- /dev/null
+++ b/src/app/projects/states/plan/task-planner/task-planner.component.scss
@@ -0,0 +1,18 @@
+:host ::ng-deep .flexible-dates .gantt-links-overlay svg {
+  z-index: 999 !important;
+  pointer-events: none;
+}
+
+:host ::ng-deep .flexible-dates .gantt-links-overlay-main {
+  height: 1px;
+  overflow: visible !important;
+  pointer-events: none;
+}
+
+.gantt-bar {
+  background-color: var(--bar-bg);
+}
+
+.flash {
+  transition: background-color 500ms ease-in-out;
+}
diff --git a/src/app/projects/states/plan/task-planner/task-planner.component.ts b/src/app/projects/states/plan/task-planner/task-planner.component.ts
new file mode 100644
index 0000000000..097b0e6b92
--- /dev/null
+++ b/src/app/projects/states/plan/task-planner/task-planner.component.ts
@@ -0,0 +1,544 @@
+import {Component, Input, OnInit, ViewChild} from '@angular/core';
+import {UIRouter} from '@uirouter/core';
+import {
+  GanttBaselineItem,
+  GanttDate,
+  GanttItem,
+  GanttLink,
+  GanttLinkType,
+  GanttViewOptions,
+  GanttViewType,
+  NgxGanttComponent,
+} from '@worktile/gantt';
+import {Project} from 'src/app/api/models/project';
+import {Task} from 'src/app/api/models/task';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {TaskPrerequisite} from 'src/app/api/models/task-prerequisite';
+import {TaskPrerequisiteService} from 'src/app/api/services/task-prerequisite.service';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {GradeService} from 'src/app/common/services/grade.service';
+import {TaskPlannerPrerequisitesModalService} from './task-planner-prerequisites-modal/task-planner-prerequisites-modal.service';
+
+interface TaskGanttItem extends GanttItem {
+  highlighted?: boolean;
+  taskDefinition: TaskDefinition;
+  task: Task;
+  originalLinks: GanttLink[];
+}
+
+@Component({
+  selector: 'f-task-planner',
+  templateUrl: './task-planner.component.html',
+  styleUrl: './task-planner.component.scss',
+})
+export class TaskPlannerComponent implements OnInit {
+  // Show a warning if the task's target end date is within this many days of the feedback deadline
+  public readonly CLOSE_TO_FEEDBACK_DEADLINE_THRESHOLD = 7;
+
+  @Input() project: Project;
+  @ViewChild('gantt') ganttComponent: NgxGanttComponent;
+
+  public viewType: GanttViewType = GanttViewType.day;
+  public viewOptions: GanttViewOptions;
+
+  public allTaskPrerequisites: TaskPrerequisite[];
+  public taskPrerequisites: TaskPrerequisite[];
+
+  public items: TaskGanttItem[] = [];
+
+  // TaskDefinition default dates for reference
+  public baselineItems: GanttBaselineItem[] = [];
+
+  public animateBackground: boolean = false;
+  public showDatesColumn: boolean = false;
+  public overlayLines: boolean = false;
+
+  public get unit() {
+    return this.project?.unit;
+  }
+
+  constructor(
+    private gradeService: GradeService,
+    private alertService: AlertService,
+    private confirmationModalService: ConfirmationModalService,
+    private taskPlannerPrerequisitesModal: TaskPlannerPrerequisitesModalService,
+    private taskPrerequisiteService: TaskPrerequisiteService,
+    private router: UIRouter,
+  ) {}
+
+  public get gradeValues() {
+    return this.gradeService.gradeValues;
+  }
+
+  public get gradeAcronyms() {
+    return this.gradeService.gradeAcronyms;
+  }
+
+  public gradeString(grade: number) {
+    return this.gradeService.grades[grade];
+  }
+
+  onBarHover(item: TaskGanttItem) {
+    this.setLinkColors(item, true);
+  }
+
+  onBarLeave(item: TaskGanttItem) {
+    this.setLinkColors(item, false);
+  }
+
+  setLinkColors(item: TaskGanttItem, active: boolean) {
+    this.overlayLines = active;
+
+    const ganttItem = this.items.find((i) => i.id === item.id);
+    ganttItem.links.forEach((linkItem) => {
+      const link = linkItem as GanttLink;
+      this.toggleLinkOpacity(link, active);
+    });
+
+    const prerequisites = this.items.filter((i) => {
+      const links = i.links;
+      if (typeof links === 'string') {
+        return false;
+      }
+
+      return links.some((l) => typeof l !== 'string' && l.link === item.id);
+    });
+
+    prerequisites.forEach((prereq) => {
+      prereq.links.forEach((linkItem) => {
+        const link = linkItem as GanttLink;
+        if (link.link == item.id) {
+          this.toggleLinkOpacity(link, active);
+        }
+      });
+    });
+
+    this.items = [...this.items];
+  }
+
+  private toggleLinkOpacity(link: GanttLink, active: boolean) {
+    const color = link.color as {active: string; default: string};
+
+    if (!active && !color.default.endsWith('0.1)')) {
+      // Dim link by lowering alpha
+      color.default = color.default.slice(0, -2) + '0.1)';
+    } else if (active && color.default.endsWith('0.1)')) {
+      // Restore full opacity
+      color.default = color.default.slice(0, -4) + '1)';
+    }
+  }
+
+  barClick(item: TaskGanttItem) {
+    const td = item.taskDefinition;
+    const prereqs = this.taskPrerequisites.filter((p) => p.prerequisiteId === td.id);
+    this.taskPlannerPrerequisitesModal.show(this.project, td, prereqs);
+  }
+
+  private mapPrerequisites() {
+    for (const prerequisite of this.allTaskPrerequisites) {
+      prerequisite.taskDefinition = this.unit.taskDefinitions.find(
+        (td) => td.id === prerequisite.taskDefinitionId,
+      );
+      prerequisite.prerequisite = this.unit.taskDefinitions.find(
+        (td) => td.id === prerequisite.prerequisiteId,
+      );
+    }
+    this.allTaskPrerequisites = [...this.allTaskPrerequisites];
+  }
+
+  public blockedDependents: Map<string, boolean> = new Map();
+
+  // Check to see if this task is a prerequisite for another task
+  // If it is, ensure the end date on the task is before the start of its dependent task
+  prerequisiteConflict(item: TaskGanttItem) {
+    if (!item.links.length) {
+      return false;
+    }
+
+    let isAfterDependentStartDate: boolean = false;
+    for (const ganttLink of item.links) {
+      if (typeof ganttLink === 'string') {
+        continue;
+      }
+
+      const ganttItem = this.items.find((i) => i.id === ganttLink.link);
+      if (!ganttItem) {
+        return false;
+      }
+      const diff = this.normalizeDateUTC(item.end) - this.normalizeDateUTC(ganttItem.end);
+      const color = typeof ganttLink.color === 'string' ? ganttLink.color : ganttLink.color.default;
+
+      if (diff > 0) {
+        isAfterDependentStartDate = true;
+      }
+
+      continue;
+
+      if (color === '#0079D8') {
+        // Ready for feedback
+        if (diff > 0) {
+          isAfterDependentStartDate = true;
+        }
+      } else if (color === '#31b0d5' || color === '#5BB75B') {
+        // Discuss or Complete
+        if (diff >= -7 * 24 * 60 * 60) {
+          // We need to ensure this task is submitted a week earlier than its dependent so get it in a Discuss state
+          isAfterDependentStartDate = true;
+        }
+      }
+    }
+
+    return isAfterDependentStartDate;
+  }
+
+  isBlockedByPrerequisite(item: TaskGanttItem) {
+    const prerequisites = this.items.filter((i) => {
+      const links = i.links;
+      if (typeof links === 'string') {
+        return false;
+      }
+
+      return links.some((l) => typeof l !== 'string' && l.link === item.id);
+    });
+
+    for (const link of prerequisites) {
+      if (this.prerequisiteConflict(link)) {
+        const diff = this.normalizeDateUTC(link.end) - this.normalizeDateUTC(item.end);
+        if (diff > 0) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
+  getItemClasses(item: TaskGanttItem): string[] {
+    const classes: string[] = ['gantt-bar'];
+    if (this.animateBackground) {
+      classes.push('flash');
+    }
+    if (item.highlighted) {
+      classes.push('[--bar-bg:#03c6fc]');
+    } else if (this.isPastFeedbackDeadline(item)) {
+      classes.push('[--bar-bg:#cd3704]', 'text-white');
+    } else if (this.isBlockedByPrerequisite(item)) {
+      classes.push('[--bar-bg:#e88307]', 'text-black');
+    } else if (this.isCloseToFeedbackDeadline(item)) {
+      classes.push('[--bar-bg:#ffc53d]', 'text-black');
+    } else {
+      classes.push('[--bar-bg:#0e467b]', 'text-white');
+    }
+
+    return classes;
+  }
+
+  isPastFeedbackDeadline(item: TaskGanttItem) {
+    return item.end > item.task.localDeadlineDate().getTime() / 1000;
+  }
+
+  isCloseToFeedbackDeadline(item: TaskGanttItem) {
+    if (!this.unit.allowFlexibleDates) {
+      return false;
+    }
+
+    const task = item.task;
+    const diff =
+      this.normalizeDateUTC(task.localDeadlineDate().getTime() / 1000) -
+      this.normalizeDateUTC(item.end);
+
+    return diff >= 0 && diff <= this.CLOSE_TO_FEEDBACK_DEADLINE_THRESHOLD * 24 * 60 * 60;
+  }
+
+  toDateStr = (timestamp: number) => {
+    const d = new Date(timestamp * 1000);
+    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+  };
+
+  saveTargetDates() {
+    for (const item of this.items) {
+      const td = item.taskDefinition;
+      if (!td) {
+        continue;
+      }
+      if (this.unsavedChanges(item)) {
+        this.saveTargetDate(item);
+      }
+    }
+  }
+
+  saveTargetDate(item: TaskGanttItem) {
+    const td = item.taskDefinition;
+    const task = item.task;
+
+    task.saveTargetDates(this.toDateStr(item.start), this.toDateStr(item.end)).subscribe({
+      next: (data) => {
+        task.targetDueDate = data.targetDueDate;
+        task.targetStartDate = data.targetStartDate;
+        item.start = this.normalizeDateUTC(data.targetStartDate.getTime() / 1000);
+        item.end = this.normalizeDateUTC(data.targetDueDate.getTime() / 1000);
+        this.items = [...this.items];
+      },
+      error: (error) => {
+        this.alertService.error(
+          `Failed to save target date for ${td.abbreviation}: ${error}`,
+          6000,
+        );
+      },
+    });
+  }
+
+  anyUnsavedChanges() {
+    return this.items.some((i) => this.unsavedChanges(i));
+  }
+
+  confirmSaveTargetDates() {
+    this.confirmationModalService.show(
+      'Save Task Dates?',
+      `Do you want to save these new target dates for your tasks? You can always reset them to the unit's default later.`,
+      () => {
+        this.saveTargetDates();
+      },
+    );
+  }
+
+  confirmResetTargetDates() {
+    this.confirmationModalService.show(
+      'Reset Task Dates?',
+      `Are you sure you want to reset all target dates to the unit's default? All modified dates will be reset.`,
+      () => {
+        this.project.resetTargetDates().subscribe({
+          next: (_project) => {
+            for (const task of this.project.tasks) {
+              task.targetDueDate = null;
+              task.targetStartDate = null;
+
+              const item = this.items.find((item) => item.id === task.definition.id.toString());
+
+              item.start = this.normalizeDateUTC(task.startDate.getTime() / 1000);
+              item.end = this.normalizeDateUTC(task.localDueDate().getTime() / 1000);
+            }
+            this.items = [...this.items];
+          },
+          error: (error) => {
+            this.alertService.error(`Failed to reset target dates: ${error}`, 6000);
+          },
+        });
+      },
+    );
+  }
+
+  normalizeDateUTC = (ts: number) => {
+    const d = new GanttDate(ts * 1000);
+    // const utc = Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), 0, 0, 0, 0);
+    return Math.floor(d.getUnixTime());
+  };
+
+  toDateString(timestamp: number | Date) {
+    const date = timestamp instanceof Date ? timestamp : new Date(timestamp * 1000);
+    return date.toLocaleDateString('en-AU', {
+      month: 'short',
+      day: 'numeric',
+      // year: '2-digit',
+    });
+  }
+
+  unsavedChanges(item: TaskGanttItem) {
+    const task = item.task;
+    const start = this.normalizeDateUTC(task.startDate.getTime() / 1000);
+    const end = this.normalizeDateUTC(task.localDueDate().getTime() / 1000);
+    return start !== this.normalizeDateUTC(item.start) || end !== this.normalizeDateUTC(item.end);
+  }
+
+  getTooltip(item: TaskGanttItem) {
+    return `${this.toDateString(item.start)} — ${this.toDateString(item.end)}`;
+  }
+
+  public get earliestStartDate() {
+    const earliestTaskStartDate = Math.min(
+      ...this.taskDefs().map((t) => t.startDate.getTime() / 1000),
+    );
+    return Math.floor(Math.min(this.unit.startDate.getTime() / 1000, earliestTaskStartDate));
+  }
+
+  public get latestEndDate() {
+    const latestTaskEndDate = Math.max(...this.taskDefs().map((t) => t.dueDate.getTime() / 1000));
+    return Math.floor(Math.max(this.unit.endDate.getTime() / 1000, latestTaskEndDate));
+  }
+
+  ngOnInit(): void {
+    this.viewOptions = {
+      datePrecisionUnit: 'day',
+      start: new GanttDate(this.earliestStartDate),
+      end: new GanttDate(this.latestEndDate),
+      dragPreviewDateFormat: 'MMM dd',
+    };
+
+    this.unit.getTaskPrerequisites().subscribe({
+      next: (prereqs) => {
+        this.allTaskPrerequisites = prereqs;
+        this.mapPrerequisites();
+        for (const prerequisite of this.allTaskPrerequisites) {
+          prerequisite.taskDefinition.taskPrerequisitesCache.getOrCreate(
+            prerequisite.id,
+            this.taskPrerequisiteService,
+            prerequisite,
+          );
+        }
+
+        for (const td of this.unit.taskDefinitions) {
+          const prerequisites = td.taskPrerequisitesCache.currentValues;
+          const definitions = this.unit.taskDefinitions;
+          for (const prerequisite of prerequisites) {
+            prerequisite.taskDefinition = definitions.find(
+              (td) => td.id === prerequisite.taskDefinitionId,
+            );
+            prerequisite.prerequisite = definitions.find(
+              (td) => td.id === prerequisite.prerequisiteId,
+            );
+          }
+        }
+
+        this.refreshItems();
+      },
+      error: (error) => {
+        this.alertService.error(`Failed to get task prerequisites: ${error}`, 6000);
+      },
+    });
+  }
+
+  refreshItems() {
+    this.taskPrerequisites = this.allTaskPrerequisites.filter((pre) =>
+      this.taskDefs().find((td) => td.id === pre.taskDefinitionId),
+    );
+
+    const taskDefinitions = this.taskDefs();
+    this.items = [];
+
+    for (const td of taskDefinitions) {
+      const task = this.project.findTaskForDefinition(td.id);
+
+      const item: TaskGanttItem = {
+        id: td.id.toString(),
+        title: `${td.abbreviation} ${td.name}`,
+        start: this.normalizeDateUTC(task.startDate.getTime() / 1000),
+        end: this.normalizeDateUTC(task.localDueDate().getTime() / 1000),
+        expandable: false,
+        draggable: this.project.unit.allowFlexibleDates,
+        // color: this.gradeService.gradeColors[td.targetGrade],
+        expanded: false,
+        color: '#3333ff',
+        taskDefinition: td,
+        task: task,
+        // progress: 0.5,
+        originalLinks: [],
+        links: this.taskPrerequisites
+          .filter((p) => p.prerequisiteId === td.id)
+          // .filter((p) => p.taskDefinitionId === td.id)
+          .map((p) => {
+            let color: string;
+
+            switch (p.taskStatus) {
+              case 'ready_for_feedback':
+                color = 'rgba(0, 121, 216, 0.1)';
+                break;
+              case 'complete':
+                color = 'rgba(91, 183, 91, 0.1)';
+                break;
+              case 'discuss':
+                color = 'rgba(49, 176, 213, 0.1)';
+                break;
+              case 'demonstrate':
+                color = 'rgba(49, 176, 213, 0.1)';
+                break;
+              default:
+                color = 'gray';
+            }
+            const link: GanttLink = {
+              type: GanttLinkType.fs,
+              link: p.taskDefinitionId.toString(),
+              // link: p.prerequisiteId.toString(),
+              color: {
+                default: color,
+                active: color,
+              },
+            };
+
+            return link;
+          }),
+      };
+
+      // if (
+      //   item.links.length &&
+      //   (this.isCloseToFeedbackDeadline(item) || this.isPastFeedbackDeadline(item))
+      // ) {
+      //   const task = this.project.findTaskForDefinition(td.id);
+
+      //   item.start = this.normalizeDateUTC(task.startDate.getTime() / 1000);
+      //   item.end = this.normalizeDateUTC(task.localDueDate().getTime() / 1000);
+
+      //   // If the task defaults are still invalid, reset them to the task definition default
+      //   if (this.isCloseToFeedbackDeadline(item) || this.isPastFeedbackDeadline(item)) {
+      //     item.start = this.normalizeDateUTC(td.startDate.getTime() / 1000);
+      //     item.end = this.normalizeDateUTC(td.localDueDate().getTime() / 1000);
+      //   }
+      // }
+
+      const originalItem = {...item};
+      item.originalLinks = [...(originalItem.links as GanttLink[])];
+
+      this.items.push(item);
+      this.items = [...this.items];
+
+      // Create baseline item
+      const baselineItem = {...item};
+      baselineItem.start = this.normalizeDateUTC(td.startDate.getTime() / 1000);
+      baselineItem.end = this.normalizeDateUTC(td.targetDate.getTime() / 1000);
+      this.baselineItems.push(baselineItem);
+      this.baselineItems = [...this.baselineItems];
+
+      // if (this.unsavedChanges(item)) {
+      //   this.saveTargetDate(item);
+      // }
+    }
+
+    this.ganttComponent.scrollToToday();
+
+    if (this.router.globals.params.taskDef) {
+      const taskItem = this.items.find((item) => item.id === this.router.globals.params.taskDef);
+      if (taskItem) {
+        this.ganttComponent.scrollToDate(taskItem.start);
+        taskItem.highlighted = true;
+        this.animateBackground = true;
+
+        setTimeout(() => {
+          const el = document.querySelector(`[data-gantt-id="${taskItem.id}"]`) as HTMLElement;
+
+          el?.scrollIntoView({
+            behavior: 'smooth',
+            block: 'center',
+            inline: 'nearest',
+          });
+        });
+        setTimeout(() => (taskItem.highlighted = false), 1000);
+        setTimeout(() => (this.animateBackground = false), 2000);
+      }
+      this.router.stateService.go(
+        this.router.globals.current.name,
+        {taskDef: null},
+        {location: 'replace', notify: false, reload: false},
+      );
+    }
+  }
+
+  public taskDefs(): TaskDefinition[] {
+    if (!this.project || !this.project.unit.taskDefinitions) {
+      return [];
+    }
+
+    return this.project.unit.taskDefinitions.filter((taskDef) => {
+      return taskDef.targetGrade <= this.project.targetGrade;
+    });
+  }
+}
diff --git a/src/styles.scss b/src/styles.scss
index 7eec75221c..8b8db3480d 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,5 +1,6 @@
 // For more information: https://material.angular.io/guide/theming
 @use '@angular/material' as mat;
+@use '@worktile/gantt/styles/index';
 
 @include mat.core();
 
diff --git a/tsconfig.json b/tsconfig.json
index c1f136d7b7..f062ffbb0f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,7 +19,8 @@
     "typeRoots": ["node_modules/@types"],
     "lib": ["es2020", "dom", "ES2021.String"],
     "useDefineForClassFields": false,
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true
   },
   "angularCompilerOptions": {
     "strictTemplates": false

From 6b616fc6de2f58197988c7999005a9abaa79864b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 5 Jan 2026 15:45:22 +1100
Subject: [PATCH 664/776] chore(release): 10.0.0-69

---
 CHANGELOG.md      | 10 ++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bf63acef3..51a2cd51da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 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.
 
+## [10.0.0-69](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-68...v10.0.0-69) (2026-01-05)
+
+
+### Features
+
+* attention required task status ([#1061](https://github.com/b0ink/doubtfire-deploy/issues/1061)) ([15365ed](https://github.com/b0ink/doubtfire-deploy/commit/15365ed4f42af790af9a9ae24dae42f041dff1df))
+* display number of stuff notes in tutor discussion ([2674d4e](https://github.com/b0ink/doubtfire-deploy/commit/2674d4e5ade26e5420b87518f4cd9da909ec7246))
+* overseer pipeline ([#1064](https://github.com/b0ink/doubtfire-deploy/issues/1064)) ([7cb8fc7](https://github.com/b0ink/doubtfire-deploy/commit/7cb8fc7471f0402c562fb8a0b87df672ceb22ea3))
+* project task planner gantt chart ([#1051](https://github.com/b0ink/doubtfire-deploy/issues/1051)) ([4f60792](https://github.com/b0ink/doubtfire-deploy/commit/4f607926e3ac305316a05607fda7f7bff7faec00))
+
 ## [10.0.0-68](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-67...v10.0.0-68) (2025-12-08)
 
 
diff --git a/package-lock.json b/package-lock.json
index 53f1d09af5..ae33639815 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-68",
+  "version": "10.0.0-69",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-68",
+      "version": "10.0.0-69",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 4b9234d2b7..33f6f2b521 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-68",
+  "version": "10.0.0-69",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 6c6c7f9cd1297d0671231c80fbad77b900be5cba Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 5 Jan 2026 16:44:33 +1100
Subject: [PATCH 665/776] chore: allow no expected output file

---
 .../task-definition-overseer.component.html                      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
index fb78832932..cde5ed4e7e 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
@@ -194,6 +194,7 @@
                     <mat-form-field appearance="outline" class="w-full">
                       <mat-label>Expected Output File</mat-label>
                       <mat-select [(ngModel)]="selectedOverseerStep.expectedOutputFile" required>
+                        <mat-option value="">(none)</mat-option>
                         @for (file of taskDefinition.overseerResourceFiles; track file) {
                           <mat-option [value]="file">{{ file }}</mat-option>
                         }

From 7ff9fa3380b58320ed1819f04ac8a258c72ada39 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 6 Jan 2026 08:08:24 +1100
Subject: [PATCH 666/776] chore: render correct error

---
 src/app/home/states/lti-dashboard/lti-dashboard.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
index db081c7375..0c0ad93d57 100644
--- a/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
+++ b/src/app/home/states/lti-dashboard/lti-dashboard.component.ts
@@ -78,7 +78,7 @@ export class LtiDashboardComponent implements AfterViewInit {
                   this.isLoading = false;
                 },
                 error: (error) => {
-                  this.alertsService.error(error.error, 6000);
+                  this.alertsService.error(error.error || error, 6000);
                   this.isLoading = false;
                 },
               });

From a6bdd22ff864e72c679fae1844345963447fdf08 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 6 Jan 2026 09:02:27 +1100
Subject: [PATCH 667/776] fix: skip query for unsaved task definition

---
 .../task-definition-discussion-prompts.component.ts       | 5 ++++-
 .../task-definition-prerequisites.component.ts            | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.ts
index 149682d55d..e22072d433 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.ts
@@ -80,12 +80,15 @@ export class TaskDefinitionDiscussionPromptsComponent
 
   private fetchDiscussionPrompts() {
     const taskDefinition = this.taskDefinition;
+    if (!taskDefinition.id) {
+      return;
+    }
     this.discussionPromptService.loadDiscussionPrompts(null, taskDefinition).subscribe({
       next: (data) => {
         this.dataSource.data = data;
       },
       error: (error) => {
-        this.alertService.error(`Failed to load discussion promnpts: ${error}`);
+        this.alertService.error(`Failed to load discussion prompts: ${error}`, 6000);
       },
     });
   }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 2528ffcd6d..201e8a35ab 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -101,6 +101,9 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
 
   private fetchTaskPrerequisites() {
     const taskDefinition = this.taskDefinition;
+    if (!taskDefinition.id) {
+      return;
+    }
     this.taskPrerequisiteService
       .query(
         {
@@ -127,7 +130,10 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
           this.filterTaskDefs(this.searchCtrl.value ?? '');
         },
         error: (error) => {
-          console.error(error);
+          this.alertService.error(
+            `Failed to fetch prerequisites for task definition: ${error}`,
+            6000,
+          );
         },
       });
   }

From 9317a5477bb27ed59d9c2e29af9e4538c253816c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 6 Jan 2026 09:13:21 +1100
Subject: [PATCH 668/776] chore: remove required fields

---
 .../task-definition-overseer.component.html   | 45 ++-----------------
 1 file changed, 3 insertions(+), 42 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
index cde5ed4e7e..87e44b0754 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
@@ -113,35 +113,14 @@
               cdkDragDisabled
               (click)="selectStep(newOverseerStep)"
             >
-              <!-- <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon> -->
               {{ newOverseerStep.sortOrder }}. {{ newOverseerStep.name || 'Untitled Step' }}
             </div>
           }
-
-          <!-- <div class="example-box" cdkDrag>
-        <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon>
-        1. Compile
-      </div>
-      <div class="example-box" cdkDrag>
-        <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon>
-        2. Run
-      </div>
-      <div class="example-box" cdkDrag>
-        <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon>
-        3. Compare output
-      </div>
-      <div class="example-box" cdkDrag>
-        <mat-icon cdkDragHandle class="cursor-move">drag_indicator</mat-icon>
-        4. Search for text
-      </div> -->
         </div>
       </mat-drawer>
       <mat-drawer-content>
         @if (selectedOverseerStep) {
           <mat-card class="w-full min-h-[350px]">
-            <!-- <mat-card-header>
-        <mat-card-title>Step 1: Compile</mat-card-title>
-      </mat-card-header> -->
             <mat-card-content class="w-full flex flex-col">
               <div class="flex gap-5 w-full">
                 <mat-form-field appearance="outline" class="basis-1/3">
@@ -193,7 +172,7 @@
                   <div class="w-full">
                     <mat-form-field appearance="outline" class="w-full">
                       <mat-label>Expected Output File</mat-label>
-                      <mat-select [(ngModel)]="selectedOverseerStep.expectedOutputFile" required>
+                      <mat-select [(ngModel)]="selectedOverseerStep.expectedOutputFile">
                         <mat-option value="">(none)</mat-option>
                         @for (file of taskDefinition.overseerResourceFiles; track file) {
                           <mat-option [value]="file">{{ file }}</mat-option>
@@ -220,9 +199,6 @@
                     </mat-hint>
                   </div>
                 </div>
-                <!-- <mat-checkbox [(ngModel)]="selectedOverseerStep.showExpectedOutputToStudent">
-              Show expected output to student
-            </mat-checkbox> -->
               }
 
               <div class="py-2 mt-2 flex justify-between items-end">
@@ -231,7 +207,6 @@
                   <mat-label>Language</mat-label>
                   <mat-select
                     [(ngModel)]="selectedOverseerStep.commandLanguage"
-                    required
                     (selectionChange)="onLanguageChange($event)"
                   >
                     @for (language of getLanguages; track language) {
@@ -244,11 +219,6 @@
                 </mat-form-field>
               </div>
 
-              <!-- <ngs-code-editor
-            class="w-full min-h-[100px] bg-gray-100 p-5"
-            [codeModel]="model"
-          ></ngs-code-editor> -->
-
               <div class="w-full">
                 <ngx-monaco-editor
                   #editor
@@ -293,7 +263,7 @@
                     @if (selectedOverseerStep.haltOnSuccess) {
                       <mat-form-field appearance="outline" class="w-full">
                         <mat-label>Status on Success</mat-label>
-                        <mat-select [(ngModel)]="selectedOverseerStep.statusOnSuccess" required>
+                        <mat-select [(ngModel)]="selectedOverseerStep.statusOnSuccess">
                           <mat-option value="no_change">No Change</mat-option>
                           @for (status of statusKeys; track status) {
                             <mat-option [value]="status">{{ statusName(status) }}</mat-option>
@@ -318,7 +288,7 @@
                       <mat-form-field appearance="outline" class="w-full">
                         <!-- On Fail, which status, should halt, feedback message? -->
                         <mat-label>Status on Fail</mat-label>
-                        <mat-select [(ngModel)]="selectedOverseerStep.statusOnFailure" required>
+                        <mat-select [(ngModel)]="selectedOverseerStep.statusOnFailure">
                           <mat-option value="no_change">No Change</mat-option>
                           @for (status of statusKeys; track status) {
                             <mat-option [value]="status">{{ statusName(status) }}</mat-option>
@@ -361,15 +331,6 @@
                   and a default will message will be used instead.</mat-hint
                 >
               </mat-form-field>
-              <!--
-          <mat-form-field appearance="outline">
-            <mat-label>Step Visibility</mat-label>
-            <mat-select [(ngModel)]="selectedOverseerStep.visibility">
-              <mat-option value="public">Public</mat-option>
-              <mat-option value="masked">Masked</mat-option>
-              <mat-option value="hidden">Hidden</mat-option>
-            </mat-select>
-          </mat-form-field> -->
 
               <div class="mt-5">
                 <mat-slide-toggle [(ngModel)]="selectedOverseerStep.enabled"

From 67f8f9f7cebc1e99653932be3df3eb6b1aa7fa85 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 6 Jan 2026 09:26:42 +1100
Subject: [PATCH 669/776] chore(release): 10.0.0-70

---
 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 51a2cd51da..6121dce31b 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.
 
+## [10.0.0-70](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-69...v10.0.0-70) (2026-01-05)
+
+
+### Bug Fixes
+
+* skip query for unsaved task definition ([a6bdd22](https://github.com/b0ink/doubtfire-deploy/commit/a6bdd22ff864e72c679fae1844345963447fdf08))
+
 ## [10.0.0-69](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-68...v10.0.0-69) (2026-01-05)
 
 
diff --git a/package-lock.json b/package-lock.json
index ae33639815..2eb60f3bef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-69",
+  "version": "10.0.0-70",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-69",
+      "version": "10.0.0-70",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 33f6f2b521..6b4ad8bb97 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-69",
+  "version": "10.0.0-70",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 6dcfe952f0415fb1327b738137f817a0fcfa0488 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 11 Feb 2026 12:06:34 +1100
Subject: [PATCH 670/776] feat: download staff notes csv (#1062)

* feat: download staff notes csv

* chore: restore imports
---
 src/app/api/models/unit.ts                    | 11 +++++++++
 src/app/doubtfire-angular.module.ts           |  2 ++
 src/app/doubtfire-angularjs.module.ts         |  6 +++++
 .../download-staff-notes.component.html       |  3 +++
 .../download-staff-notes.component.scss       |  0
 .../download-staff-notes.component.ts         | 24 +++++++++++++++++++
 .../states/portfolios/portfolios.tpl.html     |  1 +
 7 files changed, 47 insertions(+)
 create mode 100644 src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.html
 create mode 100644 src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.scss
 create mode 100644 src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.ts

diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 452bbceb98..0415a8bda2 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -723,6 +723,17 @@ export class Unit extends Entity {
     );
   }
 
+  public get staffNotesCsvDownloadUrl(): string {
+    return `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/staff_notes`;
+  }
+
+  public downloadStaffNotesCsv(): void {
+    AppInjector.get(FileDownloaderService).downloadFile(
+      `${AppInjector.get(DoubtfireConstants).API_URL}/csv/units/${this.id}/staff_notes`,
+      `${this.name}-StaffNotes.csv`,
+    );
+  }
+
   public get taskDefinitionsPrerequisitesUrl(): string {
     return `${AppInjector.get(DoubtfireConstants).API_URL}/units/${this.id}/task_prerequisites`;
   }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 33c8db369b..16e6c15557 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -305,6 +305,7 @@ import {DiscussionPromptService} from './api/services/discussion-prompt.service'
 import {DiscussionPromptsComponent} from './projects/states/discussion-prompts/discussion-prompts.component';
 import {TaskDefinitionDiscussionPromptsComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component';
 import {DiscussionPromptsViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/discussion-prompts-view/discussion-prompts-view.component';
+import {DownloadStaffNotesComponent} from './units/states/portfolios/download-staff-notes/download-staff-notes.component';
 import {TaskPlannerComponent} from './projects/states/plan/task-planner/task-planner.component';
 import {TaskPlannerPrerequisitesModalComponent} from './projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.component';
 import {TaskPlannerPrerequisitesModalService} from './projects/states/plan/task-planner/task-planner-prerequisites-modal/task-planner-prerequisites-modal.service';
@@ -497,6 +498,7 @@ const GANTT_CHART_CONFIG = {
     TaskDefinitionDiscussionPromptsComponent,
     DiscussionPromptsViewComponent,
     TaskPlannerComponent,
+    DownloadStaffNotesComponent,
     TaskPlannerCardComponent,
     TaskPlannerPrerequisitesModalComponent,
     TaskOverseerReportComponent,
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 40e8930490..1fb4868e3c 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -233,6 +233,7 @@ import {PortfolioGradeSelectStepComponent} from './projects/states/portfolio/dir
 import {PortfolioIncludedTasksComponent} from './projects/states/portfolio/directives/portfolio-review-step/portfolio-included-tasks/portfolio-included-tasks.component';
 import {TaskSimilarityViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component';
 import {UploadGradesComponent} from './units/states/portfolios/upload-grades/upload-grades.component';
+import {DownloadStaffNotesComponent} from './units/states/portfolios/download-staff-notes/download-staff-notes.component';
 import {ProjectPlanComponent} from './projects/states/plan/project-plan.component';
 import {TaskPlannerComponent} from './projects/states/plan/task-planner/task-planner.component';
 import {TaskPlannerCardComponent} from './projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component';
@@ -580,6 +581,11 @@ DoubtfireAngularJSModule.directive(
   downgradeComponent({component: UploadGradesComponent}),
 );
 
+DoubtfireAngularJSModule.directive(
+  'fDownloadStaffNotes',
+  downgradeComponent({component: DownloadStaffNotesComponent}),
+);
+
 DoubtfireAngularJSModule.directive(
   'fProjectPlan',
   downgradeComponent({component: ProjectPlanComponent}),
diff --git a/src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.html b/src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.html
new file mode 100644
index 0000000000..529708f97c
--- /dev/null
+++ b/src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.html
@@ -0,0 +1,3 @@
+<button (click)="downloadStaffNotesCsv()" class="pr-4">
+  <i class="fa fa-download"></i> Download Staff Notes CSV
+</button>
diff --git a/src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.scss b/src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.ts b/src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.ts
new file mode 100644
index 0000000000..eb3e1501bd
--- /dev/null
+++ b/src/app/units/states/portfolios/download-staff-notes/download-staff-notes.component.ts
@@ -0,0 +1,24 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {Unit} from 'src/app/api/models/unit';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-download-staff-notes',
+  templateUrl: 'download-staff-notes.component.html',
+  styleUrl: 'download-staff-notes.component.scss',
+})
+export class DownloadStaffNotesComponent implements OnInit {
+  @Input() unit: Unit;
+
+  constructor(private alertService: AlertService) {}
+
+  public ngOnInit(): void {
+    if (!this.unit) {
+      return console.error(`Invalid unit`);
+    }
+  }
+
+  public downloadStaffNotesCsv() {
+    this.unit.downloadStaffNotesCsv();
+  }
+}
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index 34d00d5d7f..eaff240d73 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -236,6 +236,7 @@ <h4 class="panel-title">Mark Portfolios</h4>
         rotate="false"
       ></pagination>
       <div class="pull-right">
+        <f-download-staff-notes [unit]="unit"></f-download-staff-notes>
         <button
           ng-click="downloadPortfolios()"
           class="mr-3"

From 697588b98e28ec663f4982c49f18fe8109ba7c34 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Feb 2026 10:16:50 +1100
Subject: [PATCH 671/776] feat: migrate to jplag report viewer v6.3.0 (#1082)

* feat: migrate to jplag report viewer v6.3.0

- now runs on vanilla JPlag report viewer

* chore: update jplag build

* chore: rename variable
---
 JPlag-Report-Viewer                           |  2 +-
 .../jplag/jplag-report-viewer.component.html  |  1 -
 .../jplag/jplag-report-viewer.component.ts    | 52 ++++++++++++++-----
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/JPlag-Report-Viewer b/JPlag-Report-Viewer
index 26e62e17b1..4132c30d9e 160000
--- a/JPlag-Report-Viewer
+++ b/JPlag-Report-Viewer
@@ -1 +1 @@
-Subproject commit 26e62e17b11b136af5568c78327cfec82a691034
+Subproject commit 4132c30d9ed5606df4648a7f1494ca751d3dca49
diff --git a/src/app/projects/states/jplag/jplag-report-viewer.component.html b/src/app/projects/states/jplag/jplag-report-viewer.component.html
index c5c52c229e..5cc391a465 100644
--- a/src/app/projects/states/jplag/jplag-report-viewer.component.html
+++ b/src/app/projects/states/jplag/jplag-report-viewer.component.html
@@ -1,7 +1,6 @@
 <iframe
   [hidden]="hidden"
   #jplagIframe
-  src="/JPlag/"
   frameborder="0"
   style="overflow: hidden"
   class="w-full h-screen overflow-hidden"
diff --git a/src/app/projects/states/jplag/jplag-report-viewer.component.ts b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
index 1b6bf53b71..2f052d359d 100644
--- a/src/app/projects/states/jplag/jplag-report-viewer.component.ts
+++ b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
@@ -1,4 +1,5 @@
 import {Component, ElementRef, Input, ViewChild} from '@angular/core';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
   selector: 'f-jplag-report-viewer',
@@ -9,21 +10,48 @@ export class JplagReportViewerComponent {
 
   @Input() hidden: boolean = false;
 
+  constructor(private alertService: AlertService) {}
+
   public uploadReport(file: Blob) {
-    // Send the JPlag report to load
-    this.jplagIframe.nativeElement.contentWindow?.postMessage({
-      type: 'upload-jplag-report',
-      file: file,
-      name: 'report.jplag',
-    });
+    const blobUrl = URL.createObjectURL(file);
+    this.jplagIframe.nativeElement.src = `/JPlag/?file=${encodeURIComponent(blobUrl)}`;
   }
 
   public openComparison(firstSubmissionId: string, secondSubmissionId: string) {
-    // Open comparisons between these two submissions (student usernames)
-    this.jplagIframe.nativeElement.contentWindow?.postMessage({
-      type: 'open-comparison',
-      firstSubmissionId,
-      secondSubmissionId,
-    });
+    const iframe = this.jplagIframe.nativeElement;
+
+    const tryClick = () => {
+      const doc = iframe.contentDocument;
+      if (!doc) return false;
+
+      const el =
+        doc.querySelector(
+          `a[href="/JPlag/comparison/${firstSubmissionId}/${secondSubmissionId}"]`,
+        ) ||
+        doc.querySelector(`a[href="/JPlag/comparison/${secondSubmissionId}/${firstSubmissionId}"]`);
+
+      if (el) {
+        (el as HTMLElement).click();
+        return true;
+      }
+
+      return false;
+    };
+
+    // Attempt to find the Vue component for 5 seconds
+    let elapsed = 0;
+    const interval = setInterval(() => {
+      if (tryClick()) {
+        clearInterval(interval);
+        return;
+      }
+
+      elapsed += 50;
+
+      if (elapsed >= 5000) {
+        clearInterval(interval);
+        this.alertService.error('Could not open JPlag comparison.', 6000);
+      }
+    }, 50);
   }
 }

From 866078af23b6404b4521db79e18a4ffb420f290d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Feb 2026 10:40:56 +1100
Subject: [PATCH 672/776] chore(release): 10.0.0-71

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6121dce31b..bcc54e732d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+## [10.0.0-71](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-70...v10.0.0-71) (2026-02-11)
+
+
+### Features
+
+* download staff notes csv ([#1062](https://github.com/b0ink/doubtfire-deploy/issues/1062)) ([6dcfe95](https://github.com/b0ink/doubtfire-deploy/commit/6dcfe952f0415fb1327b738137f817a0fcfa0488))
+* migrate to jplag report viewer v6.3.0 ([#1082](https://github.com/b0ink/doubtfire-deploy/issues/1082)) ([697588b](https://github.com/b0ink/doubtfire-deploy/commit/697588b98e28ec663f4982c49f18fe8109ba7c34))
+
 ## [10.0.0-70](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-69...v10.0.0-70) (2026-01-05)
 
 
diff --git a/package-lock.json b/package-lock.json
index 2eb60f3bef..8027dd96d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-70",
+  "version": "10.0.0-71",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-70",
+      "version": "10.0.0-71",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 6b4ad8bb97..05c59d8316 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-70",
+  "version": "10.0.0-71",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From f6aeecc6c2c79909ca859422e7d9b3bc65ef6456 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Feb 2026 11:43:04 +1100
Subject: [PATCH 673/776] fix: null safe user access

---
 src/app/api/services/marking-session.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/api/services/marking-session.service.ts b/src/app/api/services/marking-session.service.ts
index f1ce830a02..a621dfa5f0 100644
--- a/src/app/api/services/marking-session.service.ts
+++ b/src/app/api/services/marking-session.service.ts
@@ -27,7 +27,7 @@ export class MarkingSessionService extends CachedEntityService<MarkingSession> {
         keys: ['user', 'user_id'],
         toEntityFn: (data: object, _key: string, markingSession: MarkingSession) => {
           const userRole = markingSession.unit.staff.find((s) => s.user.id === data['user_id']);
-          return userRole.user;
+          return userRole?.user;
         },
       },
     );

From ecb7c36d03fee64452780224a3e761f0008c3d92 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Feb 2026 11:54:13 +1100
Subject: [PATCH 674/776] refactor: render sessions with missing staff

- tutors may have had marking sessions, but then removed from the unit
---
 .../directives/analytics-tutor-times.component.ts    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
index 9b65234bbd..a3451a78de 100644
--- a/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
+++ b/src/app/units/states/analytics/directives/analytics-tutor-times.component.ts
@@ -217,10 +217,10 @@ export class AnalyticsTutorTimesComponent implements OnInit {
           this.isLoading = false;
           this.canLoadSessions = false;
           this.events = data.map((session) => {
-            const tutor = this.unit.staff.find((t) => t.user.id === session.user.id);
+            const tutor = this.unit.staff.find((t) => t.user.id === session.user?.id);
 
-            const primary = this.stringToHexColor(tutor.user.firstName);
-            const secondary = this.stringToHexColor(tutor.user.firstName);
+            const primary = tutor ? this.stringToHexColor(tutor.user.firstName) : '#e0e0e0';
+            const secondary = tutor ? this.stringToHexColor(tutor.user.firstName) : '#e3e2e1';
             return {
               start: new Date(session.startTime),
               end: new Date(session.endTime),
@@ -234,15 +234,15 @@ export class AnalyticsTutorTimesComponent implements OnInit {
                 minute: '2-digit',
                 hour12: false,
               }),
-              title: `${tutor?.user.firstName} (${session.durationMinutes}m) ${session.duringTutorial ? '(T)' : ''}`,
+              title: `${tutor?.user?.firstName ?? 'N/A'} (${session.durationMinutes}m) ${session.duringTutorial ? '(T)' : ''}`,
               color: {primary: secondary, secondary: primary},
-              userId: session.user.id,
+              userId: session.user?.id,
               commentsAdded: session.commentsAdded,
               assessments: session.assessments,
               submissionsOpened: session.submissionsOpened,
               duration: session.durationMinutes,
               duringTutorial: session.duringTutorial,
-              tutorName: tutor?.user.firstName,
+              tutorName: tutor?.user?.firstName ?? 'N/A',
             };
           });
 

From 8ea6566cd92201bca291fd1e6b8beb5c401b36e9 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Feb 2026 11:55:34 +1100
Subject: [PATCH 675/776] chore(release): 10.0.0-72

---
 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 bcc54e732d..26a94466d1 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.
 
+## [10.0.0-72](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-71...v10.0.0-72) (2026-02-12)
+
+
+### Bug Fixes
+
+* null safe user access ([f6aeecc](https://github.com/b0ink/doubtfire-deploy/commit/f6aeecc6c2c79909ca859422e7d9b3bc65ef6456))
+
 ## [10.0.0-71](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-70...v10.0.0-71) (2026-02-11)
 
 
diff --git a/package-lock.json b/package-lock.json
index 8027dd96d1..1b1ac415c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-71",
+  "version": "10.0.0-72",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-71",
+      "version": "10.0.0-72",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 05c59d8316..1a42056dcc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-71",
+  "version": "10.0.0-72",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 100c860b91ff39d75f42a85abe723bec954738f6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Feb 2026 12:23:35 +1100
Subject: [PATCH 676/776] chore: default jplag src

---
 src/app/projects/states/jplag/jplag-report-viewer.component.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/projects/states/jplag/jplag-report-viewer.component.html b/src/app/projects/states/jplag/jplag-report-viewer.component.html
index 5cc391a465..c5c52c229e 100644
--- a/src/app/projects/states/jplag/jplag-report-viewer.component.html
+++ b/src/app/projects/states/jplag/jplag-report-viewer.component.html
@@ -1,6 +1,7 @@
 <iframe
   [hidden]="hidden"
   #jplagIframe
+  src="/JPlag/"
   frameborder="0"
   style="overflow: hidden"
   class="w-full h-screen overflow-hidden"

From e31c24f04af06a4f0403e891e57003d1baaceacd Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Feb 2026 12:24:01 +1100
Subject: [PATCH 677/776] refactor: attempt to scroll jplag comparisons until
 component is found

---
 .../jplag/jplag-report-viewer.component.ts    | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/app/projects/states/jplag/jplag-report-viewer.component.ts b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
index 2f052d359d..4021eb6d22 100644
--- a/src/app/projects/states/jplag/jplag-report-viewer.component.ts
+++ b/src/app/projects/states/jplag/jplag-report-viewer.component.ts
@@ -20,34 +20,51 @@ export class JplagReportViewerComponent {
   public openComparison(firstSubmissionId: string, secondSubmissionId: string) {
     const iframe = this.jplagIframe.nativeElement;
 
-    const tryClick = () => {
-      const doc = iframe.contentDocument;
-      if (!doc) return false;
-
-      const el =
+    const findLink = (doc: Document) =>
+      (doc.querySelector(
+        `a[href="/JPlag/comparison/${firstSubmissionId}/${secondSubmissionId}"]`,
+      ) ||
         doc.querySelector(
-          `a[href="/JPlag/comparison/${firstSubmissionId}/${secondSubmissionId}"]`,
-        ) ||
-        doc.querySelector(`a[href="/JPlag/comparison/${secondSubmissionId}/${firstSubmissionId}"]`);
+          `a[href="/JPlag/comparison/${secondSubmissionId}/${firstSubmissionId}"]`,
+        )) as HTMLElement | null;
 
-      if (el) {
-        (el as HTMLElement).click();
-        return true;
+    // If the Vue component isn't rendered yet, try to scroll down the window until we find it
+    const getScroller = (doc: Document) => {
+      const wrapper = doc.querySelector(
+        '.vue-recycle-scroller__item-wrapper',
+      ) as HTMLElement | null;
+      if (!wrapper) return null;
+
+      let cur = wrapper.parentElement as HTMLElement | null;
+      while (cur) {
+        const overflowY = getComputedStyle(cur).overflowY;
+        if (
+          (overflowY === 'auto' || overflowY === 'scroll') &&
+          cur.scrollHeight > cur.clientHeight
+        ) {
+          return cur;
+        }
+        cur = cur.parentElement;
       }
 
-      return false;
+      return doc.scrollingElement as HTMLElement | null;
     };
 
-    // Attempt to find the Vue component for 5 seconds
     let elapsed = 0;
     const interval = setInterval(() => {
-      if (tryClick()) {
+      const doc = iframe.contentDocument;
+      if (!doc) return;
+
+      const el = findLink(doc);
+      if (el) {
+        el.click();
         clearInterval(interval);
         return;
       }
 
-      elapsed += 50;
+      getScroller(doc)?.scrollBy(0, 600);
 
+      elapsed += 50;
       if (elapsed >= 5000) {
         clearInterval(interval);
         this.alertService.error('Could not open JPlag comparison.', 6000);

From 039af818dac8dbd2a162e31f5eab1536da1e7a42 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Feb 2026 12:25:36 +1100
Subject: [PATCH 678/776] chore(release): 10.0.0-73

---
 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 26a94466d1..80e7c3b21d 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.
 
+## [10.0.0-73](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-72...v10.0.0-73) (2026-02-12)
+
 ## [10.0.0-72](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-71...v10.0.0-72) (2026-02-12)
 
 
diff --git a/package-lock.json b/package-lock.json
index 1b1ac415c8..265e4858cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-72",
+  "version": "10.0.0-73",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-72",
+      "version": "10.0.0-73",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 1a42056dcc..ed5b4002f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-72",
+  "version": "10.0.0-73",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 38da3444d443c0ca2f24ada3088de68d993fb5fc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Feb 2026 18:28:09 +1100
Subject: [PATCH 679/776] chore(release): 10.0.0

---
 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 80e7c3b21d..50ea32d0c0 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.
 
+## [10.0.0](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-73...v10.0.0) (2026-02-12)
+
 ## [10.0.0-73](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-72...v10.0.0-73) (2026-02-12)
 
 ## [10.0.0-72](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-71...v10.0.0-72) (2026-02-12)
diff --git a/package-lock.json b/package-lock.json
index 265e4858cd..a6edcbf9fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-73",
+  "version": "10.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0-73",
+      "version": "10.0.0",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index ed5b4002f4..b1ad33f6b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0-73",
+  "version": "10.0.0",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From c1cc2a5b80bf220b7297df7b4e691e6dd824bb63 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Feb 2026 10:49:38 +1100
Subject: [PATCH 680/776] refactor: update task definition resource files
 (#1066)

---
 src/app/api/services/task-definition.service.ts               | 4 ++--
 .../task-definition-overseer.component.ts                     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 8e98e8175d..9abda58a1f 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -188,10 +188,10 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
     );
   }
 
-  public uploadOverseerResources(taskDefinition: TaskDefinition, file: File): Observable<boolean> {
+  public uploadOverseerResources(taskDefinition: TaskDefinition, file: File): Observable<string[]> {
     const formData = new FormData();
     formData.append('file', file);
-    return AppInjector.get(HttpClient).post<boolean>(
+    return AppInjector.get(HttpClient).post<string[]>(
       taskDefinition.taskOverseerResourcesUploadUrl,
       formData,
     );
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
index 07f7eb597c..478f642279 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
@@ -313,9 +313,10 @@ export class TaskDefinitionOverseerComponent implements OnChanges, OnInit {
     if (validFiles.length > 0) {
       const file = validFiles[0];
       this.taskDefinitionService.uploadOverseerResources(this.taskDefinition, file).subscribe({
-        next: () => {
+        next: (resourceFiles) => {
           this.alerts.success('Uploaded Overseer Resources', 2000);
           this.taskDefinition.hasTaskAssessmentResources = true;
+          this.taskDefinition.overseerResourceFiles = [...resourceFiles];
         },
         error: (message) => this.alerts.error(message, 6000),
       });

From 226458713a015ff82a496a3176b68b8a42d3f959 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Feb 2026 10:50:46 +1100
Subject: [PATCH 681/776] chore(release): 10.0.1-0

---
 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 50ea32d0c0..c3c9203cb8 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.
 
+### [10.0.1-0](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0...v10.0.1-0) (2026-02-17)
+
 ## [10.0.0](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-73...v10.0.0) (2026-02-12)
 
 ## [10.0.0-73](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-72...v10.0.0-73) (2026-02-12)
diff --git a/package-lock.json b/package-lock.json
index a6edcbf9fe..c35690f5f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0",
+  "version": "10.0.1-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.0",
+      "version": "10.0.1-0",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index b1ad33f6b5..ed3ba71746 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.0",
+  "version": "10.0.1-0",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 2cc9a151f30008b6fdb3069cbc71b5fd18d888cb Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Feb 2026 13:06:51 +1100
Subject: [PATCH 682/776] refactor: disable target grade change from project
 dashboard (#1084)

---
 .../progress-dashboard/progress-dashboard.tpl.html     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
index b5859c8b2a..4fc5c674e1 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
@@ -21,9 +21,13 @@ <h4>Target Grade</h4>
             ng-model="project.targetGrade"
             ng-options="grade as grades.names[grade] for grade in grades.values"
             ng-if="$index != 4"
-            ng-change="updateTargetGrade(project.targetGrade)"></select>
-        </div><!--/target-grade-body-->
-      </div><!--/target-grade-card-->
+            disabled
+          ></select>
+          <div class="ml-1 py-2 opacity-70">To change your target grade, use the Task Planner.</div>
+        </div>
+        <!--/target-grade-body-->
+      </div>
+      <!--/target-grade-card-->
       <div class="card">
         <f-task-ilos-card [unit]="project.unit" [ilo-context-type]="'Unit'"></f-task-ilos-card>
       </div>

From ffa0e835cf52a1b3f3e6a688bd0974c36574de3e Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Feb 2026 13:07:56 +1100
Subject: [PATCH 683/776] refactor: improve wording and ux for assess in
 portfolio submissions (#1083)

* refactor: improve wording and ux for assess in portfolio submissions

* chore: increase max width

* refactor: expand on wording
---
 .../submission-type-modal.component.html      | 51 +++++++++++++++----
 .../submission-type-modal.component.ts        | 20 +++++++-
 .../submission-type-modal.service.ts          |  3 +-
 3 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
index 36351da0d1..fbd3164016 100644
--- a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.html
@@ -1,36 +1,65 @@
 <h2 mat-dialog-title>Select submission type</h2>
 <mat-dialog-content>
   <p>
-    This task will not be marked as complete by your tutor, and will instead be assessed in your
-    final portfolio.
+    This task won't be marked as complete by your tutor. It will be assessed as part of your final
+    portfolio.
   </p>
   <p>
-    You may submit it for tutor feedback before the deadline, but you'll still need to resubmit it
-    for your portfolio when you are ready.
+    You can submit it for feedback before the deadline, but you'll need to resubmit it later for
+    portfolio assessment.
   </p>
   <div class="p-5 flex justify-center gap-5">
     <button
       matTooltip="Receive feedback from your tutor"
       mat-raised-button
       class="h-[175px] w-[175px] flex flex-col text-align p-2 items-center gap-3"
-      color="primary"
-      (click)="triggerTransition('ready_for_feedback')"
+      [color]="selectedTransition === 'ready_for_feedback' ? 'primary' : 'default'"
+      (click)="selectRff()"
     >
       <mat-icon class="icon-size">grading</mat-icon>
-      <div class="text-center">Submit for Feedback</div>
+      <div class="text-center">I would like feedback</div>
     </button>
     <button
       matTooltip="Submit directly for portfolio assessment"
       mat-raised-button
       class="h-[175px] w-[175px] flex flex-col text-align p-2 items-center gap-3"
-      (click)="triggerTransition('assess_in_portfolio')"
+      [color]="selectedTransition === 'assess_in_portfolio' ? 'primary' : 'default'"
+      (click)="selectAip()"
     >
       <mat-icon class="icon-size">auto_stories</mat-icon>
 
-      <div class="text-center">Skip Feedback</div>
+      <div class="text-center">I'm done!</div>
     </button>
   </div>
+  @if (selectedTransition === 'ready_for_feedback') {
+    <p>
+      You've made progress on this task and would like feedback, clarification, or to discuss
+      questions with your tutor.
+    </p>
+    <p>
+      If submitted before the deadline, your tutor will review it and provide feedback. After making
+      changes, you'll need to resubmit it before the portfolio deadline, using the
+      <strong>I’m done!</strong> button.
+    </p>
+  } @else if (selectedTransition === 'assess_in_portfolio') {
+    <p>
+      You’re done with this task and satisfied with your submission. You don’t require any further
+      feedback.
+    </p>
+    <p>
+      This submission will not be reviewed again by your tutor and will be assessed directly in your
+      final portfolio. You can resubmit as many times as you like until the portfolio deadline.
+    </p>
+  }
 </mat-dialog-content>
-<mat-dialog-actions class="flex justify-end">
-  <button mat-button [mat-dialog-close]>Cancel</button>
+<mat-dialog-actions class="flex justify-between">
+  <button mat-raised-button [mat-dialog-close]>Cancel</button>
+  <button
+    mat-raised-button
+    color="primary"
+    [disabled]="selectedTransition === null"
+    (click)="submit()"
+  >
+    Submit
+  </button>
 </mat-dialog-actions>
diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.ts b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.ts
index 2dfd66e4dd..71a5bb4268 100644
--- a/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.ts
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.component.ts
@@ -13,12 +13,30 @@ export interface SubmissionTypeModalData {
   styleUrls: ['./submission-type-modal.component.scss'],
 })
 export class SubmissionTypeModalComponent {
+  selectedTransition: 'ready_for_feedback' | 'assess_in_portfolio' = null;
+
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: SubmissionTypeModalData,
     private dialogRef: MatDialogRef<SubmissionTypeModalComponent>,
   ) {}
 
-  triggerTransition(status: TaskStatusEnum) {
+  public selectRff() {
+    this.selectedTransition = 'ready_for_feedback';
+  }
+
+  public selectAip() {
+    this.selectedTransition = 'assess_in_portfolio';
+  }
+
+  public submit() {
+    if (this.selectedTransition === null) {
+      return;
+    }
+
+    this.triggerTransition(this.selectedTransition);
+  }
+
+  private triggerTransition(status: TaskStatusEnum) {
     this.data.task.triggerTransition(status);
     this.dismissModal();
   }
diff --git a/src/app/tasks/modals/submission-type-modal/submission-type-modal.service.ts b/src/app/tasks/modals/submission-type-modal/submission-type-modal.service.ts
index d867ce4ce3..1c0ab250c8 100644
--- a/src/app/tasks/modals/submission-type-modal/submission-type-modal.service.ts
+++ b/src/app/tasks/modals/submission-type-modal/submission-type-modal.service.ts
@@ -16,12 +16,13 @@ export class SubmissionTypeModalService {
     const _dialogRef = this.dialog.open<SubmissionTypeModalComponent, SubmissionTypeModalData>(
       SubmissionTypeModalComponent,
       {
+        autoFocus: false,
         data: {
           task: task,
         },
         position: {top: '2.5%'},
         width: '100%',
-        maxWidth: '650px',
+        maxWidth: '700px',
       },
     );
   }

From 48f4db730f06e349f5e3c791f1972d23b0f8573f Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Feb 2026 14:06:46 +1100
Subject: [PATCH 684/776] feat: tutor notes + mentorship + moderation +
 escalation (#1068)

* feat: init tutor notes and mentorship

* feat: tutor moderation route

* feat: add moderator actions

* refactor: add confirmation modals

* refactor: move moderation buttons to footer

* feat: filter tutor notes by task

* refactor: mark tutor notes as read

* refactor: view tutor notes via modal

* fix: remove task definition filters for moderation

* chore: add dividers for moderation buttons

* refactor: add tooltip

* refactor: clean up tasks tutor getter

* refactor: rename vars to tutor notes

* refactor: add typing

* refactor: clean up unused code

* fix: check for valid tutor

* feat: init escalation request

* chore: add moderation type field

* refactor: add alternate ui for escalated tasks

* chore: add moderation action type

* feat: feedback appeal modal

* feat: add feedback review requested comment

* chore: revert task-submission-card

* feat: add moderation confirmation modal and allow dismiss all

* chore: dismiss modal

* feat: filter tasks by tutor

* refactor: style action buttons

* chore: rename staff to tutor

* refactor: improve wording

* refactor: improve styling

* chore: add relevant icon

* refactor: update success alert

* chore: increase alert duration

* chore: display tasks tutor

* refactor: sort tutors alphabetically

* chore: remove divider on the right

* refactor: require a comment for review requests

* chore: increase modal max width
---
 src/app/api/models/project.ts                 |   3 +-
 src/app/api/models/task.ts                    |  61 +++++
 src/app/api/models/tutor-note.ts              |  55 +++++
 src/app/api/models/unit-role.ts               |  22 +-
 src/app/api/services/project.service.ts       |   1 +
 src/app/api/services/task.service.ts          |  20 ++
 src/app/api/services/tutor-note.service.ts    | 174 ++++++++++++++
 src/app/api/services/unit-role.service.ts     |   4 +-
 src/app/common/filters/tasks-by-tutor.pipe.ts |  15 ++
 src/app/common/footer/footer.component.html   | 197 +++++++++-------
 src/app/common/footer/footer.component.ts     |  37 ++-
 src/app/common/header/header.component.html   |   8 +
 src/app/common/header/header.component.ts     |   6 +
 .../task-dropdown.component.html              |   7 +
 .../task-dropdown/task-dropdown.component.ts  |   1 +
 .../tutor-notes-modal.component.html          |   1 +
 .../tutor-notes-modal.component.scss          |   0
 .../tutor-notes-modal.component.ts            |  22 ++
 .../tutor-notes-modal.service.ts              |  33 +++
 src/app/doubtfire-angular.module.ts           |  17 +-
 src/app/doubtfire-angularjs.module.ts         |   7 +
 .../task-status-card.component.html           |  47 ++--
 .../task-status-card.component.ts             |   6 +
 .../task-submission-card.component.html       |   2 +-
 .../task-submission-card.component.ts         |   2 +-
 .../tutor-notes-view.component.html           |  20 ++
 .../tutor-notes-view.component.scss           |   0
 .../tutor-notes-view.component.ts             |  18 ++
 .../task-dashboard.component.html             |   4 +
 .../states/dashboard/selected-task.service.ts |   5 +
 .../tutor-notes/tutor-notes.component.html    | 169 ++++++++++++++
 .../tutor-notes/tutor-notes.component.scss    |  27 +++
 .../tutor-notes/tutor-notes.component.ts      | 215 ++++++++++++++++++
 .../feedback-appeal-modal.component.html      |  46 ++++
 .../feedback-appeal-modal.component.scss      |   0
 .../feedback-appeal-modal.component.ts        |  57 +++++
 .../feedback-appeal-modal.service.ts          |  29 +++
 .../task-comments-viewer.component.html       |  21 ++
 .../unit-staff-editor.component.html          |  19 ++
 .../unit-staff-editor.component.ts            |  24 +-
 .../states/tasks/definition/definition.coffee |   1 +
 .../confirm-moderation-modal.component.html   |  43 ++++
 .../confirm-moderation-modal.component.scss   |   0
 .../confirm-moderation-modal.component.ts     |  48 ++++
 .../confirm-moderation-modal.service.ts       |  47 ++++
 .../moderation/moderation.component.html      |  64 ++++++
 .../moderation/moderation.component.scss      |  27 +++
 .../moderation/moderation.component.ts        | 118 ++++++++++
 .../staff-task-list.component.html            |  20 ++
 .../staff-task-list.component.ts              |  48 +++-
 src/app/units/states/tasks/inbox/inbox.coffee |   1 +
 .../states/tasks/inbox/inbox.component.html   |  34 +--
 .../states/tasks/inbox/inbox.component.ts     |  27 ++-
 .../units/states/tasks/inbox/inbox.tpl.html   |  11 +-
 .../states/tasks/moderation/moderation.coffee |  33 +++
 src/app/units/states/tasks/tasks.coffee       |   1 +
 56 files changed, 1774 insertions(+), 151 deletions(-)
 create mode 100644 src/app/api/models/tutor-note.ts
 create mode 100644 src/app/api/services/tutor-note.service.ts
 create mode 100644 src/app/common/filters/tasks-by-tutor.pipe.ts
 create mode 100644 src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html
 create mode 100644 src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.scss
 create mode 100644 src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.ts
 create mode 100644 src/app/common/modals/tutor-notes-modal/tutor-notes-modal.service.ts
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.html
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.scss
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.ts
 create mode 100644 src/app/projects/states/tutor-notes/tutor-notes.component.html
 create mode 100644 src/app/projects/states/tutor-notes/tutor-notes.component.scss
 create mode 100644 src/app/projects/states/tutor-notes/tutor-notes.component.ts
 create mode 100644 src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.html
 create mode 100644 src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.scss
 create mode 100644 src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.ts
 create mode 100644 src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.service.ts
 create mode 100644 src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.html
 create mode 100644 src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.scss
 create mode 100644 src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.ts
 create mode 100644 src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.service.ts
 create mode 100644 src/app/units/states/tasks/inbox/directives/moderation/moderation.component.html
 create mode 100644 src/app/units/states/tasks/inbox/directives/moderation/moderation.component.scss
 create mode 100644 src/app/units/states/tasks/inbox/directives/moderation/moderation.component.ts
 create mode 100644 src/app/units/states/tasks/moderation/moderation.coffee

diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index 2afef9ffa2..6eed890270 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -43,7 +43,8 @@ export class Project extends Entity {
 
   public hasPortfolio: boolean;
   public portfolioStatus: number;
-  public portfolioFiles: { kind: string; name: string; idx: number }[];
+  public portfolioFiles: {kind: string; name: string; idx: number}[];
+  public escalationAttemptsRemaining: number;
 
   public taskStats: {
     key: TaskStatusEnum;
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index e2d85bf61b..7ef9d5e716 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -18,6 +18,8 @@ import {
   TestAttempt,
   TestAttemptService,
   ScormComment,
+  UnitRoleService,
+  UnitRole,
 } from './doubtfire-model';
 import {Grade} from './grade';
 import {LOCALE_ID} from '@angular/core';
@@ -27,6 +29,18 @@ import {gradeTaskModal, uploadSubmissionModal} from 'src/app/ajs-upgraded-provid
 import {AlertService} from 'src/app/common/services/alert.service';
 import {MappingFunctions} from '../services/mapping-fn';
 
+export const FeedbackModerationAction = {
+  ShowMore: 'show_more',
+  ShowLess: 'show_less',
+  DismissOk: 'dismiss_ok',
+  DismissGood: 'dismiss_good',
+  Upheld: 'upheld',
+  Overturn: 'overturn',
+} as const;
+
+export type FeedbackModerationActionType =
+  (typeof FeedbackModerationAction)[keyof typeof FeedbackModerationAction];
+
 export class Task extends Entity {
   id: number;
 
@@ -44,6 +58,8 @@ export class Task extends Entity {
   numNewComments: number = 0;
   hasExtensions: boolean;
 
+  moderationType: 'random_sample' | 'escalation' | 'first_feedback';
+
   project: Project;
   definition: TaskDefinition;
 
@@ -93,6 +109,16 @@ export class Task extends Entity {
     return this.commentCache.currentValues;
   }
 
+  public get tutor(): UnitRole {
+    const enrolments = this.project.tutorialEnrolmentsCache.currentValues.filter(
+      (t) => t.tutorialStream.name === this.definition.tutorialStream.name,
+    );
+    if (enrolments.length === 1) {
+      const user = enrolments[0].tutor;
+      return this.unit.staff.find((ur) => ur.user.id === user.id);
+    }
+  }
+
   public addComment(textString): void {
     AppInjector.get(TaskCommentService)
       .addComment(this, textString, 'text')
@@ -982,4 +1008,39 @@ export class Task extends Entity {
 
     return false;
   }
+
+  public moderateFeedback(
+    action: FeedbackModerationActionType,
+    applyToAll: boolean = false,
+  ): Observable<boolean> {
+    const unitRoleService: UnitRoleService = AppInjector.get(UnitRoleService);
+
+    const tutor = this.tutor;
+    if (!tutor) {
+      return;
+    }
+
+    return unitRoleService.post(
+      {
+        id: tutor.id,
+        taskId: this.id,
+      },
+      {
+        endpointFormat: '/unit_roles/:id:/moderation/:taskId:',
+        body: {
+          action,
+          apply_to_all: applyToAll,
+        },
+      },
+    );
+  }
+
+  public requestFeedbackReview(): Observable<boolean> {
+    const httpClient: HttpClient = AppInjector.get(HttpClient);
+    const url = `${AppInjector.get(DoubtfireConstants).API_URL}/projects/${
+      this.project.id
+    }/task_def_id/${this.definition.id}/feedback_review`;
+
+    return httpClient.post<boolean>(url, {});
+  }
 }
diff --git a/src/app/api/models/tutor-note.ts b/src/app/api/models/tutor-note.ts
new file mode 100644
index 0000000000..148d5fa9eb
--- /dev/null
+++ b/src/app/api/models/tutor-note.ts
@@ -0,0 +1,55 @@
+import {Entity} from 'ngx-entity-service';
+import {AppInjector} from 'src/app/app-injector';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {TutorNoteService} from '../services/tutor-note.service';
+import {Project, Task, TaskDefinition, UnitRole, User, UserService} from './doubtfire-model';
+
+export class TutorNote extends Entity {
+  id: number;
+
+  unitRole: UnitRole;
+  task?: Task;
+  taskDefinition?: TaskDefinition;
+  project?: Project;
+  user: User;
+  note: string;
+  replyTo?: TutorNote;
+  replyToId: number;
+  readByUnitRole: boolean;
+
+  createdAt: Date;
+  updatedAt: Date;
+
+  constructor(data?: UnitRole) {
+    super();
+    if (data) {
+      this.unitRole = data;
+    } else {
+      console.error('Failed to get unit role');
+    }
+  }
+
+  public get noteIsForMe(): boolean {
+    const userService: UserService = AppInjector.get(UserService);
+    return this.unitRole.user.id === userService.currentUser.id;
+  }
+
+  public get authorIsMe(): boolean {
+    const userService: UserService = AppInjector.get(UserService);
+    return this.user.id === userService.currentUser.id;
+  }
+
+  public delete() {
+    const tutorNoteService: TutorNoteService = AppInjector.get(TutorNoteService);
+    tutorNoteService
+      .delete({unitRoleId: this.unitRole.id, id: this.id}, {cache: this.unitRole.tutorNotesCache})
+      .subscribe({
+        next: () => {
+          AppInjector.get(AlertService).error('Successfully deleted tutor note', 4000);
+        },
+        error: (error) => {
+          AppInjector.get(AlertService).error(error?.message || error || 'Unknown error', 2000);
+        },
+      });
+  }
+}
diff --git a/src/app/api/models/unit-role.ts b/src/app/api/models/unit-role.ts
index 63bf9852de..837d1d8eb6 100644
--- a/src/app/api/models/unit-role.ts
+++ b/src/app/api/models/unit-role.ts
@@ -1,17 +1,25 @@
-import { Entity, EntityMapping } from 'ngx-entity-service';
-import { User, Unit } from './doubtfire-model';
+import {Entity, EntityCache, EntityMapping} from 'ngx-entity-service';
+import {User, Unit} from './doubtfire-model';
+import {TutorNote} from './tutor-note';
 
 /**
  * A unit role represents a academic teaching role within a unit. Linking a user
  * to their role within the unit.
  */
 export class UnitRole extends Entity {
-
   id: number;
   role: string;
   user: User;
   unit: Unit;
   observerOnly: boolean;
+  mentorId: number;
+  tutorNoteCount: number;
+
+  public get mentor(): UnitRole {
+    return this.unit?.staff.find((ur) => ur.id === this.mentorId);
+  }
+
+  public readonly tutorNotesCache: EntityCache<TutorNote> = new EntityCache<TutorNote>();
 
   /**
    * The id for updated roles - but we need to move away from this to the role string...
@@ -29,10 +37,12 @@ export class UnitRole extends Entity {
     return this.user.matches(text) || this.unit.matches(text);
   }
 
-  public override toJson<T extends Entity>(mappingData: EntityMapping<T>, ignoreKeys?: string[]): object {
+  public override toJson<T extends Entity>(
+    mappingData: EntityMapping<T>,
+    ignoreKeys?: string[],
+  ): object {
     return {
       unit_role: super.toJson(mappingData, ignoreKeys),
-    }
+    };
   }
-
 }
diff --git a/src/app/api/services/project.service.ts b/src/app/api/services/project.service.ts
index a897e9c1dd..f5573dafcb 100644
--- a/src/app/api/services/project.service.ts
+++ b/src/app/api/services/project.service.ts
@@ -207,6 +207,7 @@ export class ProjectService extends CachedEntityService<Project> {
           });
         },
       },
+      'escalationAttemptsRemaining',
     );
 
     this.mapping.addJsonKey(
diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index e8e51ace8b..3fd9dc0532 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -22,6 +22,7 @@ export class TaskService extends CachedEntityService<Task> {
 
   private readonly taskInboxEndpoint = '/units/:id:/tasks/inbox';
   private readonly taskExplorerEndpoint = '/units/:id:/task_definitions/:task_def_id:/tasks';
+  private readonly taskModerationEndpoint = '/units/:id:/tasks/moderation';
   private readonly refreshTaskEndpoint = 'projects/:projectId:/refresh_tasks/:taskDefinitionId:';
 
   constructor(httpClient: HttpClient) {
@@ -97,6 +98,7 @@ export class TaskService extends CachedEntityService<Task> {
           });
         },
       },
+      'moderationType',
     );
 
     this.mapping.addJsonKey('qualityPts', 'grade', 'includeInPortfolio', 'trigger');
@@ -155,6 +157,24 @@ export class TaskService extends CachedEntityService<Task> {
     );
   }
 
+  public queryTasksForMentorModeration(unit: Unit): Observable<Task[]> {
+    const cache: EntityCache<Task> = new EntityCache<Task>();
+    return this.query(
+      {
+        id: unit.id,
+      },
+      {
+        endpointFormat: this.taskModerationEndpoint,
+        cache: cache,
+        constructorParams: unit,
+      },
+    ).pipe(
+      tap((tasks: Task[]) => {
+        unit.incorporateTasks(tasks);
+      }),
+    );
+  }
+
   public refreshExtensionDetails(task: Task): void {
     const pathIds = {
       projectId: task.project.id,
diff --git a/src/app/api/services/tutor-note.service.ts b/src/app/api/services/tutor-note.service.ts
new file mode 100644
index 0000000000..a1c85cbb30
--- /dev/null
+++ b/src/app/api/services/tutor-note.service.ts
@@ -0,0 +1,174 @@
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {CachedEntityService, RequestOptions} from 'ngx-entity-service';
+import {Observable, tap} from 'rxjs';
+import {ProjectService, Task, UnitRole, UserService} from 'src/app/api/models/doubtfire-model';
+import API_URL from 'src/app/config/constants/apiUrl';
+import {TutorNote} from '../models/tutor-note';
+
+@Injectable()
+export class TutorNoteService extends CachedEntityService<TutorNote> {
+  protected readonly endpointFormat = 'unit_roles/:unitRoleId:/tutor_notes/:id:';
+  protected readonly markAsReadEndpointFormat =
+    'unit_roles/:unitRoleId:/tutor_notes/:id:/mark_as_read';
+
+  constructor(
+    httpClient: HttpClient,
+    private userService: UserService,
+    private projectService: ProjectService,
+  ) {
+    super(httpClient, API_URL);
+
+    this.mapping.addKeys(
+      'id',
+      'note',
+      'createdAt',
+      'updatedAt',
+      'replyToId',
+      {
+        keys: ['user', 'user_id'],
+        toEntityFn: (data: object, _key: string, tutorNote: TutorNote) => {
+          const userRole = tutorNote.unitRole.unit.staff.find((s) => s.user.id === data['user_id']);
+          // If the user is not a staff in the unit it will be null
+          return userRole?.user;
+        },
+      },
+      {
+        keys: ['taskDefinition', 'task_definition_id'],
+        toEntityFn: (data: object, _key: string, tutorNote: TutorNote) => {
+          const taskDefinition = tutorNote.unitRole.unit.taskDefinitions.find(
+            (td) => td.id === data['task_definition_id'],
+          );
+          return taskDefinition;
+        },
+      },
+      {
+        keys: ['project', 'project_id'],
+        toEntityFn: (data: object, key: string, tutorNote: TutorNote) => {
+          const project = tutorNote.unitRole.unit.students.find((p) => p.id === data['project_id']);
+          return project;
+        },
+      },
+      'readByUnitRole',
+    );
+
+    this.mapping.addJsonKey('note', 'createdAt', 'updatedAt');
+  }
+
+  public createInstanceFrom(_json: object, other?: UnitRole): TutorNote {
+    return new TutorNote(other);
+  }
+
+  public addNote(
+    unitRole: UnitRole,
+    text: string,
+    task?: Task,
+    originalNote?: TutorNote,
+  ): Observable<TutorNote> {
+    const pathId = {
+      unitRoleId: unitRole.id,
+    };
+
+    const body: FormData = new FormData();
+    if (originalNote) {
+      body.append('reply_to_id', originalNote?.id.toString());
+    }
+
+    if (task) {
+      body.append('task_id', task?.id.toString());
+    }
+
+    body.append('note', text);
+
+    const opts: RequestOptions<TutorNote> = {endpointFormat: this.endpointFormat};
+    opts.cache = unitRole.tutorNotesCache;
+    opts.body = body;
+    opts.constructorParams = unitRole;
+
+    return this.create(pathId, opts);
+  }
+
+  public updateTutorNoteReplies(tutorNotes: readonly TutorNote[]) {
+    for (const note of tutorNotes) {
+      if (note.replyToId) {
+        const repliedTo = tutorNotes.find((n) => n.id === note.replyToId);
+        if (repliedTo) {
+          note.replyTo = repliedTo;
+        } else {
+          // Remove deleted replies
+          note.replyTo = null;
+        }
+      }
+    }
+  }
+
+  public updateNote(unitRole: UnitRole, note: TutorNote, text: string): Observable<TutorNote> {
+    const pathId = {
+      unitRoleId: unitRole.id,
+      id: note.id,
+    };
+
+    const body: FormData = new FormData();
+    body.append('note', text);
+
+    const opts: RequestOptions<TutorNote> = {endpointFormat: this.endpointFormat};
+    opts.cache = unitRole.tutorNotesCache;
+    opts.body = body;
+    opts.constructorParams = unitRole;
+
+    return this.put(pathId, opts).pipe(
+      tap((_note: TutorNote) => {
+        note.note = text;
+      }),
+    );
+  }
+
+  public markAsRead(unitRole: UnitRole, note: TutorNote): Observable<boolean> {
+    const pathId = {
+      unitRoleId: unitRole.id,
+      id: note.id,
+    };
+
+    const opts: RequestOptions<TutorNote> = {endpointFormat: this.markAsReadEndpointFormat};
+    opts.cache = unitRole.tutorNotesCache;
+    opts.constructorParams = unitRole;
+
+    return this.put<boolean>(pathId, opts).pipe(
+      tap((response: boolean) => {
+        if (response) {
+          note.readByUnitRole = true;
+          unitRole.tutorNoteCount--;
+          // unitRole.tutorNoteCount = unitRole.tutorNotesCache.currentValues.filter(
+          //   (note) => !note.readByUnitRole,
+          // ).length;
+        }
+      }),
+    );
+  }
+
+  public loadTutorNotes(unitRole: UnitRole, useFetch: boolean = false): Observable<TutorNote[]> {
+    const options: RequestOptions<TutorNote> = {
+      endpointFormat: this.endpointFormat,
+      cache: unitRole.tutorNotesCache,
+      sourceCache: unitRole.tutorNotesCache,
+      cacheBehaviourOnGet: 'cacheQuery',
+      constructorParams: unitRole,
+    };
+
+    if (useFetch) {
+      return super.fetchAll(
+        {
+          unitRoleId: unitRole.id,
+        },
+        options,
+      );
+    } else {
+      return super.query(
+        {
+          unitRoleId: unitRole.id,
+        },
+        options,
+      );
+    }
+  }
+}
diff --git a/src/app/api/services/unit-role.service.ts b/src/app/api/services/unit-role.service.ts
index 71cb194422..e4aca28602 100644
--- a/src/app/api/services/unit-role.service.ts
+++ b/src/app/api/services/unit-role.service.ts
@@ -63,9 +63,11 @@ export class UnitRoleService extends CachedEntityService<UnitRole> {
         },
       },
       'observerOnly',
+      'mentorId',
+      'tutorNoteCount',
     );
 
-    this.mapping.addJsonKey('roleId', 'userId', 'unitId', 'role', 'observerOnly');
+    this.mapping.addJsonKey('roleId', 'userId', 'unitId', 'role', 'observerOnly', 'mentorId');
   }
 
   public createInstanceFrom(json: any, other?: any): UnitRole {
diff --git a/src/app/common/filters/tasks-by-tutor.pipe.ts b/src/app/common/filters/tasks-by-tutor.pipe.ts
new file mode 100644
index 0000000000..c95634d6a3
--- /dev/null
+++ b/src/app/common/filters/tasks-by-tutor.pipe.ts
@@ -0,0 +1,15 @@
+import {Pipe, PipeTransform} from '@angular/core';
+import {Task} from '../../api/models/doubtfire-model';
+
+@Pipe({
+  name: 'tasksByTutor',
+})
+export class TasksByTutorPipe implements PipeTransform {
+  transform(tasks: Task[], unitRoleId?: number | string): Task[] {
+    if (!tasks) return tasks;
+
+    if (!unitRoleId || unitRoleId === 'all') return tasks;
+
+    return tasks.filter((task) => task.tutor?.id === unitRoleId);
+  }
+}
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index a31bf9fac8..b1caed6d6d 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -13,114 +13,121 @@
 
   <div class="flex w-full">
     <f-user-badge fxFlex fxFlexAlign="start start" [selectedTask]="selectedTask"></f-user-badge>
+    <div class="flex justify-between">
+      <span class="center-buttons flex justify-around gap-5">
+        <div>
+          <button
+            [disabled]="selectedTask === undefined"
+            mat-icon-button
+            matTooltip="Mark as Redo"
+            matTooltipPosition="above"
+            aria-label=""
+            class="button"
+            (click)="selectedTask?.updateTaskStatus('redo')"
+          >
+            <mat-icon>undo</mat-icon>
+          </button>
 
-    <span class="center-buttons flex justify-around gap-5">
-      <div>
+          <button
+            [disabled]="selectedTask === undefined"
+            mat-icon-button
+            matTooltip="Mark as Attention Required"
+            matTooltipPosition="above"
+            aria-label=""
+            class="button"
+            (click)="selectedTask?.updateTaskStatus('attention_required')"
+          >
+            <mat-icon>sms_failed</mat-icon>
+          </button>
+        </div>
         <button
           [disabled]="selectedTask === undefined"
           mat-icon-button
-          matTooltip="Mark as Redo"
+          matTooltip="Mark as Resubmit"
           matTooltipPosition="above"
           aria-label=""
-          class="button"
-          (click)="selectedTask?.updateTaskStatus('redo')"
+          class="button large-button"
+          (click)="selectedTask?.updateTaskStatus('fix')"
         >
-          <mat-icon>undo</mat-icon>
+          <mat-icon>construction</mat-icon>
         </button>
 
+        @if (selectedTask && selectedTask.suggestedTaskStatus) {
+          <button
+            mat-icon-button
+            matTooltip="Recommended: Mark as {{
+              taskService.statusData(selectedTask.suggestedTaskStatus).label
+            }}"
+            matTooltipPosition="above"
+            aria-label=""
+            class="button extra-large-button status-chip"
+            (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
+            [ngClass]="taskService.statusData(selectedTask.suggestedTaskStatus).class"
+          >
+            <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
+          </button>
+        }
+        @if (selectedTask?.definition?.assessInPortfolioOnly) {
+          <button
+            [disabled]="selectedTask === undefined"
+            mat-icon-button
+            matTooltip="Mark as Working On It"
+            matTooltipPosition="above"
+            aria-label="Mark as Working On It"
+            class="button large-button"
+            (click)="markTaskWorkingOnIt(selectedTask)"
+          >
+            <mat-icon>bolt</mat-icon>
+          </button>
+        } @else {
+          <button
+            [disabled]="selectedTask === undefined"
+            mat-icon-button
+            matTooltip="Mark as Complete"
+            matTooltipPosition="above"
+            aria-label="Mark as Complete"
+            class="button large-button"
+            (click)="selectedTask?.updateTaskStatus('complete')"
+          >
+            <mat-icon>done</mat-icon>
+          </button>
+        }
+
         <button
           [disabled]="selectedTask === undefined"
           mat-icon-button
-          matTooltip="Mark as Attention Required"
+          matTooltip="Mark as Discuss"
           matTooltipPosition="above"
           aria-label=""
           class="button"
-          (click)="selectedTask?.updateTaskStatus('attention_required')"
+          (click)="selectedTask?.updateTaskStatus('discuss')"
         >
-          <mat-icon>sms_failed</mat-icon>
+          <mat-icon>question_answer</mat-icon>
         </button>
-      </div>
-      <button
-        [disabled]="selectedTask === undefined"
-        mat-icon-button
-        matTooltip="Mark as Resubmit"
-        matTooltipPosition="above"
-        aria-label=""
-        class="button large-button"
-        (click)="selectedTask?.updateTaskStatus('fix')"
-      >
-        <mat-icon>construction</mat-icon>
-      </button>
 
-      @if (selectedTask && selectedTask.suggestedTaskStatus) {
-        <button
-          mat-icon-button
-          matTooltip="Recommended: Mark as {{
-            taskService.statusData(selectedTask.suggestedTaskStatus).label
-          }}"
-          matTooltipPosition="above"
-          aria-label=""
-          class="button extra-large-button status-chip"
-          (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
-          [ngClass]="taskService.statusData(selectedTask.suggestedTaskStatus).class"
-        >
-          <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
-        </button>
-      }
-      @if (selectedTask?.definition?.assessInPortfolioOnly) {
-        <button
-          [disabled]="selectedTask === undefined"
-          mat-icon-button
-          matTooltip="Mark as Working On It"
-          matTooltipPosition="above"
-          aria-label="Mark as Working On It"
-          class="button large-button"
-          (click)="markTaskWorkingOnIt(selectedTask)"
-        >
-          <mat-icon>bolt</mat-icon>
-        </button>
-      } @else {
-        <button
-          [disabled]="selectedTask === undefined"
-          mat-icon-button
-          matTooltip="Mark as Complete"
-          matTooltipPosition="above"
-          aria-label="Mark as Complete"
-          class="button large-button"
-          (click)="selectedTask?.updateTaskStatus('complete')"
-        >
-          <mat-icon>done</mat-icon>
-        </button>
-      }
-
-      <button
-        [disabled]="selectedTask === undefined"
-        mat-icon-button
-        matTooltip="Mark as Discuss"
-        matTooltipPosition="above"
-        aria-label=""
-        class="button"
-        (click)="selectedTask?.updateTaskStatus('discuss')"
-      >
-        <mat-icon>question_answer</mat-icon>
-      </button>
+        <mat-divider [vertical]="true"></mat-divider>
 
-      <mat-divider [vertical]="true"></mat-divider>
+        <div class="flex justify-start">
+          <button
+            [disabled]="selectedTask === undefined"
+            mat-icon-button
+            matTooltip="Discussed in class"
+            matTooltipPosition="above"
+            aria-label=""
+            class="button ml-5"
+            (click)="selectedTask?.markAsDiscussed()"
+          >
+            <mat-icon>group</mat-icon>
+          </button>
+        </div>
+      </span>
 
-      <div class="w-[120px] flex justify-start">
-        <button
-          [disabled]="selectedTask === undefined"
-          mat-icon-button
-          matTooltip="Discussed in class"
-          matTooltipPosition="above"
-          aria-label=""
-          class="button ml-5"
-          (click)="selectedTask?.markAsDiscussed()"
-        >
-          <mat-icon>group</mat-icon>
-        </button>
-      </div>
-    </span>
+      @if (viewType === 'moderation' && selectedTask) {
+        <mat-divider class="ml-10" [vertical]="true"></mat-divider>
+        <f-moderation [task]="selectedTask"></f-moderation>
+        <!-- <mat-divider class="mr-10" [vertical]="true"></mat-divider> -->
+      }
+    </div>
 
     <div fxFlex fxFlexAlign="end start" fxLayout="row" fxLayoutAlign="end center">
       @if (selectedTask?.similaritiesDetected) {
@@ -156,6 +163,20 @@
           </button>
         }
 
+        @if (canAccessTutorNotes(selectedTask)) {
+          <div class="relative inline-block">
+            <button
+              mat-icon-button
+              matTooltipPosition="above"
+              class="button small-button"
+              [disabled]="!selectedTask.tutor"
+              (click)="viewTutorNotes()"
+            >
+              <mat-icon class="small-icon">local_library</mat-icon>
+            </button>
+          </div>
+        }
+
         <div class="relative inline-block">
           @if (selectedTask.project.staffNoteCount > 0) {
             <div [matBadge]="selectedTask.project.staffNoteCount"></div>
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index fa44839024..d0d6c9d9ee 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -1,10 +1,12 @@
-import {Component, ElementRef, HostListener, OnInit, ViewChild} from '@angular/core';
+import {Component, ElementRef, HostListener, Input, OnInit, ViewChild} from '@angular/core';
 import {Observable} from 'rxjs';
 import {Task} from 'src/app/api/models/task';
 import {SelectedTaskService} from 'src/app/projects/states/dashboard/selected-task.service';
 import {TaskService} from 'src/app/api/services/task.service';
 import {FileDownloaderService} from '../file-downloader/file-downloader.service';
 import {TaskAssessmentModalService} from '../modals/task-assessment-modal/task-assessment-modal.service';
+import {UnitRole} from 'src/app/api/models/unit-role';
+import {UserService} from 'src/app/api/services/user.service';
 
 @Component({
   selector: 'f-footer',
@@ -17,8 +19,11 @@ export class FooterComponent implements OnInit {
     public taskService: TaskService,
     private fileDownloader: FileDownloaderService,
     private taskAssessmentModal: TaskAssessmentModalService,
+    private userService: UserService,
   ) {}
 
+  @Input() viewType: 'inbox' | 'explorer' | 'moderation';
+
   selectedTask$: Observable<Task>;
   selectedTask: Task;
 
@@ -48,12 +53,42 @@ export class FooterComponent implements OnInit {
       (this.warningText?.nativeElement.getBoundingClientRect().width + totalPaddingOffset) / 2;
   }
 
+  public canAccessTutorNotes(task: Task): boolean {
+    const tutor = task.tutor;
+    if (!tutor) {
+      return false;
+    }
+
+    const currentUser = this.userService.currentUser;
+    const currentUserRole = task.unit.staff.find((ur) => ur.user.id === currentUser.id);
+
+    if (!currentUserRole) {
+      return false;
+    }
+
+    // Ensure the unit is mapped correctly to access the mentor
+    tutor.unit = task.unit;
+
+    const canAccess =
+      currentUserRole.role === 'Convenor' ||
+      currentUserRole.role === 'Admin' ||
+      (tutor.mentor && tutor.mentor.id === currentUserRole.id) ||
+      tutor.id === currentUserRole.id;
+
+    return canAccess;
+  }
+
+  public viewTutorNotes() {
+    this.selectedTaskService.showTutorNotes();
+  }
+
   ngOnInit(): void {
     // watch for changes to the selected task
     this.selectedTask$ = this.selectedTaskService.selectedTask$;
 
     this.selectedTask$.subscribe((task) => {
       this.selectedTask = task;
+
       // We need to timeout to give the DOM a chance to place the elements
       setTimeout(() => {
         this.findSimilaritiesButton();
diff --git a/src/app/common/header/header.component.html b/src/app/common/header/header.component.html
index 96706776c9..7b494c2198 100644
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
@@ -45,6 +45,14 @@
         <mat-icon>cloud_sync_outline</mat-icon>
       </button>
     }
+    @if (currentUnit && currentUnitRole && currentUnitRole.tutorNoteCount) {
+      <!-- TODO: Replace this with a more standardised notification system -->
+      <button mat-icon-button (click)="openTutorNotes()" matTooltip="Tutor Notes">
+        <mat-icon [matBadge]="currentUnitRole.tutorNoteCount" matBadgeSize="small"
+          >feedback</mat-icon
+        >
+      </button>
+    }
     @if (currentUnit) {
       <button mat-icon-button (click)="showMyQr()">
         <mat-icon>qr_code_scanner</mat-icon>
diff --git a/src/app/common/header/header.component.ts b/src/app/common/header/header.component.ts
index 4601057b15..c2041fb83a 100644
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
@@ -13,6 +13,7 @@ import {SidekiqJobEntry, SidekiqJobService} from 'src/app/api/services/sidekiq-j
 import {SidekiqJobsModalService} from '../modals/sidekiq-jobs-modal/sidekiq-jobs-modal.service';
 import {QrModalService} from '../modals/qr-modal/qr-modal.service';
 import {StateService} from '@uirouter/core';
+import {TutorNotesModalService} from '../modals/tutor-notes-modal/tutor-notes-modal.service';
 
 @Component({
   selector: 'app-header',
@@ -58,6 +59,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
     private sidekiqJobsModalService: SidekiqJobsModalService,
     private qrModalService: QrModalService,
     private stateService: StateService,
+    private tutorNotesModal: TutorNotesModalService,
   ) {}
 
   ngOnInit(): void {
@@ -210,4 +212,8 @@ export class HeaderComponent implements OnInit, OnDestroy {
   get currentUser(): User {
     return this.userService.currentUser;
   }
+
+  openTutorNotes() {
+    this.tutorNotesModal.show(null, this.currentUnitRole);
+  }
 }
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index cc8cec968f..451a3abc74 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -106,6 +106,13 @@
         >
           <mat-icon aria-label="Task Explorer Icon" fontIcon="pageview"></mat-icon> Explorer
         </button>
+        <button
+          uiSref="units/tasks/moderation"
+          [uiParams]="{unitId: unitRole.unit.id}"
+          mat-menu-item
+        >
+          <mat-icon aria-label="Audit Icon">rate_review</mat-icon> Moderation
+        </button>
         <button uiSref="units/tasks/viewer" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
           <mat-icon aria-label="Task list icon" fontIcon="list_alt"></mat-icon> Tasks
         </button>
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.ts b/src/app/common/header/task-dropdown/task-dropdown.component.ts
index b67f220b03..cd733052ec 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.ts
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.ts
@@ -24,6 +24,7 @@ export class TaskDropdownComponent {
     'Student List': 'Students',
     'Student Portfolios': 'Portfolios',
     'Task Explorer': 'Task Explorer',
+    'Task Moderation': 'Task Moderation',
     'Task Inbox': 'Inbox',
     'Task Lists': 'Tasks',
     'Tutorial List': 'Tutorials',
diff --git a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html
new file mode 100644
index 0000000000..ac97e33fe5
--- /dev/null
+++ b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html
@@ -0,0 +1 @@
+<f-tutor-notes-view [task]="task" [unitRole]="unitRole"></f-tutor-notes-view>
diff --git a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.scss b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.ts b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.ts
new file mode 100644
index 0000000000..70cf2c78af
--- /dev/null
+++ b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.ts
@@ -0,0 +1,22 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {Task} from 'src/app/api/models/task';
+import {UnitRole} from 'src/app/api/models/unit-role';
+import {TutorNotesModalData} from './tutor-notes-modal.service';
+
+@Component({
+  selector: 'f-tutor-notes-modal',
+  templateUrl: './tutor-notes-modal.component.html',
+  styleUrl: './tutor-notes-modal.component.scss',
+})
+export class TutorNotesModalComponent implements OnInit {
+  constructor(@Inject(MAT_DIALOG_DATA) public data: TutorNotesModalData) {}
+
+  task?: Task;
+  unitRole?: UnitRole;
+
+  ngOnInit() {
+    this.task = this.data.task;
+    this.unitRole = this.data.unitRole;
+  }
+}
diff --git a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.service.ts b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.service.ts
new file mode 100644
index 0000000000..152821d97c
--- /dev/null
+++ b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.service.ts
@@ -0,0 +1,33 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {Task} from 'src/app/api/models/task';
+import {UnitRole} from 'src/app/api/models/unit-role';
+import {TutorNotesModalComponent} from './tutor-notes-modal.component';
+
+export interface TutorNotesModalData {
+  task?: Task;
+  unitRole?: UnitRole;
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TutorNotesModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(task?: Task, unitRole?: UnitRole) {
+    const _dialogRef = this.dialog.open<TutorNotesModalComponent, TutorNotesModalData>(
+      TutorNotesModalComponent,
+      {
+        data: {
+          task,
+          unitRole,
+        },
+        width: '100%',
+        height: '90vh',
+        maxWidth: '900px',
+        panelClass: 'overflow-y-auto',
+      },
+    );
+  }
+}
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 16e6c15557..ba5b377a60 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -36,7 +36,7 @@ import {MatSnackBarModule} from '@angular/material/snack-bar';
 import {MatPaginatorModule} from '@angular/material/paginator';
 import {MatTooltipModule} from '@angular/material/tooltip';
 import {MatSlideToggleModule} from '@angular/material/slide-toggle';
-import {MatChipsModule} from '@angular/material/chips';
+import {MatChipListbox, MatChipsModule} from '@angular/material/chips';
 import {MatGridListModule} from '@angular/material/grid-list';
 import {PdfViewerModule} from 'ng2-pdf-viewer';
 import {UIRouterUpgradeModule} from '@uirouter/angular-hybrid';
@@ -313,6 +313,13 @@ import {TaskPlannerCardComponent} from './projects/states/dashboard/directives/p
 import {OverseerStepService} from './api/services/overseer-step.service';
 import {TaskOverseerReportComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component';
 import {OverseerStepResultService} from './api/services/overseer-step-result.service';
+import {TutorNotesComponent} from './projects/states/tutor-notes/tutor-notes.component';
+import {TutorNotesViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component';
+import {TutorNoteService} from './api/services/tutor-note.service';
+import {ModerationComponent} from './units/states/tasks/inbox/directives/moderation/moderation.component';
+import {TutorNotesModalComponent} from './common/modals/tutor-notes-modal/tutor-notes-modal.component';
+import {FeedbackAppealModalComponent} from './tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component';
+import {ConfirmModerationModalComponent} from './units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -502,6 +509,12 @@ const GANTT_CHART_CONFIG = {
     TaskPlannerCardComponent,
     TaskPlannerPrerequisitesModalComponent,
     TaskOverseerReportComponent,
+    TutorNotesComponent,
+    TutorNotesViewComponent,
+    ModerationComponent,
+    TutorNotesModalComponent,
+    FeedbackAppealModalComponent,
+    ConfirmModerationModalComponent,
   ],
   providers: [
     // Services we provide
@@ -596,6 +609,7 @@ const GANTT_CHART_CONFIG = {
     TaskPlannerPrerequisitesModalService,
     OverseerStepService,
     OverseerStepResultService,
+    TutorNoteService,
   ],
   imports: [
     FlexLayoutModule,
@@ -662,6 +676,7 @@ const GANTT_CHART_CONFIG = {
     NgxGanttModule,
     MatSidenavModule,
     MonacoEditorModule.forRoot(),
+    MatChipListbox,
   ],
 })
 
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 1fb4868e3c..4a46b0ac8c 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -95,6 +95,7 @@ import 'build/src/app/units/states/tasks/tasks.js';
 import 'build/src/app/units/states/tasks/viewer/directives/directives.js';
 import 'build/src/app/units/states/tasks/viewer/viewer.js';
 import 'build/src/app/units/states/tasks/definition/definition.js';
+import 'build/src/app/units/states/tasks/moderation/moderation.js';
 import 'build/src/app/units/states/portfolios/portfolios.js';
 import 'build/src/app/units/states/groups/groups.js';
 import 'build/src/app/units/states/states.js';
@@ -238,6 +239,7 @@ import {ProjectPlanComponent} from './projects/states/plan/project-plan.componen
 import {TaskPlannerComponent} from './projects/states/plan/task-planner/task-planner.component';
 import {TaskPlannerCardComponent} from './projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component';
 import {TaskOverseerReportComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component';
+import {TutorNotesComponent} from './projects/states/tutor-notes/tutor-notes.component';
 
 export const DoubtfireAngularJSModule = angular
   .module('doubtfire', [
@@ -605,3 +607,8 @@ DoubtfireAngularJSModule.directive(
   'fTaskOverseerReport',
   downgradeComponent({component: TaskOverseerReportComponent}),
 );
+
+DoubtfireAngularJSModule.directive(
+  'fTutorNotes',
+  downgradeComponent({component: TutorNotesComponent}),
+);
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
index 7463d4fb13..7b49a65daa 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.html
@@ -41,25 +41,34 @@ <h5>{{ task?.statusLabel() }}</h5>
     }
   </mat-card-content>
 
-  <mat-card-actions class="space-x-2">
-    <button
-      mat-stroked-button
-      (click)="uploadSubmission()"
-      [disabled]="
-        isReadyForFeedback() || task?.blockedByPrerequisiteTasks() || isSubmittedForPortfolio()
-      "
-    >
-      Upload Submission
-    </button>
+  <mat-card-actions class="justify-between w-full">
+    <div class="space-x-2">
+      <button
+        mat-stroked-button
+        (click)="uploadSubmission()"
+        [disabled]="
+          isReadyForFeedback() || task?.blockedByPrerequisiteTasks() || isSubmittedForPortfolio()
+        "
+      >
+        Upload Submission
+      </button>
 
-    @if (task?.canApplyForExtension()) {
-      <button mat-stroked-button (click)="applyForExtension()">Request extension</button>
-    }
-    @if (task?.inSubmittedState() && task?.requiresFileUpload()) {
-      <button mat-stroked-button (click)="updateFilesInSubmission()">Upload new files</button>
-    }
-    <button mat-raised-button color="primary" (click)="openDiscussionQrCode()">
-      Show Discussion QR
-    </button>
+      @if (task?.canApplyForExtension()) {
+        <button mat-stroked-button (click)="applyForExtension()">Request extension</button>
+      }
+      @if (task?.inSubmittedState() && task?.requiresFileUpload()) {
+        <button mat-stroked-button (click)="updateFilesInSubmission()">Upload new files</button>
+      }
+    </div>
+
+    <div>
+      <button mat-icon-button aria-label="More task options" [matMenuTriggerFor]="menu">
+        <mat-icon>more_vert</mat-icon>
+      </button>
+      <div fxFlex></div>
+      <mat-menu #menu="matMenu">
+        <button mat-menu-item (click)="openFeedbackAppealModal()">Request Feedback Review</button>
+      </mat-menu>
+    </div>
   </mat-card-actions>
 </mat-card>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index 70934d7d51..d08c1b1ffd 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -11,6 +11,7 @@ import {SubmissionTypeModalService} from 'src/app/tasks/modals/submission-type-m
 
 import {Project} from 'src/app/api/models/project';
 import {UserService} from 'src/app/api/services/user.service';
+import {FeedbackAppealModalService} from 'src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.service';
 @Component({
   selector: 'f-task-status-card',
   templateUrl: './task-status-card.component.html',
@@ -27,6 +28,7 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
     private doubtfireConstants: DoubtfireConstants,
     private submissionTypeModalService: SubmissionTypeModalService,
     private userService: UserService,
+    private feedbackAppealService: FeedbackAppealModalService,
   ) {}
 
   @Input() task: Task;
@@ -111,4 +113,8 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
       this.task.refresh();
     });
   }
+
+  openFeedbackAppealModal(): void {
+    this.feedbackAppealService.show(this.task);
+  }
 }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html
index ca9f850437..8d7141d892 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html
@@ -54,4 +54,4 @@
       <button [hidden]="!canRegeneratePdf" mat-menu-item (click)="regeneratePdf()">Regenerate PDFs</button>
     </mat-menu>
   </mat-card-actions>
-</mat-card>
+</mat-card>
\ No newline at end of file
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.ts
index 771b1ce53e..8c10c71c40 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.ts
@@ -81,4 +81,4 @@ export class TaskSubmissionCardComponent implements OnChanges, OnInit {
   downloadSubmissionFiles(): void {
     this.fileDownloader.downloadFile(this.urls.files, `${this.task.definition.abbreviation}.zip`);
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.html
new file mode 100644
index 0000000000..71ea152187
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.html
@@ -0,0 +1,20 @@
+<div class="p-4 h-[calc(100%-154px)]">
+  <div class="flex items-center">
+    <mat-icon class="mr-2">comment</mat-icon>
+    <h1 class="mat-headline m-0">Tutor Notes for {{ unitRole?.user?.name }}</h1>
+  </div>
+  @if (task) {
+    <p>
+      {{ task.definition.abbreviation }} {{ task.definition.name }} ({{
+        task.project.student.name
+      }})
+    </p>
+  }
+  <p>
+    Notes left here are for staff-only discussion about the feedback given to the student. Use this
+    space to question, clarify, or discuss the tutor’s feedback. These notes are visible to
+    {{ unitRole?.user?.name }} and other convenors.
+  </p>
+
+  <f-tutor-notes [task]="task" [unitRole]="unitRole"></f-tutor-notes>
+</div>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.scss b/src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.ts
new file mode 100644
index 0000000000..33ba1dd5a4
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component.ts
@@ -0,0 +1,18 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {UnitRole} from 'src/app/api/models/unit-role';
+
+@Component({
+  selector: 'f-tutor-notes-view',
+  templateUrl: './tutor-notes-view.component.html',
+  styleUrls: ['./tutor-notes-view.component.scss'],
+})
+export class TutorNotesViewComponent implements OnInit {
+  @Input() task?;
+  @Input() unitRole: UnitRole;
+
+  ngOnInit(): void {
+    if (this.task && !this.unitRole) {
+      this.unitRole = this.task.tutor;
+    }
+  }
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
index fc861e5b34..931c569b6e 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/task-dashboard.component.html
@@ -24,6 +24,10 @@
       <f-staff-notes-view [project]="task.project"></f-staff-notes-view>
     </ng-template>
 
+    <ng-template [ngSwitchCase]="DashboardViews.tutor_notes">
+      <f-tutor-notes-view [task]="task" [unitRole]="unitRole"></f-tutor-notes-view>
+    </ng-template>
+
     <ng-template [ngSwitchCase]="DashboardViews.discussion_prompts">
       <f-discussion-prompts-view
         [project]="task.project"
diff --git a/src/app/projects/states/dashboard/selected-task.service.ts b/src/app/projects/states/dashboard/selected-task.service.ts
index 3385019a77..94730262da 100644
--- a/src/app/projects/states/dashboard/selected-task.service.ts
+++ b/src/app/projects/states/dashboard/selected-task.service.ts
@@ -9,6 +9,7 @@ export enum DashboardViews {
   task,
   similarity,
   staff_notes,
+  tutor_notes,
   discussion_prompts,
   overseer,
 }
@@ -68,6 +69,10 @@ export class SelectedTaskService {
     this.currentView$.next(DashboardViews.staff_notes);
   }
 
+  public showTutorNotes() {
+    this.currentView$.next(DashboardViews.tutor_notes);
+  }
+
   public showOverseerReports() {
     this.currentView$.next(DashboardViews.overseer);
   }
diff --git a/src/app/projects/states/tutor-notes/tutor-notes.component.html b/src/app/projects/states/tutor-notes/tutor-notes.component.html
new file mode 100644
index 0000000000..b587307e5c
--- /dev/null
+++ b/src/app/projects/states/tutor-notes/tutor-notes.component.html
@@ -0,0 +1,169 @@
+<div class="flex flex-col h-full">
+  <!-- @if (!loadingStaffNotes && project?.staffNoteCount === 0) {
+    <div class="flex justify-center items-center w-full h-full text-gray-300">
+      No staff notes for {{ project.student.preferredName }} {{ project.student.lastName }}
+    </div>
+  } -->
+  <div #tutorNotesContainer class="flex-1 overflow-auto p-4">
+    @if (!loadingTutorNotes) {
+      @for (note of filteredNotes; track note) {
+        @if (note.replyToId) {
+          <div
+            class="text-md px-2 py-2 select-none rounded-t-md border border-gray-300 flex items-center justify-between"
+          >
+            <div
+              class="flex items-center"
+              [ngClass]="note.replyTo && 'hover:text-blue-500 hover:underline cursor-pointer'"
+              (click)="scrollToNote(note.replyTo)"
+            >
+              <mat-icon class="mr-3">reply</mat-icon>
+              <div class="flex flex-col">
+                @if (note.replyTo) {
+                  <span class="font-medium">
+                    Replying to {{ note.replyTo.user.preferredName }}
+                    {{ note.replyTo.user.lastName }} ({{ note.replyTo.user.nickname }})
+                  </span>
+                  <span class="text-base text-gray-600">{{ note.replyTo.note }}</span>
+                } @else {
+                  <span class="text-base text-gray-400 italic">Replying to: Deleted note</span>
+                }
+              </div>
+            </div>
+          </div>
+        }
+        <mat-card
+          [id]="'note-' + note.id"
+          class="mb-4 p-5"
+          (mouseover)="hoveredNoteId = note.id"
+          (mouseout)="hoveredNoteId = null"
+        >
+          <div
+            [hidden]="hoveredNoteId !== note.id"
+            class="flex items-center absolute right-5 bottom-5"
+          >
+            @if (!note.readByUnitRole) {
+              @if (note.noteIsForMe) {
+                <button mat-button color="primary" (click)="markAsRead(note)">Mark as Read</button>
+              }
+            } @else {
+              <div class="text-gray-400 italic px-5">Read by tutor</div>
+            }
+            @if (note.authorIsMe) {
+              <mat-icon type="button" (click)="editNote(note)">edit</mat-icon>
+            }
+            <mat-icon type="button" (click)="replyToNote(note)">reply</mat-icon>
+            <mat-icon type="button" (click)="deleteNote(note)">delete</mat-icon>
+          </div>
+
+          <div class="flex justify-between">
+            <mat-card-title class="flex items-center">
+              <user-icon size="25" [user]="note.user" style="margin-right: 8px"></user-icon>
+              {{ note.user?.firstName }} {{ note.user?.lastName }}</mat-card-title
+            >
+            <div class="flex items-center">
+              <mat-card-subtitle
+                [matTooltip]="note.createdAt | localizedDateTime"
+                matTooltipPosition="above"
+                matTooltipShowDelay="1000"
+                >{{ note.createdAt | humanizedDate }}</mat-card-subtitle
+              >
+            </div>
+          </div>
+
+          <div class="flex gap-5 py-2">
+            @if (note.taskDefinition) {
+              <mat-chip class="w-fit"
+                >{{ note.taskDefinition?.abbreviation }} {{ note.taskDefinition.name }}</mat-chip
+              >
+            }
+            @if (note.project) {
+              <mat-chip
+                chipListSelectable
+                class="w-fit cursor-pointer"
+                matTooltip="Click to view student"
+                matTooltipPosition="above"
+                (click)="openProject($event, note)"
+                >{{ note.project?.student.name }}</mat-chip
+              >
+            }
+          </div>
+
+          <mat-card-content class="py-4">
+            @if (editingNote && editingNote.id === note.id) {
+              <mat-form-field appearance="outline" class="flex items-center w-full">
+                <mat-label>Update Note</mat-label>
+                <textarea
+                  (input)="autoResizeTutorNoteEditor()"
+                  #tutorNoteEditor
+                  matInput
+                  [(ngModel)]="editingNoteText"
+                  class="resize-none w-full px-2 py-1 placeholder:px-2 placeholder:py-1 overflow-hidden"
+                ></textarea>
+                <div class="flex justify-end gap-2">
+                  <button mat-raised-button color="" (click)="cancelEditingNote()">Cancel</button>
+                  <button mat-raised-button color="primary" (click)="updateNote(note)">
+                    Update Note
+                  </button>
+                </div>
+              </mat-form-field>
+            } @else {
+              <div class="markdown-to-html" [innerHTML]="note.note | marked"></div>
+            }
+          </mat-card-content>
+        </mat-card>
+      }
+    } @else {
+      <!-- <div id="spinner">
+          <mat-spinner
+            class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50"
+          ></mat-spinner>
+        </div> -->
+    }
+  </div>
+
+  <div class="h-[150px] border-t border-gray-300 p-4">
+    <mat-chip-listbox selectable multiple class="mb-4">
+      <mat-chip-option value="all" (click)="toggleSelection('all')">All Tasks</mat-chip-option>
+      @for (option of taskDefinitionFilters; track option) {
+        <mat-chip-option
+          [value]="option"
+          [selected]="selectedTaskDefinitions.get(option)"
+          (click)="toggleSelection(option)"
+        >
+          {{ option }}
+        </mat-chip-option>
+      }
+    </mat-chip-listbox>
+
+    @if (replyingToNote) {
+      <div
+        class="text-md px-2 py-2 select-none rounded-t-md border border-b-0 border-gray-300 flex items-center justify-between"
+      >
+        <div class="flex items-center">
+          <mat-icon class="mr-3 mt-1">reply</mat-icon>
+          <div class="flex flex-col">
+            <span class="font-medium">
+              Replying to {{ replyingToNote.user.firstName }} {{ replyingToNote.user.lastName }} ({{
+                replyingToNote.user.nickname
+              }})
+            </span>
+            <span class="text-base text-gray-600">{{ replyingToNote.note }}</span>
+          </div>
+        </div>
+        <mat-icon class="cursor-pointer" (click)="cancelReplyingToNote()">close</mat-icon>
+      </div>
+    }
+
+    <mat-form-field appearance="outline" class="flex items-center w-full">
+      <mat-label>Tutor note</mat-label>
+      <textarea
+        matInput
+        [(ngModel)]="noteText"
+        class="resize-none w-full px-2 py-1 placeholder:px-2 placeholder:py-1"
+      ></textarea>
+      <div class="flex justify-end">
+        <button mat-raised-button color="primary" (click)="submitNote()">Submit</button>
+      </div>
+    </mat-form-field>
+  </div>
+</div>
diff --git a/src/app/projects/states/tutor-notes/tutor-notes.component.scss b/src/app/projects/states/tutor-notes/tutor-notes.component.scss
new file mode 100644
index 0000000000..a6d41ed2d2
--- /dev/null
+++ b/src/app/projects/states/tutor-notes/tutor-notes.component.scss
@@ -0,0 +1,27 @@
+.mat-icon {
+  color: #9696969d;
+  font-size: 20px;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+  vertical-align: middle;
+  text-align: center;
+  margin-left: 0.3em;
+}
+
+.mat-icon:hover {
+  color: black;
+}
+
+@keyframes blueGlowFade {
+  0% {
+    background-color: rgba(66, 133, 244, 0.6);
+  }
+  100% {
+    background-color: transparent;
+  }
+}
+
+.flash-highlight {
+  animation: blueGlowFade 1s ease-out;
+}
diff --git a/src/app/projects/states/tutor-notes/tutor-notes.component.ts b/src/app/projects/states/tutor-notes/tutor-notes.component.ts
new file mode 100644
index 0000000000..6f83b31b3d
--- /dev/null
+++ b/src/app/projects/states/tutor-notes/tutor-notes.component.ts
@@ -0,0 +1,215 @@
+import {Component, ElementRef, Input, OnInit, ViewChild} from '@angular/core';
+import {Task, UnitRole, UserService} from 'src/app/api/models/doubtfire-model';
+import {TutorNote} from 'src/app/api/models/tutor-note';
+import {TutorNoteService} from 'src/app/api/services/tutor-note.service';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-tutor-notes',
+  templateUrl: './tutor-notes.component.html',
+  styleUrl: './tutor-notes.component.scss',
+})
+export class TutorNotesComponent implements OnInit {
+  @ViewChild('tutorNotesContainer') tutorNotesContainer!: ElementRef;
+  @ViewChild('tutorNoteEditor', {static: false}) tutorNoteEditor!: ElementRef<HTMLTextAreaElement>;
+
+  @Input() unitRole: UnitRole;
+  @Input() task: Task;
+
+  loadingTutorNotes: boolean = true;
+
+  noteText: string = '';
+
+  editingNote?: TutorNote;
+  editingNoteText?: string = '';
+
+  replyingToNote?: TutorNote;
+
+  hoveredNoteId: number | null = null;
+
+  constructor(
+    private userService: UserService,
+    private tutorNoteService: TutorNoteService,
+    private alertService: AlertService,
+    private confirmationModalService: ConfirmationModalService,
+  ) {}
+  ngOnInit(): void {
+    if (this.task && !this.unitRole) {
+      this.unitRole = this.task.tutor;
+    }
+
+    this.loadingTutorNotes = true;
+    this.tutorNoteService.loadTutorNotes(this.unitRole).subscribe((notes) => {
+      this.loadingTutorNotes = false;
+      this.tutorNoteService.updateTutorNoteReplies(this.unitRole?.tutorNotesCache.currentValues);
+      this.scrollDown();
+    });
+    if (this.task) {
+      this.selectedTaskDefinitions.set(this.task.definition.abbreviation, true);
+    }
+  }
+
+  scrollToComment(commentID: number) {
+    document.querySelector(`#comment-${commentID}`).scrollIntoView();
+  }
+
+  scrollDown() {
+    setTimeout(() => {
+      const el = this.tutorNotesContainer.nativeElement;
+      el.scrollTop = el.scrollHeight;
+    }, 50);
+  }
+
+  public submitNote() {
+    const noteText = this.noteText.trim();
+    if (noteText === '') {
+      return;
+    }
+
+    this.noteText = '';
+
+    this.tutorNoteService
+      .addNote(this.unitRole, noteText, this.task, this.replyingToNote)
+      .subscribe({
+        next: (_note) => {
+          this.alertService.success('Succesfully submitted note', 4000);
+          this.scrollDown();
+          this.replyingToNote = null;
+          this.tutorNoteService.updateTutorNoteReplies(
+            this.unitRole?.tutorNotesCache.currentValues,
+          );
+        },
+        error: (error) => {
+          this.alertService.error(`Failed to create note: ${error}`, 4000);
+          this.noteText = noteText;
+        },
+      });
+  }
+
+  public updateNote() {
+    const noteText = this.editingNoteText.trim();
+    if (noteText === '' || !this.editingNote) {
+      return;
+    }
+
+    this.tutorNoteService.updateNote(this.unitRole, this.editingNote, noteText).subscribe({
+      next: (_note) => {
+        this.alertService.success('Succesfully updated note', 4000);
+        this.editingNote = null;
+        this.editingNoteText = '';
+      },
+      error: (error) => {
+        this.alertService.error(`Failed to update note: ${error}`, 4000);
+      },
+    });
+  }
+
+  public markAsRead(note: TutorNote) {
+    this.tutorNoteService.markAsRead(this.unitRole, note).subscribe({
+      next: (response) => {
+        if (response) {
+          this.alertService.success(`Marked note as read`, 3000);
+        } else {
+          this.alertService.error(`Failed to mark as read`, 6000);
+        }
+      },
+      error: (error) => {
+        this.alertService.error(`Failed to mark as read: ${error}`, 6000);
+      },
+    });
+  }
+
+  public deleteNote(note: TutorNote) {
+    this.confirmationModalService.show(
+      'Delete note',
+      'Are you sure want to delete this tutor note?',
+      () => {
+        note.delete();
+      },
+    );
+  }
+
+  public replyToNote(note: TutorNote) {
+    this.replyingToNote = note;
+  }
+  public cancelReplyingToNote() {
+    this.replyingToNote = null;
+  }
+
+  public editNote(note: TutorNote) {
+    if (!note.authorIsMe) {
+      return;
+    }
+
+    this.editingNote = note;
+    this.editingNoteText = note.note;
+    setTimeout(() => {
+      this.autoResizeTutorNoteEditor();
+      this.tutorNoteEditor?.nativeElement.focus();
+    });
+  }
+
+  public cancelEditingNote() {
+    this.editingNote = null;
+    this.editingNoteText = '';
+  }
+
+  public autoResizeTutorNoteEditor() {
+    const el = this.tutorNoteEditor.nativeElement;
+    el.style.height = 'auto';
+    el.offsetHeight;
+    el.style.height = el.scrollHeight + 'px';
+  }
+
+  scrollToNote(note: TutorNote): void {
+    const el = document.getElementById(`note-${note.id}`);
+    if (el) {
+      el.scrollIntoView({behavior: 'smooth', block: 'center'});
+      el.classList.add('flash-highlight');
+      setTimeout(() => el.classList.remove('flash-highlight'), 1000);
+    }
+  }
+
+  public selectedTaskDefinitions: Map<string, boolean> = new Map<string, boolean>();
+
+  public get filteredNotes() {
+    const selected = this.selectedTaskDefinitions;
+    const allSelected = selected.size === 0 || selected.get('all');
+
+    return (
+      this.unitRole?.tutorNotesCache?.currentValues?.filter((note) => {
+        const abbr = note.taskDefinition?.abbreviation;
+        // if (!abbr) return false; // skip notes without taskDefinition
+        if (allSelected) return true;
+        return selected.get(abbr);
+      }) ?? []
+    );
+  }
+
+  toggleSelection(option: string) {
+    if (this.selectedTaskDefinitions.get(option)) {
+      this.selectedTaskDefinitions.set(option, false);
+    } else {
+      this.selectedTaskDefinitions.set(option, true);
+    }
+  }
+
+  public get taskDefinitionFilters() {
+    const abbrs =
+      this.unitRole.tutorNotesCache.currentValues
+        .map((note) => note.taskDefinition?.abbreviation)
+        .filter(Boolean) ?? [];
+
+    // Remove duplicates
+    return Array.from(new Set(abbrs));
+  }
+
+  openProject(event: Event, note: TutorNote) {
+    event.stopPropagation();
+    const link = document.createElement('a');
+    link.href = `/projects/${note.project.id}/dashboard/${note.taskDefinition.abbreviation}?tutor=true`;
+    link.target = '_blank';
+    link.click();
+  }
+}
diff --git a/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.html b/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.html
new file mode 100644
index 0000000000..131bc86541
--- /dev/null
+++ b/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.html
@@ -0,0 +1,46 @@
+<h2 mat-dialog-title>Request Feedback Review</h2>
+<mat-dialog-content>
+  <p>
+    If you believe the feedback or marking on this task does not accurately reflect your work, you
+    may request a review. This allows another tutor to reassess the feedback and determine whether
+    it should be confirmed or revised.
+  </p>
+
+  <p>
+    You have
+    <b>
+      {{ task.project.escalationAttemptsRemaining }} review request{{
+        task.project.escalationAttemptsRemaining !== 1 ? 's' : ''
+      }}
+    </b>
+    remaining for this unit. If the original feedback is revised as a result of this review, the
+    request will not be counted against your remaining total.
+  </p>
+
+  <mat-form-field appearance="outline" class="w-full mt-4">
+    <mat-label>Reason for review request</mat-label>
+    <textarea
+      matInput
+      rows="4"
+      maxlength="1000"
+      [(ngModel)]="reviewComment"
+      placeholder="Briefly explain why you believe this feedback should be reviewed. Refer to specific criteria if relevant."
+    ></textarea>
+    <div class="flex justify-end">
+      <mat-hint> {{ reviewComment?.length || 0 }}/1000 </mat-hint>
+    </div>
+  </mat-form-field>
+  <p class="opacity-70">Review decisions are final once resolved.</p>
+
+  <mat-dialog-actions class="flex justify-between">
+    <button mat-raised-button (click)="dismissModal()">Cancel</button>
+    <button
+      mat-raised-button
+      color="primary"
+      (click)="submit()"
+      [disabled]="!reviewComment || submitting"
+    >
+      Submit
+    </button>
+  </mat-dialog-actions>
+</mat-dialog-content>
diff --git a/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.scss b/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.ts b/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.ts
new file mode 100644
index 0000000000..d44c1853ca
--- /dev/null
+++ b/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component.ts
@@ -0,0 +1,57 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {Task} from 'src/app/api/models/task';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {FeedbackAppealModalData} from './feedback-appeal-modal.service';
+import {TaskService} from 'src/app/api/services/task.service';
+
+@Component({
+  selector: 'f-feedback-appeal-modal',
+  templateUrl: './feedback-appeal-modal.component.html',
+  styleUrl: './feedback-appeal-modal.component.scss',
+})
+export class FeedbackAppealModalComponent implements OnInit {
+  task: Task;
+
+  reviewComment: string;
+  submitting: boolean;
+
+  constructor(
+    public dialogRef: MatDialogRef<FeedbackAppealModalComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: FeedbackAppealModalData,
+    private alerts: AlertService,
+    private taskService: TaskService,
+  ) {}
+
+  ngOnInit() {
+    this.task = this.data.task;
+  }
+
+  submit(): void {
+    this.submitting = true;
+    this.task.requestFeedbackReview().subscribe({
+      next: (_response) => {
+        this.alerts.success(
+          `Requested feedback review for ${this.task.definition.abbreviation} ${this.task.definition.name}`,
+          3000,
+        );
+        setTimeout(() => {
+          // Fetch the "Feedback Review Requested" comment
+          this.taskService.notifyStatusChange(this.task);
+          setTimeout(() => {
+            this.task.addComment(this.reviewComment);
+          }, 250);
+          this.dismissModal();
+        }, 250);
+      },
+      error: (error) => {
+        this.alerts.error(`An error occurred: ${error}`, 3000);
+        this.submitting = false;
+      },
+    });
+  }
+
+  public dismissModal() {
+    this.dialogRef.close();
+  }
+}
diff --git a/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.service.ts b/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.service.ts
new file mode 100644
index 0000000000..622d3bf99f
--- /dev/null
+++ b/src/app/tasks/modals/feedback-appeal-modal/feedback-appeal-modal.service.ts
@@ -0,0 +1,29 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {Task} from 'src/app/api/models/task';
+import {FeedbackAppealModalComponent} from './feedback-appeal-modal.component';
+
+export interface FeedbackAppealModalData {
+  task: Task;
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class FeedbackAppealModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(task: Task) {
+    const _dialogRef = this.dialog.open<FeedbackAppealModalComponent, FeedbackAppealModalData>(
+      FeedbackAppealModalComponent,
+      {
+        data: {
+          task: task,
+        },
+        position: {top: '2.5%'},
+        width: '100%',
+        maxWidth: '700px',
+      },
+    );
+  }
+}
diff --git a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
index 8cbc442d50..924ec54829 100644
--- a/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
+++ b/src/app/tasks/task-comments-viewer/task-comments-viewer.component.html
@@ -102,6 +102,27 @@
                 </mat-card>
               </div>
 
+              <div
+                *ngSwitchCase="'feedback_review_request'"
+                class="w-full flex flex-col items-center my-2"
+                [matTooltip]="comment.createdAt | humanizedDate"
+                matTooltipPosition="above"
+                matTooltipShowDelay="1000"
+              >
+                <mat-card class="w-full self-end" appearance="outlined">
+                  <mat-card-header>
+                    <mat-icon class="m-auto" style="color: #9696969d">comment</mat-icon>
+                  </mat-card-header>
+
+                  <mat-card-content
+                    style="color: #9696969d"
+                    class="flex flex-col justify-center items-center"
+                  >
+                    {{ comment.text }}
+                  </mat-card-content>
+                </mat-card>
+              </div>
+
               <div
                 *ngSwitchCase="'checked_in'"
                 class="w-full flex flex-col items-center my-2"
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
index ae0ca0114d..431b09dfc3 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
@@ -70,6 +70,25 @@ <h3>Unit Staff</h3>
         ></mat-slide-toggle>
       </td>
     </ng-container>
+
+    <ng-container matColumnDef="mentor">
+      <th mat-header-cell *matHeaderCellDef>Mentor</th>
+      <td mat-cell *matCellDef="let unitRole">
+        <mat-select
+          class="w-full min-w-fit"
+          (selectionChange)="selectMentor(unitRole, $event)"
+          [ngModel]="unitRole.mentorId"
+        >
+          <mat-option value="">(None)</mat-option>
+          @for (unitRole of unitStaff; track unitRole) {
+            <mat-option class="w-full min-w-fit" [value]="unitRole.id">
+              {{ unitRole.user.name }}</mat-option
+            >
+          }
+        </mat-select>
+      </td>
+    </ng-container>
+
     <ng-container matColumnDef="actions">
       <th mat-header-cell *matHeaderCellDef>Actions</th>
       <td mat-cell *matCellDef="let unitRole">
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
index f161c384aa..bf55d7b45d 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
@@ -7,6 +7,7 @@ import {UnitRole} from 'src/app/api/models/unit-role';
 import {MatTableDataSource} from '@angular/material/table';
 import {MatButtonToggleChange} from '@angular/material/button-toggle';
 import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
+import {MatSelectChange} from '@angular/material/select';
 
 @Component({
   selector: 'unit-staff-editor',
@@ -22,7 +23,14 @@ export class UnitStaffEditorComponent implements OnInit {
   filteredStaff: User[] = []; // Filtered staff members
   searchTerm: string = ''; // Search term entered by the user
 
-  displayedColumns: string[] = ['name', 'role', 'main-convenor', 'observer-only', 'actions'];
+  displayedColumns: string[] = [
+    'name',
+    'role',
+    'main-convenor',
+    'observer-only',
+    'mentor',
+    'actions',
+  ];
   dataSource = new MatTableDataSource<UnitRole>();
 
   // Inject services here
@@ -87,6 +95,20 @@ export class UnitStaffEditorComponent implements OnInit {
     });
   }
 
+  selectMentor(unitRole: UnitRole, event: MatSelectChange) {
+    const previousValue = unitRole.mentorId;
+    unitRole.mentorId = event.value;
+    unitRole.roleId = unitRole.role === 'Tutor' ? 2 : 3;
+
+    this.unitRoleService.update(unitRole).subscribe({
+      next: () => this.alertService.success('Mentor updated', 2000),
+      error: (response) => {
+        // Revert changes on error
+        unitRole.mentorId = previousValue;
+        this.alertService.error(response, 6000);
+      },
+    });
+  }
   /**
    * Changes who the `Main Convenor` of the unit is.
    *
diff --git a/src/app/units/states/tasks/definition/definition.coffee b/src/app/units/states/tasks/definition/definition.coffee
index bd0bad8241..9dbdc249ea 100644
--- a/src/app/units/states/tasks/definition/definition.coffee
+++ b/src/app/units/states/tasks/definition/definition.coffee
@@ -22,6 +22,7 @@ angular.module('doubtfire.units.states.tasks.definition', [
 
 .controller('TaskDefinitionStateCtrl', ($scope, newTaskService) ->
   $scope.taskData.source = newTaskService.queryTasksForTaskExplorer.bind(newTaskService)
+  $scope.viewType = 'explorer'
   $scope.taskData.taskDefMode = true
   $scope.showSearchOptions = true
   $scope.filters = {
diff --git a/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.html b/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.html
new file mode 100644
index 0000000000..907c9793df
--- /dev/null
+++ b/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.html
@@ -0,0 +1,43 @@
+<h3 mat-dialog-title>
+  <div class="flex flex-row items-center">
+    <div class="mr-5 flex items-center">
+      @if (action === 'show_less') {
+        <mat-icon>thumb_up</mat-icon>
+      } @else if (action === 'show_more') {
+        <mat-icon>flag</mat-icon>
+      } @else if (action === 'dismiss_ok') {
+        <mat-icon>check_circle</mat-icon>
+      } @else if (action === 'dismiss_good') {
+        <mat-icon>task_alt</mat-icon>
+      } @else if (action === 'overturn') {
+        <mat-icon>gavel</mat-icon>
+      } @else if (action === 'upheld') {
+        <mat-icon>verified</mat-icon>
+      }
+    </div>
+    <div class="flex flex-col">
+      <div>{{ title }}</div>
+      <!-- <small>Please confirm that you want to perform this action.</small> -->
+      <small>Tutor: {{ task.tutor.user.name }}</small>
+    </div>
+  </div>
+</h3>
+<mat-dialog-content>
+  <p>
+    {{ description }}
+  </p>
+  @if (showDismissAll) {
+    <p>
+      <mat-checkbox [(ngModel)]="dismissAllTasks">
+        Apply this action to all {{ task.definition.abbreviation }} {{ task.definition.name }} tasks
+        from {{ task.tutor?.user.name ?? 'N/A' }}, currently waiting for moderation
+      </mat-checkbox>
+    </p>
+  }
+</mat-dialog-content>
+<mat-dialog-actions class="flex justify-between">
+  <button mat-button color="warn" (click)="dismiss()">Cancel</button>
+  <button mat-raised-button color="primary" (click)="runCallback()">
+    <i class="fa fa-check"></i> Confirm
+  </button>
+</mat-dialog-actions>
diff --git a/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.scss b/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.ts b/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.ts
new file mode 100644
index 0000000000..9b61056ad6
--- /dev/null
+++ b/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component.ts
@@ -0,0 +1,48 @@
+import {Component, Inject, OnInit} from '@angular/core';
+import {ConfirmModerationModalData} from './confirm-moderation-modal.service';
+import {MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {TaskService} from 'src/app/api/services/task.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {FeedbackModerationActionType} from 'src/app/api/models/task';
+import {Task} from 'src/app/api/models/task';
+
+@Component({
+  selector: 'f-confirm-moderation-modal',
+  templateUrl: './confirm-moderation-modal.component.html',
+  styleUrl: './confirm-moderation-modal.component.scss',
+})
+export class ConfirmModerationModalComponent implements OnInit {
+  task: Task;
+  title: string;
+  description: string;
+  action: FeedbackModerationActionType;
+  showDismissAll: boolean;
+  callback: (applyToAll: boolean) => void;
+
+  dismissAllTasks: boolean = false;
+
+  constructor(
+    public dialogRef: MatDialogRef<ConfirmModerationModalComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: ConfirmModerationModalData,
+    private alerts: AlertService,
+    private taskService: TaskService,
+  ) {}
+
+  ngOnInit() {
+    this.task = this.data.task;
+    this.title = this.data.title;
+    this.description = this.data.description;
+    this.action = this.data.action;
+    this.showDismissAll = this.data.showDismissAll;
+    this.callback = this.data.callback;
+  }
+
+  public runCallback() {
+    this.callback(this.dismissAllTasks);
+    this.dismiss();
+  }
+
+  public dismiss() {
+    this.dialogRef.close();
+  }
+}
diff --git a/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.service.ts b/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.service.ts
new file mode 100644
index 0000000000..bd271f321c
--- /dev/null
+++ b/src/app/units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.service.ts
@@ -0,0 +1,47 @@
+import {Injectable} from '@angular/core';
+import {MatDialog} from '@angular/material/dialog';
+import {FeedbackModerationActionType} from 'src/app/api/models/task';
+import {ConfirmModerationModalComponent} from './confirm-moderation-modal.component';
+import {Task} from 'src/app/api/models/task';
+
+export interface ConfirmModerationModalData {
+  task: Task;
+  title: string;
+  description: string;
+  action: FeedbackModerationActionType;
+  showDismissAll: boolean;
+  callback: (applyToAll: boolean) => void;
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ConfirmModerationModalService {
+  constructor(public dialog: MatDialog) {}
+
+  public show(
+    task: Task,
+    title: string,
+    description: string,
+    action: FeedbackModerationActionType,
+    showDismissAll: boolean,
+    callback: (applyToAll: boolean) => void,
+  ) {
+    const _dialogRef = this.dialog.open<
+      ConfirmModerationModalComponent,
+      ConfirmModerationModalData
+    >(ConfirmModerationModalComponent, {
+      data: {
+        task,
+        title,
+        description,
+        action,
+        showDismissAll,
+        callback,
+      },
+      position: {top: '2.5%'},
+      width: '100%',
+      maxWidth: '650px',
+    });
+  }
+}
diff --git a/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.html b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.html
new file mode 100644
index 0000000000..efb5f80449
--- /dev/null
+++ b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.html
@@ -0,0 +1,64 @@
+<!-- <div class="flex justify-center py-2">Tutor: {{ task.tutor?.user.name }}</div> -->
+<span class="center-buttons flex justify-around gap-5 mx-5">
+  @if (task.moderationType === 'random_sample' || task.moderationType === 'first_feedback') {
+    <button
+      [disabled]="task === undefined || isModerated(task)"
+      mat-icon-button
+      matTooltip="Show more from this tutor"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button"
+      (click)="showMore()"
+    >
+      <mat-icon>flag</mat-icon>
+    </button>
+    <button
+      [disabled]="task === undefined || isModerated(task)"
+      mat-icon-button
+      matTooltip="Dismiss moderation task"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button large-button"
+      (click)="dismiss()"
+    >
+      <mat-icon>archive</mat-icon>
+    </button>
+    <button
+      [disabled]="task === undefined || isModerated(task)"
+      mat-icon-button
+      matTooltip="Show less from this tutor"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button"
+      (click)="showLess()"
+    >
+      <mat-icon>thumb_up</mat-icon>
+    </button>
+  } @else if (task.moderationType === 'escalation') {
+    <button
+      [disabled]="task === undefined || isModerated(task)"
+      mat-icon-button
+      matTooltip="Overturn"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button"
+      (click)="overturn()"
+    >
+      <!-- <mat-icon>flag</mat-icon> -->
+      <mat-icon>gavel</mat-icon>
+    </button>
+
+    <button
+      [disabled]="task === undefined || isModerated(task)"
+      mat-icon-button
+      matTooltip="Upheld"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button"
+      (click)="upheld()"
+    >
+      <!-- <mat-icon>thumb_up</mat-icon> -->
+      <mat-icon>verified</mat-icon>
+    </button>
+  }
+</span>
diff --git a/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.scss b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.scss
new file mode 100644
index 0000000000..168ca35fb9
--- /dev/null
+++ b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.scss
@@ -0,0 +1,27 @@
+.center-buttons {
+  text-align: center;
+
+  .button {
+    // margin: 0 6px;
+    transform: scale(0.8);
+    border-radius: 100%;
+  }
+
+  .large-button {
+    transform: scale(1.15);
+    background-color: white;
+  }
+
+  .large-button:hover {
+    background-color: #f5f5f5;
+  }
+
+  .extra-large-button {
+    padding-top: 7px;
+    transform: scale(1.25);
+  }
+
+  .extra-large-button:hover {
+    filter: brightness(0.85);
+  }
+}
diff --git a/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.ts b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.ts
new file mode 100644
index 0000000000..991cf71574
--- /dev/null
+++ b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.ts
@@ -0,0 +1,118 @@
+import {Component, Input} from '@angular/core';
+import {FeedbackModerationActionType, Task} from 'src/app/api/models/task';
+import {AlertService} from 'src/app/common/services/alert.service';
+import {ConfirmModerationModalService} from './confirm-moderation-modal/confirm-moderation-modal.service';
+import {Router} from '@angular/router';
+
+@Component({
+  selector: 'f-moderation',
+  templateUrl: './moderation.component.html',
+  styleUrl: './moderation.component.scss',
+})
+export class ModerationComponent {
+  @Input() task: Task;
+
+  public moderated: Map<Task, boolean> = new Map<Task, boolean>();
+
+  constructor(
+    private alertService: AlertService,
+    private confirmModerationModal: ConfirmModerationModalService,
+    private router: Router,
+  ) {}
+
+  overturn() {
+    this.confirmModerationModal.show(
+      this.task,
+      'Overturn',
+      `The original feedback will be revised and the task outcome updated.
+      Provide clear, constructive feedback explaining the changes made, and record any guidance for the tutor in the tutor notes section.`,
+      'overturn',
+      false,
+      () => {
+        this.moderateTask('overturn');
+      },
+    );
+  }
+
+  upheld() {
+    this.confirmModerationModal.show(
+      this.task,
+      'Upheld',
+      `After reviewing the task and feedback, you are satisfied that the original marking and comments are appropriate and align with the assessment criteria.
+      No changes will be made.
+      Ensure any concerns raised by the student have been considered and addressed where necessary.`,
+      'upheld',
+      false,
+      () => {
+        this.moderateTask('upheld');
+      },
+    );
+  }
+
+  showMore() {
+    this.confirmModerationModal.show(
+      this.task,
+      'Show more from this tutor',
+      `There were concerns with feedback and you would like to see more tasks from this tutor. You will review this task again if further feedback is provided.`,
+      'show_more',
+      false,
+      () => {
+        this.moderateTask('show_more');
+      },
+    );
+  }
+
+  showLess() {
+    this.confirmModerationModal.show(
+      this.task,
+      'Show less from this tutor',
+      `The feedback provided by the tutor is satisfactory and you would like to see less of their feedback for moderation. You won't see this task again.`,
+      'show_less',
+      true,
+      (applyToAll) => {
+        this.moderateTask('show_less', applyToAll);
+      },
+    );
+  }
+
+  dismiss() {
+    this.confirmModerationModal.show(
+      this.task,
+      'Dismiss from moderation',
+      'This task will be removed from moderation and will not get a follow up. This will not affect how many tasks from this tutor are selected for moderation.',
+      'dismiss_ok',
+      true,
+      (applyToAll) => {
+        this.moderateTask('dismiss_ok', applyToAll);
+      },
+    );
+  }
+
+  private moderateTask(action: FeedbackModerationActionType, applyToAll: boolean = false) {
+    this.task.moderateFeedback(action, applyToAll).subscribe({
+      next: (_response) => {
+        if (applyToAll) {
+          this.alertService.success(
+            `Tasks moderated successfully. Refresh the list to view the updated queue.`,
+            6000,
+          );
+        } else {
+          this.alertService.success(`Task moderated successfully`, 2000);
+        }
+
+        this.setModerated(this.task);
+      },
+      error: (error) => {
+        this.alertService.error(`Failed to moderate task: ${error}`, 6000);
+      },
+    });
+  }
+
+  private setModerated(task: Task) {
+    this.moderated.set(task, true);
+  }
+
+  public isModerated(task: Task): boolean {
+    return this.moderated.get(task);
+  }
+}
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index 2a36a9704f..cbe2bdbff4 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -153,6 +153,26 @@
               <mat-icon>{{ states[tutorialSort].icon }}</mat-icon>
             </button>
           </div>
+          <div class="flex flex-row justify-between items-center">
+            <mat-form-field class="flex-1">
+              <mat-label>Tutors</mat-label>
+              <mat-select
+                [disabled]="filters.tutorialIdSelected !== 'all'"
+                [(ngModel)]="filters.unitRoleIdSelected"
+                name="tutor"
+                (selectionChange)="unitRoleIdChanged()"
+              >
+                @for (t of tutorFilter; track t) {
+                  <mat-option [value]="t.id">
+                    <span class="truncate">{{ t.inboxDescription }}</span>
+                  </mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+            <button disabled mat-icon-button aria-label="Sort by tutor icon">
+              <mat-icon>{{ states[tutorialSort].icon }}</mat-icon>
+            </button>
+          </div>
           <!--/students-->
         </form>
       </mat-expansion-panel>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 8be2d3a77e..2534696fc9 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -34,6 +34,7 @@ import {HotkeysService} from '@ngneat/hotkeys';
 import {Router} from '@angular/router';
 import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
 import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
+import {TasksByTutorPipe} from 'src/app/common/filters/tasks-by-tutor.pipe';
 
 @Component({
   selector: 'df-staff-task-list',
@@ -65,14 +66,17 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     forceStream: boolean;
     studentName: string;
     tutorialIdSelected: any;
+    unitRoleIdSelected: number | string;
     taskDefinitionIdSelected: number | TaskDefinition;
   };
   @Input() showSearchOptions = true;
 
   @Input() isNarrow: boolean;
 
+  @Input() viewType: 'inbox' | 'explorer' | 'moderation';
+
   userHasTutorials: boolean;
-  filteredTasks: any[] = null;
+  filteredTasks: Task[] = null;
 
   studentFilter: {
     id: number | string;
@@ -82,7 +86,12 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     tutorial?: Tutorial;
   }[] = null;
 
-  tasks: any[] = null;
+  tutorFilter: {
+    id: number | string;
+    inboxDescription: string;
+  }[] = null;
+
+  tasks: Task[] = null;
 
   // hasJplagReport: boolean = false;
 
@@ -94,6 +103,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
   definedTasksPipe = new TasksOfTaskDefinitionPipe();
   tasksInTutorialsPipe = new TasksInTutorialsPipe();
   taskWithStudentNamePipe = new TasksForInboxSearchPipe();
+  tasksByTutorPipe = new TasksByTutorPipe();
   // Let's call having a source of tasksForDefinition plus having a task definition
   // auto-selected with the search options open task def mode -- i.e., the mode
   // for selecting tasks by task definitions
@@ -181,6 +191,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
         tutorialIdSelected:
           (this.unitRole.role === 'Tutor' || 'Convenor') && this.userHasTutorials ? 'mine' : 'all',
         tutorials: [],
+        unitRoleIdSelected: 'all',
         taskDefinitionIdSelected: null,
         taskDefinition: null,
         forceStream: true,
@@ -209,6 +220,20 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
       }),
     ];
 
+    this.tutorFilter = [
+      {
+        id: 'all',
+        inboxDescription: 'All Tutors',
+      },
+      ...this.unit.staff
+        .slice()
+        .sort((a, b) => (a.user?.name ?? '').localeCompare(b.user?.name ?? ''))
+        .map((ur: UnitRole) => ({
+          id: ur.id,
+          inboxDescription: ur.user?.name,
+        })),
+    ];
+
     this.tutorialIdChanged(false);
 
     this.setTaskDefFromTaskKey(this.taskData.taskKey);
@@ -299,6 +324,14 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
         this.filters.forceStream,
       );
     }
+
+    if (this.filters.unitRoleIdSelected) {
+      filteredTasks = this.tasksByTutorPipe.transform(
+        filteredTasks,
+        this.filters.unitRoleIdSelected,
+      );
+    }
+
     filteredTasks = this.taskWithStudentNamePipe.transform(filteredTasks, this.filters.studentName);
     this.filteredTasks = filteredTasks;
 
@@ -324,6 +357,15 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     selectEl.focus();
   }
 
+  unitRoleIdChanged(attemptRefreshData: boolean = true): void {
+    this.applyFilters();
+
+    const isExplorerView = this.isTaskDefMode;
+    if (attemptRefreshData && !this.fetchedAllTasks && !isExplorerView) {
+      this.refreshData();
+    }
+  }
+
   tutorialIdChanged(attemptRefreshData: boolean = true): void {
     const tutorialId = this.filters.tutorialIdSelected;
 
@@ -333,11 +375,13 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
 
     if (tutorialId === 'mine') {
       this.filters.tutorials = this.unit.tutorialsForUserName(this.userService.currentUser.name);
+      this.filters.unitRoleIdSelected = 'all';
     } else if (tutorialId === 'all') {
       // Ignore tutorials filter
       this.filters.tutorials = null;
     } else {
       this.filters.tutorials = [filterOption.tutorial];
+      this.filters.unitRoleIdSelected = 'all';
     }
 
     this.applyFilters();
diff --git a/src/app/units/states/tasks/inbox/inbox.coffee b/src/app/units/states/tasks/inbox/inbox.coffee
index 9f04950ca0..77afab0740 100644
--- a/src/app/units/states/tasks/inbox/inbox.coffee
+++ b/src/app/units/states/tasks/inbox/inbox.coffee
@@ -20,5 +20,6 @@ angular.module('doubtfire.units.states.tasks.inbox', [])
 
 .controller('TaskInboxStateCtrl', ($scope, newTaskService) ->
   $scope.taskData.source = newTaskService.queryTasksForTaskInbox.bind(newTaskService)
+  $scope.viewType = 'inbox'
   $scope.taskData.taskDefMode = false
 )
diff --git a/src/app/units/states/tasks/inbox/inbox.component.html b/src/app/units/states/tasks/inbox/inbox.component.html
index 84edcabe13..cdaee8d1bd 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.html
+++ b/src/app/units/states/tasks/inbox/inbox.component.html
@@ -2,14 +2,14 @@
   <div fxLayout="row" fxLayoutAlign="center stretch" fxFill>
     <div id="inboxpanel" #inboxpanel class="staff-task-list inbox-panel">
       @if (taskData) {
-      <df-staff-task-list
-        [isNarrow]="narrowTaskInbox"
-        [showSearchOptions]="showSearchOptions"
-        [filters]="filters"
-        [taskData]="taskData"
-        [unit]="unit"
-        [unitRole]="unitRole"
-      ></df-staff-task-list>
+        <df-staff-task-list
+          [isNarrow]="narrowTaskInbox"
+          [showSearchOptions]="showSearchOptions"
+          [filters]="filters"
+          [taskData]="taskData"
+          [unit]="unit"
+          [unitRole]="unitRole"
+        ></df-staff-task-list>
       }
     </div>
     @if (subs$ | async) {
@@ -42,20 +42,20 @@
       <task-comments-viewer [task]="taskData.selectedTask"> </task-comments-viewer>
     </div>
   </div>
-  <f-footer></f-footer>
+  <f-footer class="z-10" [viewType]="viewType"></f-footer>
 </div>
 
 <div #mobile fxLayout="row" fxFill fxHide fxShow.lt-md>
   <div id="inboxpanel" #inboxpanel class="inbox-panel mobile" [hidden]="taskSelected">
     @if (taskData) {
-    <df-staff-task-list
-      [isNarrow]="false"
-      [showSearchOptions]="showSearchOptions"
-      [filters]="filters"
-      [taskData]="taskData"
-      [unit]="unit"
-      [unitRole]="unitRole"
-    ></df-staff-task-list>
+      <df-staff-task-list
+        [isNarrow]="false"
+        [showSearchOptions]="showSearchOptions"
+        [filters]="filters"
+        [taskData]="taskData"
+        [unit]="unit"
+        [unitRole]="unitRole"
+      ></df-staff-task-list>
     }
   </div>
   <div [hidden]="!taskSelected" fxLayout="column" fxFill fxLayoutAlign="space-between stretch">
diff --git a/src/app/units/states/tasks/inbox/inbox.component.ts b/src/app/units/states/tasks/inbox/inbox.component.ts
index 7e73fcccb1..9f2bd164ab 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.ts
+++ b/src/app/units/states/tasks/inbox/inbox.component.ts
@@ -1,12 +1,5 @@
 import {CdkDragEnd, CdkDragStart, CdkDragMove} from '@angular/cdk/drag-drop';
-import {
-  Component,
-  ElementRef,
-  Input,
-  OnDestroy,
-  OnInit,
-  ViewChild,
-} from '@angular/core';
+import {Component, ElementRef, Input, OnDestroy, OnInit, ViewChild} from '@angular/core';
 import {MediaObserver} from 'ng-flex-layout';
 import {UIRouter} from '@uirouter/angular';
 import {auditTime, merge, Observable, of, Subject, tap, withLatestFrom} from 'rxjs';
@@ -19,6 +12,8 @@ import {HotkeysService, HotkeysHelpComponent} from '@ngneat/hotkeys';
 import {MatDialog} from '@angular/material/dialog';
 import {UserService} from 'src/app/api/services/user.service';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
+import {Tutorial} from 'src/app/api/models/doubtfire-model';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
 
 @Component({
   selector: 'f-inbox',
@@ -29,18 +24,28 @@ export class InboxComponent implements OnInit, OnDestroy {
   @Input() unit: Unit;
   @Input() unitRole: UnitRole;
   @Input() taskData: {selectedTask: Task; any};
-
+  @Input() filters: {
+    taskDefinition: TaskDefinition;
+    tutorials: Tutorial[];
+    forceStream: boolean;
+    studentName: string;
+    tutorialIdSelected: any;
+    taskDefinitionIdSelected: number | TaskDefinition;
+  };
+  @Input() showSearchOptions: boolean;
   @ViewChild('inboxpanel') inboxPanel: ElementRef;
   @ViewChild('commentspanel') commentspanel: ElementRef;
 
+  @Input() viewType: 'inbox' | 'explorer' | 'moderation';
+
   subs$: Observable<unknown>;
 
   private inboxStartSize$ = new Subject<number>();
   private dragMove$ = new Subject<{event: CdkDragMove; div: HTMLDivElement}>();
   private dragMoveAudited$;
 
-  protected filters;
-  protected showSearchOptions;
+  // protected filters;
+  // protected showSearchOptions;
 
   public taskSelected = false;
 
diff --git a/src/app/units/states/tasks/inbox/inbox.tpl.html b/src/app/units/states/tasks/inbox/inbox.tpl.html
index d77bb14cc2..9adb06b9ad 100644
--- a/src/app/units/states/tasks/inbox/inbox.tpl.html
+++ b/src/app/units/states/tasks/inbox/inbox.tpl.html
@@ -1 +1,10 @@
-<f-inbox [unit]="unit" [task-data]="taskData" [unit-role]="unitRole" [task]="task" [project]="project"></f-inbox>
+<f-inbox
+  [unit]="unit"
+  [task-data]="taskData"
+  [unit-role]="unitRole"
+  [task]="task"
+  [project]="project"
+  [filters]="filters"
+  [show-search-options]="showSearchOptions"
+  [view-type]="viewType"
+></f-inbox>
diff --git a/src/app/units/states/tasks/moderation/moderation.coffee b/src/app/units/states/tasks/moderation/moderation.coffee
new file mode 100644
index 0000000000..4a483fd314
--- /dev/null
+++ b/src/app/units/states/tasks/moderation/moderation.coffee
@@ -0,0 +1,33 @@
+angular.module('doubtfire.units.states.tasks.moderation', [
+])
+
+#
+# Get tasks for mentor moderation
+#
+.config(($stateProvider) ->
+  $stateProvider.state 'units/tasks/moderation', {
+    parent: 'units/tasks'
+    url: '/moderation/{taskKey:any}'
+    # We can recycle the task inbox, switching the data source scope variable
+    templateUrl: "units/states/tasks/inbox/inbox.tpl.html"
+    controller: "TaskModerationStateCtrl"
+    params:
+      taskKey: dynamic: true
+    data:
+      task: "Task Moderation"
+      pageTitle: "_Home_"
+      roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor']
+   }
+)
+
+.controller('TaskModerationStateCtrl', ($scope, newTaskService) ->
+  $scope.taskData.source = newTaskService.queryTasksForMentorModeration.bind(newTaskService)
+  $scope.viewType = 'moderation'
+  $scope.showSearchOptions = false
+  $scope.filters = {
+    tutorialIdSelected: 'all'
+    taskDefinition: null
+    taskDefinitionIdSelected: null
+  }
+  $scope.taskData.taskDefMode = false
+)
diff --git a/src/app/units/states/tasks/tasks.coffee b/src/app/units/states/tasks/tasks.coffee
index 141e0364c6..c9fbef5cb4 100644
--- a/src/app/units/states/tasks/tasks.coffee
+++ b/src/app/units/states/tasks/tasks.coffee
@@ -1,6 +1,7 @@
 angular.module('doubtfire.units.states.tasks', [
   'doubtfire.units.states.tasks.inbox'
   'doubtfire.units.states.tasks.definition'
+  'doubtfire.units.states.tasks.moderation'
   'doubtfire.units.states.tasks.viewer'
 ])
 

From c872ed766bf493456da56e33dcda48a90ed3f6ce Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Feb 2026 14:08:13 +1100
Subject: [PATCH 685/776] fix: ensure tutor notes view extends full height

---
 .../modals/tutor-notes-modal/tutor-notes-modal.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html
index ac97e33fe5..d30a7a221d 100644
--- a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html
+++ b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html
@@ -1 +1 @@
-<f-tutor-notes-view [task]="task" [unitRole]="unitRole"></f-tutor-notes-view>
+<f-tutor-notes-view class="h-full" [task]="task" [unitRole]="unitRole"></f-tutor-notes-view>

From 17a9b9a4690c151d0ff8e7d9c6edb8290a9e519a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Feb 2026 14:11:01 +1100
Subject: [PATCH 686/776] chore(release): 10.0.1-1

---
 CHANGELOG.md      | 12 ++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3c9203cb8..7c2f6022f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 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.
 
+### [10.0.1-1](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-0...v10.0.1-1) (2026-02-18)
+
+
+### Features
+
+* tutor notes + mentorship + moderation + escalation ([#1068](https://github.com/b0ink/doubtfire-deploy/issues/1068)) ([48f4db7](https://github.com/b0ink/doubtfire-deploy/commit/48f4db730f06e349f5e3c791f1972d23b0f8573f))
+
+
+### Bug Fixes
+
+* ensure tutor notes view extends full height ([c872ed7](https://github.com/b0ink/doubtfire-deploy/commit/c872ed766bf493456da56e33dcda48a90ed3f6ce))
+
 ### [10.0.1-0](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0...v10.0.1-0) (2026-02-17)
 
 ## [10.0.0](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.0-73...v10.0.0) (2026-02-12)
diff --git a/package-lock.json b/package-lock.json
index c35690f5f5..26e0b31a6c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-0",
+  "version": "10.0.1-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-0",
+      "version": "10.0.1-1",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index ed3ba71746..64647510a4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-0",
+  "version": "10.0.1-1",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 75cc1b3569d17cd54e71f86874addb4bc34d566f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Feb 2026 16:20:51 +1100
Subject: [PATCH 687/776] fix: set min width for mentor dropdown

---
 .../unit-staff-editor/unit-staff-editor.component.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
index 431b09dfc3..46e19acf9a 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
@@ -75,7 +75,7 @@ <h3>Unit Staff</h3>
       <th mat-header-cell *matHeaderCellDef>Mentor</th>
       <td mat-cell *matCellDef="let unitRole">
         <mat-select
-          class="w-full min-w-fit"
+          class="w-full min-w-[140px]"
           (selectionChange)="selectMentor(unitRole, $event)"
           [ngModel]="unitRole.mentorId"
         >

From 48e521d265c555cc7cd53fb5ba32ec04faca58fb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 19 Feb 2026 14:49:26 +1100
Subject: [PATCH 688/776] refactor: group tutor filter by mine and all tutors
 mentored

---
 src/app/common/filters/tasks-by-tutor.pipe.ts | 10 +++-
 .../staff-task-list.component.html            | 12 ++--
 .../staff-task-list.component.ts              | 57 +++++++++++++------
 3 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/src/app/common/filters/tasks-by-tutor.pipe.ts b/src/app/common/filters/tasks-by-tutor.pipe.ts
index c95634d6a3..d99da5564b 100644
--- a/src/app/common/filters/tasks-by-tutor.pipe.ts
+++ b/src/app/common/filters/tasks-by-tutor.pipe.ts
@@ -1,15 +1,21 @@
 import {Pipe, PipeTransform} from '@angular/core';
-import {Task} from '../../api/models/doubtfire-model';
+import {Task, UnitRole} from '../../api/models/doubtfire-model';
 
 @Pipe({
   name: 'tasksByTutor',
 })
 export class TasksByTutorPipe implements PipeTransform {
-  transform(tasks: Task[], unitRoleId?: number | string): Task[] {
+  transform(currentUnitRole: UnitRole, tasks: Task[], unitRoleId?: number | string): Task[] {
     if (!tasks) return tasks;
 
     if (!unitRoleId || unitRoleId === 'all') return tasks;
 
+    if (unitRoleId === 'mentoring_all') {
+      if (!currentUnitRole) return [];
+
+      return tasks.filter((task) => task.tutor?.mentorId === currentUnitRole.id);
+    }
+
     return tasks.filter((task) => task.tutor?.id === unitRoleId);
   }
 }
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index cbe2bdbff4..2ab8efa521 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -162,10 +162,14 @@
                 name="tutor"
                 (selectionChange)="unitRoleIdChanged()"
               >
-                @for (t of tutorFilter; track t) {
-                  <mat-option [value]="t.id">
-                    <span class="truncate">{{ t.inboxDescription }}</span>
-                  </mat-option>
+                @for (g of tutorGroups; track g.label) {
+                  <mat-optgroup [label]="g.label">
+                    @for (t of g.options; track t.id) {
+                      <mat-option [value]="t.id">
+                        <span class="truncate">{{ t.inboxDescription }}</span>
+                      </mat-option>
+                    }
+                  </mat-optgroup>
                 }
               </mat-select>
             </mat-form-field>
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 2534696fc9..ba9920d29c 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -86,10 +86,10 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     tutorial?: Tutorial;
   }[] = null;
 
-  tutorFilter: {
-    id: number | string;
-    inboxDescription: string;
-  }[] = null;
+  tutorGroups: {
+    label: string;
+    options: {id: string | number; inboxDescription: string | undefined}[];
+  }[] = [];
 
   tasks: Task[] = null;
 
@@ -185,13 +185,25 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
     this.userHasTutorials =
       this.unit.tutorialsForUserName(this.userService.currentUser.name)?.length > 0;
 
+    const staff = this.unit.staff.slice();
+
+    const byName = (a: UnitRole, b: UnitRole) =>
+      (a.user?.name ?? '').localeCompare(b.user?.name ?? '');
+
+    const mentored = staff
+      .filter((ur) => ur.mentorId === this.unitRole.id)
+      .slice()
+      .sort(byName);
+
+    const allTutors = staff.slice().sort(byName);
+
     this.filters = Object.assign(
       {
         studentName: null,
         tutorialIdSelected:
           (this.unitRole.role === 'Tutor' || 'Convenor') && this.userHasTutorials ? 'mine' : 'all',
         tutorials: [],
-        unitRoleIdSelected: 'all',
+        unitRoleIdSelected: mentored.length > 0 ? 'mentoring_all' : 'all',
         taskDefinitionIdSelected: null,
         taskDefinition: null,
         forceStream: true,
@@ -219,19 +231,31 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
         };
       }),
     ];
-
-    this.tutorFilter = [
+    this.tutorGroups = [
+      ...(mentored.length > 0
+        ? [
+            {
+              label: 'My Tutors (Mentoring)',
+              options: [
+                {id: 'mentoring_all', inboxDescription: 'Show All Mine'},
+                ...mentored.map((ur) => ({
+                  id: ur.id,
+                  inboxDescription: ur.user?.name,
+                })),
+              ],
+            },
+          ]
+        : []),
       {
-        id: 'all',
-        inboxDescription: 'All Tutors',
+        label: 'All Tutors',
+        options: [
+          {id: 'all', inboxDescription: 'Show All'},
+          ...allTutors.map((ur) => ({
+            id: ur.id,
+            inboxDescription: ur.user?.name,
+          })),
+        ],
       },
-      ...this.unit.staff
-        .slice()
-        .sort((a, b) => (a.user?.name ?? '').localeCompare(b.user?.name ?? ''))
-        .map((ur: UnitRole) => ({
-          id: ur.id,
-          inboxDescription: ur.user?.name,
-        })),
     ];
 
     this.tutorialIdChanged(false);
@@ -327,6 +351,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
 
     if (this.filters.unitRoleIdSelected) {
       filteredTasks = this.tasksByTutorPipe.transform(
+        this.unitRole,
         filteredTasks,
         this.filters.unitRoleIdSelected,
       );

From f8d8e3b0a167140d4c38e6fb014a3d63a3346c94 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Feb 2026 17:05:33 +1100
Subject: [PATCH 689/776] refactor: show moderation link to mentors only

---
 .../task-dropdown/task-dropdown.component.html   | 16 +++++++++-------
 .../task-dropdown/task-dropdown.component.ts     |  3 +++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index 451a3abc74..f08e3d3d8b 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -106,13 +106,15 @@
         >
           <mat-icon aria-label="Task Explorer Icon" fontIcon="pageview"></mat-icon> Explorer
         </button>
-        <button
-          uiSref="units/tasks/moderation"
-          [uiParams]="{unitId: unitRole.unit.id}"
-          mat-menu-item
-        >
-          <mat-icon aria-label="Audit Icon">rate_review</mat-icon> Moderation
-        </button>
+        @if (isMentor) {
+          <button
+            uiSref="units/tasks/moderation"
+            [uiParams]="{unitId: unitRole.unit.id}"
+            mat-menu-item
+          >
+            <mat-icon aria-label="Audit Icon">rate_review</mat-icon> Moderation
+          </button>
+        }
         <button uiSref="units/tasks/viewer" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
           <mat-icon aria-label="Task list icon" fontIcon="list_alt"></mat-icon> Tasks
         </button>
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.ts b/src/app/common/header/task-dropdown/task-dropdown.component.ts
index cd733052ec..b92879e94d 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.ts
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.ts
@@ -40,4 +40,7 @@ export class TaskDropdownComponent {
     });
   }
 
+  public get isMentor(): boolean {
+    return this.currentUnit.staff.some((ur) => ur.mentorId === this.unitRole.id);
+  }
 }

From e9a0b1836e9f8af9bcf1d2780b869bd9efb608c3 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 19 Feb 2026 14:56:55 +1100
Subject: [PATCH 690/776] chore: always show moderation to convenors

---
 .../common/header/task-dropdown/task-dropdown.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index f08e3d3d8b..2ee3a781a0 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -106,7 +106,7 @@
         >
           <mat-icon aria-label="Task Explorer Icon" fontIcon="pageview"></mat-icon> Explorer
         </button>
-        @if (isMentor) {
+        @if (isMentor || unitRole.role === 'Convenor') {
           <button
             uiSref="units/tasks/moderation"
             [uiParams]="{unitId: unitRole.unit.id}"

From 5999f011b59eb1c8e8f5040e6ccf76e0a5fd80dd Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 19 Feb 2026 15:11:04 +1100
Subject: [PATCH 691/776] chore: default to my tutors only if in moderation
 view

---
 .../directives/staff-task-list/staff-task-list.component.ts    | 3 ++-
 src/app/units/states/tasks/inbox/inbox.component.html          | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index ba9920d29c..dc2d65455f 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -203,7 +203,8 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
         tutorialIdSelected:
           (this.unitRole.role === 'Tutor' || 'Convenor') && this.userHasTutorials ? 'mine' : 'all',
         tutorials: [],
-        unitRoleIdSelected: mentored.length > 0 ? 'mentoring_all' : 'all',
+        unitRoleIdSelected:
+          mentored.length > 0 && this.viewType === 'moderation' ? 'mentoring_all' : 'all',
         taskDefinitionIdSelected: null,
         taskDefinition: null,
         forceStream: true,
diff --git a/src/app/units/states/tasks/inbox/inbox.component.html b/src/app/units/states/tasks/inbox/inbox.component.html
index cdaee8d1bd..42297b6ad8 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.html
+++ b/src/app/units/states/tasks/inbox/inbox.component.html
@@ -9,6 +9,7 @@
           [taskData]="taskData"
           [unit]="unit"
           [unitRole]="unitRole"
+          [viewType]="viewType"
         ></df-staff-task-list>
       }
     </div>
@@ -55,6 +56,7 @@
         [taskData]="taskData"
         [unit]="unit"
         [unitRole]="unitRole"
+        [viewType]="viewType"
       ></df-staff-task-list>
     }
   </div>

From db006195a521d453e5054351174201407391a908 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 19 Feb 2026 15:20:46 +1100
Subject: [PATCH 692/776] chore(release): 10.0.1-2

---
 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 7c2f6022f7..f428aae901 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.
 
+### [10.0.1-2](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-1...v10.0.1-2) (2026-02-19)
+
+
+### Bug Fixes
+
+* set min width for mentor dropdown ([75cc1b3](https://github.com/b0ink/doubtfire-deploy/commit/75cc1b3569d17cd54e71f86874addb4bc34d566f))
+
 ### [10.0.1-1](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-0...v10.0.1-1) (2026-02-18)
 
 
diff --git a/package-lock.json b/package-lock.json
index 26e0b31a6c..ae465b1773 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-1",
+  "version": "10.0.1-2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-1",
+      "version": "10.0.1-2",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 64647510a4..4583c8145b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-1",
+  "version": "10.0.1-2",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 9a0c78d6efa448acb085106fdfb7b2356036110c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 21 Feb 2026 14:31:10 +1100
Subject: [PATCH 693/776] chore: disable prerequisite due date validation

---
 .../task-definition-prerequisites.component.ts                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
index 201e8a35ab..680187d594 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-prerequisites/task-definition-prerequisites.component.ts
@@ -152,7 +152,7 @@ export class TaskDefinitionPrerequisitesComponent implements OnInit, OnChanges {
       // Higher target grades can not be a prerequisite
       .filter((td) => td.targetGrade <= this.taskDefinition.targetGrade)
       // Tasks with a later due date can not be a prerequisite
-      .filter((td) => td.targetDate <= this.taskDefinition.targetDate)
+      // .filter((td) => td.targetDate <= this.taskDefinition.targetDate)
       // Search filter
       .filter(
         (td) =>

From 9ed53b85f28c505bce7f2681e7bbcc966a17f356 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 21 Feb 2026 14:40:29 +1100
Subject: [PATCH 694/776] chore(release): 10.0.1-3

---
 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 f428aae901..b5eb54658f 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.
 
+### [10.0.1-3](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-2...v10.0.1-3) (2026-02-21)
+
 ### [10.0.1-2](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-1...v10.0.1-2) (2026-02-19)
 
 
diff --git a/package-lock.json b/package-lock.json
index ae465b1773..260988f2f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-2",
+  "version": "10.0.1-3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-2",
+      "version": "10.0.1-3",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 4583c8145b..8a69563ee6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-2",
+  "version": "10.0.1-3",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 79b5af6bf05419e05dbef69e6ef1f72bfc85097c Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:06:54 +1100
Subject: [PATCH 695/776] feat: allow custom target dates per target grade
 (#1089)

* feat: allow custom target dates per target grade

* refactor: rename to target dates for clarity

* chore: rename to target date

* refactor: fade datepicker if inherited from default target date

* chore: toast erron on failed task update

* fix: only reset items that are rendered

* fix: ensure baseline items refresh on grade change

* chore: add page heading

* refactor: return per grade due dates if dates are flexible

* chore: toggle due date ui
---
 src/app/api/models/task-definition.ts         |   5 +
 src/app/api/models/task.ts                    |  26 +++-
 .../api/services/task-definition.service.ts   |  20 +++
 .../states/plan/project-plan.component.html   |   2 +-
 .../states/plan/project-plan.component.ts     |   2 +-
 .../task-planner/task-planner.component.ts    |  50 +++++--
 .../unit-task-editor.component.html           |  54 ++++++++
 .../unit-task-editor.component.scss           |   6 +
 .../unit-task-editor.component.ts             | 123 ++++++++++++++----
 9 files changed, 244 insertions(+), 44 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 4a47a7ab96..4489f80545 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -62,6 +62,11 @@ export class TaskDefinition extends Entity {
   discussionPromptsCount: number;
   overseerResourceFiles: string[] = [];
 
+  // pTargetDate: Date;
+  cTargetDate: Date;
+  dTargetDate: Date;
+  hdTargetDate: Date;
+
   public readonly taskPrerequisitesCache: EntityCache<TaskPrerequisite> =
     new EntityCache<TaskPrerequisite>();
 
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 7ef9d5e716..c4fdd3847c 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -196,13 +196,29 @@ export class Task extends Entity {
   }
 
   public localDueDate(): Date {
-    if (this.targetDueDate && this.unit.allowFlexibleDates) {
-      return this.targetDueDate;
-    } else if (this.dueDate) {
+    if (this.unit.allowFlexibleDates) {
+      if (this.targetDueDate) {
+        // Student's custom planned date
+        return this.targetDueDate;
+      }
+
+      // Unit target dates per grade guidelines
+      if (this.project.targetGrade === 1 && this.definition.cTargetDate) {
+        return this.definition.cTargetDate;
+      }
+      if (this.project.targetGrade === 2 && this.definition.dTargetDate) {
+        return this.definition.dTargetDate;
+      }
+      if (this.project.targetGrade === 3 && this.definition.hdTargetDate) {
+        return this.definition.hdTargetDate;
+      }
+    }
+
+    if (this.dueDate) {
       return this.dueDate;
-    } else {
-      return this.definition.localDueDate();
     }
+
+    return this.definition.localDueDate();
   }
 
   public localDueDateString(): string {
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index 9abda58a1f..bb1a42f0d2 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -158,6 +158,26 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
         },
       },
       'overseerResourceFiles',
+      // {
+      //   keys: 'pTargetDate',
+      //   toEntityFn: MappingFunctions.mapDateToDay,
+      //   toJsonFn: MappingFunctions.mapDayToJson,
+      // },
+      {
+        keys: 'cTargetDate',
+        toEntityFn: MappingFunctions.mapDateToDay,
+        toJsonFn: MappingFunctions.mapDayToJson,
+      },
+      {
+        keys: 'dTargetDate',
+        toEntityFn: MappingFunctions.mapDateToDay,
+        toJsonFn: MappingFunctions.mapDayToJson,
+      },
+      {
+        keys: 'hdTargetDate',
+        toEntityFn: MappingFunctions.mapDateToDay,
+        toJsonFn: MappingFunctions.mapDayToJson,
+      },
     );
 
     this.mapping.mapAllKeysToJsonExcept(
diff --git a/src/app/projects/states/plan/project-plan.component.html b/src/app/projects/states/plan/project-plan.component.html
index cf49f02ec0..553a823f91 100644
--- a/src/app/projects/states/plan/project-plan.component.html
+++ b/src/app/projects/states/plan/project-plan.component.html
@@ -30,5 +30,5 @@ <h2>Task Planner</h2>
       </mat-select>
     </mat-form-field>
   </div>
-  <f-task-planner [project]="project"></f-task-planner>
+  <f-task-planner [project]="project" [targetGrade]="selectedTargetGrade"></f-task-planner>
 </div>
diff --git a/src/app/projects/states/plan/project-plan.component.ts b/src/app/projects/states/plan/project-plan.component.ts
index d1a9194f75..b405fccfed 100644
--- a/src/app/projects/states/plan/project-plan.component.ts
+++ b/src/app/projects/states/plan/project-plan.component.ts
@@ -59,7 +59,7 @@ export class ProjectPlanComponent implements OnInit {
     this.projectService.update(this.project).subscribe({
       next: () => {
         this.alertService.success(`Succesfully updated target grade`, 2000);
-        this.planner.refreshItems();
+        this.planner.refreshItems(false);
       },
       error: (error) => {
         this.project.targetGrade = previousTargetGrade;
diff --git a/src/app/projects/states/plan/task-planner/task-planner.component.ts b/src/app/projects/states/plan/task-planner/task-planner.component.ts
index 097b0e6b92..d77abe046c 100644
--- a/src/app/projects/states/plan/task-planner/task-planner.component.ts
+++ b/src/app/projects/states/plan/task-planner/task-planner.component.ts
@@ -37,6 +37,8 @@ export class TaskPlannerComponent implements OnInit {
   public readonly CLOSE_TO_FEEDBACK_DEADLINE_THRESHOLD = 7;
 
   @Input() project: Project;
+  @Input() targetGrade: number;
+
   @ViewChild('gantt') ganttComponent: NgxGanttComponent;
 
   public viewType: GanttViewType = GanttViewType.day;
@@ -315,9 +317,10 @@ export class TaskPlannerComponent implements OnInit {
               task.targetStartDate = null;
 
               const item = this.items.find((item) => item.id === task.definition.id.toString());
-
-              item.start = this.normalizeDateUTC(task.startDate.getTime() / 1000);
-              item.end = this.normalizeDateUTC(task.localDueDate().getTime() / 1000);
+              if (item) {
+                item.start = this.normalizeDateUTC(task.startDate.getTime() / 1000);
+                item.end = this.normalizeDateUTC(task.localDueDate().getTime() / 1000);
+              }
             }
             this.items = [...this.items];
           },
@@ -408,13 +411,17 @@ export class TaskPlannerComponent implements OnInit {
     });
   }
 
-  refreshItems() {
+  refreshItems(scroll: boolean = true) {
     this.taskPrerequisites = this.allTaskPrerequisites.filter((pre) =>
       this.taskDefs().find((td) => td.id === pre.taskDefinitionId),
     );
 
     const taskDefinitions = this.taskDefs();
     this.items = [];
+    this.baselineItems = [];
+
+    const _items: TaskGanttItem[] = [];
+    const _baselineItems: GanttBaselineItem[] = [];
 
     for (const td of taskDefinitions) {
       const task = this.project.findTaskForDefinition(td.id);
@@ -489,23 +496,44 @@ export class TaskPlannerComponent implements OnInit {
       item.originalLinks = [...(originalItem.links as GanttLink[])];
 
       this.items.push(item);
-      this.items = [...this.items];
+      _items.push(item);
 
       // Create baseline item
       const baselineItem = {...item};
       baselineItem.start = this.normalizeDateUTC(td.startDate.getTime() / 1000);
-      baselineItem.end = this.normalizeDateUTC(td.targetDate.getTime() / 1000);
-      this.baselineItems.push(baselineItem);
-      this.baselineItems = [...this.baselineItems];
+
+      const tdTargetDate =
+        (this.targetGrade === 1
+          ? td.cTargetDate
+          : this.targetGrade === 2
+            ? td.dTargetDate
+            : this.targetGrade === 3
+              ? td.hdTargetDate
+              : td.targetDate) ?? td.targetDate;
+
+      console.log(this.targetGrade);
+      if (td.id === 65) {
+        console.log(tdTargetDate);
+      }
+
+      baselineItem.end = this.normalizeDateUTC(tdTargetDate.getTime() / 1000);
+      _baselineItems.push(baselineItem);
 
       // if (this.unsavedChanges(item)) {
       //   this.saveTargetDate(item);
       // }
     }
 
-    this.ganttComponent.scrollToToday();
+    this.items = [..._items];
+    setTimeout(() => {
+      this.baselineItems = [..._baselineItems];
+    });
+
+    if (scroll) {
+      this.ganttComponent.scrollToToday();
+    }
 
-    if (this.router.globals.params.taskDef) {
+    if (this.router.globals.params.taskDef && scroll) {
       const taskItem = this.items.find((item) => item.id === this.router.globals.params.taskDef);
       if (taskItem) {
         this.ganttComponent.scrollToDate(taskItem.start);
@@ -538,7 +566,7 @@ export class TaskPlannerComponent implements OnInit {
     }
 
     return this.project.unit.taskDefinitions.filter((taskDef) => {
-      return taskDef.targetGrade <= this.project.targetGrade;
+      return taskDef.targetGrade <= this.targetGrade;
     });
   }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
index 37191fb944..0bd47d9950 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
@@ -130,6 +130,11 @@ <h3>Task List</h3>
         <mat-icon>upload_file</mat-icon>
       </button>
       <span class="flex-grow"></span>
+      @if (unit.allowFlexibleDates) {
+        <button mat-raised-button (click)="manageDueDates = !manageDueDates" class="mr-5">
+          Manage Due Dates
+        </button>
+      }
       <button mat-raised-button color="primary" (click)="createTaskDefinition()">Add Task</button>
     </span>
     @if (selectedTaskDefinition) {
@@ -140,3 +145,52 @@ <h3>Task List</h3>
     }
   </div>
 </div>
+
+@if (unit.allowFlexibleDates) {
+  @if (manageDueDates) {
+    <br />
+    <mat-divider class="my-5"></mat-divider>
+    <br />
+    <div>
+      <h3>Manage Target Dates</h3>
+      <p>Modify or add target dates for each target grade</p>
+    </div>
+    <div class="mt-6">
+      <table mat-table [dataSource]="taskDefinitionSource" class="mat-elevation-z0 w-full">
+        <ng-container matColumnDef="taskDefinition">
+          <th mat-header-cell *matHeaderCellDef>Task</th>
+          <td mat-cell *matCellDef="let td">{{ td.abbreviation }} {{ td.name }}</td>
+        </ng-container>
+
+        <ng-container *ngFor="let g of gradeColumns" [matColumnDef]="g">
+          <th mat-header-cell *matHeaderCellDef class="text-center w-[160px]">
+            <div class="w-full flex justify-center">
+              <f-grade-icon [grade]="gradeColumns.indexOf(g)"></f-grade-icon>
+            </div>
+          </th>
+          <td mat-cell *matCellDef="let td">
+            <mat-form-field
+              appearance="outline"
+              class="w-[200px] flex justify-center items-center pt-[22px]"
+            >
+              <input
+                matInput
+                [matDatepicker]="dp"
+                [ngModel]="getGradeDueDate(td, g)"
+                (ngModelChange)="setGradeDueDate(td, g, $event)"
+                [ngClass]="{'fallback-date': isFallbackDate(td, g)}"
+                placeholder="Select date"
+              />
+
+              <mat-datepicker-toggle matSuffix [for]="dp"></mat-datepicker-toggle>
+              <mat-datepicker #dp></mat-datepicker>
+            </mat-form-field>
+          </td>
+        </ng-container>
+
+        <tr mat-header-row *matHeaderRowDef="dueDateColumns"></tr>
+        <tr mat-row *matRowDef="let row; columns: dueDateColumns"></tr>
+      </table>
+    </div>
+  }
+}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss
index 5996af349a..802426fd17 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss
@@ -4,3 +4,9 @@
   // bottom: 0;
   // width: 100%;
 }
+
+::ng-deep input.mat-mdc-input-element.fallback-date {
+  font-style: italic;
+  color: #bfbfbf !important;
+  -webkit-text-fill-color: #bfbfbf !important; /* fixes some WebKit cases */
+}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
index 8fea690462..5fc3722c10 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
@@ -1,15 +1,21 @@
-import { AfterViewInit, Component, Inject, Input, ViewChild } from '@angular/core';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSort, Sort } from '@angular/material/sort';
-import { MatTable, MatTableDataSource } from '@angular/material/table';
-import { Subscription } from 'rxjs';
-import { confirmationModal, csvResultModalService, csvUploadModalService } from 'src/app/ajs-upgraded-providers';
-import { TaskDefinition } from 'src/app/api/models/task-definition';
-import { Unit } from 'src/app/api/models/unit';
-import { TaskDefinitionService } from 'src/app/api/services/task-definition.service';
-import { AlertService } from 'src/app/common/services/alert.service';
-import { addWeeks } from 'date-fns';
-import { FeedbackTemplateService } from 'src/app/api/services/feedback-template.service';
+import {AfterViewInit, Component, Inject, Input, ViewChild} from '@angular/core';
+import {MatPaginator} from '@angular/material/paginator';
+import {MatSort, Sort} from '@angular/material/sort';
+import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {addWeeks} from 'date-fns';
+import {Subscription} from 'rxjs';
+import {
+  confirmationModal,
+  csvResultModalService,
+  csvUploadModalService,
+} from 'src/app/ajs-upgraded-providers';
+import {TaskDefinition} from 'src/app/api/models/task-definition';
+import {Unit} from 'src/app/api/models/unit';
+import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
+import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+type GradeCol = 'p' | 'c' | 'd' | 'hd';
 
 @Component({
   selector: 'f-unit-task-editor',
@@ -17,24 +23,83 @@ import { FeedbackTemplateService } from 'src/app/api/services/feedback-template.
   styleUrls: ['unit-task-editor.component.scss'],
 })
 export class UnitTaskEditorComponent implements AfterViewInit {
-  @ViewChild(MatTable, { static: false }) table: MatTable<TaskDefinition>;
-  @ViewChild(MatSort, { static: false }) sort: MatSort;
-  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator;
+  @ViewChild(MatTable, {static: false}) table: MatTable<TaskDefinition>;
+  @ViewChild(MatSort, {static: false}) sort: MatSort;
+  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
 
   @Input() unit: Unit;
 
   public taskDefinitionSource: MatTableDataSource<TaskDefinition>;
-  public columns: string[] = ['name', 'grade', 'startDate', 'targetDate', 'deadlineDate', 'taskDefAction'];
+  public columns: string[] = [
+    'name',
+    'grade',
+    'startDate',
+    'targetDate',
+    'deadlineDate',
+    'taskDefAction',
+  ];
   public filter: string;
   public selectedTaskDefinition: TaskDefinition;
 
+  public gradeColumns: string[] = ['p', 'c', 'd', 'hd'];
+  public dueDateColumns: string[] = ['taskDefinition', 'p', 'c', 'd', 'hd'];
+  public dueDateSource: MatTableDataSource<TaskDefinition>;
+
+  public manageDueDates: boolean;
+
+  getGradeDueDate(td: TaskDefinition, g: GradeCol): Date | null {
+    switch (g) {
+      case 'p':
+        // return td.pTargetDate ?? td.dueDate ?? null; // fallback to existing dueDate
+        return td.targetDate ?? td.targetDate; // fallback to existing targetDate
+      case 'c':
+        return td.cTargetDate ?? td.targetDate;
+      case 'd':
+        return td.dTargetDate ?? td.targetDate;
+      case 'hd':
+        return td.hdTargetDate ?? td.targetDate;
+    }
+  }
+
+  isFallbackDate(td: TaskDefinition, g: GradeCol): boolean {
+    switch (g) {
+      case 'p':
+        return false; // P is always real
+      case 'c':
+        return !td.cTargetDate;
+      case 'd':
+        return !td.dTargetDate;
+      case 'hd':
+        return !td.hdTargetDate;
+    }
+  }
+
+  setGradeDueDate(td: TaskDefinition, g: GradeCol, value: Date | null): void {
+    switch (g) {
+      case 'p':
+        td.targetDate = value;
+        break;
+      case 'c':
+        td.cTargetDate = value;
+        break;
+      case 'd':
+        td.dTargetDate = value;
+        break;
+      case 'hd':
+        td.hdTargetDate = value;
+        break;
+    }
+
+    this.saveTaskDefinition(td);
+  }
+
   constructor(
     private taskDefinitionService: TaskDefinitionService,
     private feedbackTemplateService: FeedbackTemplateService,
     private alerts: AlertService,
     @Inject(csvResultModalService) private csvResultModalService: any,
     @Inject(csvUploadModalService) private csvUploadModal: any,
-    @Inject(confirmationModal) private confirmationModal: any
+    @Inject(confirmationModal) private confirmationModal: any,
   ) {}
 
   ngAfterViewInit(): void {
@@ -43,15 +108,21 @@ export class UnitTaskEditorComponent implements AfterViewInit {
         this.taskDefinitionSource = new MatTableDataSource<TaskDefinition>(taskDefinitions);
         this.taskDefinitionSource.paginator = this.paginator;
         this.taskDefinitionSource.sort = this.sort;
-        this.taskDefinitionSource.filterPredicate = (data: any, filter: string) => data.matches(filter);
-      })
+        this.taskDefinitionSource.filterPredicate = (data: any, filter: string) =>
+          data.matches(filter);
+      }),
     );
   }
 
   public saveTaskDefinition(taskDefinition: TaskDefinition) {
-    taskDefinition.save().subscribe(() => {
-      this.alerts.success('Task Saved');
-      taskDefinition.setOriginalSaveData(this.taskDefinitionService.mapping);
+    taskDefinition.save().subscribe({
+      next: () => {
+        this.alerts.success('Task Saved');
+        taskDefinition.setOriginalSaveData(this.taskDefinitionService.mapping);
+      },
+      error: (error) => {
+        this.alerts.error(`Failed to update task: ${error}`, 6000);
+      },
     });
   }
 
@@ -154,7 +225,7 @@ export class UnitTaskEditorComponent implements AfterViewInit {
     this.csvUploadModal.show(
       'Upload Task Definitions as CSV',
       'Test message',
-      { file: { name: 'Task Definition CSV Data', type: 'csv' } },
+      {file: {name: 'Task Definition CSV Data', type: 'csv'}},
       this.unit.getTaskDefinitionBatchUploadUrl(),
       (response: any) => {
         // at least one student?
@@ -162,7 +233,7 @@ export class UnitTaskEditorComponent implements AfterViewInit {
         if (response.success.length > 0) {
           this.unit.refresh();
         }
-      }
+      },
     );
   }
 
@@ -170,7 +241,7 @@ export class UnitTaskEditorComponent implements AfterViewInit {
     this.csvUploadModal.show(
       'Upload Task Sheets and Resources as Zip',
       'Test message',
-      { file: { name: 'Task Sheets and Resources', type: 'zip' } },
+      {file: {name: 'Task Sheets and Resources', type: 'zip'}},
       this.unit.taskUploadUrl,
       (response: any) => {
         // at least one student?
@@ -178,7 +249,7 @@ export class UnitTaskEditorComponent implements AfterViewInit {
         if (response.success.length > 0) {
           this.unit.refresh();
         }
-      }
+      },
     );
   }
 

From ba3d5bda7d9ae15130f804e4e60dc437fa000738 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:12:49 +1100
Subject: [PATCH 696/776] chore: add link to task planner

---
 .../progress-dashboard/progress-dashboard.tpl.html   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
index 4fc5c674e1..95a5664aaf 100644
--- a/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
+++ b/src/app/projects/states/dashboard/directives/progress-dashboard/progress-dashboard.tpl.html
@@ -23,7 +23,17 @@ <h4>Target Grade</h4>
             ng-if="$index != 4"
             disabled
           ></select>
-          <div class="ml-1 py-2 opacity-70">To change your target grade, use the Task Planner.</div>
+          <!-- <div class="ml-1 py-2 opacity-70">To change your target grade, use the Task Planner.</div> -->
+          <div class="ml-1 py-2 opacity-70">
+            To change your target grade, use the
+            <a
+              ui-sref="project/plan"
+              [ui-params]="{projectId: project.id}"
+              class="underline cursor-pointer"
+            >
+              Task Planner
+            </a>
+          </div>
         </div>
         <!--/target-grade-body-->
       </div>

From 748665f74cbe2df13b84ab9bf52a7a56a1108ea6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:13:15 +1100
Subject: [PATCH 697/776] chore: remove debug

---
 .../states/plan/task-planner/task-planner.component.ts       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/app/projects/states/plan/task-planner/task-planner.component.ts b/src/app/projects/states/plan/task-planner/task-planner.component.ts
index d77abe046c..01335fd9a5 100644
--- a/src/app/projects/states/plan/task-planner/task-planner.component.ts
+++ b/src/app/projects/states/plan/task-planner/task-planner.component.ts
@@ -511,11 +511,6 @@ export class TaskPlannerComponent implements OnInit {
               ? td.hdTargetDate
               : td.targetDate) ?? td.targetDate;
 
-      console.log(this.targetGrade);
-      if (td.id === 65) {
-        console.log(tdTargetDate);
-      }
-
       baselineItem.end = this.normalizeDateUTC(tdTargetDate.getTime() / 1000);
       _baselineItems.push(baselineItem);
 

From cf951c7ff6dcac6a9de25b990655b26fa603e7e9 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Feb 2026 12:16:40 +1100
Subject: [PATCH 698/776] chore(release): 10.0.1-4

---
 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 b5eb54658f..b7edccfcc2 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.
 
+### [10.0.1-4](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-3...v10.0.1-4) (2026-02-23)
+
+
+### Features
+
+* allow custom target dates per target grade ([#1089](https://github.com/b0ink/doubtfire-deploy/issues/1089)) ([79b5af6](https://github.com/b0ink/doubtfire-deploy/commit/79b5af6bf05419e05dbef69e6ef1f72bfc85097c))
+
 ### [10.0.1-3](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-2...v10.0.1-3) (2026-02-21)
 
 ### [10.0.1-2](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-1...v10.0.1-2) (2026-02-19)
diff --git a/package-lock.json b/package-lock.json
index 260988f2f2..d8b7d491d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-3",
+  "version": "10.0.1-4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-3",
+      "version": "10.0.1-4",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 8a69563ee6..077b300413 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-3",
+  "version": "10.0.1-4",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From a35019aa4011fce7808da8cc1481fae7635aac69 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 24 Feb 2026 12:22:41 +1100
Subject: [PATCH 699/776] feat: per grade start dates (#1090)

* feat: per grade start dates

* feat: display errors when target date is before start date
---
 src/app/api/models/task-definition.ts         |  4 ++
 src/app/api/models/task.ts                    | 21 +++++-
 .../api/services/task-definition.service.ts   | 16 +++++
 .../task-planner/task-planner.component.ts    | 12 +++-
 .../unit-task-editor.component.html           | 67 ++++++++++++++-----
 .../unit-task-editor.component.scss           | 11 +++
 .../unit-task-editor.component.ts             | 54 ++++++++++++++-
 7 files changed, 164 insertions(+), 21 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index 4489f80545..f556de8631 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -67,6 +67,10 @@ export class TaskDefinition extends Entity {
   dTargetDate: Date;
   hdTargetDate: Date;
 
+  cStartDate: Date;
+  dStartDate: Date;
+  hdStartDate: Date;
+
   public readonly taskPrerequisitesCache: EntityCache<TaskPrerequisite> =
     new EntityCache<TaskPrerequisite>();
 
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index c4fdd3847c..b7cba5a054 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -363,9 +363,24 @@ export class Task extends Entity {
   }
 
   public get startDate(): Date {
-    if (this.targetStartDate && this.unit.allowFlexibleDates) {
-      return this.targetStartDate;
-    } else if (this.extensions < 0) {
+    if (this.unit.allowFlexibleDates) {
+      if (this.targetStartDate) {
+        return this.targetStartDate;
+      }
+
+      // Unit start dates per grade guidelines
+      if (this.project.targetGrade === 1 && this.definition.cStartDate) {
+        return this.definition.cStartDate;
+      }
+      if (this.project.targetGrade === 2 && this.definition.dStartDate) {
+        return this.definition.dStartDate;
+      }
+      if (this.project.targetGrade === 3 && this.definition.hdStartDate) {
+        return this.definition.hdStartDate;
+      }
+    }
+
+    if (this.extensions < 0) {
       // If the task has an extension, the start date is the due date minus the extension
       return MappingFunctions.addWeeks(this.definition.startDate, this.extensions);
     } else {
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index bb1a42f0d2..f43d104ada 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -178,6 +178,22 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
         toEntityFn: MappingFunctions.mapDateToDay,
         toJsonFn: MappingFunctions.mapDayToJson,
       },
+
+      {
+        keys: 'cStartDate',
+        toEntityFn: MappingFunctions.mapDateToDay,
+        toJsonFn: MappingFunctions.mapDayToJson,
+      },
+      {
+        keys: 'dStartDate',
+        toEntityFn: MappingFunctions.mapDateToDay,
+        toJsonFn: MappingFunctions.mapDayToJson,
+      },
+      {
+        keys: 'hdStartDate',
+        toEntityFn: MappingFunctions.mapDateToDay,
+        toJsonFn: MappingFunctions.mapDayToJson,
+      },
     );
 
     this.mapping.mapAllKeysToJsonExcept(
diff --git a/src/app/projects/states/plan/task-planner/task-planner.component.ts b/src/app/projects/states/plan/task-planner/task-planner.component.ts
index 01335fd9a5..46c7b2999f 100644
--- a/src/app/projects/states/plan/task-planner/task-planner.component.ts
+++ b/src/app/projects/states/plan/task-planner/task-planner.component.ts
@@ -500,7 +500,6 @@ export class TaskPlannerComponent implements OnInit {
 
       // Create baseline item
       const baselineItem = {...item};
-      baselineItem.start = this.normalizeDateUTC(td.startDate.getTime() / 1000);
 
       const tdTargetDate =
         (this.targetGrade === 1
@@ -511,7 +510,18 @@ export class TaskPlannerComponent implements OnInit {
               ? td.hdTargetDate
               : td.targetDate) ?? td.targetDate;
 
+      const tdStartDate =
+        (this.targetGrade === 1
+          ? td.cStartDate
+          : this.targetGrade === 2
+            ? td.dStartDate
+            : this.targetGrade === 3
+              ? td.hdStartDate
+              : td.startDate) ?? td.startDate;
+
+      baselineItem.start = this.normalizeDateUTC(tdStartDate.getTime() / 1000);
       baselineItem.end = this.normalizeDateUTC(tdTargetDate.getTime() / 1000);
+
       _baselineItems.push(baselineItem);
 
       // if (this.unsavedChanges(item)) {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
index 0bd47d9950..33f48afcd9 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
@@ -159,7 +159,9 @@ <h3>Manage Target Dates</h3>
       <table mat-table [dataSource]="taskDefinitionSource" class="mat-elevation-z0 w-full">
         <ng-container matColumnDef="taskDefinition">
           <th mat-header-cell *matHeaderCellDef>Task</th>
-          <td mat-cell *matCellDef="let td">{{ td.abbreviation }} {{ td.name }}</td>
+          <td mat-cell *matCellDef="let td" class="w-fit whitespace-nowrap">
+            {{ td.abbreviation }} {{ td.name }}
+          </td>
         </ng-container>
 
         <ng-container *ngFor="let g of gradeColumns" [matColumnDef]="g">
@@ -169,22 +171,55 @@ <h3>Manage Target Dates</h3>
             </div>
           </th>
           <td mat-cell *matCellDef="let td">
-            <mat-form-field
-              appearance="outline"
-              class="w-[200px] flex justify-center items-center pt-[22px]"
-            >
-              <input
-                matInput
-                [matDatepicker]="dp"
-                [ngModel]="getGradeDueDate(td, g)"
-                (ngModelChange)="setGradeDueDate(td, g, $event)"
-                [ngClass]="{'fallback-date': isFallbackDate(td, g)}"
-                placeholder="Select date"
-              />
+            <div class="flex flex-col gap-2">
+              <mat-form-field
+                appearance="outline"
+                class="w-[250px] flex justify-center items-center pt-[22px]"
+                [ngClass]="{
+                  'date-error': isStartAfterTarget(td, g)
+                }"
+              >
+                <mat-label> Start Date </mat-label>
+                <input
+                  matInput
+                  [matDatepicker]="dpStart"
+                  [ngModel]="getGradeStartDate(td, g)"
+                  (ngModelChange)="setGradeStartDate(td, g, $event)"
+                  [ngClass]="{
+                    'fallback-date': isFallbackStartDate(td, g)
+                  }"
+                  placeholder="Select date"
+                />
 
-              <mat-datepicker-toggle matSuffix [for]="dp"></mat-datepicker-toggle>
-              <mat-datepicker #dp></mat-datepicker>
-            </mat-form-field>
+                <mat-datepicker-toggle matSuffix [for]="dpStart"></mat-datepicker-toggle>
+                <mat-datepicker #dpStart></mat-datepicker>
+              </mat-form-field>
+              <mat-form-field
+                appearance="outline"
+                class="w-[250px] flex justify-center items-center"
+                [ngClass]="{
+                  'date-error': isStartAfterTarget(td, g)
+                }"
+              >
+                <mat-label> Target Date </mat-label>
+                <input
+                  matInput
+                  [matDatepicker]="dpTarget"
+                  [ngModel]="getGradeDueDate(td, g)"
+                  (ngModelChange)="setGradeDueDate(td, g, $event)"
+                  [ngClass]="{
+                    'fallback-date': isFallbackTargetDate(td, g)
+                  }"
+                  placeholder="Select date"
+                />
+                @if (isStartAfterTarget(td, g)) {
+                  <mat-hint class="text-red-500"> Target date must be after start date </mat-hint>
+                }
+
+                <mat-datepicker-toggle matSuffix [for]="dpTarget"></mat-datepicker-toggle>
+                <mat-datepicker #dpTarget></mat-datepicker>
+              </mat-form-field>
+            </div>
           </td>
         </ng-container>
 
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss
index 802426fd17..e33b519c28 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss
@@ -10,3 +10,14 @@
   color: #bfbfbf !important;
   -webkit-text-fill-color: #bfbfbf !important; /* fixes some WebKit cases */
 }
+
+::ng-deep .date-error .mdc-notched-outline__leading,
+::ng-deep .date-error .mdc-notched-outline__notch,
+::ng-deep .date-error .mdc-notched-outline__trailing {
+  border-color: #ef4444 !important; // tailwind red-500
+}
+
+::ng-deep .date-error .mat-mdc-input-element {
+  color: #ef4444 !important;
+  -webkit-text-fill-color: #ef4444 !important;
+}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
index 5fc3722c10..933a346d5d 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
@@ -47,6 +47,58 @@ export class UnitTaskEditorComponent implements AfterViewInit {
 
   public manageDueDates: boolean;
 
+  isStartAfterTarget(td: TaskDefinition, g: GradeCol): boolean {
+    const start = this.getGradeStartDate(td, g);
+    const target = this.getGradeDueDate(td, g);
+    if (!start || !target) return false;
+    return new Date(start).getTime() > new Date(target).getTime();
+  }
+
+  getGradeStartDate(td: TaskDefinition, g: GradeCol): Date | null {
+    switch (g) {
+      case 'p':
+        return td.startDate ?? td.startDate; // fallback to existing startDate
+      case 'c':
+        return td.cStartDate ?? td.startDate;
+      case 'd':
+        return td.dStartDate ?? td.startDate;
+      case 'hd':
+        return td.hdStartDate ?? td.startDate;
+    }
+  }
+
+  isFallbackStartDate(td: TaskDefinition, g: GradeCol): boolean {
+    switch (g) {
+      case 'p':
+        return false; // P is always real
+      case 'c':
+        return !td.cStartDate;
+      case 'd':
+        return !td.dStartDate;
+      case 'hd':
+        return !td.hdStartDate;
+    }
+  }
+
+  setGradeStartDate(td: TaskDefinition, g: GradeCol, value: Date | null): void {
+    switch (g) {
+      case 'p':
+        td.startDate = value;
+        break;
+      case 'c':
+        td.cStartDate = value;
+        break;
+      case 'd':
+        td.dStartDate = value;
+        break;
+      case 'hd':
+        td.hdStartDate = value;
+        break;
+    }
+
+    this.saveTaskDefinition(td);
+  }
+
   getGradeDueDate(td: TaskDefinition, g: GradeCol): Date | null {
     switch (g) {
       case 'p':
@@ -61,7 +113,7 @@ export class UnitTaskEditorComponent implements AfterViewInit {
     }
   }
 
-  isFallbackDate(td: TaskDefinition, g: GradeCol): boolean {
+  isFallbackTargetDate(td: TaskDefinition, g: GradeCol): boolean {
     switch (g) {
       case 'p':
         return false; // P is always real

From 71058c4ebc331d7c8189456959c3ae317e1ffc50 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 24 Feb 2026 12:24:00 +1100
Subject: [PATCH 700/776] refactor: use projects task dates to get earliest
 start date

---
 .../task-planner/task-planner.component.ts    | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/app/projects/states/plan/task-planner/task-planner.component.ts b/src/app/projects/states/plan/task-planner/task-planner.component.ts
index 46c7b2999f..67f077eb70 100644
--- a/src/app/projects/states/plan/task-planner/task-planner.component.ts
+++ b/src/app/projects/states/plan/task-planner/task-planner.component.ts
@@ -359,15 +359,31 @@ export class TaskPlannerComponent implements OnInit {
   }
 
   public get earliestStartDate() {
-    const earliestTaskStartDate = Math.min(
-      ...this.taskDefs().map((t) => t.startDate.getTime() / 1000),
-    );
-    return Math.floor(Math.min(this.unit.startDate.getTime() / 1000, earliestTaskStartDate));
+    const tasks = this.taskDefs()
+      .map((td) => this.project.findTaskForDefinition(td.id))
+      .filter((t) => t?.startDate);
+
+    if (!tasks.length) {
+      return Math.floor(this.unit.startDate.getTime() / 1000);
+    }
+
+    const earliestTaskStart = Math.min(...tasks.map((t) => t.startDate.getTime() / 1000));
+
+    return Math.floor(Math.min(this.unit.startDate.getTime() / 1000, earliestTaskStart));
   }
 
   public get latestEndDate() {
-    const latestTaskEndDate = Math.max(...this.taskDefs().map((t) => t.dueDate.getTime() / 1000));
-    return Math.floor(Math.max(this.unit.endDate.getTime() / 1000, latestTaskEndDate));
+    const tasks = this.taskDefs()
+      .map((td) => this.project.findTaskForDefinition(td.id))
+      .filter((t) => t?.localDueDate());
+
+    if (!tasks.length) {
+      return Math.floor(this.unit.endDate.getTime() / 1000);
+    }
+
+    const latestTaskEnd = Math.max(...tasks.map((t) => t.localDueDate().getTime() / 1000));
+
+    return Math.floor(Math.max(this.unit.endDate.getTime() / 1000, latestTaskEnd));
   }
 
   ngOnInit(): void {

From 8730739783af8cec6824e3989a9e7fed14419af7 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 24 Feb 2026 12:38:43 +1100
Subject: [PATCH 701/776] chore(release): 10.0.1-5

---
 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 b7edccfcc2..b5bf1d68fe 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.
 
+### [10.0.1-5](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-4...v10.0.1-5) (2026-02-24)
+
+
+### Features
+
+* per grade start dates ([#1090](https://github.com/b0ink/doubtfire-deploy/issues/1090)) ([a35019a](https://github.com/b0ink/doubtfire-deploy/commit/a35019aa4011fce7808da8cc1481fae7635aac69))
+
 ### [10.0.1-4](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-3...v10.0.1-4) (2026-02-23)
 
 
diff --git a/package-lock.json b/package-lock.json
index d8b7d491d1..292404c03c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-4",
+  "version": "10.0.1-5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-4",
+      "version": "10.0.1-5",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 077b300413..4585fae8b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-4",
+  "version": "10.0.1-5",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 45d133fd0346fe3e301b7eaeeafaf7a867903218 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 24 Feb 2026 17:11:35 +1100
Subject: [PATCH 702/776] refactor: encode script content to avoid firewall
 conflicts (#1091)

---
 src/app/api/models/overseer/overseer-step.ts      |  2 ++
 src/app/api/services/overseer-step.service.ts     | 15 ++++++++++++++-
 .../task-definition-overseer.component.html       |  3 ++-
 .../task-definition-overseer.component.ts         |  9 +++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/app/api/models/overseer/overseer-step.ts b/src/app/api/models/overseer/overseer-step.ts
index 5d2a03ee28..6fa14bf1bf 100644
--- a/src/app/api/models/overseer/overseer-step.ts
+++ b/src/app/api/models/overseer/overseer-step.ts
@@ -17,6 +17,8 @@ export class OverseerStep extends Entity {
   displayDescription: string;
 
   runCommand: string;
+  decodedRunCommand: string;
+
   commandLanguage: string;
   timeout: number;
   sortOrder: number;
diff --git a/src/app/api/services/overseer-step.service.ts b/src/app/api/services/overseer-step.service.ts
index 6df6323294..3d8a8fca9a 100644
--- a/src/app/api/services/overseer-step.service.ts
+++ b/src/app/api/services/overseer-step.service.ts
@@ -20,7 +20,20 @@ export class OverseerStepService extends CachedEntityService<OverseerStep> {
       'description',
       'displayName',
       'displayDescription',
-      'runCommand',
+      // 'runCommand',
+      {
+        keys: 'runCommand',
+        toEntityFn: (data: object, key: string, entity: OverseerStep, params?: any) => {
+          const raw = data['run_command'];
+          if (raw?.startsWith('b64:')) {
+            entity.decodedRunCommand = atob(raw.slice(4));
+          } else {
+            entity.decodedRunCommand = raw;
+          }
+
+          return raw;
+        },
+      },
       'timeout',
       'sortOrder',
       'stepType',
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
index 87e44b0754..e1d96032c0 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
@@ -224,7 +224,8 @@
                   #editor
                   class="w-full"
                   [options]="editorOptions"
-                  [(ngModel)]="selectedOverseerStep.runCommand"
+                  [(ngModel)]="selectedOverseerStep.decodedRunCommand"
+                  (ngModelChange)="onRunCommandChange(selectedOverseerStep, $event)"
                 ></ngx-monaco-editor>
                 <mat-hint class="pl-2 text-xl w-full">
                   @if (selectedOverseerStep.stepType === 'status_check') {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
index 478f642279..1c188080ed 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
@@ -73,6 +73,14 @@ export class TaskDefinitionOverseerComponent implements OnChanges, OnInit {
 
   public overseerSteps: OverseerStep[] = [];
 
+  onRunCommandChange(step: OverseerStep, value: string) {
+    step.runCommand = `b64:${this.base64UrlEncode(value)}`;
+  }
+
+  private base64UrlEncode(str) {
+    return btoa(str).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+  }
+
   selectStep(step: OverseerStep) {
     this.selectedOverseerStep = step;
     setTimeout(() => {
@@ -93,6 +101,7 @@ export class TaskDefinitionOverseerComponent implements OnChanges, OnInit {
     this.newOverseerStep.statusOnFailure = 'no_change';
     this.newOverseerStep.statusOnSuccess = 'no_change';
     this.newOverseerStep.commandLanguage = 'shell';
+    this.newOverseerStep.decodedRunCommand = '#!/bin/bash\n\n';
     this.newOverseerStep.runCommand = '#!/bin/bash\n\n';
     this.newOverseerStep.showExpectedOutput = true;
 

From e79efd63947fcc6346b18038989d095a2d39c985 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 24 Feb 2026 17:12:26 +1100
Subject: [PATCH 703/776] chore(release): 10.0.1-6

---
 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 b5bf1d68fe..f08370901e 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.
 
+### [10.0.1-6](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-5...v10.0.1-6) (2026-02-24)
+
 ### [10.0.1-5](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-4...v10.0.1-5) (2026-02-24)
 
 
diff --git a/package-lock.json b/package-lock.json
index 292404c03c..939962b14c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-5",
+  "version": "10.0.1-6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-5",
+      "version": "10.0.1-6",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 4585fae8b6..7c03cc7116 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-5",
+  "version": "10.0.1-6",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 671c3916797dc5ab680b9dac52ae68626e49d351 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 25 Feb 2026 11:50:16 +1100
Subject: [PATCH 704/776] fix: ensure timestamp is normalised to start of day

---
 .../plan/task-planner/task-planner.component.ts  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/projects/states/plan/task-planner/task-planner.component.ts b/src/app/projects/states/plan/task-planner/task-planner.component.ts
index 67f077eb70..a5f1040717 100644
--- a/src/app/projects/states/plan/task-planner/task-planner.component.ts
+++ b/src/app/projects/states/plan/task-planner/task-planner.component.ts
@@ -332,12 +332,24 @@ export class TaskPlannerComponent implements OnInit {
     );
   }
 
+  // normalizeDateUTC = (ts: number) => {
+  //   const d = new GanttDate(ts * 1000);
+  //   // const utc = Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), 0, 0, 0, 0);
+  //   return Math.floor(d.getUnixTime());
+  // };
+
   normalizeDateUTC = (ts: number) => {
     const d = new GanttDate(ts * 1000);
-    // const utc = Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate(), 0, 0, 0, 0);
-    return Math.floor(d.getUnixTime());
+    // d.setHours(0, 0, 0, 0);
+    return Math.floor(d.startOfDay().getTime() / 1000);
   };
 
+  // normalizeDateUTC = (ts: number) => {
+  //   const d = new Date(ts * 1000);
+  //   d.setHours(0, 0, 0, 0);
+  //   return Math.floor(d.getTime() / 1000);
+  // };
+
   toDateString(timestamp: number | Date) {
     const date = timestamp instanceof Date ? timestamp : new Date(timestamp * 1000);
     return date.toLocaleDateString('en-AU', {

From aedb0950e4ad679300af39c128ec9d87b6ddf487 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 25 Feb 2026 11:52:49 +1100
Subject: [PATCH 705/776] chore(release): 10.0.1-7

---
 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 f08370901e..ba8822a01a 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.
 
+### [10.0.1-7](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-6...v10.0.1-7) (2026-02-25)
+
+
+### Bug Fixes
+
+* ensure timestamp is normalised to start of day ([671c391](https://github.com/b0ink/doubtfire-deploy/commit/671c3916797dc5ab680b9dac52ae68626e49d351))
+
 ### [10.0.1-6](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-5...v10.0.1-6) (2026-02-24)
 
 ### [10.0.1-5](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-4...v10.0.1-5) (2026-02-24)
diff --git a/package-lock.json b/package-lock.json
index 939962b14c..5f7bd90dd3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-6",
+  "version": "10.0.1-7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-6",
+      "version": "10.0.1-7",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 7c03cc7116..6407722954 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-6",
+  "version": "10.0.1-7",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From e047988c4fff787852d1cc5a041cb48e11ee57f8 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 25 Feb 2026 14:56:01 +1100
Subject: [PATCH 706/776] feat: overflow marking (#1086)

* feat: init overflow marking

* chore: show overflow link to only staff who can overflow mark

* feat: enable overflow marking permission saving

* feat: feedback overflow unit setting

* chore: track if task is loading submission details

* feat: claim task request

* chore: ensure feedback thresholds are saved

* refactor: disable buttons based on claim conditions

* chore: call claim task request

* fix: display message for task comment errors

* refactor: clean up unit role getter

* refactor: display overflow claim state

* chore: reword label

* chore: add error alert

* fix: check if key exists so it can be reset to null

* refactor: add tooltips, show claim button in box

* chore: remove todo

* refactor: add snackbar

* refactor: move task claim to its own component

* feat: display overdue feedback warnings in staff task list

* refactor: reword task claim tooltip

* chore: extend type
---
 src/app/api/models/task.ts                    |  9 +++-
 src/app/api/models/unit-role.ts               |  1 +
 src/app/api/models/unit.ts                    |  3 ++
 src/app/api/services/task.service.ts          | 35 +++++++++++++++
 src/app/api/services/unit-role.service.ts     | 11 ++++-
 src/app/api/services/unit.service.ts          |  4 ++
 src/app/common/footer/footer.component.html   | 36 ++++++++-------
 src/app/common/footer/footer.component.ts     | 44 ++++++++++++++-----
 .../task-dropdown.component.html              | 14 ++++++
 .../task-dropdown/task-dropdown.component.ts  |  8 ++++
 src/app/doubtfire-angular.module.ts           |  2 +
 src/app/doubtfire-angularjs.module.ts         |  1 +
 .../task-comment-composer.component.ts        |  2 +-
 .../unit-details-editor.component.html        | 31 +++++++++++++
 .../unit-staff-editor.component.html          | 13 ++++++
 .../unit-staff-editor.component.ts            | 15 +++++++
 .../staff-task-list.component.html            | 20 ++++++++-
 .../staff-task-list.component.ts              | 22 ++++++++++
 .../task-claim/task-claim.component.html      | 34 ++++++++++++++
 .../task-claim/task-claim.component.scss      |  0
 .../task-claim/task-claim.component.ts        | 44 +++++++++++++++++++
 .../states/tasks/overflow/overflow.coffee     | 33 ++++++++++++++
 src/app/units/states/tasks/tasks.coffee       |  1 +
 23 files changed, 352 insertions(+), 31 deletions(-)
 create mode 100644 src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.html
 create mode 100644 src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.scss
 create mode 100644 src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.ts
 create mode 100644 src/app/units/states/tasks/overflow/overflow.coffee

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index b7cba5a054..456a531119 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -66,6 +66,9 @@ export class Task extends Entity {
   //TODO: map task submission details
   hasPdf: boolean = false;
   processingPdf: boolean = false;
+  claimedByUnitRoleId: number | null;
+
+  loadingSubmissionDetails: boolean = false;
 
   pinned: boolean = false;
 
@@ -641,7 +644,7 @@ export class Task extends Entity {
 
   public getSubmissionDetails(): Observable<Task> {
     const http: HttpClient = AppInjector.get(HttpClient);
-
+    this.loadingSubmissionDetails = true;
     return http
       .get(
         `${AppInjector.get(DoubtfireConstants).API_URL}/projects/${this.project.id}/task_def_id/${
@@ -650,12 +653,16 @@ export class Task extends Entity {
       )
       .pipe(
         map((response: object) => {
+          this.loadingSubmissionDetails = false;
           this.hasPdf = response['has_pdf'];
           this.processingPdf = response['processing_pdf'];
           this.submissionDate = MappingFunctions.mapDate(response, 'submission_date', this);
           if (response['task_status'] && TaskStatus.STATUS_KEYS.includes(response['task_status'])) {
             this.status = response['task_status'];
           }
+          if ('claimed_by_unit_role_id' in response) {
+            this.claimedByUnitRoleId = response['claimed_by_unit_role_id'] as number | null;
+          }
           return this;
         }),
       );
diff --git a/src/app/api/models/unit-role.ts b/src/app/api/models/unit-role.ts
index 837d1d8eb6..967d542381 100644
--- a/src/app/api/models/unit-role.ts
+++ b/src/app/api/models/unit-role.ts
@@ -12,6 +12,7 @@ export class UnitRole extends Entity {
   user: User;
   unit: Unit;
   observerOnly: boolean;
+  canMarkOverflowTasks: boolean;
   mentorId: number;
   tutorNoteCount: number;
 
diff --git a/src/app/api/models/unit.ts b/src/app/api/models/unit.ts
index 0415a8bda2..e9f48f02f9 100644
--- a/src/app/api/models/unit.ts
+++ b/src/app/api/models/unit.ts
@@ -76,6 +76,9 @@ export class Unit extends Entity {
   allowStudentChangeTutorial: boolean;
   markLateSubmissionsAsAssessInPortfolio: boolean;
 
+  feedbackWarningThresholdDays: number;
+  feedbackOverflowThresholdDays: number;
+
   d2lMapping: D2lAssessmentMapping;
 
   public readonly learningOutcomesCache: EntityCache<LearningOutcome> =
diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 3fd9dc0532..fb2a0c025a 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -23,6 +23,7 @@ export class TaskService extends CachedEntityService<Task> {
   private readonly taskInboxEndpoint = '/units/:id:/tasks/inbox';
   private readonly taskExplorerEndpoint = '/units/:id:/task_definitions/:task_def_id:/tasks';
   private readonly taskModerationEndpoint = '/units/:id:/tasks/moderation';
+  private readonly taskOverflowEndpoint = '/units/:id:/tasks/overflow';
   private readonly refreshTaskEndpoint = 'projects/:projectId:/refresh_tasks/:taskDefinitionId:';
 
   constructor(httpClient: HttpClient) {
@@ -175,6 +176,24 @@ export class TaskService extends CachedEntityService<Task> {
     );
   }
 
+  public queryTasksForOverflow(unit: Unit): Observable<Task[]> {
+    const cache: EntityCache<Task> = new EntityCache<Task>();
+    return this.query(
+      {
+        id: unit.id,
+      },
+      {
+        endpointFormat: this.taskOverflowEndpoint,
+        cache: cache,
+        constructorParams: unit,
+      },
+    ).pipe(
+      tap((tasks: Task[]) => {
+        unit.incorporateTasks(tasks);
+      }),
+    );
+  }
+
   public refreshExtensionDetails(task: Task): void {
     const pathIds = {
       projectId: task.project.id,
@@ -263,4 +282,20 @@ export class TaskService extends CachedEntityService<Task> {
       options,
     );
   }
+
+  public claimTask(task: Task): Observable<boolean> {
+    const options: RequestOptions<Task> = {
+      entity: task,
+      cache: task.project.taskCache,
+      endpointFormat: `${this.endpointFormat}/claim_overflow_task`,
+    };
+
+    return this.post(
+      {
+        projectId: task.project.id,
+        taskDefId: task.definition.id,
+      },
+      options,
+    );
+  }
 }
diff --git a/src/app/api/services/unit-role.service.ts b/src/app/api/services/unit-role.service.ts
index e4aca28602..b67a40d41c 100644
--- a/src/app/api/services/unit-role.service.ts
+++ b/src/app/api/services/unit-role.service.ts
@@ -65,9 +65,18 @@ export class UnitRoleService extends CachedEntityService<UnitRole> {
       'observerOnly',
       'mentorId',
       'tutorNoteCount',
+      'canMarkOverflowTasks',
     );
 
-    this.mapping.addJsonKey('roleId', 'userId', 'unitId', 'role', 'observerOnly', 'mentorId');
+    this.mapping.addJsonKey(
+      'roleId',
+      'userId',
+      'unitId',
+      'role',
+      'observerOnly',
+      'mentorId',
+      'canMarkOverflowTasks',
+    );
   }
 
   public createInstanceFrom(json: any, other?: any): UnitRole {
diff --git a/src/app/api/services/unit.service.ts b/src/app/api/services/unit.service.ts
index 498b993ee0..1d6462727d 100644
--- a/src/app/api/services/unit.service.ts
+++ b/src/app/api/services/unit.service.ts
@@ -255,6 +255,8 @@ export class UnitService extends CachedEntityService<Unit> {
         },
       },
       // 'groupMemberships', - map to group memberships
+      'feedbackWarningThresholdDays',
+      'feedbackOverflowThresholdDays',
     );
 
     this.mapping.addJsonKey(
@@ -284,6 +286,8 @@ export class UnitService extends CachedEntityService<Unit> {
       'allowStudentExtensionRequests',
       'extensionWeeksOnResubmitRequest',
       'allowStudentChangeTutorial',
+      'feedbackWarningThresholdDays',
+      'feedbackOverflowThresholdDays',
     );
   }
 
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index b1caed6d6d..371ef47086 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -13,14 +13,14 @@
 
   <div class="flex w-full">
     <f-user-badge fxFlex fxFlexAlign="start start" [selectedTask]="selectedTask"></f-user-badge>
-    <div class="flex justify-between">
+    <div class="flex justify-between items-center">
       <span class="center-buttons flex justify-around gap-5">
         <div>
           <button
-            [disabled]="selectedTask === undefined"
+            [disabled]="!actionButtonEnabled"
             mat-icon-button
             matTooltip="Mark as Redo"
-            matTooltipPosition="above"
+            matTooltipPo`sition="above"
             aria-label=""
             class="button"
             (click)="selectedTask?.updateTaskStatus('redo')"
@@ -29,7 +29,7 @@
           </button>
 
           <button
-            [disabled]="selectedTask === undefined"
+            [disabled]="!actionButtonEnabled"
             mat-icon-button
             matTooltip="Mark as Attention Required"
             matTooltipPosition="above"
@@ -41,7 +41,7 @@
           </button>
         </div>
         <button
-          [disabled]="selectedTask === undefined"
+          [disabled]="!actionButtonEnabled"
           mat-icon-button
           matTooltip="Mark as Resubmit"
           matTooltipPosition="above"
@@ -63,13 +63,14 @@
             class="button extra-large-button status-chip"
             (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
             [ngClass]="taskService.statusData(selectedTask.suggestedTaskStatus).class"
+            [disabled]="!actionButtonEnabled"
           >
             <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
           </button>
         }
         @if (selectedTask?.definition?.assessInPortfolioOnly) {
           <button
-            [disabled]="selectedTask === undefined"
+            [disabled]="!actionButtonEnabled"
             mat-icon-button
             matTooltip="Mark as Working On It"
             matTooltipPosition="above"
@@ -81,7 +82,7 @@
           </button>
         } @else {
           <button
-            [disabled]="selectedTask === undefined"
+            [disabled]="!actionButtonEnabled"
             mat-icon-button
             matTooltip="Mark as Complete"
             matTooltipPosition="above"
@@ -94,7 +95,7 @@
         }
 
         <button
-          [disabled]="selectedTask === undefined"
+          [disabled]="!actionButtonEnabled"
           mat-icon-button
           matTooltip="Mark as Discuss"
           matTooltipPosition="above"
@@ -109,7 +110,7 @@
 
         <div class="flex justify-start">
           <button
-            [disabled]="selectedTask === undefined"
+            [disabled]="!actionButtonEnabled"
             mat-icon-button
             matTooltip="Discussed in class"
             matTooltipPosition="above"
@@ -122,10 +123,15 @@
         </div>
       </span>
 
-      @if (viewType === 'moderation' && selectedTask) {
-        <mat-divider class="ml-10" [vertical]="true"></mat-divider>
-        <f-moderation [task]="selectedTask"></f-moderation>
-        <!-- <mat-divider class="mr-10" [vertical]="true"></mat-divider> -->
+      @if (selectedTask && !selectedTask.loadingSubmissionDetails) {
+        @if (viewType === 'moderation') {
+          <mat-divider class="ml-10" [vertical]="true"></mat-divider>
+          <f-moderation [task]="selectedTask"></f-moderation>
+          <!-- <mat-divider class="mr-10" [vertical]="true"></mat-divider> -->
+        }
+        @if (viewType === 'overflow' || selectedTask.claimedByUnitRoleId) {
+          <f-task-claim [selectedTask]="selectedTask"></f-task-claim>
+        }
       }
     </div>
 
@@ -163,7 +169,7 @@
           </button>
         }
 
-        @if (canAccessTutorNotes(selectedTask)) {
+        @if (canAccessTutorNotes) {
           <div class="relative inline-block">
             <button
               mat-icon-button
@@ -263,7 +269,7 @@
         <button
           mat-menu-item
           (click)="selectedTask?.updateTaskStatus('fail')"
-          [disabled]="selectedTask === undefined"
+          [disabled]="!actionButtonEnabled"
         >
           <mat-icon matListItemIcon aria-label="Fail icon" fontIcon="cancel"></mat-icon>
           Mark as fail
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index d0d6c9d9ee..3898c07d56 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -22,7 +22,7 @@ export class FooterComponent implements OnInit {
     private userService: UserService,
   ) {}
 
-  @Input() viewType: 'inbox' | 'explorer' | 'moderation';
+  @Input() viewType: 'inbox' | 'explorer' | 'moderation' | 'overflow';
 
   selectedTask$: Observable<Task>;
   selectedTask: Task;
@@ -53,27 +53,24 @@ export class FooterComponent implements OnInit {
       (this.warningText?.nativeElement.getBoundingClientRect().width + totalPaddingOffset) / 2;
   }
 
-  public canAccessTutorNotes(task: Task): boolean {
-    const tutor = task.tutor;
+  public get canAccessTutorNotes(): boolean {
+    const tutor = this.selectedTask.tutor;
     if (!tutor) {
       return false;
     }
 
-    const currentUser = this.userService.currentUser;
-    const currentUserRole = task.unit.staff.find((ur) => ur.user.id === currentUser.id);
-
-    if (!currentUserRole) {
+    if (!this.currentUnitRole) {
       return false;
     }
 
     // Ensure the unit is mapped correctly to access the mentor
-    tutor.unit = task.unit;
+    tutor.unit = this.selectedTask.unit;
 
     const canAccess =
-      currentUserRole.role === 'Convenor' ||
-      currentUserRole.role === 'Admin' ||
-      (tutor.mentor && tutor.mentor.id === currentUserRole.id) ||
-      tutor.id === currentUserRole.id;
+      this.currentUnitRole.role === 'Convenor' ||
+      this.currentUnitRole.role === 'Admin' ||
+      (tutor.mentor && tutor.mentor.id === this.currentUnitRole.id) ||
+      tutor.id === this.currentUnitRole.id;
 
     return canAccess;
   }
@@ -159,4 +156,27 @@ export class FooterComponent implements OnInit {
       `${this.selectedTask.definition.abbreviation}-jplag-report`,
     );
   }
+
+  public get currentUnitRole(): UnitRole | undefined {
+    const currentUser = this.userService.currentUser;
+    return this.selectedTask.unit.staff.find((ur) => ur.user.id === currentUser.id);
+  }
+
+  public get actionButtonEnabled(): boolean {
+    if (!this.selectedTask) {
+      return false;
+    }
+
+    if (this.selectedTask.loadingSubmissionDetails) {
+      return false;
+    }
+
+    if (this.viewType === 'overflow' || this.selectedTask.claimedByUnitRoleId) {
+      if (this.currentUnitRole.id !== this.selectedTask.claimedByUnitRoleId) {
+        return false;
+      }
+    }
+
+    return true;
+  }
 }
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index 2ee3a781a0..b09c5dbaa9 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -106,6 +106,7 @@
         >
           <mat-icon aria-label="Task Explorer Icon" fontIcon="pageview"></mat-icon> Explorer
         </button>
+
         @if (isMentor || unitRole.role === 'Convenor') {
           <button
             uiSref="units/tasks/moderation"
@@ -115,6 +116,19 @@
             <mat-icon aria-label="Audit Icon">rate_review</mat-icon> Moderation
           </button>
         }
+
+        @if (canMarkOverflowTask) {
+          <button
+            uiSref="units/tasks/overflow"
+            [uiParams]="{unitId: unitRole.unit.id}"
+            mat-menu-item
+          >
+            <!-- <mat-icon aria-label="Audit Icon">pending_actions</mat-icon> Overflow -->
+            <mat-icon aria-label="Audit Icon">more_time</mat-icon> Overflow
+            <!-- <mat-icon aria-label="Audit Icon">work_history</mat-icon> Overflow -->
+            <!-- <mat-icon aria-label="Audit Icon">safety_check</mat-icon> Overflow -->
+          </button>
+        }
         <button uiSref="units/tasks/viewer" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
           <mat-icon aria-label="Task list icon" fontIcon="list_alt"></mat-icon> Tasks
         </button>
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.ts b/src/app/common/header/task-dropdown/task-dropdown.component.ts
index b92879e94d..bf22f382d8 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.ts
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.ts
@@ -25,6 +25,7 @@ export class TaskDropdownComponent {
     'Student Portfolios': 'Portfolios',
     'Task Explorer': 'Task Explorer',
     'Task Moderation': 'Task Moderation',
+    'Task Overflow': 'Task Overflow',
     'Task Inbox': 'Inbox',
     'Task Lists': 'Tasks',
     'Tutorial List': 'Tutorials',
@@ -40,6 +41,13 @@ export class TaskDropdownComponent {
     });
   }
 
+  public get canMarkOverflowTask() {
+    // this.unitRole does not have permission-based fields exposed such as canMarkOverflowTasks
+    // so we must access them via the unit data
+    const staff = this.currentUnit.staff.find((ur) => ur.id === this.unitRole.id);
+    return staff?.canMarkOverflowTasks;
+  }
+
   public get isMentor(): boolean {
     return this.currentUnit.staff.some((ur) => ur.mentorId === this.unitRole.id);
   }
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index ba5b377a60..43ae68e4b8 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -320,6 +320,7 @@ import {ModerationComponent} from './units/states/tasks/inbox/directives/moderat
 import {TutorNotesModalComponent} from './common/modals/tutor-notes-modal/tutor-notes-modal.component';
 import {FeedbackAppealModalComponent} from './tasks/modals/feedback-appeal-modal/feedback-appeal-modal.component';
 import {ConfirmModerationModalComponent} from './units/states/tasks/inbox/directives/moderation/confirm-moderation-modal/confirm-moderation-modal.component';
+import {TaskClaimComponent} from './units/states/tasks/inbox/directives/task-claim/task-claim.component';
 
 // See https://stackoverflow.com/questions/55721254/how-to-change-mat-datepicker-date-format-to-dd-mm-yyyy-in-simplest-way/58189036#58189036
 const MY_DATE_FORMAT = {
@@ -515,6 +516,7 @@ const GANTT_CHART_CONFIG = {
     TutorNotesModalComponent,
     FeedbackAppealModalComponent,
     ConfirmModerationModalComponent,
+    TaskClaimComponent,
   ],
   providers: [
     // Services we provide
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index 4a46b0ac8c..ca57426fd2 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -96,6 +96,7 @@ import 'build/src/app/units/states/tasks/viewer/directives/directives.js';
 import 'build/src/app/units/states/tasks/viewer/viewer.js';
 import 'build/src/app/units/states/tasks/definition/definition.js';
 import 'build/src/app/units/states/tasks/moderation/moderation.js';
+import 'build/src/app/units/states/tasks/overflow/overflow.js';
 import 'build/src/app/units/states/portfolios/portfolios.js';
 import 'build/src/app/units/states/groups/groups.js';
 import 'build/src/app/units/states/states.js';
diff --git a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
index e11816e3a5..294f305292 100644
--- a/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
+++ b/src/app/tasks/task-comment-composer/task-comment-composer.component.ts
@@ -529,7 +529,7 @@ export class TaskCommentComposerComponent implements OnInit, AfterViewInit, DoCh
       },
       error: (error: ApiError) => {
         this.isSending = false;
-        this.alerts.error(error.error || error.message || 'Failed to add comment', 2000);
+        this.alerts.error(error.error || error.message || `Failed to add comment: ${error}`, 6000);
       },
     });
   }
diff --git a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.html b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.html
index 7ee30534e9..073c69ce2a 100644
--- a/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-details-editor/unit-details-editor.component.html
@@ -90,6 +90,37 @@ <h3>Unit Details</h3>
         will be extended to allow students to fix and resubmit their work.
       </mat-hint>
     </mat-form-field>
+
+    <div class="flex w-full gap-5">
+      <mat-form-field appearance="outline" class="w-full">
+        <mat-label>Feedback warning after (days)</mat-label>
+        <input
+          matInput
+          type="number"
+          min="0"
+          required
+          [(ngModel)]="unit.feedbackWarningThresholdDays"
+        />
+        <mat-hint>
+          Tasks in inbox are highlighted if feedback isn’t given within this many days of
+          submission.
+        </mat-hint>
+      </mat-form-field>
+
+      <mat-form-field appearance="outline" class="w-full">
+        <mat-label>Show task in overflow queue after (days)</mat-label>
+        <input
+          matInput
+          type="number"
+          min="0"
+          required
+          [(ngModel)]="unit.feedbackOverflowThresholdDays"
+        />
+        <mat-hint>
+          Tasks without feedback for this many days will appear in the overflow queue.
+        </mat-hint>
+      </mat-form-field>
+    </div>
   </mat-card>
 
   <mat-card appearance="outlined" class="flex flex-col gap-5 p-[16px]">
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
index 46e19acf9a..9dda4d23a0 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
@@ -71,6 +71,19 @@ <h3>Unit Staff</h3>
       </td>
     </ng-container>
 
+    <ng-container matColumnDef="overflow-marking">
+      <th mat-header-cell *matHeaderCellDef>Overflow Marking</th>
+      <td mat-cell *matCellDef="let unitRole">
+        <mat-slide-toggle
+          [checked]="unitRole.canMarkOverflowTasks"
+          (change)="toggleCanOverflowMark(unitRole)"
+          matTooltip="This staff member can mark overflow tasks"
+          matTooltipShowDelay="1000"
+          matTooltipPosition="above"
+        ></mat-slide-toggle>
+      </td>
+    </ng-container>
+
     <ng-container matColumnDef="mentor">
       <th mat-header-cell *matHeaderCellDef>Mentor</th>
       <td mat-cell *matCellDef="let unitRole">
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
index bf55d7b45d..e8b9a7a295 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
@@ -28,6 +28,7 @@ export class UnitStaffEditorComponent implements OnInit {
     'role',
     'main-convenor',
     'observer-only',
+    'overflow-marking',
     'mentor',
     'actions',
   ];
@@ -95,6 +96,20 @@ export class UnitStaffEditorComponent implements OnInit {
     });
   }
 
+  toggleCanOverflowMark(unitRole: UnitRole) {
+    const previousValue = unitRole.canMarkOverflowTasks;
+    unitRole.canMarkOverflowTasks = !unitRole.canMarkOverflowTasks;
+    unitRole.roleId = unitRole.role === 'Tutor' ? 2 : 3;
+    this.unitRoleService.update(unitRole).subscribe({
+      next: () => this.alertService.success('Overflow marking permissions updated', 2000),
+      error: (response) => {
+        // Revert changes on error
+        unitRole.canMarkOverflowTasks = previousValue;
+        this.alertService.error(response, 6000);
+      },
+    });
+  }
+
   selectMentor(unitRole: UnitRole, event: MatSelectChange) {
     const previousValue = unitRole.mentorId;
     unitRole.mentorId = event.value;
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index 2ab8efa521..5912585804 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -259,7 +259,25 @@
                 <user-icon class="self-center" [user]="task.project.student" [size]="30">
                 </user-icon>
                 <div class="task-list-data truncate flex-1" [hidden]="isNarrow">
-                  <h4 class="student-name">{{ task.project.student.name }}</h4>
+                  <h4 class="student-name flex items-center gap-1">
+                    @if (getWarningIcon(task) === 'warning') {
+                      <mat-icon
+                        matTooltip="Feedback due soon — please review before it escalates."
+                        class="shrink-0 text-amber-500"
+                      >
+                        warning
+                      </mat-icon>
+                    } @else if (getWarningIcon(task) === 'overflow') {
+                      <mat-icon
+                        matTooltip="Feedback overdue — this task has been escalated for urgent review."
+                        class="shrink-0 text-red-500"
+                      >
+                        watch_later
+                      </mat-icon>
+                    }
+
+                    {{ task.project.student.name }}
+                  </h4>
                   <div class="task-details truncate">
                     {{ task.definition.abbreviation }} -
                     {{ task.definition.name }}
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index dc2d65455f..1d3c166609 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -565,4 +565,26 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
   togglePin(task: Task) {
     task.pinned ? task.unpin() : task.pin();
   }
+
+  getWarningIcon(task: Task): 'warning' | 'overflow' | null {
+    if (!task.submissionDate) return null;
+    if (task.status !== 'ready_for_feedback') {
+      return null;
+    }
+
+    const now = Date.now();
+    const submission = new Date(task.submissionDate).getTime();
+
+    const daysSinceSubmission = (now - submission) / (1000 * 60 * 60 * 24);
+
+    if (daysSinceSubmission >= task.unit.feedbackOverflowThresholdDays) {
+      return 'overflow';
+    }
+
+    if (daysSinceSubmission >= task.unit.feedbackWarningThresholdDays) {
+      return 'warning';
+    }
+
+    return null;
+  }
 }
diff --git a/src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.html b/src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.html
new file mode 100644
index 0000000000..e7477fa34f
--- /dev/null
+++ b/src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.html
@@ -0,0 +1,34 @@
+<div
+  [matTooltip]="
+    selectedTask.claimedByUnitRoleId
+      ? selectedTask.claimedByUnitRoleId === currentUnitRole.id
+        ? 'You have claimed this task.'
+        : 'Another tutor has temporarily acquired this task and is currently providing feedback.'
+      : 'Claim this task from the overflow marking queue.'
+  "
+>
+  <button
+    mat-raised-button
+    color="primary"
+    (click)="claimTask(selectedTask)"
+    [disabled]="
+      !selectedTask || selectedTask.loadingSubmissionDetails || selectedTask.claimedByUnitRoleId
+    "
+    class="ml-5"
+  >
+    <div class="flex items-center gap-1">
+      @if (selectedTask.claimedByUnitRoleId) {
+        @if (selectedTask.claimedByUnitRoleId === currentUnitRole.id) {
+          <mat-icon class="scale-80">check_circle</mat-icon>
+          Claimed by you
+        } @else {
+          <mat-icon class="scale-80">event_busy</mat-icon>
+          Claimed by tutor
+        }
+      } @else {
+        <mat-icon>sync_lock</mat-icon>
+        Claim Task
+      }
+    </div>
+  </button>
+</div>
diff --git a/src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.scss b/src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.ts b/src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.ts
new file mode 100644
index 0000000000..43a0a6bd2c
--- /dev/null
+++ b/src/app/units/states/tasks/inbox/directives/task-claim/task-claim.component.ts
@@ -0,0 +1,44 @@
+import {Component, Input} from '@angular/core';
+import {MatSnackBar} from '@angular/material/snack-bar';
+import {Task} from 'src/app/api/models/task';
+import {UnitRole} from 'src/app/api/models/unit-role';
+import {TaskService} from 'src/app/api/services/task.service';
+import {UserService} from 'src/app/api/services/user.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+@Component({
+  selector: 'f-task-claim',
+  templateUrl: './task-claim.component.html',
+  styleUrl: './task-claim.component.scss',
+})
+export class TaskClaimComponent {
+  @Input() selectedTask: Task;
+
+  constructor(
+    private taskService: TaskService,
+    private alertService: AlertService,
+    private snackBar: MatSnackBar,
+    private userService: UserService,
+  ) {}
+
+  public get currentUnitRole(): UnitRole | undefined {
+    const currentUser = this.userService.currentUser;
+    return this.selectedTask.unit.staff.find((ur) => ur.user.id === currentUser.id);
+  }
+
+  claimTask(task: Task) {
+    this.taskService.claimTask(task).subscribe({
+      next: (_response) => {
+        this.alertService.success(`Successfully claimed task`, 6000);
+        this.snackBar.open(
+          `Successfully claimed task. This task will be automatically unclaimed after 30 minutes of inactivity.`,
+          'OK',
+        );
+        task.claimedByUnitRoleId = this.currentUnitRole.id;
+      },
+      error: (error) => {
+        this.alertService.error(`Failed to claim task ${error}`, 6000);
+      },
+    });
+  }
+}
diff --git a/src/app/units/states/tasks/overflow/overflow.coffee b/src/app/units/states/tasks/overflow/overflow.coffee
new file mode 100644
index 0000000000..08bec0792f
--- /dev/null
+++ b/src/app/units/states/tasks/overflow/overflow.coffee
@@ -0,0 +1,33 @@
+angular.module('doubtfire.units.states.tasks.overflow', [
+])
+
+#
+# Get tasks for overflow marking
+#
+.config(($stateProvider) ->
+  $stateProvider.state 'units/tasks/overflow', {
+    parent: 'units/tasks'
+    url: '/overflow/{taskKey:any}'
+    # We can recycle the task inbox, switching the data source scope variable
+    templateUrl: "units/states/tasks/inbox/inbox.tpl.html"
+    controller: "TaskOverflowStateCtrl"
+    params:
+      taskKey: dynamic: true
+    data:
+      task: "Task Overflow"
+      pageTitle: "_Home_"
+      roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor']
+   }
+)
+
+.controller('TaskOverflowStateCtrl', ($scope, newTaskService) ->
+  $scope.taskData.source = newTaskService.queryTasksForOverflow.bind(newTaskService)
+  $scope.viewType = 'overflow'
+  $scope.showSearchOptions = false
+  $scope.filters = {
+    tutorialIdSelected: 'all'
+    taskDefinition: null
+    taskDefinitionIdSelected: null
+  }
+  $scope.taskData.taskDefMode = false
+)
diff --git a/src/app/units/states/tasks/tasks.coffee b/src/app/units/states/tasks/tasks.coffee
index c9fbef5cb4..d4bff19b2e 100644
--- a/src/app/units/states/tasks/tasks.coffee
+++ b/src/app/units/states/tasks/tasks.coffee
@@ -2,6 +2,7 @@ angular.module('doubtfire.units.states.tasks', [
   'doubtfire.units.states.tasks.inbox'
   'doubtfire.units.states.tasks.definition'
   'doubtfire.units.states.tasks.moderation'
+  'doubtfire.units.states.tasks.overflow'
   'doubtfire.units.states.tasks.viewer'
 ])
 

From be30fbd1002360e27a13a1ed675bcd402d3b4d2d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 25 Feb 2026 14:56:25 +1100
Subject: [PATCH 707/776] chore(release): 10.0.1-8

---
 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 ba8822a01a..c302d3e63c 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.
 
+### [10.0.1-8](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-7...v10.0.1-8) (2026-02-25)
+
+
+### Features
+
+* overflow marking ([#1086](https://github.com/b0ink/doubtfire-deploy/issues/1086)) ([e047988](https://github.com/b0ink/doubtfire-deploy/commit/e047988c4fff787852d1cc5a041cb48e11ee57f8))
+
 ### [10.0.1-7](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-6...v10.0.1-7) (2026-02-25)
 
 
diff --git a/package-lock.json b/package-lock.json
index 5f7bd90dd3..081ea1d0c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-7",
+  "version": "10.0.1-8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-7",
+      "version": "10.0.1-8",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 6407722954..dd7eacf934 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-7",
+  "version": "10.0.1-8",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 4ecfe27c91104c746ac8a4f9059030d5475776bb Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Feb 2026 10:43:01 +1100
Subject: [PATCH 708/776] fix: typo

---
 src/app/common/footer/footer.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 371ef47086..abbb434f3d 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -20,7 +20,7 @@
             [disabled]="!actionButtonEnabled"
             mat-icon-button
             matTooltip="Mark as Redo"
-            matTooltipPo`sition="above"
+            matTooltipPosition="above"
             aria-label=""
             class="button"
             (click)="selectedTask?.updateTaskStatus('redo')"

From b02048c41754c9b67c91165418ca4928adc125dc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Feb 2026 10:43:26 +1100
Subject: [PATCH 709/776] chore(release): 10.0.1-9

---
 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 c302d3e63c..8312fcf5ef 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.
 
+### [10.0.1-9](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-8...v10.0.1-9) (2026-02-25)
+
+
+### Bug Fixes
+
+* typo ([4ecfe27](https://github.com/b0ink/doubtfire-deploy/commit/4ecfe27c91104c746ac8a4f9059030d5475776bb))
+
 ### [10.0.1-8](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-7...v10.0.1-8) (2026-02-25)
 
 
diff --git a/package-lock.json b/package-lock.json
index 081ea1d0c0..a3464491aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-8",
+  "version": "10.0.1-9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-8",
+      "version": "10.0.1-9",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index dd7eacf934..a714837d7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-8",
+  "version": "10.0.1-9",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 81ebd3488d20a1e057c24b37190f4eea99bad9ec Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Feb 2026 12:53:02 +1100
Subject: [PATCH 710/776] feat: display available storage for docker images
 (#1092)

* feat: display available storage for docker images

* refactor: hide available storage if disabled
---
 .../overseer-image-list.component.html        |  7 ++++++-
 .../overseer-image-list.component.ts          | 20 ++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html
index bf6ca86233..9ca1c6a6ba 100644
--- a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html
+++ b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.html
@@ -7,7 +7,12 @@
 <div class="overseer-image-list-container">
   <div class="header">
     <div>
-      <h3>Overseer Images</h3>
+      <h3>
+        Overseer Images
+        @if (diskSpace !== null) {
+          ({{ diskSpace ?? 'N/A' }} GB available)
+        }
+      </h3>
       <p>Add new image or modify existing ones used for automated task analysis</p>
     </div>
   </div>
diff --git a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.ts b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.ts
index 526660962d..05173d587d 100644
--- a/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.ts
+++ b/src/app/admin/institution-settings/overseer-images/overseer-image-list.component.ts
@@ -1,12 +1,13 @@
+import {HttpClient} from '@angular/common/http';
 import {AfterViewInit, Component, TemplateRef, ViewChild} from '@angular/core';
-import {MatTableDataSource, MatTable} from '@angular/material/table';
-import {OverseerImage, OverseerImageService} from 'src/app/api/models/doubtfire-model';
-import {EntityFormComponent} from 'src/app/common/entity-form/entity-form.component';
 import {UntypedFormControl, Validators} from '@angular/forms';
-import {MatSort, Sort} from '@angular/material/sort';
-import {AlertService} from 'src/app/common/services/alert.service';
 import {MatDialog} from '@angular/material/dialog';
+import {MatSort, Sort} from '@angular/material/sort';
+import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {OverseerImage, OverseerImageService} from 'src/app/api/models/doubtfire-model';
+import {EntityFormComponent} from 'src/app/common/entity-form/entity-form.component';
 import {SidekiqProgressModalService} from 'src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service';
+import {AlertService} from 'src/app/common/services/alert.service';
 
 @Component({
   selector: 'overseer-image-list',
@@ -28,6 +29,8 @@ export class OverseerImageListComponent
   dataSource = new MatTableDataSource(this.overseerImages);
   loading = false;
 
+  public diskSpace: number | null = null;
+
   // Calls the parent's constructor, passing in an object
   // that maps all of the form controls that this form consists of.
   constructor(
@@ -35,6 +38,7 @@ export class OverseerImageListComponent
     private alerts: AlertService,
     private dialog: MatDialog,
     private sidekiqProgressModalService: SidekiqProgressModalService,
+    private httpClient: HttpClient,
   ) {
     super(
       {
@@ -50,6 +54,12 @@ export class OverseerImageListComponent
     this.overseerImageService.fetchAll().subscribe((response) => {
       this.pushToTable(response);
     });
+
+    this.httpClient.get<number>('/api/admin/disk_space').subscribe({
+      next: (diskSpace) => {
+        this.diskSpace = diskSpace;
+      },
+    });
   }
 
   // This method is passed to the submit method on the parent

From dc8f09aed858df85d8f724b1e22aca951411158f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Feb 2026 12:53:22 +1100
Subject: [PATCH 711/776] chore(release): 10.0.1-10

---
 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 8312fcf5ef..fe5b931cd2 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.
 
+### [10.0.1-10](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-9...v10.0.1-10) (2026-02-26)
+
+
+### Features
+
+* display available storage for docker images ([#1092](https://github.com/b0ink/doubtfire-deploy/issues/1092)) ([81ebd34](https://github.com/b0ink/doubtfire-deploy/commit/81ebd3488d20a1e057c24b37190f4eea99bad9ec))
+
 ### [10.0.1-9](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-8...v10.0.1-9) (2026-02-25)
 
 
diff --git a/package-lock.json b/package-lock.json
index a3464491aa..2f17c75d91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-9",
+  "version": "10.0.1-10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-9",
+      "version": "10.0.1-10",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index a714837d7b..66b4c62194 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-9",
+  "version": "10.0.1-10",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 05a4d15592181016fcd9245760a11fc58322e465 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Feb 2026 13:21:06 +1100
Subject: [PATCH 712/776] chore: increase allowed failed attempts

- Increase poll delay and failure threshold (5) to improve blue-green Caddy switchover buffer
---
 .../sidekiq-progress-modal.component.ts                   | 8 +++++---
 .../sidekiq-progress-modal.service.ts                     | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
index caac1b5d80..166f50a7b6 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.component.ts
@@ -20,10 +20,12 @@ export interface SidekiqProgressModalData {
   styleUrl: './sidekiq-progress-modal.component.scss',
 })
 export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
+  private readonly pollingInterval: number = 1250;
+
   private jobPollingInterval; // NodeJS.timeout
 
   pollFailureCount: number = 0;
-  pollFailureLimit: number = 3;
+  pollFailureLimit: number = 5;
 
   public job?: SidekiqJob;
 
@@ -38,13 +40,13 @@ export class SidekiqProgressModalComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit(): void {
-    this.pollFailureLimit = this.data.pollFailureLimit ?? 3;
+    this.pollFailureLimit = this.data.pollFailureLimit ?? 5;
     this.pollFailureCount = 0;
 
     this.getSidekiqJob();
     this.jobPollingInterval = setInterval(() => {
       this.getSidekiqJob();
-    }, 1000);
+    }, this.pollingInterval);
 
     this.dialogRef.afterClosed().subscribe(() => {
       clearInterval(this.jobPollingInterval);
diff --git a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
index 328b5bf95d..8316294b1f 100644
--- a/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
+++ b/src/app/common/modals/sidekiq-progress-modal/sidekiq-progress-modal.service.ts
@@ -29,7 +29,7 @@ export class SidekiqProgressModalService {
           title,
           jobId,
           subject: subject,
-          pollFailureLimit: 3,
+          pollFailureLimit: 5,
         },
         position: {top: '2.5%'},
         width: '100%',

From 6629a5f4b9834009dabf19a60a36c1289126034d Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 28 Feb 2026 12:00:10 +1100
Subject: [PATCH 713/776] fix: ensure deadline is returned

---
 .../task-description-card/task-description-card.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
index 5a27cae3e7..73da8076c8 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-description-card/task-description-card.component.ts
@@ -60,7 +60,7 @@ export class TaskDescriptionCardComponent {
     if (this.task) {
       return this.task.localDeadlineDate();
     }
-    this.taskDef.localDeadlineDate();
+    return this.taskDef.localDeadlineDate();
   }
 
   public shouldShowDeadline(): boolean {

From 7e551632c3f144e8f376a88912e1247db0609ea2 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 28 Feb 2026 12:28:50 +1100
Subject: [PATCH 714/776] chore: sort task planner by start date

---
 .../plan/task-planner/task-planner.component.ts    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/projects/states/plan/task-planner/task-planner.component.ts b/src/app/projects/states/plan/task-planner/task-planner.component.ts
index a5f1040717..44574d803f 100644
--- a/src/app/projects/states/plan/task-planner/task-planner.component.ts
+++ b/src/app/projects/states/plan/task-planner/task-planner.component.ts
@@ -598,8 +598,16 @@ export class TaskPlannerComponent implements OnInit {
       return [];
     }
 
-    return this.project.unit.taskDefinitions.filter((taskDef) => {
-      return taskDef.targetGrade <= this.targetGrade;
-    });
+    return this.project.unit.taskDefinitions
+      .filter((taskDef) => taskDef.targetGrade <= this.targetGrade)
+      .sort((a, b) => {
+        const taskA = this.project.findTaskForDefinition(a.id);
+        const taskB = this.project.findTaskForDefinition(b.id);
+
+        const dateA = taskA?.startDate ?? a.startDate;
+        const dateB = taskB?.startDate ?? b.startDate;
+
+        return new Date(dateA).getTime() - new Date(dateB).getTime();
+      });
   }
 }

From 392a18ec11ab88e3fd641234238fd8eec7664f20 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Sat, 28 Feb 2026 12:39:14 +1100
Subject: [PATCH 715/776] chore(release): 10.0.1-11

---
 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 fe5b931cd2..37e0e5fb3e 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.
 
+### [10.0.1-11](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-10...v10.0.1-11) (2026-02-28)
+
+
+### Bug Fixes
+
+* ensure deadline is returned ([6629a5f](https://github.com/b0ink/doubtfire-deploy/commit/6629a5f4b9834009dabf19a60a36c1289126034d))
+
 ### [10.0.1-10](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-9...v10.0.1-10) (2026-02-26)
 
 
diff --git a/package-lock.json b/package-lock.json
index 2f17c75d91..02c36a62a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-10",
+  "version": "10.0.1-11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-10",
+      "version": "10.0.1-11",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 66b4c62194..8d906c45ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-10",
+  "version": "10.0.1-11",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 5b82f94ef81ab52b3d71276bf76979207398f94a Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 2 Mar 2026 11:43:31 +1100
Subject: [PATCH 716/776] refactor: parse submission date with timestamp

---
 src/app/api/services/task.service.ts                            | 2 +-
 .../task-submission-card/task-submission-card.component.html    | 2 +-
 .../task-submission-card/task-submission-card.tpl.html          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index fb2a0c025a..8aaa3805a2 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -61,7 +61,7 @@ export class TaskService extends CachedEntityService<Task> {
       'scormExtensions',
       {
         keys: 'submissionDate',
-        toEntityFn: MappingFunctions.mapDateToDay,
+        toEntityFn: MappingFunctions.mapDate,
       },
       {
         keys: 'completionDate',
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html
index 8d7141d892..7d1fd9f9b9 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html
@@ -12,7 +12,7 @@
       submission or the files you uploaded below.
     </p>
     <p [hidden]="!submission?.isUploaded">
-      You uploaded this submission <strong>{{ task.submissionDate | humanizedDate }}</strong
+      You uploaded this submission <strong>{{ task.submissionDate | date: 'dd/MM/yyyy' }}</strong
       >.
     </p>
     <p [hidden]="!canRegeneratePdf">
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.tpl.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.tpl.html
index b4d417cc17..44c36541dc 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.tpl.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.tpl.html
@@ -15,7 +15,7 @@ <h4>
       submission or the files you uploaded below.
     </p>
     <p ng-show="submission.isUploaded">
-      You uploaded this submission <strong>{{task.submissionDate | humanizedDate}}</strong>.
+      You uploaded this submission <strong>{{task.submissionDate | date: 'dd/MM/yyyy'}}</strong>.
     </p>
     <p ng-show="canRegeneratePdf">
       If you feel there has been an error in your submission, you can request to

From 96b6bf09daea1be3b035239f26f3cd68fdb7c9df Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 2 Mar 2026 11:49:44 +1100
Subject: [PATCH 717/776] chore(release): 10.0.1-12

---
 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 37e0e5fb3e..f878a3c347 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.
 
+### [10.0.1-12](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-11...v10.0.1-12) (2026-03-02)
+
 ### [10.0.1-11](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-10...v10.0.1-11) (2026-02-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index 02c36a62a3..d4a6c48f3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-11",
+  "version": "10.0.1-12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-11",
+      "version": "10.0.1-12",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 8d906c45ff..bf849400c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-11",
+  "version": "10.0.1-12",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From bdcefda81e4acdef56ebe9f228632f26a904287c Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 3 Mar 2026 10:24:47 +1100
Subject: [PATCH 718/776] feat: add snooze moderation action (#1096)

---
 src/app/api/models/task.ts                          |  1 +
 .../directives/moderation/moderation.component.html | 11 +++++++++++
 .../directives/moderation/moderation.component.ts   | 13 +++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 456a531119..906e5759d8 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -36,6 +36,7 @@ export const FeedbackModerationAction = {
   DismissGood: 'dismiss_good',
   Upheld: 'upheld',
   Overturn: 'overturn',
+  Snooze: 'snooze',
 } as const;
 
 export type FeedbackModerationActionType =
diff --git a/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.html b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.html
index efb5f80449..ccd8e468e1 100644
--- a/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.html
+++ b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.html
@@ -12,6 +12,17 @@
     >
       <mat-icon>flag</mat-icon>
     </button>
+    <button
+      [disabled]="task === undefined || isModerated(task)"
+      mat-icon-button
+      matTooltip="Snooze task"
+      matTooltipPosition="above"
+      aria-label=""
+      class="button large-button"
+      (click)="snooze()"
+    >
+      <mat-icon>snooze</mat-icon>
+    </button>
     <button
       [disabled]="task === undefined || isModerated(task)"
       mat-icon-button
diff --git a/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.ts b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.ts
index 991cf71574..945b0ae0d3 100644
--- a/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/moderation/moderation.component.ts
@@ -88,6 +88,19 @@ export class ModerationComponent {
     );
   }
 
+  snooze() {
+    this.confirmModerationModal.show(
+      this.task,
+      'Snooze task',
+      'This task will be hidden from moderation until the tutor leaves new feedback. This will not affect how many tasks from this tutor are selected for moderation.',
+      'snooze',
+      false,
+      (applyToAll) => {
+        this.moderateTask('snooze', applyToAll);
+      },
+    );
+  }
+
   private moderateTask(action: FeedbackModerationActionType, applyToAll: boolean = false) {
     this.task.moderateFeedback(action, applyToAll).subscribe({
       next: (_response) => {

From d76a6d686421aa61d1e0be0c935d9f737b1c2956 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 3 Mar 2026 10:26:23 +1100
Subject: [PATCH 719/776] chore(release): 10.0.1-13

---
 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 f878a3c347..fc114a7174 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.
 
+### [10.0.1-13](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-12...v10.0.1-13) (2026-03-02)
+
+
+### Features
+
+* add snooze moderation action ([#1096](https://github.com/b0ink/doubtfire-deploy/issues/1096)) ([bdcefda](https://github.com/b0ink/doubtfire-deploy/commit/bdcefda81e4acdef56ebe9f228632f26a904287c))
+
 ### [10.0.1-12](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-11...v10.0.1-12) (2026-03-02)
 
 ### [10.0.1-11](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-10...v10.0.1-11) (2026-02-28)
diff --git a/package-lock.json b/package-lock.json
index d4a6c48f3d..eaa964b31f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-12",
+  "version": "10.0.1-13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-12",
+      "version": "10.0.1-13",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index bf849400c6..07868144ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-12",
+  "version": "10.0.1-13",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From a22d3fdf8ec6f4cf57115e95b582d1a3a9c00cb5 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 3 Mar 2026 13:43:34 +1100
Subject: [PATCH 720/776] refactor: remove streamless tutorials (#1093)

* refactor: remove ui to add tutorial with no stream

* refactor: improve tutorial ui

* refactor: add ui to show no tutorials added
---
 .../unit-tutorials-list.component.html        |  6 +--
 .../unit-tutorials-manager.component.html     | 39 ++++++++++++-------
 .../unit-tutorials-manager.component.scss     |  8 ++--
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.html b/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.html
index 03b219e422..a11935e9d4 100644
--- a/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.html
+++ b/src/app/units/states/edit/directives/unit-tutorials-list/unit-tutorials-list.component.html
@@ -225,13 +225,13 @@ <h4>Tutorials without a stream</h4>
     <ng-container matColumnDef="options" stickyEnd>
       <th mat-header-cell *matHeaderCellDef></th>
       <td mat-cell *matCellDef="let tutorial">
-        <div class="right" *ngIf="!editing(tutorial); else edit">
+        <div class="right mr-5" *ngIf="!editing(tutorial); else edit">
           <button mat-icon-button (click)="flagEdit(tutorial)">
             <mat-icon>edit</mat-icon>
           </button>
         </div>
         <ng-template #edit>
-          <div class="edit-actions right">
+          <div class="edit-actions right mr-5">
             <button mat-icon-button color="primary" (click)="submit()">
               <mat-icon>save</mat-icon>
             </button>
@@ -246,7 +246,7 @@ <h4>Tutorials without a stream</h4>
       </td>
       <td mat-footer-cell *matFooterCellDef>
         <div class="edit-actions right">
-          <button mat-icon-button (click)="submit()">
+          <button mat-icon-button (click)="submit()" class="mb-[22px] mr-5">
             <mat-icon>add</mat-icon>
           </button>
         </div>
diff --git a/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.html b/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.html
index 6159d62f94..9f98162d6d 100644
--- a/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.html
+++ b/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.html
@@ -1,21 +1,30 @@
 <div>
-  <df-unit-tutorials-list [unit]="unit"></df-unit-tutorials-list>
+  <!-- <df-unit-tutorials-list [unit]="unit"></df-unit-tutorials-list> -->
   @for (stream of unit.tutorialStreams; track stream) {
-  <df-unit-tutorials-list
-   
-    [unit]="unit"
-    [stream]="stream"
-  ></df-unit-tutorials-list>
-}
-  <button class="new-activity-stream-button" mat-raised-button [matMenuTriggerFor]="activities">
-    <mat-icon>add</mat-icon>
-    New Tutorial Stream
-  </button>
+    <df-unit-tutorials-list [unit]="unit" [stream]="stream"></df-unit-tutorials-list>
+  } @empty {
+    <div class="no-tutorials container">
+      <div class="flex flex-col justify-center items-center max-w-4xl mx-auto">
+        <mat-icon>groups</mat-icon>
+        <h1>No Tutorials</h1>
+        <p class="p-2 text-gray-500 text-center">
+          There are no tutorials yet. Create a tutorial stream to begin adding tutorials.
+        </p>
+      </div>
+    </div>
+  }
+  <div class="w-full flex justify-center mt-5">
+    <button mat-raised-button class="mx-auto" color="primary" [matMenuTriggerFor]="activities">
+      <mat-icon>add</mat-icon>
+      New Tutorial Stream
+    </button>
+  </div>
+
   <mat-menu #activities="matMenu">
     @for (activityType of activityTypes; track activityType) {
-  <button mat-menu-item (click)="onClickNewActivity(activityType)">
-      <span>{{ activityType.name }}</span>
-    </button>
-}
+      <button mat-menu-item (click)="onClickNewActivity(activityType)">
+        <span>{{ activityType.name }}</span>
+      </button>
+    }
   </mat-menu>
 </div>
diff --git a/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.scss b/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.scss
index 95fde129f0..7f40e10c71 100644
--- a/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.scss
+++ b/src/app/units/states/edit/directives/unit-tutorials-manager/unit-tutorials-manager.component.scss
@@ -1,5 +1,5 @@
-.new-activity-stream-button {
-  display: flex;
-  margin: 0 auto;
-  padding-left: 4px;
+.no-tutorials .mat-icon {
+  font-size: 75px;
+  width: 75px;
+  height: 75px;
 }

From 68dc9e3097ba336eba84e46e70cf008cf09afa55 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 3 Mar 2026 15:06:22 +1100
Subject: [PATCH 721/776] chore: add tooltip

---
 src/app/common/footer/footer.component.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index abbb434f3d..22316673e0 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -173,6 +173,7 @@
           <div class="relative inline-block">
             <button
               mat-icon-button
+              matTooltip="Open Tutor Notes"
               matTooltipPosition="above"
               class="button small-button"
               [disabled]="!selectedTask.tutor"

From 5014db2a75f329bc4a7fad03763b60e1ff6547d6 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 3 Mar 2026 17:15:05 +1100
Subject: [PATCH 722/776] chore: extend tutor notes max width

---
 .../tutor-notes-modal/tutor-notes-modal.component.html      | 6 +++++-
 .../modals/tutor-notes-modal/tutor-notes-modal.service.ts   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html
index d30a7a221d..56d9e9acc3 100644
--- a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html
+++ b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.component.html
@@ -1 +1,5 @@
-<f-tutor-notes-view class="h-full" [task]="task" [unitRole]="unitRole"></f-tutor-notes-view>
+<f-tutor-notes-view
+  class="h-full p-5 pb-0"
+  [task]="task"
+  [unitRole]="unitRole"
+></f-tutor-notes-view>
diff --git a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.service.ts b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.service.ts
index 152821d97c..ef32e890c6 100644
--- a/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.service.ts
+++ b/src/app/common/modals/tutor-notes-modal/tutor-notes-modal.service.ts
@@ -25,7 +25,7 @@ export class TutorNotesModalService {
         },
         width: '100%',
         height: '90vh',
-        maxWidth: '900px',
+        maxWidth: '1200px',
         panelClass: 'overflow-y-auto',
       },
     );

From 011980ddebb4caddaebb380aae4825930c077122 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 3 Mar 2026 17:16:18 +1100
Subject: [PATCH 723/776] feat: view tutor notes from unit staff editor

---
 .../unit-staff-editor.component.html                  | 11 ++++++++---
 .../unit-staff-editor/unit-staff-editor.component.ts  |  7 +++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
index 9dda4d23a0..c95e5c847e 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.html
@@ -105,9 +105,14 @@ <h3>Unit Staff</h3>
     <ng-container matColumnDef="actions">
       <th mat-header-cell *matHeaderCellDef>Actions</th>
       <td mat-cell *matCellDef="let unitRole">
-        <button mat-icon-button color="warn" (click)="removeStaff(unitRole)">
-          <mat-icon>delete</mat-icon>
-        </button>
+        <div class="flex gap-2">
+          <button mat-icon-button matTooltip="View Tutor Notes" (click)="openTutorNotes(unitRole)">
+            <mat-icon>local_library</mat-icon>
+          </button>
+          <button mat-icon-button color="warn" (click)="removeStaff(unitRole)">
+            <mat-icon>delete</mat-icon>
+          </button>
+        </div>
       </td>
     </ng-container>
     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
index e8b9a7a295..15b726d868 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
@@ -8,6 +8,7 @@ import {MatTableDataSource} from '@angular/material/table';
 import {MatButtonToggleChange} from '@angular/material/button-toggle';
 import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
 import {MatSelectChange} from '@angular/material/select';
+import {TutorNotesModalService} from 'src/app/common/modals/tutor-notes-modal/tutor-notes-modal.service';
 
 @Component({
   selector: 'unit-staff-editor',
@@ -39,6 +40,7 @@ export class UnitStaffEditorComponent implements OnInit {
     private alertService: AlertService,
     private unitRoleService: UnitRoleService,
     private confirmationModalService: ConfirmationModalService,
+    private tutorNotesModal: TutorNotesModalService,
   ) {}
 
   ngOnInit(): void {
@@ -217,4 +219,9 @@ export class UnitStaffEditorComponent implements OnInit {
   groupSetName(id: number) {
     this.unit.groupSetsCache.get(id).name || 'Individual Work';
   }
+
+  openTutorNotes(unitRole: UnitRole) {
+    unitRole.unit = this.unit; // HACK: ensure unit is mapped within the UnitRole
+    this.tutorNotesModal.show(null, unitRole);
+  }
 }

From 78509af07d0842b98b051ba2cab1174b7deb4c08 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 4 Mar 2026 10:01:07 +1100
Subject: [PATCH 724/776] chore(release): 10.0.1-14

---
 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 fc114a7174..6f1451ab51 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.
 
+### [10.0.1-14](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-13...v10.0.1-14) (2026-03-03)
+
+
+### Features
+
+* view tutor notes from unit staff editor ([011980d](https://github.com/b0ink/doubtfire-deploy/commit/011980ddebb4caddaebb380aae4825930c077122))
+
 ### [10.0.1-13](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-12...v10.0.1-13) (2026-03-02)
 
 
diff --git a/package-lock.json b/package-lock.json
index eaa964b31f..d45930ddf0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-13",
+  "version": "10.0.1-14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-13",
+      "version": "10.0.1-14",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 07868144ae..3fa23e6488 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-13",
+  "version": "10.0.1-14",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From de2013592661783a6dc546cbc1bb4947bff14c54 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 4 Mar 2026 13:19:16 +1100
Subject: [PATCH 725/776] chore: ensure all tasks filter is selected by default
 if task is null

---
 .../projects/states/tutor-notes/tutor-notes.component.html | 7 ++++++-
 .../projects/states/tutor-notes/tutor-notes.component.ts   | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-notes/tutor-notes.component.html b/src/app/projects/states/tutor-notes/tutor-notes.component.html
index b587307e5c..93eca2cd01 100644
--- a/src/app/projects/states/tutor-notes/tutor-notes.component.html
+++ b/src/app/projects/states/tutor-notes/tutor-notes.component.html
@@ -123,7 +123,12 @@
 
   <div class="h-[150px] border-t border-gray-300 p-4">
     <mat-chip-listbox selectable multiple class="mb-4">
-      <mat-chip-option value="all" (click)="toggleSelection('all')">All Tasks</mat-chip-option>
+      <mat-chip-option
+        value="all"
+        [selected]="selectedTaskDefinitions.get('all')"
+        (click)="toggleSelection('all')"
+        >All Tasks</mat-chip-option
+      >
       @for (option of taskDefinitionFilters; track option) {
         <mat-chip-option
           [value]="option"
diff --git a/src/app/projects/states/tutor-notes/tutor-notes.component.ts b/src/app/projects/states/tutor-notes/tutor-notes.component.ts
index 6f83b31b3d..2b1543c247 100644
--- a/src/app/projects/states/tutor-notes/tutor-notes.component.ts
+++ b/src/app/projects/states/tutor-notes/tutor-notes.component.ts
@@ -47,6 +47,8 @@ export class TutorNotesComponent implements OnInit {
     });
     if (this.task) {
       this.selectedTaskDefinitions.set(this.task.definition.abbreviation, true);
+    } else {
+      this.selectedTaskDefinitions.set('all', true);
     }
   }
 

From 4c86d5854b73676a1c074a48d7d75ef0a0aafbfc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 4 Mar 2026 13:20:01 +1100
Subject: [PATCH 726/776] chore: view tutor notes from task dropdown menu

---
 .../task-dropdown.component.html              |  3 +++
 .../task-dropdown/task-dropdown.component.ts  | 22 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index b09c5dbaa9..9a9a7b6c63 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -136,6 +136,9 @@
           <mat-icon aria-label="Tutor Discussion icon" fontIcon="qr_code_scanner"></mat-icon
           >Discussion
         </button>
+        <button (click)="openTutorNotes()" mat-menu-item>
+          <mat-icon aria-label="Tutor Notes icon" fontIcon="local_library"></mat-icon>Tutor Notes
+        </button>
         <mat-divider></mat-divider>
         <!-- <p class="task-dropdown-heading">Students</p> -->
         <button uiSref="units/students/list" [uiParams]="{unitId: unitRole.unit.id}" mat-menu-item>
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.ts b/src/app/common/header/task-dropdown/task-dropdown.component.ts
index bf22f382d8..2b945884c4 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.ts
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.ts
@@ -1,7 +1,8 @@
-import { Component, Input } from '@angular/core';
-import { UIRouter } from '@uirouter/core';
-import { Project, Unit, UnitRole } from 'src/app/api/models/doubtfire-model';
-import { ViewType } from 'src/app/projects/states/index/global-state.service';
+import {Component, Input} from '@angular/core';
+import {UIRouter} from '@uirouter/core';
+import {Project, Unit, UnitRole} from 'src/app/api/models/doubtfire-model';
+import {ViewType} from 'src/app/projects/states/index/global-state.service';
+import {TutorNotesModalService} from '../../modals/tutor-notes-modal/tutor-notes-modal.service';
 
 @Component({
   selector: 'task-dropdown',
@@ -33,9 +34,12 @@ export class TaskDropdownComponent {
     'Unit Analytics': 'Analytics',
   };
 
-  taskDropdownData: { title: string; target: string; visible: any }[];
-  constructor(private router: UIRouter) {
-    this.router.transitionService.onSuccess({ to: '**' }, (trans) => {
+  taskDropdownData: {title: string; target: string; visible: any}[];
+  constructor(
+    private router: UIRouter,
+    private tutorNotesModal: TutorNotesModalService,
+  ) {
+    this.router.transitionService.onSuccess({to: '**'}, (trans) => {
       this.currentActivity = trans.to().data.task;
       this.menuText = this.taskToShortName?.[this.currentActivity] ?? this.currentActivity;
     });
@@ -51,4 +55,8 @@ export class TaskDropdownComponent {
   public get isMentor(): boolean {
     return this.currentUnit.staff.some((ur) => ur.mentorId === this.unitRole.id);
   }
+
+  openTutorNotes() {
+    this.tutorNotesModal.show(null, this.unitRole);
+  }
 }

From 41f5e9d9d33a38115d43fb51ad98bfabee0b5b90 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 4 Mar 2026 13:34:57 +1100
Subject: [PATCH 727/776] chore(release): 10.0.1-15

---
 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 6f1451ab51..831d40d597 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.
 
+### [10.0.1-15](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-14...v10.0.1-15) (2026-03-04)
+
 ### [10.0.1-14](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-13...v10.0.1-14) (2026-03-03)
 
 
diff --git a/package-lock.json b/package-lock.json
index d45930ddf0..ca45abbee3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-14",
+  "version": "10.0.1-15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-14",
+      "version": "10.0.1-15",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 3fa23e6488..92f3019f52 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-14",
+  "version": "10.0.1-15",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 9780741c7e6e9a5dabcd428eb53a6f7ebd205064 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 4 Mar 2026 15:05:55 +1100
Subject: [PATCH 728/776] chore: require confirmation for removing staff

---
 .../unit-staff-editor.component.ts                 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
index 15b726d868..5eab52fae3 100644
--- a/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-staff-editor/unit-staff-editor.component.ts
@@ -210,10 +210,16 @@ export class UnitStaffEditorComponent implements OnInit {
    * @returns void
    */
   removeStaff(staff: UnitRole) {
-    this.unitRoleService.delete(staff, {cache: this.unit.staffCache}).subscribe({
-      next: () => this.alertService.success('Staff member removed', 2000),
-      error: (response) => this.alertService.error(response, 6000),
-    });
+    this.confirmationModalService.show(
+      'Remove staff member',
+      `Are you sure you want to remove ${staff.user.name} from ${this.unit.code} ${this.unit.name}?`,
+      () => {
+        this.unitRoleService.delete(staff, {cache: this.unit.staffCache}).subscribe({
+          next: () => this.alertService.success('Staff member removed', 2000),
+          error: (response) => this.alertService.error(response, 6000),
+        });
+      },
+    );
   }
 
   groupSetName(id: number) {

From 1aee8e19c5b447ebf1c87ba08bdf89b113fb120b Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 4 Mar 2026 15:06:39 +1100
Subject: [PATCH 729/776] chore(release): 10.0.1-16

---
 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 831d40d597..70c0ae9ac0 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.
 
+### [10.0.1-16](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-15...v10.0.1-16) (2026-03-04)
+
 ### [10.0.1-15](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-14...v10.0.1-15) (2026-03-04)
 
 ### [10.0.1-14](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-13...v10.0.1-14) (2026-03-03)
diff --git a/package-lock.json b/package-lock.json
index ca45abbee3..80db3c2768 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-15",
+  "version": "10.0.1-16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-15",
+      "version": "10.0.1-16",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 92f3019f52..ed60f2244d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-15",
+  "version": "10.0.1-16",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From c77325a2992d0b326bdeb27cd00a955aaa19811c Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 4 Mar 2026 15:19:40 +1100
Subject: [PATCH 730/776] fix: empty prompts layout

---
 .../task-definition-discussion-prompts.component.html       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.html
index 86d762974e..7453a19525 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-discussion-prompts/task-definition-discussion-prompts.component.html
@@ -62,10 +62,10 @@
       <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
       <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
     </table>
-    @if (!dataSource.data.length) {
-      <div class="w-full text-center text-gray-400 m-5">No discussion prompts</div>
-    }
   </div>
+  @if (!dataSource.data.length) {
+    <div class="w-full text-center text-gray-400 m-5">No discussion prompts</div>
+  }
   @if (!creatingNewDiscussionPrompt) {
     <div class="flex justify-center m-5">
       <button mat-raised-button color="primary" (click)="createNewDiscussionPrompt()">

From e704afcd00ed71fce24550345bb3a5adc58d8e34 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 6 Mar 2026 12:30:41 +1100
Subject: [PATCH 731/776] chore: always show mark as read button (#1098)

---
 .../tutor-notes/tutor-notes.component.html    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/app/projects/states/tutor-notes/tutor-notes.component.html b/src/app/projects/states/tutor-notes/tutor-notes.component.html
index 93eca2cd01..5d65d88936 100644
--- a/src/app/projects/states/tutor-notes/tutor-notes.component.html
+++ b/src/app/projects/states/tutor-notes/tutor-notes.component.html
@@ -33,26 +33,27 @@
         }
         <mat-card
           [id]="'note-' + note.id"
-          class="mb-4 p-5"
+          class="mb-4 p-5 pb-12"
           (mouseover)="hoveredNoteId = note.id"
           (mouseout)="hoveredNoteId = null"
         >
-          <div
-            [hidden]="hoveredNoteId !== note.id"
-            class="flex items-center absolute right-5 bottom-5"
-          >
+          <div class="flex items-center absolute right-5 bottom-5 gap-5">
+            <div [hidden]="hoveredNoteId !== note.id" class="flex items-center">
+              @if (note.authorIsMe) {
+                <mat-icon type="button" (click)="editNote(note)">edit</mat-icon>
+              }
+              <mat-icon type="button" (click)="replyToNote(note)">reply</mat-icon>
+              <mat-icon type="button" (click)="deleteNote(note)">delete</mat-icon>
+            </div>
             @if (!note.readByUnitRole) {
               @if (note.noteIsForMe) {
-                <button mat-button color="primary" (click)="markAsRead(note)">Mark as Read</button>
+                <button mat-stroked-button color="primary" (click)="markAsRead(note)">
+                  Mark as read
+                </button>
               }
             } @else {
               <div class="text-gray-400 italic px-5">Read by tutor</div>
             }
-            @if (note.authorIsMe) {
-              <mat-icon type="button" (click)="editNote(note)">edit</mat-icon>
-            }
-            <mat-icon type="button" (click)="replyToNote(note)">reply</mat-icon>
-            <mat-icon type="button" (click)="deleteNote(note)">delete</mat-icon>
           </div>
 
           <div class="flex justify-between">

From a3f9d6dfeee06c173daab730c16c27a629819fba Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 6 Mar 2026 12:59:50 +1100
Subject: [PATCH 732/776] chore(release): 10.0.1-17

---
 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 70c0ae9ac0..920b0694a7 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.
 
+### [10.0.1-17](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-16...v10.0.1-17) (2026-03-06)
+
+
+### Bug Fixes
+
+* empty prompts layout ([c77325a](https://github.com/b0ink/doubtfire-deploy/commit/c77325a2992d0b326bdeb27cd00a955aaa19811c))
+
 ### [10.0.1-16](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-15...v10.0.1-16) (2026-03-04)
 
 ### [10.0.1-15](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-14...v10.0.1-15) (2026-03-04)
diff --git a/package-lock.json b/package-lock.json
index 80db3c2768..a95ab51ec5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-16",
+  "version": "10.0.1-17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-16",
+      "version": "10.0.1-17",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index ed60f2244d..0ebd47d9a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-16",
+  "version": "10.0.1-17",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 8fe61718c0e263fa965b861763337af27c175b36 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 9 Mar 2026 15:52:01 +1100
Subject: [PATCH 733/776] fix: dont subtract tutor note count for reading your
 own notes

---
 src/app/api/services/tutor-note.service.ts  | 4 +++-
 src/app/common/header/header.component.html | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/api/services/tutor-note.service.ts b/src/app/api/services/tutor-note.service.ts
index a1c85cbb30..3e08ce451d 100644
--- a/src/app/api/services/tutor-note.service.ts
+++ b/src/app/api/services/tutor-note.service.ts
@@ -137,7 +137,9 @@ export class TutorNoteService extends CachedEntityService<TutorNote> {
       tap((response: boolean) => {
         if (response) {
           note.readByUnitRole = true;
-          unitRole.tutorNoteCount--;
+          if (unitRole.user.id !== note.user.id) {
+            unitRole.tutorNoteCount--;
+          }
           // unitRole.tutorNoteCount = unitRole.tutorNotesCache.currentValues.filter(
           //   (note) => !note.readByUnitRole,
           // ).length;
diff --git a/src/app/common/header/header.component.html b/src/app/common/header/header.component.html
index 7b494c2198..76e5022622 100644
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
@@ -45,7 +45,7 @@
         <mat-icon>cloud_sync_outline</mat-icon>
       </button>
     }
-    @if (currentUnit && currentUnitRole && currentUnitRole.tutorNoteCount) {
+    @if (currentUnit && currentUnitRole && currentUnitRole.tutorNoteCount > 0) {
       <!-- TODO: Replace this with a more standardised notification system -->
       <button mat-icon-button (click)="openTutorNotes()" matTooltip="Tutor Notes">
         <mat-icon [matBadge]="currentUnitRole.tutorNoteCount" matBadgeSize="small"

From 7c508cba8695fcd7b6df4aaa53a70066ecb137f3 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Mar 2026 10:39:15 +1100
Subject: [PATCH 734/776] fix: convert emojis in submission comment to string
 with colons (#1105)

---
 .../upload-submission-modal/upload-submission-modal.coffee    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
index f60a2a7b48..a310b31abf 100644
--- a/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
+++ b/src/app/tasks/modals/upload-submission-modal/upload-submission-modal.coffee
@@ -32,7 +32,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
 
   UploadSubmissionModal
 )
-.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, newTaskService, newProjectService, task, reuploadEvidence, PrivacyPolicy, alertService) ->
+.controller('UploadSubmissionModalCtrl', ($scope, $rootScope, $timeout, $modalInstance, newTaskService, newProjectService, task, reuploadEvidence, PrivacyPolicy, alertService, emojiService) ->
   $scope.privacyPolicy = PrivacyPolicy
   # Expose task to scope
   $scope.task = task
@@ -71,7 +71,7 @@ angular.module('doubtfire.tasks.modals.upload-submission-modal', [])
       $scope.uploader.payload.trigger = 'need_help' if $scope.submissionType == 'need_help'
       $scope.uploader.payload.trigger = 'assess_in_portfolio' if $scope.submissionType == 'assess_in_portfolio' || $scope.task.status == 'assess_in_portfolio'
       if $scope.comment? and $scope.comment.trim() isnt ''
-        $scope.uploader.payload.comment = $scope.comment
+        $scope.uploader.payload.comment = emojiService.nativeEmojiToColons($scope.comment)
     onSuccess: (response) ->
       # Ensure our response contains the data we're expecting
       if typeof response is 'object' and response? and response.id? and response.project_id? and response.status?

From c302547b31705b5974f26575635816a1801935e4 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Mar 2026 10:40:02 +1100
Subject: [PATCH 735/776] chore(release): 10.0.1-18

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 920b0694a7..87b5f30590 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+### [10.0.1-18](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-17...v10.0.1-18) (2026-03-11)
+
+
+### Bug Fixes
+
+* convert emojis in submission comment to string with colons ([#1105](https://github.com/b0ink/doubtfire-deploy/issues/1105)) ([7c508cb](https://github.com/b0ink/doubtfire-deploy/commit/7c508cba8695fcd7b6df4aaa53a70066ecb137f3))
+* dont subtract tutor note count for reading your own notes ([8fe6171](https://github.com/b0ink/doubtfire-deploy/commit/8fe61718c0e263fa965b861763337af27c175b36))
+
 ### [10.0.1-17](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-16...v10.0.1-17) (2026-03-06)
 
 
diff --git a/package-lock.json b/package-lock.json
index a95ab51ec5..d83d3388f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-17",
+  "version": "10.0.1-18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-17",
+      "version": "10.0.1-18",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 0ebd47d9a2..7b76634133 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-17",
+  "version": "10.0.1-18",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 5bc6d840c3f466cbea90766934f633f0eae4e6d3 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 12 Mar 2026 15:01:24 +1100
Subject: [PATCH 736/776] chore: hide tutor notes icon in footer from tutors

---
 src/app/common/footer/footer.component.ts                      | 3 +--
 .../common/header/task-dropdown/task-dropdown.component.html   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 3898c07d56..f246322423 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -69,8 +69,7 @@ export class FooterComponent implements OnInit {
     const canAccess =
       this.currentUnitRole.role === 'Convenor' ||
       this.currentUnitRole.role === 'Admin' ||
-      (tutor.mentor && tutor.mentor.id === this.currentUnitRole.id) ||
-      tutor.id === this.currentUnitRole.id;
+      (tutor.mentor && tutor.mentor.id === this.currentUnitRole.id);
 
     return canAccess;
   }
diff --git a/src/app/common/header/task-dropdown/task-dropdown.component.html b/src/app/common/header/task-dropdown/task-dropdown.component.html
index 9a9a7b6c63..dcc4bf854d 100644
--- a/src/app/common/header/task-dropdown/task-dropdown.component.html
+++ b/src/app/common/header/task-dropdown/task-dropdown.component.html
@@ -137,7 +137,7 @@
           >Discussion
         </button>
         <button (click)="openTutorNotes()" mat-menu-item>
-          <mat-icon aria-label="Tutor Notes icon" fontIcon="local_library"></mat-icon>Tutor Notes
+          <mat-icon aria-label="Tutor Notes icon" fontIcon="local_library"></mat-icon>My Tutor Notes
         </button>
         <mat-divider></mat-divider>
         <!-- <p class="task-dropdown-heading">Students</p> -->

From d706f0918285a2c6d69c6240a93b41e88506f771 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 13 Mar 2026 14:09:26 +1100
Subject: [PATCH 737/776] feat: view submission history + zip file editor
 (#1104)

* feat: zip file viewer

* refactor: display upload requirement names instead of zipped file names if available

* feat: show file comparisons when selecting two submissions

* chore: ensure single editor sets correct language

* chore: close menu when selecting for comparison

* refactor: add task and student to modal title

* refactor: clean up ui

* fix: set correct submission number

* refactor: reduce duplicated code

* feat: add tree navigation and edit overseer resources

* refactor: show submission id and most recent

* chore: fix icon size

* refactor: clean up logic

* chore: view submission files as staff only
---
 package-lock.json                             |  14 +-
 package.json                                  |   1 +
 .../models/overseer/overseer-assessment.ts    |  10 +
 .../services/overseer-assessment.service.ts   |   1 +
 .../archive-viewer.component.html             | 193 ++++++++
 .../archive-viewer.component.scss             |  34 ++
 .../archive-viewer.component.ts               | 464 ++++++++++++++++++
 .../archive-viewer/archive-viewer.helpers.ts  | 252 ++++++++++
 .../common/pdf-viewer/pdf-viewer.component.ts |   6 +-
 src/app/doubtfire-angular.module.ts           |   4 +
 .../submission-files-modal.component.html     | 214 ++++++++
 .../submission-files-modal.component.scss     |   5 +
 .../submission-files-modal.component.ts       | 279 +++++++++++
 .../task-overseer-report.component.html       |  42 +-
 .../task-overseer-report.component.ts         | 105 +++-
 .../task-definition-overseer.component.html   |  45 +-
 .../task-definition-overseer.component.ts     |  49 ++
 17 files changed, 1698 insertions(+), 20 deletions(-)
 create mode 100644 src/app/common/archive-viewer/archive-viewer.component.html
 create mode 100644 src/app/common/archive-viewer/archive-viewer.component.scss
 create mode 100644 src/app/common/archive-viewer/archive-viewer.component.ts
 create mode 100644 src/app/common/archive-viewer/archive-viewer.helpers.ts
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.html
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.scss
 create mode 100644 src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.ts

diff --git a/package-lock.json b/package-lock.json
index d83d3388f8..559f9dc27f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,6 +59,7 @@
         "html2canvas": "^1.4.1",
         "html5-qrcode": "^2.3.8",
         "jquery": "2.1.4",
+        "jszip": "^3.10.1",
         "lodash": "~4.17",
         "lottie-web": "^5.12.2",
         "marked": "^11.1.0",
@@ -8587,7 +8588,6 @@
     },
     "node_modules/core-util-is": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/cors": {
@@ -13133,7 +13133,6 @@
     },
     "node_modules/immediate": {
       "version": "3.0.6",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/immutable": {
@@ -14568,7 +14567,8 @@
     },
     "node_modules/jszip": {
       "version": "3.10.1",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
       "license": "(MIT OR GPL-3.0-or-later)",
       "dependencies": {
         "lie": "~3.3.0",
@@ -14579,12 +14579,10 @@
     },
     "node_modules/jszip/node_modules/isarray": {
       "version": "1.0.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/jszip/node_modules/readable-stream": {
       "version": "2.3.8",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -14598,7 +14596,6 @@
     },
     "node_modules/jszip/node_modules/string_decoder": {
       "version": "1.1.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
@@ -15009,7 +15006,6 @@
     },
     "node_modules/lie": {
       "version": "3.3.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "immediate": "~3.0.5"
@@ -17335,7 +17331,6 @@
     },
     "node_modules/pako": {
       "version": "1.0.11",
-      "dev": true,
       "license": "(MIT AND Zlib)"
     },
     "node_modules/param-case": {
@@ -18302,7 +18297,6 @@
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/promise": {
@@ -19839,7 +19833,6 @@
     },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/safe-json-parse": {
@@ -20281,7 +20274,6 @@
     },
     "node_modules/setimmediate": {
       "version": "1.0.5",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/setprototypeof": {
diff --git a/package.json b/package.json
index 7b76634133..2b04546593 100644
--- a/package.json
+++ b/package.json
@@ -78,6 +78,7 @@
     "html2canvas": "^1.4.1",
     "html5-qrcode": "^2.3.8",
     "jquery": "2.1.4",
+    "jszip": "^3.10.1",
     "lodash": "~4.17",
     "lottie-web": "^5.12.2",
     "marked": "^11.1.0",
diff --git a/src/app/api/models/overseer/overseer-assessment.ts b/src/app/api/models/overseer/overseer-assessment.ts
index 005b6be09f..a41bcbb5d2 100644
--- a/src/app/api/models/overseer/overseer-assessment.ts
+++ b/src/app/api/models/overseer/overseer-assessment.ts
@@ -1,4 +1,6 @@
 import {Entity, EntityCache, EntityMapping} from 'ngx-entity-service';
+import {AppInjector} from 'src/app/app-injector';
+import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 import {Task} from '../doubtfire-model';
 import {OverseerStepResult} from './overseer-step-result';
 
@@ -19,6 +21,7 @@ export class OverseerAssessment extends Entity {
   passedSteps: number;
 
   label: string;
+  hasSubmissionFiles?: boolean;
 
   public readonly stepResultsCache: EntityCache<OverseerStepResult> =
     new EntityCache<OverseerStepResult>();
@@ -50,4 +53,11 @@ export class OverseerAssessment extends Entity {
   public get reportReady() {
     return this.submissionStatus === 'passed' || this.submissionStatus === 'failed';
   }
+
+  public submissionFilesUrl(): string {
+    const constants = AppInjector.get(DoubtfireConstants);
+    const timestamp =
+      this.timestampString ?? Math.floor(this.timestamp.getTime() / 1000).toString();
+    return `${constants.API_URL}/projects/${this.task.project.id}/task_def_id/${this.task.definition.id}/submissions/timestamps/${timestamp}/files`;
+  }
 }
diff --git a/src/app/api/services/overseer-assessment.service.ts b/src/app/api/services/overseer-assessment.service.ts
index df897e43be..82c41e3dbc 100644
--- a/src/app/api/services/overseer-assessment.service.ts
+++ b/src/app/api/services/overseer-assessment.service.ts
@@ -53,6 +53,7 @@ export class OverseerAssessmentService extends EntityService<OverseerAssessment>
       'overseerStepId',
       'totalSteps',
       'passedSteps',
+      'hasSubmissionFiles',
     );
   }
 
diff --git a/src/app/common/archive-viewer/archive-viewer.component.html b/src/app/common/archive-viewer/archive-viewer.component.html
new file mode 100644
index 0000000000..da1de5293f
--- /dev/null
+++ b/src/app/common/archive-viewer/archive-viewer.component.html
@@ -0,0 +1,193 @@
+<div class="flex h-full min-h-0 min-w-0 w-full max-w-full flex-col">
+  @if (isLoading) {
+    <div
+      class="flex min-h-[20rem] flex-1 flex-col items-center justify-center gap-3 text-slate-600"
+    >
+      <mat-spinner diameter="40" strokeWidth="3"></mat-spinner>
+      <span>Loading archive...</span>
+    </div>
+  } @else if (errorMessage) {
+    <div class="flex min-h-[20rem] flex-1 flex-col items-center justify-center gap-3 text-red-700">
+      <mat-icon class="h-8 w-8">error_outline</mat-icon>
+      <span>{{ errorMessage }}</span>
+    </div>
+  } @else if (!archiveFile) {
+    <div
+      class="flex min-h-[20rem] flex-1 flex-col items-center justify-center gap-3 text-slate-600"
+    >
+      <mat-icon class="h-8 w-8">folder_zip</mat-icon>
+      <span>Select an archive to preview.</span>
+    </div>
+  } @else if (!hasFiles) {
+    <div
+      class="flex min-h-[20rem] flex-1 flex-col items-center justify-center gap-3 text-slate-600"
+    >
+      <mat-icon class="h-8 w-8">folder_off</mat-icon>
+      <span>No files to display.</span>
+    </div>
+  } @else {
+    @if (!readOnly && saveEndpoint) {
+      <div class="flex justify-end px-3 pt-3 items-center">
+        <button
+          mat-flat-button
+          color="primary"
+          (click)="saveArchive()"
+          [disabled]="!canSave"
+          class="flex items-center gap-2"
+        >
+          @if (isSaving) {
+            <mat-icon class="animate-spin">sync</mat-icon>
+            Saving...
+          } @else {
+            <!-- <mat-icon>save</mat-icon> -->
+            Save Archive
+          }
+        </button>
+      </div>
+    }
+
+    @if (navigationMode === 'tree') {
+      <div class="flex min-h-0 w-full flex-1 border-t border-slate-200">
+        <aside
+          class="w-72 max-w-[45%] min-w-[13rem] shrink-0 overflow-y-auto border-r border-slate-200 bg-slate-50/60 py-2"
+        >
+          <ng-container
+            [ngTemplateOutlet]="treeNodesTemplate"
+            [ngTemplateOutletContext]="{$implicit: fileTreeNodes, depth: 0}"
+          ></ng-container>
+        </aside>
+        <div class="min-w-0 flex flex-1 flex-col">
+          <ng-container [ngTemplateOutlet]="selectedFilePane"></ng-container>
+        </div>
+      </div>
+    } @else {
+      <div
+        class="sticky top-0 z-10 w-full max-w-full shrink-0 overflow-x-auto overflow-y-hidden bg-white px-1 pb-1 min-w-0"
+      >
+        <div class="inline-block min-w-full">
+          <mat-button-toggle-group
+            [value]="selectedTab"
+            (change)="selectTab($event.value)"
+            class="inline-flex whitespace-nowrap"
+            style="display: inline-flex; width: max-content"
+          >
+            @for (file of files; track trackByPath($index, file); let i = $index) {
+              <mat-button-toggle [value]="i" [title]="file.path" class="flex-none">
+                <span class="inline-block max-w-56 truncate align-bottom">{{ file.tabLabel }}</span>
+              </mat-button-toggle>
+            }
+          </mat-button-toggle-group>
+        </div>
+      </div>
+      <ng-container [ngTemplateOutlet]="selectedFilePane"></ng-container>
+    }
+  }
+</div>
+
+<ng-template #selectedFilePane>
+  @if (selectedFile; as file) {
+    <div class="flex min-h-0 w-full flex-1 flex-col">
+      @if (showPreview) {
+        @if (file.isLoading || !file.isLoaded) {
+          <div
+            class="flex min-h-[350px] w-full flex-1 items-center justify-center gap-3 text-slate-600"
+          >
+            <mat-spinner [diameter]="42"></mat-spinner>
+            <span>Loading {{ file.name }}...</span>
+          </div>
+        } @else if (isArchiveCodeOrTextFile(file)) {
+          <div class="archive-editor-wrapper flex min-h-0 flex-1 flex-col">
+            <ng-container
+              [ngTemplateOutlet]="filePathLabel"
+              [ngTemplateOutletContext]="{$implicit: file.path}"
+            ></ng-container>
+            <ngx-monaco-editor
+              class="archive-monaco block h-full w-full flex-1"
+              [options]="editorOptionsForSelectedFile"
+              [ngModel]="file.textContent"
+              (ngModelChange)="onEditorChange($event)"
+            ></ngx-monaco-editor>
+          </div>
+        } @else if (isArchiveImageFile(file)) {
+          <div class="flex min-h-0 w-full flex-1 flex-col">
+            <ng-container
+              [ngTemplateOutlet]="filePathLabel"
+              [ngTemplateOutletContext]="{$implicit: file.path}"
+            ></ng-container>
+            <div class="flex min-h-[350px] w-full flex-1 items-center justify-center p-4">
+              <img
+                class="max-h-full max-w-full object-contain"
+                [src]="file.blobUrl"
+                [alt]="file.name"
+              />
+            </div>
+          </div>
+        } @else if (isArchivePdfFile(file)) {
+          <div class="archive-pdf-wrapper flex min-h-0 flex-1 flex-col">
+            <ng-container
+              [ngTemplateOutlet]="filePathLabel"
+              [ngTemplateOutletContext]="{$implicit: file.path}"
+            ></ng-container>
+            <f-pdf-viewer class="block h-full w-full flex-1" [pdfUrl]="file.blobUrl"></f-pdf-viewer>
+          </div>
+        } @else {
+          <div
+            class="flex min-h-[350px] flex-1 items-center justify-center gap-4 px-4 text-slate-600"
+          >
+            <mat-icon class="h-9 w-9">insert_drive_file</mat-icon>
+            <div>
+              <p class="mb-3">This file type cannot be previewed.</p>
+              <button mat-stroked-button color="primary" (click)="downloadSelectedFile()">
+                <mat-icon>download</mat-icon>
+                Download {{ file.name }}
+              </button>
+            </div>
+          </div>
+        }
+      }
+    </div>
+  }
+</ng-template>
+
+<ng-template #treeNodesTemplate let-nodes let-depth="depth">
+  @for (node of nodes; track trackTreeNode($index, node)) {
+    @if (node.isDirectory) {
+      <div
+        class="flex items-center gap-1 py-1 pr-2 text-slate-600"
+        [style.paddingLeft.px]="8 + depth * 14"
+        [title]="node.path"
+      >
+        <mat-icon class="small-icon text-slate-500">folder</mat-icon>
+        <span class="truncate">{{ node.name }}</span>
+      </div>
+      <ng-container
+        [ngTemplateOutlet]="treeNodesTemplate"
+        [ngTemplateOutletContext]="{$implicit: node.children, depth: depth + 1}"
+      ></ng-container>
+    } @else {
+      <button
+        type="button"
+        class="flex w-full items-center gap-1 py-1 pr-2 text-left hover:bg-slate-200/70"
+        [style.paddingLeft.px]="8 + depth * 14"
+        [ngClass]="{
+          'bg-slate-200/80 text-slate-900': selectedTab === node.fileIndex,
+          'text-slate-700': selectedTab !== node.fileIndex
+        }"
+        [title]="node.path"
+        (click)="selectTreeNode(node)"
+      >
+        <mat-icon class="small-icon text-slate-500">description</mat-icon>
+        <span class="truncate">{{ treeNodeLabel(node) }}</span>
+      </button>
+    }
+  }
+</ng-template>
+
+<ng-template #filePathLabel let-path>
+  <div
+    class="shrink-0 overflow-hidden px-4 py-2 text-slate-700 whitespace-nowrap truncate"
+    [title]="path"
+  >
+    {{ path }}
+  </div>
+</ng-template>
diff --git a/src/app/common/archive-viewer/archive-viewer.component.scss b/src/app/common/archive-viewer/archive-viewer.component.scss
new file mode 100644
index 0000000000..62defd6df8
--- /dev/null
+++ b/src/app/common/archive-viewer/archive-viewer.component.scss
@@ -0,0 +1,34 @@
+:host {
+  display: block;
+  min-width: 0;
+  width: 100%;
+  height: 100%;
+  min-height: 0;
+}
+
+.archive-editor-wrapper,
+.archive-pdf-wrapper {
+  width: 100%;
+  height: 100%;
+  min-height: 350px;
+  flex: 1 1 auto;
+  overflow: hidden;
+}
+
+:host ::ng-deep .archive-monaco {
+  width: 100% !important;
+  height: 100% !important;
+}
+
+:host ::ng-deep .archive-monaco .monaco-editor,
+:host ::ng-deep .archive-monaco .overflow-guard,
+:host ::ng-deep .archive-monaco .monaco-scrollable-element {
+  width: 100% !important;
+  height: 100% !important;
+}
+
+.small-icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+}
diff --git a/src/app/common/archive-viewer/archive-viewer.component.ts b/src/app/common/archive-viewer/archive-viewer.component.ts
new file mode 100644
index 0000000000..152f261b25
--- /dev/null
+++ b/src/app/common/archive-viewer/archive-viewer.component.ts
@@ -0,0 +1,464 @@
+import {HttpClient, HttpResponse} from '@angular/common/http';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import JSZip from 'jszip';
+import {firstValueFrom} from 'rxjs';
+import {AlertService} from '../services/alert.service';
+import {
+  ArchiveFileEntry,
+  classifyArchiveFile,
+  createArchiveFileEntry,
+  createArchiveFilePlaceholder,
+  getMonacoLanguageForPath,
+  getOrderedUploadFileIndex,
+  isArchiveCodeOrTextFile,
+  isArchiveImageFile,
+  isArchivePathHidden,
+  isArchivePdfFile,
+} from './archive-viewer.helpers';
+
+type ArchiveViewerNavigationMode = 'tabs' | 'tree';
+
+interface ArchiveFileTreeNode {
+  key: string;
+  name: string;
+  path: string;
+  isDirectory: boolean;
+  fileIndex: number | null;
+  children: ArchiveFileTreeNode[];
+}
+
+@Component({
+  selector: 'f-archive-viewer',
+  templateUrl: './archive-viewer.component.html',
+  styleUrls: ['./archive-viewer.component.scss'],
+})
+export class ArchiveViewerComponent implements OnChanges, OnDestroy {
+  @Input() archiveFile: File | Blob | null = null;
+  @Input() navigationMode: ArchiveViewerNavigationMode = 'tabs';
+  @Input() readOnly = true;
+  @Input() uploadRequirementNames: string[] = [];
+  @Input() showPreview = true;
+  @Input() preloadSelectedFile = false;
+  @Input() saveEndpoint?: string;
+  @Input() saveMethod: 'POST' | 'PUT' = 'POST';
+  @Input() saveFieldName = 'file';
+  @Input() saveFileName = 'archive.zip';
+
+  @Output() filesLoaded = new EventEmitter<number>();
+  @Output() saveSuccess = new EventEmitter<HttpResponse<unknown>>();
+  @Output() saveError = new EventEmitter<unknown>();
+  @Output() selectedFileChanged = new EventEmitter<ArchiveFileEntry | null>();
+
+  public files: ArchiveFileEntry[] = [];
+  public selectedTab = 0;
+  public isLoading = false;
+  public isSaving = false;
+  public errorMessage: string | null = null;
+  public fileTreeNodes: ArchiveFileTreeNode[] = [];
+
+  public readonly isArchiveCodeOrTextFile = isArchiveCodeOrTextFile;
+  public readonly isArchiveImageFile = isArchiveImageFile;
+  public readonly isArchivePdfFile = isArchivePdfFile;
+
+  public readonly editorOptions = {
+    theme: 'vs',
+    language: 'plaintext',
+    automaticLayout: true,
+    scrollBeyondLastLine: false,
+    renderMinimap: false,
+    scrollbar: {
+      alwaysConsumeMouseWheel: false,
+    },
+    minimap: {
+      enabled: false,
+    },
+  };
+
+  public editorOptionsForSelectedFile = {
+    ...this.editorOptions,
+    language: 'plaintext',
+    readOnly: true,
+  };
+
+  constructor(
+    private http: HttpClient,
+    private alerts: AlertService,
+  ) {}
+
+  public ngOnChanges(changes: SimpleChanges): void {
+    if (changes['archiveFile']) {
+      void this.loadArchive();
+    }
+
+    if (changes['uploadRequirementNames']) {
+      this.applyUploadRequirementLabels(this.files);
+      this.rebuildFileTree();
+    }
+
+    if (changes['readOnly']) {
+      this.updateEditorOptions();
+    }
+  }
+
+  public ngOnDestroy(): void {
+    this.clearFiles();
+  }
+
+  public get selectedFile(): ArchiveFileEntry | null {
+    return this.files[this.selectedTab] ?? null;
+  }
+
+  public get hasFiles(): boolean {
+    return this.files.length > 0;
+  }
+
+  public get hasDirtyFiles(): boolean {
+    return this.files.some((entry) => entry.dirty);
+  }
+
+  public get canSave(): boolean {
+    return !this.readOnly && !!this.saveEndpoint && this.hasDirtyFiles && !this.isSaving;
+  }
+
+  public trackByPath(index: number, file: ArchiveFileEntry): string {
+    return `${index}-${file.path}`;
+  }
+
+  public trackTreeNode(_index: number, node: ArchiveFileTreeNode): string {
+    return node.key;
+  }
+
+  public selectTreeNode(node: ArchiveFileTreeNode): void {
+    if (node.fileIndex === null) {
+      return;
+    }
+
+    this.selectTab(node.fileIndex);
+  }
+
+  public treeNodeLabel(node: ArchiveFileTreeNode): string {
+    return node.fileIndex === null ? node.name : this.files[node.fileIndex]?.tabLabel || node.name;
+  }
+
+  public selectTab(index: number): void {
+    this.selectedTab = index;
+    this.updateEditorOptions();
+    void this.loadAndPrepareSelectedFile();
+  }
+
+  public selectedFileLanguage(): string {
+    const selectedFile = this.selectedFile;
+    if (!selectedFile) {
+      return 'plaintext';
+    }
+
+    return selectedFile.language ?? getMonacoLanguageForPath(selectedFile.path) ?? 'plaintext';
+  }
+
+  public onEditorChange(value: string): void {
+    const selectedFile = this.selectedFile;
+    if (
+      !selectedFile ||
+      !selectedFile.isLoaded ||
+      this.readOnly ||
+      !isArchiveCodeOrTextFile(selectedFile)
+    ) {
+      return;
+    }
+
+    selectedFile.textContent = value;
+    selectedFile.dirty = selectedFile.textContent !== selectedFile.originalTextContent;
+  }
+
+  public async downloadSelectedFile(): Promise<void> {
+    const file = this.selectedFile;
+    await this.ensureFileLoaded(file);
+    if (!file?.blobUrl) {
+      return;
+    }
+
+    const downloadLink = document.createElement('a');
+    downloadLink.href = file.blobUrl;
+    downloadLink.download = file.name;
+    document.body.appendChild(downloadLink);
+    downloadLink.click();
+    downloadLink.parentNode?.removeChild(downloadLink);
+  }
+
+  public async saveArchive(): Promise<void> {
+    if (!this.canSave || !this.saveEndpoint) {
+      return;
+    }
+
+    this.isSaving = true;
+
+    try {
+      const zip = new JSZip();
+
+      for (const file of this.files) {
+        if (file.isLoaded && isArchiveCodeOrTextFile(file) && file.textContent !== undefined) {
+          const encoded = new TextEncoder().encode(file.textContent);
+          file.data = encoded;
+          file.originalTextContent = file.textContent;
+          zip.file(file.path, encoded);
+          continue;
+        }
+
+        if (file.data) {
+          zip.file(file.path, file.data);
+          continue;
+        }
+
+        const rawData = await file.zipObject.async('uint8array');
+        zip.file(file.path, rawData);
+      }
+
+      const archiveBlob = await zip.generateAsync({type: 'blob'});
+      const archiveUpload = new File([archiveBlob], this.saveFileName, {type: 'application/zip'});
+      const formData = new FormData();
+      formData.append(this.saveFieldName, archiveUpload);
+
+      const request =
+        this.saveMethod === 'PUT'
+          ? this.http.put<unknown>(this.saveEndpoint, formData, {observe: 'response'})
+          : this.http.post<unknown>(this.saveEndpoint, formData, {observe: 'response'});
+
+      const response = await firstValueFrom(request);
+      for (const file of this.files) {
+        file.dirty = false;
+      }
+
+      this.alerts.success('Archive saved', 3000);
+      this.saveSuccess.emit(response);
+    } catch (error) {
+      this.alerts.error(`Failed to save archive: ${error}`, 6000);
+      this.saveError.emit(error);
+    } finally {
+      this.isSaving = false;
+    }
+  }
+
+  private async loadArchive(): Promise<void> {
+    const requestedArchive = this.archiveFile;
+
+    this.errorMessage = null;
+    this.selectedTab = 0;
+    this.clearFiles();
+
+    if (!requestedArchive) {
+      return;
+    }
+
+    this.isLoading = true;
+
+    try {
+      const zipData = await requestedArchive.arrayBuffer();
+      const zip = await JSZip.loadAsync(zipData);
+      const paths = Object.keys(zip.files).sort((a, b) => a.localeCompare(b));
+      const loadedFiles: ArchiveFileEntry[] = [];
+
+      for (const path of paths) {
+        const zipFile = zip.files[path];
+        if (!zipFile || zipFile.dir || isArchivePathHidden(path)) {
+          continue;
+        }
+
+        loadedFiles.push(createArchiveFilePlaceholder(path, zipFile));
+      }
+
+      if (requestedArchive !== this.archiveFile) {
+        this.revokeUrls(loadedFiles);
+        return;
+      }
+
+      this.files = loadedFiles;
+      this.applyUploadRequirementLabels(this.files);
+      this.rebuildFileTree();
+      this.filesLoaded.emit(this.files.length);
+
+      if (this.files.length === 0) {
+        this.errorMessage = 'This archive does not contain any files.';
+        this.selectedFileChanged.emit(null);
+        return;
+      }
+
+      this.updateEditorOptions();
+      if (this.showPreview || this.preloadSelectedFile) {
+        void this.loadAndPrepareSelectedFile();
+      } else {
+        this.selectedFileChanged.emit(null);
+      }
+    } catch {
+      this.errorMessage = 'Unable to read archive. Please provide a valid zip file.';
+      this.filesLoaded.emit(0);
+    } finally {
+      if (requestedArchive === this.archiveFile) {
+        this.isLoading = false;
+      }
+    }
+  }
+
+  private clearFiles(): void {
+    this.revokeUrls(this.files);
+    this.files = [];
+    this.fileTreeNodes = [];
+    this.selectedFileChanged.emit(null);
+  }
+
+  private applyUploadRequirementLabels(files: ArchiveFileEntry[]): void {
+    for (let fileIndex = 0; fileIndex < files.length; fileIndex++) {
+      const file = files[fileIndex];
+      const orderedIndex = getOrderedUploadFileIndex(file.path);
+      const requirementIndex = orderedIndex ?? fileIndex;
+      const requirementName = this.uploadRequirementNames[requirementIndex];
+      file.tabLabel = requirementName?.trim() || file.name;
+    }
+  }
+
+  private rebuildFileTree(): void {
+    const rootNodes: ArchiveFileTreeNode[] = [];
+
+    const getOrCreateNode = (
+      siblings: ArchiveFileTreeNode[],
+      node: Pick<ArchiveFileTreeNode, 'name' | 'path' | 'isDirectory' | 'fileIndex'>,
+    ): ArchiveFileTreeNode => {
+      const existing = siblings.find(
+        (candidate) =>
+          candidate.name === node.name &&
+          candidate.path === node.path &&
+          candidate.isDirectory === node.isDirectory,
+      );
+      if (existing) {
+        if (!node.isDirectory && node.fileIndex !== null) {
+          existing.fileIndex = node.fileIndex;
+        }
+        return existing;
+      }
+
+      const createdNode: ArchiveFileTreeNode = {
+        key: `${node.isDirectory ? 'dir' : 'file'}:${node.path}`,
+        name: node.name,
+        path: node.path,
+        isDirectory: node.isDirectory,
+        fileIndex: node.fileIndex,
+        children: [],
+      };
+      siblings.push(createdNode);
+      return createdNode;
+    };
+
+    for (let fileIndex = 0; fileIndex < this.files.length; fileIndex++) {
+      const file = this.files[fileIndex];
+      const segments = file.path.split('/').filter((segment) => segment.length > 0);
+      if (segments.length === 0) {
+        continue;
+      }
+
+      let currentNodes = rootNodes;
+      let currentPath = '';
+      for (let i = 0; i < segments.length; i++) {
+        const segment = segments[i];
+        const isFile = i === segments.length - 1;
+        currentPath = currentPath ? `${currentPath}/${segment}` : segment;
+
+        const node = getOrCreateNode(currentNodes, {
+          name: segment,
+          path: currentPath,
+          isDirectory: !isFile,
+          fileIndex: isFile ? fileIndex : null,
+        });
+
+        if (!isFile) {
+          currentNodes = node.children;
+        }
+      }
+    }
+
+    const sortNodes = (nodes: ArchiveFileTreeNode[]): void => {
+      nodes.sort((a, b) => {
+        if (a.isDirectory !== b.isDirectory) {
+          return a.isDirectory ? -1 : 1;
+        }
+        return a.name.localeCompare(b.name);
+      });
+
+      for (const node of nodes) {
+        if (node.children.length > 0) {
+          sortNodes(node.children);
+        }
+      }
+    };
+
+    sortNodes(rootNodes);
+    this.fileTreeNodes = rootNodes;
+  }
+
+  private revokeUrls(files: ArchiveFileEntry[]): void {
+    for (const file of files) {
+      if (file.blobUrl) {
+        URL.revokeObjectURL(file.blobUrl);
+      }
+    }
+  }
+
+  private async ensureFileLoaded(file: ArchiveFileEntry | null): Promise<void> {
+    if (!file || file.isLoaded || file.isLoading) {
+      return;
+    }
+
+    file.isLoading = true;
+    try {
+      const data = await file.zipObject.async('uint8array');
+      const classification = classifyArchiveFile(file.path, data);
+      const enriched = createArchiveFileEntry(file, classification, data);
+      Object.assign(file, enriched);
+      if (file === this.selectedFile) {
+        this.updateEditorOptions();
+      }
+    } catch {
+      file.isLoading = false;
+      this.alerts.error(`Unable to open file '${file.path}' from archive`, 6000);
+    }
+  }
+
+  private async loadAndPrepareSelectedFile(): Promise<void> {
+    const file = this.selectedFile;
+    await this.ensureFileLoaded(file);
+
+    if (!file || file !== this.selectedFile || !file.isLoaded) {
+      this.selectedFileChanged.emit(null);
+      return;
+    }
+
+    this.prepareFileForDisplay(file);
+    this.selectedFileChanged.emit(file);
+  }
+
+  private prepareFileForDisplay(file: ArchiveFileEntry): void {
+    if (file.kind !== 'pdf' || !file.blob) {
+      return;
+    }
+
+    if (file.blobUrl) {
+      URL.revokeObjectURL(file.blobUrl);
+    }
+
+    file.blobUrl = URL.createObjectURL(file.blob);
+  }
+
+  private updateEditorOptions(): void {
+    this.editorOptionsForSelectedFile = {
+      ...this.editorOptions,
+      language: this.selectedFileLanguage(),
+      readOnly: this.readOnly,
+    };
+  }
+}
diff --git a/src/app/common/archive-viewer/archive-viewer.helpers.ts b/src/app/common/archive-viewer/archive-viewer.helpers.ts
new file mode 100644
index 0000000000..f85d74976e
--- /dev/null
+++ b/src/app/common/archive-viewer/archive-viewer.helpers.ts
@@ -0,0 +1,252 @@
+import * as monaco from 'monaco-editor';
+import JSZip from 'jszip';
+
+export type ArchiveFileKind = 'code' | 'image' | 'pdf' | 'text' | 'binary';
+
+export interface ArchiveFileClassification {
+  kind: ArchiveFileKind;
+  mimeType: string;
+  textContent?: string;
+  language?: string;
+}
+
+export interface ArchiveFileEntry {
+  path: string;
+  name: string;
+  tabLabel: string;
+  kind: ArchiveFileKind;
+  mimeType: string;
+  language?: string;
+  textContent?: string;
+  originalTextContent?: string;
+  data?: Uint8Array;
+  blob?: Blob;
+  blobUrl?: string;
+  dirty: boolean;
+  isLoaded: boolean;
+  isLoading: boolean;
+  zipObject: JSZip.JSZipObject;
+}
+
+type ArchiveFileKindLike = Pick<ArchiveFileEntry, 'kind'> | null | undefined;
+type ArchiveFilePreviewLike = Pick<ArchiveFileEntry, 'kind' | 'blobUrl'> | null | undefined;
+
+export function isArchiveCodeOrTextFile(file: ArchiveFileKindLike): boolean {
+  return file?.kind === 'code' || file?.kind === 'text';
+}
+
+export function isArchiveImageFile(file: ArchiveFilePreviewLike): boolean {
+  return file?.kind === 'image' && !!file.blobUrl;
+}
+
+export function isArchivePdfFile(file: ArchiveFilePreviewLike): boolean {
+  return file?.kind === 'pdf' && !!file.blobUrl;
+}
+
+export function createArchiveFilePlaceholder(
+  path: string,
+  zipObject: JSZip.JSZipObject,
+): ArchiveFileEntry {
+  const name = getBaseName(path);
+  return {
+    path,
+    name,
+    tabLabel: name,
+    kind: 'binary',
+    mimeType: 'application/octet-stream',
+    dirty: false,
+    isLoaded: false,
+    isLoading: false,
+    zipObject,
+  };
+}
+
+export function getOrderedUploadFileIndex(path: string): number | null {
+  const fileName = getBaseName(path);
+  const match = fileName.match(/^(\d+)-/);
+  if (!match) {
+    return null;
+  }
+
+  const parsed = Number.parseInt(match[1], 10);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : null;
+}
+
+export function isArchivePathHidden(path: string): boolean {
+  const segments = path.split('/').filter((segment) => segment.length > 0);
+  return segments.some((segment) => segment.startsWith('.') || segment === '__MACOSX');
+}
+
+export function createArchiveFileEntry(
+  existing: ArchiveFileEntry,
+  classification: ArchiveFileClassification,
+  data: Uint8Array,
+): ArchiveFileEntry {
+  const blob = new Blob([data], {type: classification.mimeType});
+  const shouldCreateBlobUrl =
+    classification.kind === 'image' ||
+    classification.kind === 'pdf' ||
+    classification.kind === 'binary';
+
+  return {
+    ...existing,
+    kind: classification.kind,
+    mimeType: classification.mimeType,
+    language: classification.language,
+    textContent: classification.textContent,
+    originalTextContent: classification.textContent,
+    data,
+    blob,
+    blobUrl: shouldCreateBlobUrl ? URL.createObjectURL(blob) : undefined,
+    dirty: false,
+    isLoaded: true,
+    isLoading: false,
+  };
+}
+
+export function classifyArchiveFile(path: string, data: Uint8Array): ArchiveFileClassification {
+  const detectedMimeType = detectMimeType(data);
+  if (detectedMimeType === 'application/pdf') {
+    return {kind: 'pdf', mimeType: detectedMimeType};
+  }
+
+  if (detectedMimeType.startsWith('image/')) {
+    return {kind: 'image', mimeType: detectedMimeType};
+  }
+
+  if (isProbablyText(data)) {
+    const decoded = decodeUtf8(data);
+    if (decoded !== null) {
+      const language = getMonacoLanguageForPath(path);
+      if (language && language !== 'plaintext') {
+        return {kind: 'code', mimeType: 'text/plain', textContent: decoded, language};
+      }
+
+      return {kind: 'text', mimeType: 'text/plain', textContent: decoded, language: 'plaintext'};
+    }
+  }
+
+  return {kind: 'binary', mimeType: detectedMimeType || 'application/octet-stream'};
+}
+
+export function getMonacoLanguageForPath(path: string): string | undefined {
+  const fileName = getBaseName(path).toLowerCase();
+  const allLanguages = monaco?.languages?.getLanguages?.() ?? [];
+
+  for (const language of allLanguages) {
+    if (language.filenames?.some((f) => f.toLowerCase() === fileName)) {
+      return language.id;
+    }
+    if (language.extensions?.some((ext) => fileName.endsWith(ext.toLowerCase()))) {
+      return language.id;
+    }
+  }
+
+  return undefined;
+}
+
+function getBaseName(path: string): string {
+  const lastSlash = path.lastIndexOf('/');
+  return lastSlash >= 0 ? path.substring(lastSlash + 1) : path;
+}
+
+function decodeUtf8(data: Uint8Array): string | null {
+  try {
+    return new TextDecoder('utf-8', {fatal: true}).decode(data);
+  } catch {
+    return null;
+  }
+}
+
+function isProbablyText(data: Uint8Array): boolean {
+  if (data.length === 0) {
+    return true;
+  }
+
+  const limit = Math.min(data.length, 8192);
+  let suspicious = 0;
+
+  for (let i = 0; i < limit; i++) {
+    const byte = data[i];
+
+    if (byte === 0) {
+      return false;
+    }
+
+    const isPrintableAscii = byte >= 32 && byte <= 126;
+    const isAllowedControl = byte === 9 || byte === 10 || byte === 13;
+    const isUtf8Extended = byte >= 128;
+
+    if (!isPrintableAscii && !isAllowedControl && !isUtf8Extended) {
+      suspicious++;
+    }
+  }
+
+  return suspicious / limit < 0.02;
+}
+
+function detectMimeType(data: Uint8Array): string {
+  if (startsWithBytes(data, [0x25, 0x50, 0x44, 0x46, 0x2d])) {
+    return 'application/pdf';
+  }
+  if (startsWithBytes(data, [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])) {
+    return 'image/png';
+  }
+  if (startsWithBytes(data, [0xff, 0xd8, 0xff])) {
+    return 'image/jpeg';
+  }
+  if (startsWithString(data, 'GIF87a') || startsWithString(data, 'GIF89a')) {
+    return 'image/gif';
+  }
+  if (startsWithString(data, 'BM')) {
+    return 'image/bmp';
+  }
+  if (
+    startsWithString(data, 'RIFF') &&
+    data.length >= 12 &&
+    String.fromCharCode(...Array.from(data.slice(8, 12))) === 'WEBP'
+  ) {
+    return 'image/webp';
+  }
+  if (isSvg(data)) {
+    return 'image/svg+xml';
+  }
+
+  return 'application/octet-stream';
+}
+
+function isSvg(data: Uint8Array): boolean {
+  const decoded = decodeUtf8(data.slice(0, 4096));
+  if (!decoded) {
+    return false;
+  }
+
+  const trimmed = decoded.trim().toLowerCase();
+  return trimmed.includes('<svg') && trimmed.includes('</svg>');
+}
+
+function startsWithBytes(data: Uint8Array, signature: number[]): boolean {
+  if (data.length < signature.length) {
+    return false;
+  }
+
+  for (let i = 0; i < signature.length; i++) {
+    if (data[i] !== signature[i]) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+function startsWithString(data: Uint8Array, signature: string): boolean {
+  if (data.length < signature.length) {
+    return false;
+  }
+  for (let i = 0; i < signature.length; i++) {
+    if (data[i] !== signature.charCodeAt(i)) {
+      return false;
+    }
+  }
+  return true;
+}
diff --git a/src/app/common/pdf-viewer/pdf-viewer.component.ts b/src/app/common/pdf-viewer/pdf-viewer.component.ts
index c019c17fc3..97c4ff5100 100644
--- a/src/app/common/pdf-viewer/pdf-viewer.component.ts
+++ b/src/app/common/pdf-viewer/pdf-viewer.component.ts
@@ -73,7 +73,11 @@ export class fPdfViewerComponent implements OnDestroy, OnChanges, AfterViewInit
       this._pdfUrl = value;
       this.loaded = false;
       this.pdfHasRendered = false;
-      this.downloadBlob(value);
+      if (value?.startsWith('blob:')) {
+        this.pdfBlobUrl = value;
+      } else {
+        this.downloadBlob(value);
+      }
     }
   }
 
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 43ae68e4b8..27f1a76d21 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -218,6 +218,7 @@ import {TeachingPeriodListComponent} from './admin/states/teaching-periods/teach
 import {FChipComponent} from './common/f-chip/f-chip.component';
 import {TaskSimilarityViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-similarity-view/task-similarity-view.component';
 import {FileViewerComponent} from './common/file-viewer/file-viewer.component';
+import {ArchiveViewerComponent} from './common/archive-viewer/archive-viewer.component';
 import {TaskDefinitionEditorComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component';
 import {TaskDefinitionGeneralComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-general/task-definition-general.component';
 import {TaskDefinitionWhoComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-who/task-definition-who.component';
@@ -312,6 +313,7 @@ import {TaskPlannerPrerequisitesModalService} from './projects/states/plan/task-
 import {TaskPlannerCardComponent} from './projects/states/dashboard/directives/progress-dashboard/task-planner-card/task-planner-card.component';
 import {OverseerStepService} from './api/services/overseer-step.service';
 import {TaskOverseerReportComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component';
+import {SubmissionFilesModalComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component';
 import {OverseerStepResultService} from './api/services/overseer-step-result.service';
 import {TutorNotesComponent} from './projects/states/tutor-notes/tutor-notes.component';
 import {TutorNotesViewComponent} from './projects/states/dashboard/directives/task-dashboard/directives/tutor-notes-view/tutor-notes-view.component';
@@ -461,6 +463,7 @@ const GANTT_CHART_CONFIG = {
     UnitCodeComponent,
     NewTeachingPeriodDialogComponent,
     FileViewerComponent,
+    ArchiveViewerComponent,
     AlertComponent,
     FUnitTaskListComponent,
     FTaskDetailsViewComponent,
@@ -510,6 +513,7 @@ const GANTT_CHART_CONFIG = {
     TaskPlannerCardComponent,
     TaskPlannerPrerequisitesModalComponent,
     TaskOverseerReportComponent,
+    SubmissionFilesModalComponent,
     TutorNotesComponent,
     TutorNotesViewComponent,
     ModerationComponent,
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.html
new file mode 100644
index 0000000000..5d1d69f412
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.html
@@ -0,0 +1,214 @@
+<div class="flex justify-between p-10">
+  <div class="min-w-0">
+    <h3 class="mb-0">
+      @if (compareMode) {
+        Compare Submission Files
+      } @else {
+        Submission Files
+      }
+    </h3>
+    <div class="truncate text-slate-600">
+      {{ data.assessment.task.definition.abbreviation }}
+      {{ data.assessment.task.definition.name }} ({{ data.assessment.task.project.student.name }})
+    </div>
+  </div>
+
+  <button mat-stroked-button color="warn" mat-dialog-close>Close</button>
+</div>
+
+<div class="flex flex-1 min-h-0 overflow-hidden p-10">
+  @if (isLoading) {
+    <div class="w-full h-full min-h-[300px] flex items-center justify-center">
+      <mat-spinner [diameter]="56"></mat-spinner>
+    </div>
+  } @else if (errorMessage) {
+    <div
+      class="flex h-full min-h-[300px] w-full items-center justify-center text-base text-red-700"
+    >
+      {{ errorMessage }}
+    </div>
+  } @else if (compareMode) {
+    @if (archiveBlob && comparedArchiveBlob) {
+      <div class="flex h-full min-h-0 w-full flex-col gap-4">
+        <div class="grid min-h-0 w-full grid-cols-1 gap-4 lg:grid-cols-2">
+          <div class="flex min-h-0 flex-col overflow-hidden rounded">
+            <ng-container
+              [ngTemplateOutlet]="submissionHeading"
+              [ngTemplateOutletContext]="{
+                number: data.assessmentNumber,
+                isMostRecent: data.assessmentIsMostRecent,
+                timestamp: data.assessment.timestamp
+              }"
+            ></ng-container>
+            <f-archive-viewer
+              class="block h-full min-h-0 w-full overflow-hidden"
+              [archiveFile]="archiveBlob"
+              [uploadRequirementNames]="uploadRequirementNames"
+              [readOnly]="true"
+              [showPreview]="false"
+              [preloadSelectedFile]="true"
+              (filesLoaded)="onPrimaryFilesLoaded()"
+              (selectedFileChanged)="onPrimarySelectionChange($event)"
+            ></f-archive-viewer>
+          </div>
+
+          <div class="flex min-h-0 flex-col overflow-hidden rounded">
+            <ng-container
+              [ngTemplateOutlet]="submissionHeading"
+              [ngTemplateOutletContext]="{
+                number: data.comparedWithNumber,
+                isMostRecent: data.comparedWithIsMostRecent,
+                timestamp: data.comparedWith?.timestamp
+              }"
+            ></ng-container>
+            @if (primaryArchiveParsed) {
+              <f-archive-viewer
+                class="block h-full min-h-0 w-full overflow-hidden"
+                [archiveFile]="comparedArchiveBlob"
+                [uploadRequirementNames]="uploadRequirementNames"
+                [readOnly]="true"
+                [showPreview]="false"
+                [preloadSelectedFile]="true"
+                (filesLoaded)="onComparedFilesLoaded()"
+                (selectedFileChanged)="onComparedSelectionChange($event)"
+              ></f-archive-viewer>
+            } @else {
+              <div class="flex h-full min-h-[240px] items-center justify-center text-slate-500">
+                Loading archive...
+              </div>
+            }
+          </div>
+        </div>
+
+        <div class="flex min-h-0 flex-1 overflow-hidden rounded">
+          @if (!bothSelectionsReady) {
+            <div
+              class="flex h-full w-full items-center justify-center px-4 text-base text-slate-500"
+            >
+              Select a file in both submissions to compare.
+            </div>
+          } @else if (canShowDiffEditor) {
+            <div class="flex h-full w-full min-h-0 flex-col">
+              <div class="grid w-full grid-cols-1 gap-4 px-3 py-2 text-slate-500 lg:grid-cols-2">
+                <div class="min-w-0 overflow-hidden whitespace-nowrap truncate">
+                  {{ primarySelectedFile?.path ?? primarySelectedFile?.name }}
+                </div>
+                <div class="min-w-0 overflow-hidden whitespace-nowrap truncate">
+                  {{ comparedSelectedFile?.path ?? comparedSelectedFile?.name }}
+                </div>
+              </div>
+              <ngx-monaco-diff-editor
+                class="block h-full w-full flex-1"
+                [options]="diffEditorOptions"
+                [originalModel]="diffOriginalModel"
+                [modifiedModel]="diffModifiedModel"
+              ></ngx-monaco-diff-editor>
+            </div>
+          } @else {
+            <div class="grid h-full w-full grid-cols-1 gap-4 p-4 lg:grid-cols-2">
+              <ng-container
+                [ngTemplateOutlet]="selectedFilePreviewPane"
+                [ngTemplateOutletContext]="{
+                  file: primarySelectedFile,
+                  editorOptions: primarySingleEditorOptions
+                }"
+              ></ng-container>
+              <ng-container
+                [ngTemplateOutlet]="selectedFilePreviewPane"
+                [ngTemplateOutletContext]="{
+                  file: comparedSelectedFile,
+                  editorOptions: comparedSingleEditorOptions
+                }"
+              ></ng-container>
+            </div>
+          }
+        </div>
+      </div>
+    } @else {
+      <div
+        class="flex h-full min-h-[300px] w-full items-center justify-center text-base text-slate-500"
+      >
+        Unable to load one or both submission archives.
+      </div>
+    }
+  } @else if (archiveBlob) {
+    <div class="flex h-full min-h-0 w-full flex-col overflow-hidden rounded">
+      <ng-container
+        [ngTemplateOutlet]="submissionHeading"
+        [ngTemplateOutletContext]="{
+          number: data.assessmentNumber,
+          isMostRecent: data.assessmentIsMostRecent,
+          timestamp: data.assessment.timestamp
+        }"
+      ></ng-container>
+      <f-archive-viewer
+        class="block h-full min-h-0 w-full overflow-hidden"
+        [archiveFile]="archiveBlob"
+        [uploadRequirementNames]="uploadRequirementNames"
+        [readOnly]="true"
+      ></f-archive-viewer>
+    </div>
+  } @else {
+    <div
+      class="flex h-full min-h-[300px] w-full items-center justify-center text-base text-slate-500"
+    >
+      Unable to load submission files.
+    </div>
+  }
+</div>
+
+<ng-template
+  #submissionHeading
+  let-number="number"
+  let-isMostRecent="isMostRecent"
+  let-timestamp="timestamp"
+>
+  <div class="shrink-0 px-3 py-2 text-slate-500">
+    Submission{{ number !== undefined ? ' ' + number : ''
+    }}{{ isMostRecent ? ' (Most recent)' : '' }}:
+    {{ timestamp | date: 'dd/MM/yyyy HH:mm' }}
+  </div>
+</ng-template>
+
+<ng-template #selectedFilePreviewPane let-file="file" let-editorOptions="editorOptions">
+  <div class="flex min-h-0 flex-col overflow-hidden rounded">
+    <div
+      class="shrink-0 flex items-center gap-2 px-3 py-2 text-slate-500"
+      [title]="file?.path ?? ''"
+    >
+      <span class="min-w-0 flex-1 overflow-hidden whitespace-nowrap truncate">
+        {{ file?.path ?? file?.name }}
+      </span>
+      @if (selectedFilesMatch !== null) {
+        <span
+          class="shrink-0"
+          [class.text-green-700]="selectedFilesMatch"
+          [class.text-red-700]="!selectedFilesMatch"
+        >
+          {{ selectedFilesMatch ? 'Identical' : 'Different' }}
+        </span>
+      }
+    </div>
+    @if (isArchiveCodeOrTextFile(file)) {
+      <ngx-monaco-editor
+        class="block h-full w-full"
+        [options]="editorOptions"
+        [ngModel]="file?.textContent ?? ''"
+      ></ngx-monaco-editor>
+    } @else if (isArchivePdfFile(file)) {
+      <f-pdf-viewer class="block h-full w-full" [pdfUrl]="file?.blobUrl ?? ''"></f-pdf-viewer>
+    } @else if (isArchiveImageFile(file)) {
+      <div class="flex h-full w-full items-center justify-center p-3">
+        <img
+          class="max-h-full max-w-full object-contain"
+          [src]="file?.blobUrl"
+          [alt]="file?.name"
+        />
+      </div>
+    } @else {
+      <div class="flex h-full w-full items-center justify-center p-3 text-slate-500">
+        Preview not available for this file type.
+      </div>
+    }
+  </div>
+</ng-template>
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.scss b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.scss
new file mode 100644
index 0000000000..dd674872c8
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.scss
@@ -0,0 +1,5 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.ts
new file mode 100644
index 0000000000..a0068a7cde
--- /dev/null
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/submission-files-modal/submission-files-modal.component.ts
@@ -0,0 +1,279 @@
+import {HttpResponse} from '@angular/common/http';
+import {Component, Inject, OnDestroy, OnInit} from '@angular/core';
+import * as monaco from 'monaco-editor';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+import {OverseerAssessment} from 'src/app/api/models/doubtfire-model';
+import {
+  ArchiveFileEntry,
+  isArchiveCodeOrTextFile,
+  isArchiveImageFile,
+  isArchivePdfFile,
+} from 'src/app/common/archive-viewer/archive-viewer.helpers';
+import {FileDownloaderService} from 'src/app/common/file-downloader/file-downloader.service';
+import {AlertService} from 'src/app/common/services/alert.service';
+
+export interface SubmissionFilesModalData {
+  assessment: OverseerAssessment;
+  assessmentNumber?: number;
+  assessmentIsMostRecent?: boolean;
+  comparedWith?: OverseerAssessment;
+  comparedWithNumber?: number;
+  comparedWithIsMostRecent?: boolean;
+}
+
+@Component({
+  selector: 'f-submission-files-modal',
+  templateUrl: './submission-files-modal.component.html',
+  styleUrls: ['./submission-files-modal.component.scss'],
+})
+export class SubmissionFilesModalComponent implements OnInit, OnDestroy {
+  private readonly diffOriginalUri = monaco.Uri.parse('inmemory://submission-compare/original');
+  private readonly diffModifiedUri = monaco.Uri.parse('inmemory://submission-compare/modified');
+  public readonly isArchiveCodeOrTextFile = isArchiveCodeOrTextFile;
+  public readonly isArchiveImageFile = isArchiveImageFile;
+  public readonly isArchivePdfFile = isArchivePdfFile;
+
+  public archiveBlob: Blob | null = null;
+  public comparedArchiveBlob: Blob | null = null;
+  public isLoading = true;
+  public uploadRequirementNames: string[] = [];
+  public errorMessage: string | null = null;
+  public primarySelectedFile: ArchiveFileEntry | null = null;
+  public comparedSelectedFile: ArchiveFileEntry | null = null;
+  public primaryArchiveParsed = false;
+  public comparedArchiveParsed = false;
+  public selectedFilesMatch: boolean | null = null;
+  private selectedFilesComparisonToken = 0;
+
+  public diffEditorOptions = {
+    theme: 'vs',
+    language: 'plaintext',
+    renderMinimap: false,
+    readOnly: true,
+    domReadOnly: true,
+    renderMarginRevertIcon: false,
+    enableSplitViewResizing: false,
+    useInlineViewWhenSpaceIsLimited: false,
+    renderSideBySideInlineBreakpoint: 1000,
+    renderSideBySide: true,
+    compactMode: false,
+    minimap: {
+      enabled: false,
+    },
+    lineNumbers: 'off',
+    automaticLayout: true,
+  };
+  public singleEditorOptions = {
+    theme: 'vs',
+    language: 'plaintext',
+    automaticLayout: true,
+    scrollBeyondLastLine: false,
+    renderMinimap: false,
+    readOnly: true,
+    minimap: {
+      enabled: false,
+    },
+  };
+  public primarySingleEditorOptions = {...this.singleEditorOptions};
+  public comparedSingleEditorOptions = {...this.singleEditorOptions};
+  public diffOriginalModel: {language: string; code: string; uri: monaco.Uri} = {
+    language: 'plaintext',
+    code: '',
+    uri: this.diffOriginalUri,
+  };
+  public diffModifiedModel: {language: string; code: string; uri: monaco.Uri} = {
+    language: 'plaintext',
+    code: '',
+    uri: this.diffModifiedUri,
+  };
+
+  constructor(
+    private fileDownloader: FileDownloaderService,
+    private alerts: AlertService,
+    public dialogRef: MatDialogRef<SubmissionFilesModalComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: SubmissionFilesModalData,
+  ) {}
+
+  public get compareMode(): boolean {
+    return !!this.data.comparedWith;
+  }
+
+  public get bothSelectionsReady(): boolean {
+    return !!this.primarySelectedFile && !!this.comparedSelectedFile;
+  }
+
+  public get canShowDiffEditor(): boolean {
+    return (
+      this.bothSelectionsReady &&
+      isArchiveCodeOrTextFile(this.primarySelectedFile) &&
+      isArchiveCodeOrTextFile(this.comparedSelectedFile)
+    );
+  }
+
+  ngOnInit(): void {
+    this.uploadRequirementNames =
+      this.data.assessment.task?.definition?.uploadRequirements?.map(
+        (requirement) => requirement?.name?.trim() ?? '',
+      ) ?? [];
+
+    void this.loadSubmissionArchives();
+  }
+
+  ngOnDestroy(): void {
+    monaco.editor.getModel(this.diffOriginalUri)?.dispose();
+    monaco.editor.getModel(this.diffModifiedUri)?.dispose();
+  }
+
+  private async loadSubmissionArchives(): Promise<void> {
+    this.isLoading = true;
+    this.errorMessage = null;
+    this.primaryArchiveParsed = false;
+    this.comparedArchiveParsed = false;
+    this.primarySelectedFile = null;
+    this.comparedSelectedFile = null;
+    this.selectedFilesMatch = null;
+    this.resetDiffModels();
+    this.resetSingleEditorOptions();
+
+    try {
+      if (this.data.comparedWith) {
+        this.archiveBlob = await this.downloadSubmissionArchive(this.data.assessment);
+        this.comparedArchiveBlob = await this.downloadSubmissionArchive(this.data.comparedWith);
+      } else {
+        this.archiveBlob = await this.downloadSubmissionArchive(this.data.assessment);
+      }
+    } catch (error) {
+      this.errorMessage = `Failed to load submission files: ${error}`;
+      this.alerts.error(this.errorMessage, 6000);
+    } finally {
+      this.isLoading = false;
+    }
+  }
+
+  private downloadSubmissionArchive(assessment: OverseerAssessment): Promise<Blob> {
+    return new Promise((resolve, reject) => {
+      this.fileDownloader.downloadBlob(
+        assessment.submissionFilesUrl(),
+        (_resourceUrl: string, response: HttpResponse<Blob>) => {
+          if (!response.body) {
+            reject('No submission archive returned.');
+            return;
+          }
+          resolve(response.body);
+        },
+        (error) => {
+          reject(error?.error?.error ?? error);
+        },
+      );
+    });
+  }
+
+  public onPrimarySelectionChange(file: ArchiveFileEntry | null): void {
+    this.applySelectionChange(file, (value) => {
+      this.primarySelectedFile = value;
+    });
+  }
+
+  public onComparedSelectionChange(file: ArchiveFileEntry | null): void {
+    this.applySelectionChange(file, (value) => {
+      this.comparedSelectedFile = value;
+    });
+  }
+
+  private applySelectionChange(
+    file: ArchiveFileEntry | null,
+    assignSelection: (value: ArchiveFileEntry | null) => void,
+  ): void {
+    if (file && !file.isLoaded) {
+      return;
+    }
+    assignSelection(file);
+    this.refreshSingleEditorOptions();
+    this.refreshDiffModels();
+    void this.refreshSelectedFilesMatch();
+  }
+
+  public onPrimaryFilesLoaded(): void {
+    this.primaryArchiveParsed = true;
+  }
+
+  public onComparedFilesLoaded(): void {
+    this.comparedArchiveParsed = true;
+  }
+
+  private resetDiffModels(): void {
+    this.diffOriginalModel = {language: 'plaintext', code: '', uri: this.diffOriginalUri};
+    this.diffModifiedModel = {language: 'plaintext', code: '', uri: this.diffModifiedUri};
+  }
+
+  private refreshDiffModels(): void {
+    if (!this.canShowDiffEditor) {
+      this.resetDiffModels();
+      return;
+    }
+
+    this.diffOriginalModel = {
+      language: this.primarySelectedFile?.language ?? 'plaintext',
+      code: this.primarySelectedFile?.textContent ?? '',
+      uri: this.diffOriginalUri,
+    };
+    this.diffModifiedModel = {
+      language: this.comparedSelectedFile?.language ?? 'plaintext',
+      code: this.comparedSelectedFile?.textContent ?? '',
+      uri: this.diffModifiedUri,
+    };
+  }
+
+  private resetSingleEditorOptions(): void {
+    this.primarySingleEditorOptions = {...this.singleEditorOptions, language: 'plaintext'};
+    this.comparedSingleEditorOptions = {...this.singleEditorOptions, language: 'plaintext'};
+  }
+
+  private refreshSingleEditorOptions(): void {
+    this.primarySingleEditorOptions = {
+      ...this.singleEditorOptions,
+      language: this.primarySelectedFile?.language ?? 'plaintext',
+    };
+    this.comparedSingleEditorOptions = {
+      ...this.singleEditorOptions,
+      language: this.comparedSelectedFile?.language ?? 'plaintext',
+    };
+  }
+
+  private async refreshSelectedFilesMatch(): Promise<void> {
+    const token = ++this.selectedFilesComparisonToken;
+    if (!this.primarySelectedFile || !this.comparedSelectedFile) {
+      this.selectedFilesMatch = null;
+      return;
+    }
+
+    const [primaryHash, comparedHash] = await Promise.all([
+      this.computeFileHash(this.primarySelectedFile),
+      this.computeFileHash(this.comparedSelectedFile),
+    ]);
+
+    if (token !== this.selectedFilesComparisonToken) {
+      return;
+    }
+
+    this.selectedFilesMatch = primaryHash === comparedHash;
+  }
+
+  private async computeFileHash(file: ArchiveFileEntry): Promise<string> {
+    let bytes: Uint8Array | null = file.data ?? null;
+    if (!bytes && file.textContent !== undefined) {
+      bytes = new TextEncoder().encode(file.textContent);
+    }
+    if (!bytes && file.blob) {
+      bytes = new Uint8Array(await file.blob.arrayBuffer());
+    }
+    if (!bytes) {
+      return '';
+    }
+
+    const digest = await crypto.subtle.digest('SHA-256', bytes);
+    return Array.from(new Uint8Array(digest))
+      .map((value) => value.toString(16).padStart(2, '0'))
+      .join('');
+  }
+}
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.html
index 5609881791..2773aed285 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.html
@@ -12,10 +12,13 @@
       <mat-expansion-panel-header class="flex justify-between items-center">
         <mat-panel-title class="flex items-center gap-5">
           <status-icon [status]="oa.taskStatus"> </status-icon>
-          Submission {{ idx + 1 }}: {{ oa.timestamp | humanizedDate }}
+          Submission {{ overseerAssessments.length - idx }}: {{ oa.timestamp | humanizedDate }}
           @if (idx === 0) {
             <span class="text-gray-500">(Most recent)</span>
           }
+          @if (isComparisonSource(oa)) {
+            <span class="text-blue-600">(Selected for comparison)</span>
+          }
         </mat-panel-title>
         @if (oa.reportReady) {
           <div class="flex gap-5 items-center">
@@ -25,6 +28,43 @@
             } @else {
               <mat-icon color="warn">cancel</mat-icon>
             }
+            @if (oa.hasSubmissionFiles && currentUnitRole) {
+              <button
+                mat-icon-button
+                aria-label="Submission options"
+                [matMenuTriggerFor]="menu"
+                #submissionMenuTrigger="matMenuTrigger"
+                (click)="viewSubmissionOptions($event)"
+              >
+                <mat-icon>more_vert</mat-icon>
+              </button>
+              <div fxFlex></div>
+              <mat-menu #menu="matMenu">
+                <button mat-menu-item (click)="viewSubmissionFiles(oa, $event)">
+                  <mat-icon>folder_zip</mat-icon>
+                  View Submission Files
+                </button>
+                @if (hasComparisonSourceFor(oa)) {
+                  <button mat-menu-item (click)="compareWithSelected(oa, $event)">
+                    <mat-icon>compare_arrows</mat-icon>
+                    Compare With Selected
+                  </button>
+                } @else if (isComparisonSource(oa)) {
+                  <button mat-menu-item (click)="clearComparisonSource($event)">
+                    <mat-icon>close</mat-icon>
+                    Clear Compare Selection
+                  </button>
+                } @else {
+                  <button
+                    mat-menu-item
+                    (click)="selectComparisonSource(oa, $event, submissionMenuTrigger)"
+                  >
+                    <mat-icon>task_alt</mat-icon>
+                    Select For Comparison
+                  </button>
+                }
+              </mat-menu>
+            }
           </div>
         } @else {
           <div class="flex gap-5 uppercase items-center">
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.ts
index cf4c5a86ed..e576813299 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component.ts
@@ -1,10 +1,13 @@
 import {Component, Input, OnInit} from '@angular/core';
-import {OverseerAssessment} from 'src/app/api/models/doubtfire-model';
+import {MatDialog} from '@angular/material/dialog';
+import {MatMenuTrigger} from '@angular/material/menu';
+import {OverseerAssessment, UnitRole, UserService} from 'src/app/api/models/doubtfire-model';
 import {Task} from 'src/app/api/models/task';
 import {OverseerAssessmentService} from 'src/app/api/services/overseer-assessment.service';
 import {OverseerStepResultService} from 'src/app/api/services/overseer-step-result.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {TaskSubmissionService} from 'src/app/common/services/task-submission.service';
+import {SubmissionFilesModalComponent} from './submission-files-modal/submission-files-modal.component';
 
 @Component({
   selector: 'f-task-overseer-report',
@@ -14,14 +17,22 @@ import {TaskSubmissionService} from 'src/app/common/services/task-submission.ser
 export class TaskOverseerReportComponent implements OnInit {
   @Input() task: Task;
   @Input() loadOverseerAssessmentId?: number;
+  public comparisonSourceAssessmentId: number | null = null;
 
   constructor(
     private alerts: AlertService,
     private submissions: TaskSubmissionService,
     private overseerAssessmentService: OverseerAssessmentService,
     private overseerStepResultsService: OverseerStepResultService,
+    private dialog: MatDialog,
+    private userService: UserService,
   ) {}
 
+  public get currentUnitRole(): UnitRole | undefined {
+    const currentUser = this.userService.currentUser;
+    return this.task.unit.staff.find((ur) => ur.user.id === currentUser.id);
+  }
+
   public viewOutput: 'your_output' | 'expected_output' | 'diff' | 'split_diff' = 'your_output';
 
   stdoutOptions = {
@@ -88,6 +99,17 @@ export class TaskOverseerReportComponent implements OnInit {
 
   public overseerAssessments: OverseerAssessment[] = [];
 
+  public get comparisonSourceAssessment(): OverseerAssessment | null {
+    if (!this.comparisonSourceAssessmentId) {
+      return null;
+    }
+    return (
+      this.overseerAssessments.find(
+        (assessment) => assessment.id === this.comparisonSourceAssessmentId,
+      ) ?? null
+    );
+  }
+
   ngOnInit(): void {
     this.loadAssessments();
   }
@@ -99,6 +121,14 @@ export class TaskOverseerReportComponent implements OnInit {
     this.overseerAssessmentService.queryForTask(this.task).subscribe({
       next: (assessments) => {
         this.overseerAssessments = assessments;
+        if (
+          this.comparisonSourceAssessmentId &&
+          !this.overseerAssessments.some(
+            (assessment) => assessment.id === this.comparisonSourceAssessmentId,
+          )
+        ) {
+          this.comparisonSourceAssessmentId = null;
+        }
         for (const oa of this.overseerAssessments) {
           for (const result of oa.stepResultsCache.currentValues) {
             result.overseerStep = this.task.definition.overseerStepsCache.currentValues.find(
@@ -142,4 +172,77 @@ export class TaskOverseerReportComponent implements OnInit {
       },
     });
   }
+
+  viewSubmissionOptions(event: Event) {
+    event.stopPropagation();
+  }
+
+  isComparisonSource(assessment: OverseerAssessment): boolean {
+    return this.comparisonSourceAssessmentId === assessment.id;
+  }
+
+  hasComparisonSourceFor(assessment: OverseerAssessment): boolean {
+    return (
+      this.comparisonSourceAssessmentId !== null &&
+      this.comparisonSourceAssessmentId !== assessment.id
+    );
+  }
+
+  selectComparisonSource(
+    assessment: OverseerAssessment,
+    event?: Event,
+    menuTrigger?: MatMenuTrigger,
+  ) {
+    event?.stopPropagation();
+    this.comparisonSourceAssessmentId = assessment.id;
+    menuTrigger?.closeMenu();
+    this.alerts.message(`Selected submission ${assessment.timestampString} for comparison.`, 3500);
+  }
+
+  clearComparisonSource(event?: Event) {
+    event?.stopPropagation();
+    this.comparisonSourceAssessmentId = null;
+  }
+
+  compareWithSelected(assessment: OverseerAssessment, event?: Event) {
+    event?.stopPropagation();
+    const selected = this.comparisonSourceAssessment;
+    if (!selected || selected.id === assessment.id) {
+      return;
+    }
+
+    this.openSubmissionFilesDialog(assessment, selected);
+  }
+
+  viewSubmissionFiles(assessment: OverseerAssessment, event?: Event) {
+    event?.stopPropagation();
+    this.openSubmissionFilesDialog(assessment);
+  }
+
+  private openSubmissionFilesDialog(
+    assessment: OverseerAssessment,
+    comparedWith?: OverseerAssessment,
+  ) {
+    const assessmentIndex = this.overseerAssessments.findIndex((item) => item.id === assessment.id);
+    const comparedWithIndex = comparedWith
+      ? this.overseerAssessments.findIndex((item) => item.id === comparedWith.id)
+      : -1;
+
+    this.dialog.open(SubmissionFilesModalComponent, {
+      data: {
+        assessment,
+        assessmentNumber:
+          assessmentIndex >= 0 ? this.overseerAssessments.length - assessmentIndex : undefined,
+        assessmentIsMostRecent: assessmentIndex === 0,
+        comparedWith,
+        comparedWithNumber:
+          comparedWithIndex >= 0 ? this.overseerAssessments.length - comparedWithIndex : undefined,
+        comparedWithIsMostRecent: comparedWithIndex === 0,
+      },
+      maxWidth: '95vw',
+      width: '100%',
+      height: '90vh',
+      panelClass: 'submission-files-dialog',
+    });
+  }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
index e1d96032c0..459dea4266 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.html
@@ -32,19 +32,52 @@
     [desiredFileName]="'Task ' + taskDefinition.abbreviation + ' Overseer zip'"
   />
   @if (taskDefinition.hasTaskAssessmentResources) {
-    <div class="flex flex-row gap-4 pt-4">
-      <button mat-flat-button color="warn" (click)="removeOverseerResources()" class="grow me-4">
+    <div class="flex flex-row flex-wrap gap-4 pt-4">
+      <button mat-flat-button color="warn" (click)="removeOverseerResources()" class="grow">
         Delete Overseer Resources Zip
       </button>
+      <button mat-flat-button color="accent" (click)="downloadOverseerResources()" class="grow">
+        Download Overseer Resources Zip
+      </button>
       <button
         mat-flat-button
-        color="accent"
-        (click)="downloadOverseerResources()"
-        class="grow ms-4"
+        color="primary"
+        (click)="toggleOverseerResourcesEditor()"
+        class="grow"
       >
-        Download Overseer Resources Zip
+        <mat-icon>{{ showOverseerResourcesEditor ? 'visibility_off' : 'edit' }}</mat-icon>
+        {{
+          showOverseerResourcesEditor
+            ? 'Hide Overseer Resource Editor'
+            : 'Edit Overseer Resources Zip'
+        }}
       </button>
     </div>
+
+    @if (showOverseerResourcesEditor) {
+      <div class="mt-4 rounded border border-slate-200 p-2">
+        @if (isLoadingOverseerResourcesArchive) {
+          <div class="flex h-[32rem] items-center justify-center text-slate-600">
+            Loading Overseer Resources archive...
+          </div>
+        } @else if (overseerResourcesArchive) {
+          <f-archive-viewer
+            class="block h-[400px] w-full overflow-hidden"
+            [archiveFile]="overseerResourcesArchive"
+            navigationMode="tree"
+            [readOnly]="false"
+            [saveEndpoint]="taskDefinition.taskOverseerResourcesUploadUrl"
+            [saveMethod]="'POST'"
+            [saveFileName]="'Task ' + taskDefinition.abbreviation + ' Overseer zip'"
+            (saveSuccess)="onOverseerResourcesArchiveSaved($event)"
+          ></f-archive-viewer>
+        } @else {
+          <div class="flex h-[32rem] items-center justify-center text-slate-600">
+            Unable to load Overseer Resources archive.
+          </div>
+        }
+      </div>
+    }
   }
 
   <div class="flex flex-row gap-4 pt-4">
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
index 1c188080ed..1d539cce29 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-overseer/task-definition-overseer.component.ts
@@ -1,4 +1,5 @@
 import {CdkDragDrop, moveItemInArray} from '@angular/cdk/drag-drop';
+import {HttpClient, HttpResponse} from '@angular/common/http';
 import {Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild} from '@angular/core';
 import {Observable} from 'rxjs';
 import {
@@ -47,7 +48,11 @@ export class TaskDefinitionOverseerComponent implements OnChanges, OnInit {
 
   public stepType: 'status_check' | 'output_diff' = 'status_check';
   public visibility = 'public';
+  public showOverseerResourcesEditor = false;
+  public isLoadingOverseerResourcesArchive = false;
+  public overseerResourcesArchive: Blob | File | null = null;
   constructor(
+    private http: HttpClient,
     private alerts: AlertService,
     private overseerImageService: OverseerImageService,
     private modalService: TaskAssessmentModalService,
@@ -264,6 +269,9 @@ export class TaskDefinitionOverseerComponent implements OnChanges, OnInit {
       this.taskDefinition.overseerStepsCache.values.subscribe((steps) => {
         this.overseerSteps = [...steps];
       });
+      this.showOverseerResourcesEditor = false;
+      this.isLoadingOverseerResourcesArchive = false;
+      this.overseerResourcesArchive = null;
     }
   }
 
@@ -304,6 +312,8 @@ export class TaskDefinitionOverseerComponent implements OnChanges, OnInit {
       next: () => {
         this.alerts.success('Deleted Overseer Resources', 2000);
         this.taskDefinition.hasTaskAssessmentResources = false;
+        this.showOverseerResourcesEditor = false;
+        this.overseerResourcesArchive = null;
       },
     });
   }
@@ -326,6 +336,7 @@ export class TaskDefinitionOverseerComponent implements OnChanges, OnInit {
           this.alerts.success('Uploaded Overseer Resources', 2000);
           this.taskDefinition.hasTaskAssessmentResources = true;
           this.taskDefinition.overseerResourceFiles = [...resourceFiles];
+          this.overseerResourcesArchive = file;
         },
         error: (message) => this.alerts.error(message, 6000),
       });
@@ -333,4 +344,42 @@ export class TaskDefinitionOverseerComponent implements OnChanges, OnInit {
       this.alerts.error('Please drop a zip with scripts for this task to upload', 6000);
     }
   }
+
+  public toggleOverseerResourcesEditor() {
+    this.showOverseerResourcesEditor = !this.showOverseerResourcesEditor;
+    if (
+      this.showOverseerResourcesEditor &&
+      !this.overseerResourcesArchive &&
+      this.taskDefinition?.hasTaskAssessmentResources
+    ) {
+      this.loadOverseerResourcesArchive();
+    }
+  }
+
+  public onOverseerResourcesArchiveSaved(response: HttpResponse<unknown>) {
+    this.taskDefinition.hasTaskAssessmentResources = true;
+
+    if (Array.isArray(response.body)) {
+      this.taskDefinition.overseerResourceFiles = response.body.filter(
+        (file): file is string => typeof file === 'string',
+      );
+    }
+  }
+
+  private loadOverseerResourcesArchive() {
+    this.isLoadingOverseerResourcesArchive = true;
+    this.http.get(this.taskDefinition.getOverseerResourcesUrl(), {responseType: 'blob'}).subscribe({
+      next: (archiveBlob) => {
+        this.overseerResourcesArchive = archiveBlob;
+      },
+      error: (error) => {
+        this.isLoadingOverseerResourcesArchive = false;
+        this.showOverseerResourcesEditor = false;
+        this.alerts.error(`Failed to load Overseer Resources Zip: ${error?.error?.error ?? error}`);
+      },
+      complete: () => {
+        this.isLoadingOverseerResourcesArchive = false;
+      },
+    });
+  }
 }

From 0d6d22270c82697aa4a8073ed68906e67f4d5324 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 13 Mar 2026 14:11:12 +1100
Subject: [PATCH 738/776] chore(release): 10.0.1-19

---
 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 87b5f30590..61e789a0c6 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.
 
+### [10.0.1-19](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-18...v10.0.1-19) (2026-03-13)
+
+
+### Features
+
+* view submission history + zip file editor ([#1104](https://github.com/b0ink/doubtfire-deploy/issues/1104)) ([d706f09](https://github.com/b0ink/doubtfire-deploy/commit/d706f0918285a2c6d69c6240a93b41e88506f771))
+
 ### [10.0.1-18](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-17...v10.0.1-18) (2026-03-11)
 
 
diff --git a/package-lock.json b/package-lock.json
index 559f9dc27f..318476e643 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-18",
+  "version": "10.0.1-19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-18",
+      "version": "10.0.1-19",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 2b04546593..a891dd4198 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-18",
+  "version": "10.0.1-19",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 0fb49334702b0df8fd2d526017f6540214954d00 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 13 Mar 2026 14:56:20 +1100
Subject: [PATCH 739/776] refactor: declutter footer ui (#1106)

* refactor: declutter footer ui

- toggle between moderation and status buttons in moderation view
- move discussed in class button to extra actions menu
- swap complete and discuss buttons

* chore: remove old discussed in class

* chore: remove old status button switch
---
 src/app/common/footer/footer.component.html | 226 +++++++++++---------
 src/app/common/footer/footer.component.ts   |   9 +
 2 files changed, 139 insertions(+), 96 deletions(-)

diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 22316673e0..bed0f886ce 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -11,123 +11,152 @@
     </div>
   }
 
-  <div class="flex w-full">
-    <f-user-badge fxFlex fxFlexAlign="start start" [selectedTask]="selectedTask"></f-user-badge>
-    <div class="flex justify-between items-center">
-      <span class="center-buttons flex justify-around gap-5">
-        <div>
-          <button
-            [disabled]="!actionButtonEnabled"
-            mat-icon-button
-            matTooltip="Mark as Redo"
-            matTooltipPosition="above"
-            aria-label=""
-            class="button"
-            (click)="selectedTask?.updateTaskStatus('redo')"
-          >
-            <mat-icon>undo</mat-icon>
-          </button>
-
-          <button
-            [disabled]="!actionButtonEnabled"
-            mat-icon-button
-            matTooltip="Mark as Attention Required"
-            matTooltipPosition="above"
-            aria-label=""
-            class="button"
-            (click)="selectedTask?.updateTaskStatus('attention_required')"
-          >
-            <mat-icon>sms_failed</mat-icon>
-          </button>
-        </div>
+  <ng-template #statusActionButtons>
+    <span class="center-buttons flex justify-around gap-5">
+      <div>
         <button
           [disabled]="!actionButtonEnabled"
           mat-icon-button
-          matTooltip="Mark as Resubmit"
+          matTooltip="Mark as Redo"
           matTooltipPosition="above"
           aria-label=""
-          class="button large-button"
-          (click)="selectedTask?.updateTaskStatus('fix')"
+          class="button"
+          (click)="selectedTask?.updateTaskStatus('redo')"
         >
-          <mat-icon>construction</mat-icon>
+          <mat-icon>undo</mat-icon>
         </button>
 
-        @if (selectedTask && selectedTask.suggestedTaskStatus) {
-          <button
-            mat-icon-button
-            matTooltip="Recommended: Mark as {{
-              taskService.statusData(selectedTask.suggestedTaskStatus).label
-            }}"
-            matTooltipPosition="above"
-            aria-label=""
-            class="button extra-large-button status-chip"
-            (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
-            [ngClass]="taskService.statusData(selectedTask.suggestedTaskStatus).class"
-            [disabled]="!actionButtonEnabled"
-          >
-            <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
-          </button>
-        }
-        @if (selectedTask?.definition?.assessInPortfolioOnly) {
-          <button
-            [disabled]="!actionButtonEnabled"
-            mat-icon-button
-            matTooltip="Mark as Working On It"
-            matTooltipPosition="above"
-            aria-label="Mark as Working On It"
-            class="button large-button"
-            (click)="markTaskWorkingOnIt(selectedTask)"
-          >
-            <mat-icon>bolt</mat-icon>
-          </button>
-        } @else {
-          <button
-            [disabled]="!actionButtonEnabled"
-            mat-icon-button
-            matTooltip="Mark as Complete"
-            matTooltipPosition="above"
-            aria-label="Mark as Complete"
-            class="button large-button"
-            (click)="selectedTask?.updateTaskStatus('complete')"
-          >
-            <mat-icon>done</mat-icon>
-          </button>
-        }
-
         <button
           [disabled]="!actionButtonEnabled"
           mat-icon-button
-          matTooltip="Mark as Discuss"
+          matTooltip="Mark as Attention Required"
           matTooltipPosition="above"
           aria-label=""
           class="button"
-          (click)="selectedTask?.updateTaskStatus('discuss')"
+          (click)="selectedTask?.updateTaskStatus('attention_required')"
         >
-          <mat-icon>question_answer</mat-icon>
+          <mat-icon>sms_failed</mat-icon>
         </button>
+      </div>
+      <button
+        [disabled]="!actionButtonEnabled"
+        mat-icon-button
+        matTooltip="Mark as Resubmit"
+        matTooltipPosition="above"
+        aria-label=""
+        class="button large-button"
+        (click)="selectedTask?.updateTaskStatus('fix')"
+      >
+        <mat-icon>construction</mat-icon>
+      </button>
 
-        <mat-divider [vertical]="true"></mat-divider>
+      @if (selectedTask && selectedTask.suggestedTaskStatus) {
+        <button
+          mat-icon-button
+          matTooltip="Recommended: Mark as {{
+            taskService.statusData(selectedTask.suggestedTaskStatus).label
+          }}"
+          matTooltipPosition="above"
+          aria-label=""
+          class="button extra-large-button status-chip"
+          (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
+          [ngClass]="taskService.statusData(selectedTask.suggestedTaskStatus).class"
+          [disabled]="!actionButtonEnabled"
+        >
+          <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
+        </button>
+      }
 
-        <div class="flex justify-start">
-          <button
-            [disabled]="!actionButtonEnabled"
-            mat-icon-button
-            matTooltip="Discussed in class"
-            matTooltipPosition="above"
-            aria-label=""
-            class="button ml-5"
-            (click)="selectedTask?.markAsDiscussed()"
-          >
-            <mat-icon>group</mat-icon>
-          </button>
-        </div>
-      </span>
+      <button
+        [disabled]="!actionButtonEnabled"
+        mat-icon-button
+        matTooltip="Mark as Discuss"
+        matTooltipPosition="above"
+        aria-label=""
+        class="button large-button"
+        (click)="selectedTask?.updateTaskStatus('discuss')"
+      >
+        <mat-icon>question_answer</mat-icon>
+      </button>
+
+      @if (selectedTask?.definition?.assessInPortfolioOnly) {
+        <button
+          [disabled]="!actionButtonEnabled"
+          mat-icon-button
+          matTooltip="Mark as Working On It"
+          matTooltipPosition="above"
+          aria-label="Mark as Working On It"
+          class="button large-button"
+          (click)="markTaskWorkingOnIt(selectedTask)"
+        >
+          <mat-icon>bolt</mat-icon>
+        </button>
+      } @else {
+        <button
+          [disabled]="!actionButtonEnabled"
+          mat-icon-button
+          matTooltip="Mark as Complete"
+          matTooltipPosition="above"
+          aria-label="Mark as Complete"
+          class="button"
+          (click)="selectedTask?.updateTaskStatus('complete')"
+        >
+          <mat-icon>done</mat-icon>
+        </button>
+      }
+    </span>
+  </ng-template>
+
+  <div class="flex w-full">
+    <f-user-badge fxFlex fxFlexAlign="start start" [selectedTask]="selectedTask"></f-user-badge>
+    <div
+      class="flex items-center"
+      [ngClass]="hideMainActionButtonsForModeration ? 'w-full justify-center' : 'justify-between'"
+    >
+      @if (viewType !== 'moderation' && !hideMainActionButtonsForModeration) {
+        <ng-container [ngTemplateOutlet]="statusActionButtons"></ng-container>
+      }
 
       @if (selectedTask && !selectedTask.loadingSubmissionDetails) {
         @if (viewType === 'moderation') {
-          <mat-divider class="ml-10" [vertical]="true"></mat-divider>
-          <f-moderation [task]="selectedTask"></f-moderation>
-          <!-- <mat-divider class="mr-10" [vertical]="true"></mat-divider> -->
+          <div
+            class="flex items-center"
+            [ngClass]="hideMainActionButtonsForModeration ? 'w-full justify-center' : ''"
+          >
+            <div class="relative flex items-center">
+              @if (!hideMainActionButtonsForModeration) {
+                <ng-container [ngTemplateOutlet]="statusActionButtons"></ng-container>
+                <mat-divider class="mx-4" [vertical]="true"></mat-divider>
+              } @else {
+                <f-moderation class="pl-[125px] ml-[100px]" [task]="selectedTask"></f-moderation>
+              }
+
+              <button
+                [disabled]="selectedTask === undefined"
+                mat-icon-button
+                matTooltip="Action options"
+                matTooltipPosition="above"
+                aria-label=""
+                class="button small-button"
+                [matMenuTriggerFor]="actionMenu"
+              >
+                <mat-icon class="small-icon">more_vert</mat-icon>
+              </button>
+
+              <mat-menu #actionMenu="matMenu" yPosition="above">
+                @if (hideMainActionButtonsForModeration) {
+                  <button mat-menu-item (click)="toggleModerationStatusButtons()">
+                    <mat-icon matListItemIcon>chat</mat-icon>
+                    View Status Buttons
+                  </button>
+                } @else {
+                  <button mat-menu-item (click)="toggleModerationStatusButtons()">
+                    <mat-icon matListItemIcon>gavel</mat-icon>View Moderation Buttons
+                  </button>
+                }
+              </mat-menu>
+            </div>
+          </div>
         }
         @if (viewType === 'overflow' || selectedTask.claimedByUnitRoleId) {
           <f-task-claim [selectedTask]="selectedTask"></f-task-claim>
@@ -249,6 +278,11 @@
           View overseer
         </button>
         <mat-divider></mat-divider>
+
+        <button mat-menu-item (click)="selectedTask?.markAsDiscussed()">
+          <mat-icon matListItemIcon aria-label="Mark task as discussed">group</mat-icon>
+          Mark Discussed in Class
+        </button>
         <button mat-menu-item (click)="selectedTask?.updateTaskStatus('assess_in_portfolio')">
           <mat-icon matListItemIcon aria-label="Switch to Assess in Portfolio"
             >folder_open</mat-icon
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index f246322423..a3537e220d 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -26,6 +26,7 @@ export class FooterComponent implements OnInit {
 
   selectedTask$: Observable<Task>;
   selectedTask: Task;
+  public showModerationStatusButtons = false;
 
   @ViewChild('similaritiesButton', {static: false, read: ElementRef})
   similaritiesButton: ElementRef;
@@ -178,4 +179,12 @@ export class FooterComponent implements OnInit {
 
     return true;
   }
+
+  public get hideMainActionButtonsForModeration(): boolean {
+    return this.viewType === 'moderation' && !this.showModerationStatusButtons;
+  }
+
+  public toggleModerationStatusButtons() {
+    this.showModerationStatusButtons = !this.showModerationStatusButtons;
+  }
 }

From 39a15577540a07cdb614219baa680757b417fcfc Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 13 Mar 2026 14:56:48 +1100
Subject: [PATCH 740/776] chore(release): 10.0.1-20

---
 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 61e789a0c6..bf453c2caf 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.
 
+### [10.0.1-20](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-19...v10.0.1-20) (2026-03-13)
+
 ### [10.0.1-19](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-18...v10.0.1-19) (2026-03-13)
 
 
diff --git a/package-lock.json b/package-lock.json
index 318476e643..e57fc43280 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-19",
+  "version": "10.0.1-20",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-19",
+      "version": "10.0.1-20",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index a891dd4198..3cac36d794 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-19",
+  "version": "10.0.1-20",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 14d68ca1ed8cb2b22a085d6660377b472f18269a Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 13 Mar 2026 15:34:54 +1100
Subject: [PATCH 741/776] refactor: task definition editor refactor (#1063)

* refactor: init task definition editor refactor

* refactor: improve task definition editor

* refactor: improve task definition editor ui

* refactor: add back task definition editor buttons

* chore: highlight selected task definition

* chore: move add task button to right side

* chore: keep task badge centered

* chore: center task badge with arrow icon

* chore: add scroll buffer
---
 .../task-badge/task-badge.component.css       |   9 +
 .../task-badge/task-badge.component.html      |   7 +-
 .../common/task-badge/task-badge.component.ts |   1 +
 src/app/doubtfire-angular.module.ts           |   1 +
 .../task-definition-editor.component.html     | 186 ++++---
 .../task-definition-editor.component.scss     |  15 -
 .../task-definition-editor.component.ts       | 189 +++++++-
 .../unit-task-editor.component.html           | 456 ++++++++++--------
 .../unit-task-editor.component.scss           |   7 -
 .../unit-task-editor.component.ts             |  85 +---
 src/app/units/states/edit/edit.tpl.html       |   2 +-
 .../f-unit-task-list.component.html           |   2 +-
 12 files changed, 594 insertions(+), 366 deletions(-)

diff --git a/src/app/common/task-badge/task-badge.component.css b/src/app/common/task-badge/task-badge.component.css
index f81d9056aa..8c791270f5 100644
--- a/src/app/common/task-badge/task-badge.component.css
+++ b/src/app/common/task-badge/task-badge.component.css
@@ -3,6 +3,15 @@
   position: relative;
 }
 
+.task-badge {
+  color: #111827;
+}
+
+.task-badge.task-badge-highlight {
+  background-color: var(--mdc-theme-primary, #3939ff) !important;
+  color: #ffffff;
+}
+
 .mat-icon {
   font-size: 50px;
   height: 50px;
diff --git a/src/app/common/task-badge/task-badge.component.html b/src/app/common/task-badge/task-badge.component.html
index 565c943555..dfa63dd941 100644
--- a/src/app/common/task-badge/task-badge.component.html
+++ b/src/app/common/task-badge/task-badge.component.html
@@ -1,5 +1,8 @@
-<div class="aspect-square w-16 rounded-md flex items-center justify-center bg-gray-200">
-  <p class="m-0 text-black">
+<div
+  class="task-badge aspect-square w-16 rounded-md flex items-center justify-center bg-gray-200"
+  [class.task-badge-highlight]="highlight"
+>
+  <p class="m-0">
     {{ abbreviation }}
   </p>
 </div>
diff --git a/src/app/common/task-badge/task-badge.component.ts b/src/app/common/task-badge/task-badge.component.ts
index 01430984c5..d050a8fe4f 100644
--- a/src/app/common/task-badge/task-badge.component.ts
+++ b/src/app/common/task-badge/task-badge.component.ts
@@ -9,6 +9,7 @@ import {TaskDefinition} from 'src/app/api/models/task-definition';
 export class FTaskBadgeComponent implements OnInit {
   @Input() taskDef: TaskDefinition;
   @Input() size = 100;
+  @Input() highlight = false;
 
   lineHeight = 12;
 
diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index 27f1a76d21..ae030bcc3e 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -679,6 +679,7 @@ const GANTT_CHART_CONFIG = {
     MatDialogModuleNew,
     CalendarModule.forRoot({provide: CalendarDateAdapter, useFactory: adapterFactory}),
     CodeEditorModule.forRoot(),
+    MatSidenavModule,
     NgxGanttModule,
     MatSidenavModule,
     MonacoEditorModule.forRoot(),
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
index a13d096675..567758a0ad 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.html
@@ -1,115 +1,173 @@
-<div id="task-def-head" class="w-full sticky top-0">
+<div id="task-def-head" class="w-full sticky top-0 bg-white z-10 pb-3">
   <h3>Details for {{ taskDefinition.abbreviation }} - {{ taskDefinition.name }}</h3>
   <mat-divider></mat-divider>
 </div>
 
-<mat-stepper orientation="vertical" #stepper>
-  <mat-step>
-    <ng-template matStepLabel matStepperIcon="1">Task Details</ng-template>
-    <div class="pt-[12px]">
+<div class="flex flex-col items-start gap-4 md:flex-row">
+  <aside class="sticky top-0 z-[9] w-full self-start md:top-20 md:w-[240px] md:shrink-0">
+    <div class="flex flex-col gap-1 overflow-y-auto overflow-x-hidden rounded-xl bg-white p-2">
+      @for (section of visibleSections; track section.id) {
+        <button
+          type="button"
+          class="w-full whitespace-nowrap border-0 rounded-lg bg-transparent cursor-pointer px-3 py-5 text-left transition-colors"
+          [ngClass]="{
+            'font-semibold': activeSectionId === section.id,
+            'text-gray-700 hover:bg-gray-100': activeSectionId !== section.id,
+          }"
+          [style.backgroundColor]="activeSectionId === section.id ? '#e7e7ff' : null"
+          [style.color]="
+            activeSectionId === section.id ? 'var(--mdc-theme-primary, #3939ff)' : null
+          "
+          (click)="scrollToSection(section.id)"
+        >
+          {{ section.label }}
+        </button>
+      }
+    </div>
+  </aside>
+
+  <div class="w-full flex-1 pr-1 pb-48 md:pb-64" #sectionScrollContainer>
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="task-details"
+    >
+      <h3>Task Details</h3>
       <p class="font-normal text-gray-500 pb-2">Name the task and set target grade</p>
       <f-task-definition-general [taskDefinition]="taskDefinition"></f-task-definition-general>
-    </div>
-  </mat-step>
+    </section>
+    <mat-divider class="my-[25px]"></mat-divider>
 
-  <mat-step>
-    <ng-template matStepLabel>Task Learning Outcomes</ng-template>
-    <div class="pt-[12px]">
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="task-learning-outcomes"
+    >
+      <h3>Task Learning Outcomes</h3>
       <p class="font-normal text-gray-500 pb-2">Add learning outcomes for this task</p>
       <f-learning-outcome-editor [context]="taskDefinition"></f-learning-outcome-editor>
-    </div>
-  </mat-step>
+    </section>
+    <mat-divider class="my-[25px]"></mat-divider>
 
-  <mat-step>
-    <ng-template matStepLabel>Inbox</ng-template>
-    <div class="pt-[12px]">
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="inbox"
+    >
+      <h3>Inbox</h3>
       <p class="font-normal text-gray-500 pb-2">
         Who assesses {{ unit.hasGroupwork() ? 'and submits ' : '' }}this task?
       </p>
       <f-task-definition-who [taskDefinition]="taskDefinition"></f-task-definition-who>
-    </div>
-  </mat-step>
+    </section>
+    <mat-divider class="my-[25px]"></mat-divider>
 
-  <mat-step>
-    <ng-template matStepLabel>Due Dates</ng-template>
-    <div class="pt-[12px]">
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="due-dates"
+    >
+      <h3>Due Dates</h3>
       <p class="font-normal text-gray-500 pb-2">When is the task due?</p>
       <f-task-definition-dates [taskDefinition]="taskDefinition"></f-task-definition-dates>
-    </div>
-  </mat-step>
+    </section>
+    <mat-divider class="my-[25px]"></mat-divider>
 
-  <mat-step>
-    <ng-template matStepLabel>Upload Requirements</ng-template>
-    <div class="pt-[12px]">
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="upload-requirements"
+    >
+      <h3>Upload Requirements</h3>
       <p class="font-normal text-gray-500 pb-2">What do students need to upload?</p>
       <f-task-definition-upload [taskDefinition]="taskDefinition"></f-task-definition-upload>
-    </div>
-  </mat-step>
+    </section>
+    <mat-divider class="my-[25px]"></mat-divider>
 
-  <mat-step>
-    <ng-template matStepLabel>Task Resources</ng-template>
-    <div class="pt-[12px]">
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="task-resources"
+    >
+      <h3>Task Resources</h3>
       <p class="font-normal text-gray-500 pb-2">Upload task descriptions and resources</p>
       <f-task-definition-resources [taskDefinition]="taskDefinition"></f-task-definition-resources>
-    </div>
-  </mat-step>
+    </section>
+    <mat-divider class="my-[25px]"></mat-divider>
 
-  <mat-step>
-    <ng-template matStepLabel>Prerequisite Tasks</ng-template>
-    <div class="pt-[12px]">
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="prerequisite-tasks"
+    >
+      <h3>Prerequisite Tasks</h3>
       <p class="font-normal text-gray-500 pb-2">
         Select which tasks need to be submitted before
         <span class="font-bold">{{ taskDefinition.abbreviation }} {{ taskDefinition.name }}</span>
         can be submitted
       </p>
-
       <f-task-definition-prerequisites [taskDefinition]="taskDefinition" [staffView]="true">
       </f-task-definition-prerequisites>
-    </div>
-  </mat-step>
+    </section>
+    <mat-divider class="my-[25px]"></mat-divider>
 
-  <mat-step>
-    <ng-template matStepLabel>Discussion Prompts</ng-template>
-    <div class="pt-[12px]">
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="discussion-prompts"
+    >
+      <h3>Discussion Prompts</h3>
       <p class="font-normal text-gray-500 pb-2">
         Discussion prompts for tutors to use when discussing student tasks in class
       </p>
-
       <f-task-definition-discussion-prompts [taskDefinition]="taskDefinition" [staffView]="true">
       </f-task-definition-discussion-prompts>
-    </div>
-  </mat-step>
+    </section>
+    <mat-divider class="my-[25px]"></mat-divider>
 
-  @if (overseerEnabled) {
-    <mat-step>
-      <ng-template matStepLabel>Task Assessment Automation</ng-template>
-      <div class="pt-[12px]">
+    @if (overseerEnabled) {
+      <section
+        class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+        #sectionElement
+        data-section-id="task-assessment-automation"
+      >
+        <h3>Task Assessment Automation</h3>
         <p class="font-normal text-gray-500 pb-2">Configure automated assessment</p>
         <f-task-definition-overseer [taskDefinition]="taskDefinition"></f-task-definition-overseer>
-      </div>
-    </mat-step>
-  }
+      </section>
+      <mat-divider class="my-[25px]"></mat-divider>
+    }
 
-  <mat-step>
-    <ng-template matStepLabel>SCORM Test</ng-template>
-    <div class="pt-[12px]">
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="scorm-test"
+    >
+      <h3>SCORM Test</h3>
       <p class="font-normal text-gray-500 pb-2">
         Upload the corresponding SCORM 2004 test (e.g. Numbas)
       </p>
       <f-task-definition-scorm [taskDefinition]="taskDefinition"></f-task-definition-scorm>
-    </div>
-  </mat-step>
+    </section>
+    <mat-divider class="my-[25px]"></mat-divider>
 
-  <mat-step>
-    <ng-template matStepLabel>Optional Settings</ng-template>
-    <div class="pt-[12px]">
+    <section
+      class="mb-0 rounded-xl bg-white p-4 scroll-mt-28"
+      #sectionElement
+      data-section-id="optional-settings"
+    >
+      <h3>Optional Settings</h3>
       <p class="font-normal text-gray-500 pb-2">Apply other options</p>
       <f-task-definition-options [taskDefinition]="taskDefinition"></f-task-definition-options>
-    </div>
-  </mat-step>
-</mat-stepper>
-<div class="flex w-full justify-end place-content-end mb-5">
-  <div class="sticky bottom-16">
+    </section>
+
+    <!-- 725px is enough space to ensure the last section ("Optional Settings") can be scrolled to the top of the browser -->
+    <!-- This value may need to change as we add or modify task-definition-editor components -->
+    <div class="h-[725px]" aria-hidden="true"></div>
+  </div>
+</div>
+<div class="fixed bottom-[50px] right-[50px] z-50">
+  <div>
     <button mat-fab color="primary" (click)="save()">
       <mat-icon>save</mat-icon>
     </button>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.scss
index 82dc723d88..e69de29bb2 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.scss
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.scss
@@ -1,15 +0,0 @@
-.mat-toolbar {
-  background-color: white;
-  // position: fixed;
-  // bottom: 0;
-  // width: 100%;
-}
-
-.form-group {
-
-}
-
-#task-def-head {
-  background-color: white;
-  z-index: 10;
-}
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.ts
index d77a3d5ad8..1da5af76f1 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component.ts
@@ -1,20 +1,73 @@
-import {Component, Input, OnInit} from '@angular/core';
+import {
+  AfterViewInit,
+  Component,
+  ElementRef,
+  HostListener,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  QueryList,
+  SimpleChanges,
+  ViewChild,
+  ViewChildren,
+} from '@angular/core';
+import {Subscription} from 'rxjs';
 import {TaskDefinition} from 'src/app/api/models/task-definition';
 import {Unit} from 'src/app/api/models/unit';
 import {TaskDefinitionService} from 'src/app/api/services/task-definition.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {DoubtfireConstants} from 'src/app/config/constants/doubtfire-constants';
 
+type TaskDefinitionSectionId =
+  | 'task-details'
+  | 'task-learning-outcomes'
+  | 'inbox'
+  | 'due-dates'
+  | 'upload-requirements'
+  | 'task-resources'
+  | 'prerequisite-tasks'
+  | 'discussion-prompts'
+  | 'task-assessment-automation'
+  | 'scorm-test'
+  | 'optional-settings';
+
+interface TaskDefinitionSection {
+  id: TaskDefinitionSectionId;
+  label: string;
+}
+
 @Component({
   selector: 'f-task-definition-editor',
   templateUrl: 'task-definition-editor.component.html',
   styleUrls: ['task-definition-editor.component.scss'],
 })
-export class TaskDefinitionEditorComponent implements OnInit {
+export class TaskDefinitionEditorComponent implements OnInit, AfterViewInit, OnChanges, OnDestroy {
   @Input() taskDefinition: TaskDefinition;
   @Input() unit: Unit;
+  @ViewChild('sectionScrollContainer') sectionScrollContainer: ElementRef<HTMLElement>;
+  @ViewChildren('sectionElement') sectionElements: QueryList<ElementRef<HTMLElement>>;
 
   public overseerEnabled: boolean = false;
+  public activeSectionId: TaskDefinitionSectionId = 'task-details';
+  public readonly sectionList: TaskDefinitionSection[] = [
+    {id: 'task-details', label: 'Task Details'},
+    {id: 'task-learning-outcomes', label: 'Task Learning Outcomes'},
+    {id: 'inbox', label: 'Inbox'},
+    {id: 'due-dates', label: 'Due Dates'},
+    {id: 'upload-requirements', label: 'Upload Requirements'},
+    {id: 'task-resources', label: 'Task Resources'},
+    {id: 'prerequisite-tasks', label: 'Prerequisite Tasks'},
+    {id: 'discussion-prompts', label: 'Discussion Prompts'},
+    {id: 'task-assessment-automation', label: 'Task Assessment Automation'},
+    {id: 'scorm-test', label: 'SCORM Test'},
+    {id: 'optional-settings', label: 'Optional Settings'},
+  ];
+
+  private sectionElementMap = new Map<TaskDefinitionSectionId, HTMLElement>();
+  private sectionChangesSubscription?: Subscription;
+  private overseerEnabledSubscription?: Subscription;
+  private readonly scrollTopOffsetPx: number = 112;
 
   constructor(
     private taskDefinitionService: TaskDefinitionService,
@@ -23,9 +76,94 @@ export class TaskDefinitionEditorComponent implements OnInit {
   ) {}
 
   public ngOnInit() {
-    this.constants.IsOverseerEnabled.subscribe((enabled) => {
+    this.overseerEnabledSubscription = this.constants.IsOverseerEnabled.subscribe((enabled) => {
       this.overseerEnabled = enabled && this.unit.overseerEnabled;
+      this.ensureActiveSectionIsVisible();
+      this.rebuildSectionElementMap();
+    });
+  }
+
+  public ngAfterViewInit() {
+    this.rebuildSectionElementMap();
+    this.sectionChangesSubscription = this.sectionElements.changes.subscribe(() => {
+      this.rebuildSectionElementMap();
+      this.syncActiveSectionOnScroll();
     });
+    queueMicrotask(() => this.syncActiveSectionOnScroll());
+  }
+
+  public ngOnChanges(changes: SimpleChanges) {
+    if (changes.taskDefinition && !changes.taskDefinition.firstChange) {
+      this.ensureActiveSectionIsVisible();
+      queueMicrotask(() => this.syncActiveSectionOnScroll());
+    }
+  }
+
+  public ngOnDestroy() {
+    this.sectionChangesSubscription?.unsubscribe();
+    this.overseerEnabledSubscription?.unsubscribe();
+  }
+
+  public get visibleSections(): TaskDefinitionSection[] {
+    return this.overseerEnabled
+      ? this.sectionList
+      : this.sectionList.filter((section) => section.id !== 'task-assessment-automation');
+  }
+
+  public scrollToSection(sectionId: TaskDefinitionSectionId) {
+    this.activeSectionId = sectionId;
+
+    const container = this.sectionScrollContainer?.nativeElement;
+    const target = this.sectionElementMap.get(sectionId);
+
+    if (!container || !target) return;
+
+    if (this.isContainerScrollable(container)) {
+      const targetTop = this.getSectionTopInContainer(container, target);
+      container.scrollTo({
+        top: Math.max(targetTop - 8, 0),
+        behavior: 'smooth',
+      });
+      return;
+    }
+
+    target.scrollIntoView({
+      behavior: 'smooth',
+      block: 'start',
+    });
+  }
+
+  public syncActiveSectionOnScroll() {
+    const container = this.sectionScrollContainer?.nativeElement;
+    if (!container) return;
+
+    if (!this.isContainerScrollable(container)) {
+      this.syncActiveSectionOnWindowScroll();
+      return;
+    }
+
+    const scrollPosition = container.scrollTop + 48;
+    let nextActiveSection = this.visibleSections[0]?.id;
+
+    this.visibleSections.forEach((section) => {
+      const sectionElement = this.sectionElementMap.get(section.id);
+      if (
+        sectionElement &&
+        this.getSectionTopInContainer(container, sectionElement) <= scrollPosition
+      ) {
+        nextActiveSection = section.id;
+      }
+    });
+
+    if (nextActiveSection) {
+      this.activeSectionId = nextActiveSection;
+    }
+  }
+
+  @HostListener('window:scroll')
+  @HostListener('window:resize')
+  public onWindowScroll() {
+    this.syncActiveSectionOnScroll();
   }
 
   public save() {
@@ -37,4 +175,49 @@ export class TaskDefinitionEditorComponent implements OnInit {
       error: (message) => this.alerts.error(message),
     });
   }
+
+  private ensureActiveSectionIsVisible() {
+    if (!this.visibleSections.some((section) => section.id === this.activeSectionId)) {
+      this.activeSectionId = this.visibleSections[0]?.id ?? 'task-details';
+    }
+  }
+
+  private rebuildSectionElementMap() {
+    this.sectionElementMap.clear();
+
+    this.sectionElements?.forEach((sectionElementRef) => {
+      const nativeElement = sectionElementRef.nativeElement;
+      const sectionId = nativeElement.getAttribute('data-section-id') as TaskDefinitionSectionId;
+
+      if (sectionId) {
+        this.sectionElementMap.set(sectionId, nativeElement);
+      }
+    });
+  }
+
+  private getSectionTopInContainer(container: HTMLElement, sectionElement: HTMLElement): number {
+    const containerRect = container.getBoundingClientRect();
+    const sectionRect = sectionElement.getBoundingClientRect();
+    return container.scrollTop + (sectionRect.top - containerRect.top);
+  }
+
+  private syncActiveSectionOnWindowScroll() {
+    const threshold = this.scrollTopOffsetPx + 12;
+    let nextActiveSection = this.visibleSections[0]?.id;
+
+    this.visibleSections.forEach((section) => {
+      const sectionElement = this.sectionElementMap.get(section.id);
+      if (sectionElement && sectionElement.getBoundingClientRect().top <= threshold) {
+        nextActiveSection = section.id;
+      }
+    });
+
+    if (nextActiveSection) {
+      this.activeSectionId = nextActiveSection;
+    }
+  }
+
+  private isContainerScrollable(container: HTMLElement): boolean {
+    return container.scrollHeight > container.clientHeight + 1;
+  }
 }
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
index 33f48afcd9..82562925c1 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.html
@@ -1,231 +1,263 @@
-<div class="flex flex-row gap-8">
-  <div class="flex-grow flex flex-col gap-8 gap-y-0">
-    <div class="flex flex-row">
-      <div>
-        <h3>Task List</h3>
-        <p>Plan the list of tasks for students to complete.</p>
+<div class="flex-grow flex flex-col gap-8 gap-y-0">
+  <div class="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+    <div>
+      <h3>Task List</h3>
+      <p>Plan the list of tasks for students to complete.</p>
+    </div>
+    <div class="flex flex-wrap items-center gap-5 md:justify-end">
+      <div class="flex items-center">
+        <label>Definitions CSV</label>
+        <div class="flex items-center">
+          <button mat-icon-button (click)="unit.downloadTaskDefinitionsCsv()">
+            <mat-icon>download</mat-icon>
+          </button>
+          <button mat-icon-button (click)="uploadTaskDefinitionsCsv()">
+            <mat-icon>upload_file</mat-icon>
+          </button>
+        </div>
       </div>
-      <span class="flex-grow"></span>
-      <div>
-        <mat-form-field appearance="outline">
-          <input
-            matInput
-            (keyup)="applyFilter($event.target.value)"
-            placeholder="Filter"
-            [(ngModel)]="filter"
-          />
-        </mat-form-field>
+      <div class="flex items-center">
+        <label>Resources as Zip</label>
+        <div class="flex items-center">
+          <button mat-icon-button (click)="unit.downloadAllTaskResourcesZip()">
+            <mat-icon>download</mat-icon>
+          </button>
+          <button mat-icon-button (click)="uploadTaskResourcesZip()">
+            <mat-icon>upload_file</mat-icon>
+          </button>
+        </div>
       </div>
     </div>
+  </div>
+  <div class="my-3 flex justify-end items-center gap-3 w-full">
+    @if (unit.allowFlexibleDates) {
+      <button mat-raised-button (click)="manageDueDates = !manageDueDates">Manage Due Dates</button>
+    }
+    <button mat-raised-button color="primary" (click)="createTaskDefinition()">Add Task</button>
+  </div>
+
+  @if (unit.allowFlexibleDates) {
+    @if (manageDueDates) {
+      <br />
+      <mat-divider class="my-5"></mat-divider>
+      <br />
+      <div>
+        <h3>Manage Target Dates</h3>
+        <p>Modify or add target dates for each target grade</p>
+      </div>
+      <div class="mt-6">
+        <table mat-table [dataSource]="taskDefinitionSource" class="mat-elevation-z0 w-full">
+          <ng-container matColumnDef="taskDefinition">
+            <th mat-header-cell *matHeaderCellDef>Task</th>
+            <td mat-cell *matCellDef="let td" class="w-fit whitespace-nowrap">
+              {{ td.abbreviation }} {{ td.name }}
+            </td>
+          </ng-container>
+
+          <ng-container *ngFor="let g of gradeColumns" [matColumnDef]="g">
+            <th mat-header-cell *matHeaderCellDef class="text-center w-[160px]">
+              <div class="w-full flex justify-center">
+                <f-grade-icon [grade]="gradeColumns.indexOf(g)"></f-grade-icon>
+              </div>
+            </th>
+            <td mat-cell *matCellDef="let td">
+              <div class="flex flex-col gap-2">
+                <mat-form-field
+                  appearance="outline"
+                  class="w-[250px] flex justify-center items-center pt-[22px]"
+                  [ngClass]="{
+                    'date-error': isStartAfterTarget(td, g)
+                  }"
+                >
+                  <mat-label> Start Date </mat-label>
+                  <input
+                    matInput
+                    [matDatepicker]="dpStart"
+                    [ngModel]="getGradeStartDate(td, g)"
+                    (ngModelChange)="setGradeStartDate(td, g, $event)"
+                    [ngClass]="{
+                      'fallback-date': isFallbackStartDate(td, g)
+                    }"
+                    placeholder="Select date"
+                  />
+
+                  <mat-datepicker-toggle matSuffix [for]="dpStart"></mat-datepicker-toggle>
+                  <mat-datepicker #dpStart></mat-datepicker>
+                </mat-form-field>
+                <mat-form-field
+                  appearance="outline"
+                  class="w-[250px] flex justify-center items-center"
+                  [ngClass]="{
+                    'date-error': isStartAfterTarget(td, g)
+                  }"
+                >
+                  <mat-label> Target Date </mat-label>
+                  <input
+                    matInput
+                    [matDatepicker]="dpTarget"
+                    [ngModel]="getGradeDueDate(td, g)"
+                    (ngModelChange)="setGradeDueDate(td, g, $event)"
+                    [ngClass]="{
+                      'fallback-date': isFallbackTargetDate(td, g)
+                    }"
+                    placeholder="Select date"
+                  />
+                  @if (isStartAfterTarget(td, g)) {
+                    <mat-hint class="text-red-500"> Target date must be after start date </mat-hint>
+                  }
 
-    <table
-      class="flex-grow f-table selectable"
-      mat-table
-      [dataSource]="taskDefinitionSource"
-      matSort
-      (matSortChange)="sortData($event)"
+                  <mat-datepicker-toggle matSuffix [for]="dpTarget"></mat-datepicker-toggle>
+                  <mat-datepicker #dpTarget></mat-datepicker>
+                </mat-form-field>
+              </div>
+            </td>
+          </ng-container>
+
+          <tr mat-header-row *matHeaderRowDef="dueDateColumns"></tr>
+          <tr mat-row *matRowDef="let row; columns: dueDateColumns"></tr>
+        </table>
+      </div>
+    }
+  }
+
+  <div class="flex flex-col items-start gap-4 md:flex-row">
+    <aside
+      class="self-start md:sticky md:top-4 md:shrink-0"
+      [ngClass]="{
+        'w-full md:w-[420px]': !isTaskListCollapsed,
+        'w-full md:w-[92px]': isTaskListCollapsed
+      }"
     >
-      <ng-container matColumnDef="name" sticky>
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Task Name</th>
-        <td
-          mat-cell
-          *matCellDef="let taskDefinition"
-          (click)="selectTaskDefinition(taskDefinition)"
-        >
-          {{ taskDefinition.abbreviation }} {{ taskDefinition.name }}
-        </td>
-      </ng-container>
-      <ng-container matColumnDef="grade" sticky>
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Grade</th>
-        <td
-          mat-cell
-          *matCellDef="let taskDefinition"
-          (click)="selectTaskDefinition(taskDefinition)"
+      <div class="overflow-hidden rounded-2xl bg-white md:flex md:h-[calc(100vh-2rem)] md:flex-col">
+        <div
+          class="text-left text-[15px]"
+          [ngClass]="{
+            'px-1': !isTaskListCollapsed,
+            'px-0': isTaskListCollapsed
+          }"
         >
-          {{ taskDefinition.targetGradeText }}
-        </td>
-      </ng-container>
-      <ng-container matColumnDef="startDate" sticky>
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Start Date</th>
-        <td
-          mat-cell
-          *matCellDef="let taskDefinition"
-          (click)="selectTaskDefinition(taskDefinition)"
-        >
-          {{ taskDefinition.startDate | date: 'd LLL y' }}
-        </td>
-      </ng-container>
-      <ng-container matColumnDef="targetDate" sticky>
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Due Date</th>
-        <td
-          mat-cell
-          *matCellDef="let taskDefinition"
-          (click)="selectTaskDefinition(taskDefinition)"
-        >
-          {{ taskDefinition.targetDate | date: 'd LLL y' }}
-        </td>
-      </ng-container>
-      <ng-container matColumnDef="deadlineDate" sticky>
-        <th mat-header-cell *matHeaderCellDef mat-sort-header>Deadline</th>
-        <td
-          mat-cell
-          *matCellDef="let taskDefinition"
-          (click)="selectTaskDefinition(taskDefinition)"
-        >
-          {{ taskDefinition.dueDate | date: 'd LLL y' }}
-        </td>
-      </ng-container>
-      <ng-container matColumnDef="taskDefAction" sticky>
-        <th mat-header-cell *matHeaderCellDef></th>
-        <td mat-cell *matCellDef="let taskDefinition">
-          @if (taskDefinitionHasChanges(taskDefinition)) {
+          <div class="flex items-center" [ngClass]="{'justify-center': isTaskListCollapsed}">
             <button
               mat-icon-button
-              aria-label="save task definition"
-              color="primary"
-              (click)="saveTaskDefinition(taskDefinition)"
+              [attr.aria-label]="isTaskListCollapsed ? 'Expand task list' : 'Collapse task list'"
+              class="flex-none flex items-center"
+              (click)="toggleTaskListCollapsed()"
             >
-              <mat-icon>save</mat-icon>
+              <mat-icon class="flex items-center">
+                {{ isTaskListCollapsed ? 'chevron_right' : 'chevron_left' }}
+              </mat-icon>
             </button>
-          }
-          <button
-            mat-icon-button
-            aria-label="delete task definition"
-            color="warn"
-            (click)="deleteTaskDefinition(taskDefinition)"
-          >
-            <mat-icon>delete</mat-icon>
-          </button>
-        </td>
-      </ng-container>
-
-      <!-- Action footer row -->
-      <ng-container matColumnDef="actions">
-        <td mat-footer-cell *matFooterCellDef [colSpan]="columns.length"></td>
-      </ng-container>
-
-      <tr mat-header-row *matHeaderRowDef="columns"></tr>
-      <tr
-        mat-row
-        *matRowDef="let row; columns: columns"
-        [style.background]="selectedTaskDefinition === row ? 'lightblue' : ''"
-      ></tr>
-    </table>
-    <span class="flex items-center">
-      <mat-paginator class="mat-elevation-z0" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
-      <span class="flex-grow"></span>
-      <label>Definitions CSV</label>
-      <button mat-icon-button (click)="unit.downloadTaskDefinitionsCsv()">
-        <mat-icon>download</mat-icon>
-      </button>
-      <button mat-icon-button (click)="uploadTaskDefinitionsCsv()">
-        <mat-icon>upload_file</mat-icon>
-      </button>
-      <span class="flex-grow"></span>
-      <label>Resources as Zip</label>
-      <button mat-icon-button (click)="unit.downloadAllTaskResourcesZip()">
-        <mat-icon>download</mat-icon>
-      </button>
-      <button mat-icon-button (click)="uploadTaskResourcesZip()">
-        <mat-icon>upload_file</mat-icon>
-      </button>
-      <span class="flex-grow"></span>
-      @if (unit.allowFlexibleDates) {
-        <button mat-raised-button (click)="manageDueDates = !manageDueDates" class="mr-5">
-          Manage Due Dates
-        </button>
-      }
-      <button mat-raised-button color="primary" (click)="createTaskDefinition()">Add Task</button>
-    </span>
-    @if (selectedTaskDefinition) {
-      <f-task-definition-editor
-        [taskDefinition]="selectedTaskDefinition"
-        [unit]="unit"
-      ></f-task-definition-editor>
-    }
-  </div>
-</div>
-
-@if (unit.allowFlexibleDates) {
-  @if (manageDueDates) {
-    <br />
-    <mat-divider class="my-5"></mat-divider>
-    <br />
-    <div>
-      <h3>Manage Target Dates</h3>
-      <p>Modify or add target dates for each target grade</p>
-    </div>
-    <div class="mt-6">
-      <table mat-table [dataSource]="taskDefinitionSource" class="mat-elevation-z0 w-full">
-        <ng-container matColumnDef="taskDefinition">
-          <th mat-header-cell *matHeaderCellDef>Task</th>
-          <td mat-cell *matCellDef="let td" class="w-fit whitespace-nowrap">
-            {{ td.abbreviation }} {{ td.name }}
-          </td>
-        </ng-container>
-
-        <ng-container *ngFor="let g of gradeColumns" [matColumnDef]="g">
-          <th mat-header-cell *matHeaderCellDef class="text-center w-[160px]">
-            <div class="w-full flex justify-center">
-              <f-grade-icon [grade]="gradeColumns.indexOf(g)"></f-grade-icon>
-            </div>
-          </th>
-          <td mat-cell *matCellDef="let td">
-            <div class="flex flex-col gap-2">
-              <mat-form-field
-                appearance="outline"
-                class="w-[250px] flex justify-center items-center pt-[22px]"
-                [ngClass]="{
-                  'date-error': isStartAfterTarget(td, g)
-                }"
+            @if (!isTaskListCollapsed) {
+              <button
+                mat-icon-button
+                aria-label="Search Icon"
+                disabled
+                class="flex-none flex items-center"
               >
-                <mat-label> Start Date </mat-label>
+                <mat-icon class="flex items-center">search</mat-icon>
+              </button>
+              <div class="grow pr-2">
                 <input
-                  matInput
-                  [matDatepicker]="dpStart"
-                  [ngModel]="getGradeStartDate(td, g)"
-                  (ngModelChange)="setGradeStartDate(td, g, $event)"
-                  [ngClass]="{
-                    'fallback-date': isFallbackStartDate(td, g)
-                  }"
-                  placeholder="Select date"
+                  class="w-full border-0 bg-transparent outline-none"
+                  autocomplete="off"
+                  spellcheck="false"
+                  type="text"
+                  placeholder="Search Tasks"
+                  [(ngModel)]="filter"
+                  (ngModelChange)="applyFilter($event)"
                 />
+              </div>
+            }
+          </div>
+        </div>
 
-                <mat-datepicker-toggle matSuffix [for]="dpStart"></mat-datepicker-toggle>
-                <mat-datepicker #dpStart></mat-datepicker>
-              </mat-form-field>
-              <mat-form-field
-                appearance="outline"
-                class="w-[250px] flex justify-center items-center"
-                [ngClass]="{
-                  'date-error': isStartAfterTarget(td, g)
-                }"
-              >
-                <mat-label> Target Date </mat-label>
-                <input
-                  matInput
-                  [matDatepicker]="dpTarget"
-                  [ngModel]="getGradeDueDate(td, g)"
-                  (ngModelChange)="setGradeDueDate(td, g, $event)"
+        <div class="h-[560px] overflow-auto md:h-auto md:flex-1">
+          <mat-selection-list [multiple]="false">
+            @if ((taskDefinitionSource?.filteredData ?? []).length === 0) {
+              <div class="text-center text-muted p-3">No task definitions to display</div>
+            }
+            @for (
+              taskDefinition of taskDefinitionSource?.filteredData ?? [];
+              track taskDefinition
+            ) {
+              <mat-list-item class="clearfix p-0 h-[60px]" [disableRipple]="true">
+                <div
+                  class="flex h-[60px] w-full cursor-pointer items-center rounded-[6px] hover:bg-gray-50"
+                  (click)="selectTaskDefinition(taskDefinition)"
+                  [matTooltip]="taskDefinition.name"
+                  matTooltipPosition="above"
+                  [matTooltipDisabled]="!isTaskListCollapsed"
+                  [matTooltipShowDelay]="250"
                   [ngClass]="{
-                    'fallback-date': isFallbackTargetDate(td, g)
+                    'bg-[#e7e7ff]': isSelectedTaskDefinition(taskDefinition)
                   }"
-                  placeholder="Select date"
-                />
-                @if (isStartAfterTarget(td, g)) {
-                  <mat-hint class="text-red-500"> Target date must be after start date </mat-hint>
-                }
+                >
+                  <div class="flex w-full items-center px-[6px]">
+                    <div
+                      class="flex w-full items-center"
+                      [ngClass]="{'justify-center': isTaskListCollapsed}"
+                    >
+                      <f-task-badge
+                        [taskDef]="taskDefinition"
+                        [highlight]="isSelectedTaskDefinition(taskDefinition)"
+                      ></f-task-badge>
 
-                <mat-datepicker-toggle matSuffix [for]="dpTarget"></mat-datepicker-toggle>
-                <mat-datepicker #dpTarget></mat-datepicker>
-              </mat-form-field>
-            </div>
-          </td>
-        </ng-container>
+                      @if (!isTaskListCollapsed) {
+                        <div class="flex-col ml-4 min-w-0 flex-1">
+                          <h4 class="line-clamp-1 mt-[8px] mb-[-2px] text-[15px]">
+                            {{ taskDefinition.name }}
+                          </h4>
+                          <div class="mb-0 text-[12px]">
+                            {{ gradeNames[taskDefinition.targetGrade] }} Task
+                          </div>
+                        </div>
 
-        <tr mat-header-row *matHeaderRowDef="dueDateColumns"></tr>
-        <tr mat-row *matRowDef="let row; columns: dueDateColumns"></tr>
-      </table>
+                        <div
+                          class="flex items-center gap-1 pr-1"
+                          (click)="$event.stopPropagation()"
+                        >
+                          @if (taskDefinitionHasChanges(taskDefinition)) {
+                            <button
+                              mat-icon-button
+                              aria-label="save task definition"
+                              color="primary"
+                              (click)="saveTaskDefinition(taskDefinition)"
+                            >
+                              <mat-icon>save</mat-icon>
+                            </button>
+                          }
+                          <button
+                            mat-icon-button
+                            aria-label="delete task definition"
+                            color="warn"
+                            (click)="deleteTaskDefinition(taskDefinition)"
+                          >
+                            <mat-icon>delete</mat-icon>
+                          </button>
+                        </div>
+                      }
+                    </div>
+                  </div>
+                </div>
+              </mat-list-item>
+            }
+          </mat-selection-list>
+        </div>
+      </div>
+    </aside>
+
+    <div class="w-full min-w-0 flex-1">
+      @if (selectedTaskDefinition) {
+        <f-task-definition-editor
+          [taskDefinition]="selectedTaskDefinition"
+          [unit]="unit"
+        ></f-task-definition-editor>
+      } @else {
+        <div class="border border-dashed border-gray-300 rounded-xl bg-gray-50 p-8 text-gray-600">
+          <h4>Select a task definition</h4>
+          <p>Pick a task from the left list to edit its details.</p>
+        </div>
+      }
     </div>
-  }
-}
+  </div>
+</div>
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss
index e33b519c28..da9f77f5b0 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.scss
@@ -1,10 +1,3 @@
-.mat-toolbar {
-  background-color: white;
-  // position: fixed;
-  // bottom: 0;
-  // width: 100%;
-}
-
 ::ng-deep input.mat-mdc-input-element.fallback-date {
   font-style: italic;
   color: #bfbfbf !important;
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
index 933a346d5d..f40f563a7c 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/unit-task-editor.component.ts
@@ -1,7 +1,5 @@
-import {AfterViewInit, Component, Inject, Input, ViewChild} from '@angular/core';
-import {MatPaginator} from '@angular/material/paginator';
-import {MatSort, Sort} from '@angular/material/sort';
-import {MatTable, MatTableDataSource} from '@angular/material/table';
+import {AfterViewInit, Component, Inject, Input} from '@angular/core';
+import {MatTableDataSource} from '@angular/material/table';
 import {addWeeks} from 'date-fns';
 import {Subscription} from 'rxjs';
 import {
@@ -9,6 +7,7 @@ import {
   csvResultModalService,
   csvUploadModalService,
 } from 'src/app/ajs-upgraded-providers';
+import {Grade} from 'src/app/api/models/grade';
 import {TaskDefinition} from 'src/app/api/models/task-definition';
 import {Unit} from 'src/app/api/models/unit';
 import {FeedbackTemplateService} from 'src/app/api/services/feedback-template.service';
@@ -23,23 +22,12 @@ type GradeCol = 'p' | 'c' | 'd' | 'hd';
   styleUrls: ['unit-task-editor.component.scss'],
 })
 export class UnitTaskEditorComponent implements AfterViewInit {
-  @ViewChild(MatTable, {static: false}) table: MatTable<TaskDefinition>;
-  @ViewChild(MatSort, {static: false}) sort: MatSort;
-  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator;
-
   @Input() unit: Unit;
 
   public taskDefinitionSource: MatTableDataSource<TaskDefinition>;
-  public columns: string[] = [
-    'name',
-    'grade',
-    'startDate',
-    'targetDate',
-    'deadlineDate',
-    'taskDefAction',
-  ];
   public filter: string;
   public selectedTaskDefinition: TaskDefinition;
+  public isTaskListCollapsed: boolean = false;
 
   public gradeColumns: string[] = ['p', 'c', 'd', 'hd'];
   public dueDateColumns: string[] = ['taskDefinition', 'p', 'c', 'd', 'hd'];
@@ -47,6 +35,8 @@ export class UnitTaskEditorComponent implements AfterViewInit {
 
   public manageDueDates: boolean;
 
+  protected gradeNames: string[] = Grade.GRADES;
+
   isStartAfterTarget(td: TaskDefinition, g: GradeCol): boolean {
     const start = this.getGradeStartDate(td, g);
     const target = this.getGradeDueDate(td, g);
@@ -158,8 +148,6 @@ export class UnitTaskEditorComponent implements AfterViewInit {
     this.subscriptions.push(
       this.unit.taskDefinitionCache.values.subscribe((taskDefinitions) => {
         this.taskDefinitionSource = new MatTableDataSource<TaskDefinition>(taskDefinitions);
-        this.taskDefinitionSource.paginator = this.paginator;
-        this.taskDefinitionSource.sort = this.sort;
         this.taskDefinitionSource.filterPredicate = (data: any, filter: string) =>
           data.matches(filter);
       }),
@@ -185,62 +173,37 @@ export class UnitTaskEditorComponent implements AfterViewInit {
 
   public selectTaskDefinition(taskDefinition: TaskDefinition) {
     if (this.selectedTaskDefinition === taskDefinition) {
-      this.selectedTaskDefinition = null;
-    } else {
-      this.selectedTaskDefinition = taskDefinition;
-
-      // Record original save data if none present
-      if (!this.selectedTaskDefinition.hasOriginalSaveData) {
-        this.selectedTaskDefinition.setOriginalSaveData(this.taskDefinitionService.mapping);
-      }
-
-      this.feedbackTemplateService
-        .query({contextType: 'task_definitions', contextId: this.selectedTaskDefinition.id}, {})
-        .subscribe({
-          error: () => this.alerts.error('Error loading task feedback templates.'),
-        });
+      return;
     }
-  }
 
-  public sortData(sort: Sort) {
-    const data = this.taskDefinitionSource.data;
+    this.selectedTaskDefinition = taskDefinition;
 
-    if (!sort.active || sort.direction === '') {
-      this.taskDefinitionSource.data = data;
-      return;
+    // Record original save data if none present
+    if (!this.selectedTaskDefinition.hasOriginalSaveData) {
+      this.selectedTaskDefinition.setOriginalSaveData(this.taskDefinitionService.mapping);
     }
 
-    this.taskDefinitionSource.data = data.sort((a, b) => {
-      const isAsc = sort.direction === 'asc';
-      switch (sort.active) {
-        case 'name':
-          return this.compare(a.abbreviation, b.abbreviation, isAsc);
-        case 'grade':
-          return this.compare(a.targetGrade, b.targetGrade, isAsc);
-        case 'startDate':
-          return this.compare(a.startDate.getTime(), b.startDate.getTime(), isAsc);
-        case 'targetDate':
-          return this.compare(a.targetDate.getTime(), b.targetDate.getTime(), isAsc);
-        case 'deadlineDate':
-          return this.compare(a.dueDate.getTime(), b.dueDate.getTime(), isAsc);
-        default:
-          return 0;
-      }
-    });
+    this.feedbackTemplateService
+      .query({contextType: 'task_definitions', contextId: this.selectedTaskDefinition.id}, {})
+      .subscribe({
+        error: () => this.alerts.error('Error loading task feedback templates.'),
+      });
+  }
+
+  public isSelectedTaskDefinition(taskDefinition: TaskDefinition): boolean {
+    return this.selectedTaskDefinition === taskDefinition;
   }
 
-  public compare(a: number | string, b: number | string, isAsc: boolean): number {
-    return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
+  public toggleTaskListCollapsed(): void {
+    this.isTaskListCollapsed = !this.isTaskListCollapsed;
   }
 
   applyFilter(filterValue: string) {
+    if (!this.taskDefinitionSource) return;
+
     this.taskDefinitionSource.filter = filterValue.trim().toLowerCase();
 
     this.selectedTaskDefinition = null;
-
-    if (this.taskDefinitionSource.paginator) {
-      this.taskDefinitionSource.paginator.firstPage();
-    }
   }
 
   private guessTaskAbbreviation() {
diff --git a/src/app/units/states/edit/edit.tpl.html b/src/app/units/states/edit/edit.tpl.html
index 8a0dc37d52..aae61b19f2 100644
--- a/src/app/units/states/edit/edit.tpl.html
+++ b/src/app/units/states/edit/edit.tpl.html
@@ -1,4 +1,4 @@
-<div class="container" style="width: 100%;">
+<div style="width: 100%;">
   <tabset class="tabset-icon">
     <tab ng-repeat="tab in tabs | toArray | orderBy: 'seq'" active="tab.active" ng-click="setActiveTab(tab)">
       <tab-heading>{{tab.title}}</tab-heading>
diff --git a/src/app/units/states/tasks/viewer/directives/f-unit-task-list/f-unit-task-list.component.html b/src/app/units/states/tasks/viewer/directives/f-unit-task-list/f-unit-task-list.component.html
index 1ca78334f0..e5175a16a0 100644
--- a/src/app/units/states/tasks/viewer/directives/f-unit-task-list/f-unit-task-list.component.html
+++ b/src/app/units/states/tasks/viewer/directives/f-unit-task-list/f-unit-task-list.component.html
@@ -37,7 +37,7 @@
             >
               <div class="task-entry w-full flex items-center">
                 <div class="task-list-data flex items-center justify-center">
-                  <f-task-badge [taskDef]="task"></f-task-badge>
+                  <f-task-badge [taskDef]="task" [highlight]="isSelectedTask(task)"></f-task-badge>
                   <div class="flex-col ml-4">
                     <h4 class="task-title line-clamp-1 mt-1">{{ task.name }}</h4>
 

From aa4c6a3241025ddd098056b94ea7834c641a1f89 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 13 Mar 2026 15:35:15 +1100
Subject: [PATCH 742/776] chore(release): 10.0.1-21

---
 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 bf453c2caf..d54a7397ca 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.
 
+### [10.0.1-21](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-20...v10.0.1-21) (2026-03-13)
+
 ### [10.0.1-20](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-19...v10.0.1-20) (2026-03-13)
 
 ### [10.0.1-19](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-18...v10.0.1-19) (2026-03-13)
diff --git a/package-lock.json b/package-lock.json
index e57fc43280..355382f4f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-20",
+  "version": "10.0.1-21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-20",
+      "version": "10.0.1-21",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 3cac36d794..8544221e10 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-20",
+  "version": "10.0.1-21",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 86ae8865268ee19e4b3430ff679358cc075e1346 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 16 Mar 2026 12:34:30 +1100
Subject: [PATCH 743/776] feat: require discussion before marking complete
 (#1103)

* feat: require discussion before marking complete

* chore: wording
---
 src/app/api/models/task-definition.ts         |  1 +
 src/app/api/models/task.ts                    | 17 ++++++++
 .../api/services/task-definition.service.ts   |  1 +
 src/app/common/footer/footer.component.html   | 33 ++++++++++-----
 src/app/common/footer/footer.component.ts     |  4 ++
 .../task-status-card.component.ts             | 14 ++++++-
 .../tutor-discussion.component.html           |  2 +-
 .../tutor-discussion.component.ts             | 40 +++++++++++++++++--
 .../task-definition-options.component.html    | 10 +++++
 .../states/tasks/inbox/inbox.component.ts     | 15 +++++--
 10 files changed, 118 insertions(+), 19 deletions(-)

diff --git a/src/app/api/models/task-definition.ts b/src/app/api/models/task-definition.ts
index f556de8631..c8f88d1e9e 100644
--- a/src/app/api/models/task-definition.ts
+++ b/src/app/api/models/task-definition.ts
@@ -57,6 +57,7 @@ export class TaskDefinition extends Entity {
   similarityLanguage: string = 'c';
   hasJplagReport: boolean;
   assessInPortfolioOnly: boolean;
+  requiresDiscussion: boolean;
   useResourcesForJplagBaseCode: boolean;
   lockAssessmentsToTutorialStream: boolean;
   discussionPromptsCount: number;
diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 906e5759d8..2d7d995792 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -113,6 +113,18 @@ export class Task extends Entity {
     return this.commentCache.currentValues;
   }
 
+  public get hasDiscussedInClassComment(): boolean {
+    return this.comments.some((comment) => comment.commentType === 'discussed_in_class');
+  }
+
+  public get requiresDiscussionForComplete(): boolean {
+    return !!this.definition?.requiresDiscussion;
+  }
+
+  public get canMarkComplete(): boolean {
+    return !this.requiresDiscussionForComplete || this.hasDiscussedInClassComment;
+  }
+
   public get tutor(): UnitRole {
     const enrolments = this.project.tutorialEnrolmentsCache.currentValues.filter(
       (t) => t.tutorialStream.name === this.definition.tutorialStream.name,
@@ -818,6 +830,11 @@ export class Task extends Entity {
     const oldStatus = this.status;
     const alerts: AlertService = AppInjector.get(AlertService);
 
+    if (status === 'complete' && !this.canMarkComplete) {
+      alerts.error('This task must be discussed in class before it can marked complete.', 6000);
+      return;
+    }
+
     const updateFunc = () => {
       const taskService: TaskService = AppInjector.get(TaskService);
       const options: RequestOptions<Task> = {
diff --git a/src/app/api/services/task-definition.service.ts b/src/app/api/services/task-definition.service.ts
index f43d104ada..d420f2c1fc 100644
--- a/src/app/api/services/task-definition.service.ts
+++ b/src/app/api/services/task-definition.service.ts
@@ -39,6 +39,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'similarityLanguage',
       'hasJplagReport',
       'assessInPortfolioOnly',
+      'requiresDiscussion',
       {
         keys: 'targetDate',
         toEntityFn: MappingFunctions.mapDateToEndOfDay,
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index bed0f886ce..cb6e238c38 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -61,7 +61,10 @@
           class="button extra-large-button status-chip"
           (click)="selectedTask?.updateTaskStatus(selectedTask.suggestedTaskStatus)"
           [ngClass]="taskService.statusData(selectedTask.suggestedTaskStatus).class"
-          [disabled]="!actionButtonEnabled"
+          [disabled]="
+            !actionButtonEnabled ||
+            (selectedTask?.suggestedTaskStatus === 'complete' && !selectedTask?.canMarkComplete)
+          "
         >
           <i class="fa {{ taskService.statusData(selectedTask.suggestedTaskStatus).icon }}"></i>
         </button>
@@ -92,17 +95,25 @@
           <mat-icon>bolt</mat-icon>
         </button>
       } @else {
-        <button
-          [disabled]="!actionButtonEnabled"
-          mat-icon-button
-          matTooltip="Mark as Complete"
-          matTooltipPosition="above"
-          aria-label="Mark as Complete"
-          class="button"
-          (click)="selectedTask?.updateTaskStatus('complete')"
+        <div
+          [matTooltip]="
+            !selectedTask?.canMarkComplete
+              ? 'This task must be discussed in class before it can marked complete'
+              : ''
+          "
         >
-          <mat-icon>done</mat-icon>
-        </button>
+          <button
+            [disabled]="!completeButtonEnabled"
+            mat-icon-button
+            matTooltip="Mark as Complete"
+            matTooltipPosition="above"
+            aria-label="Mark as Complete"
+            class="button"
+            (click)="selectedTask?.updateTaskStatus('complete')"
+          >
+            <mat-icon>done</mat-icon>
+          </button>
+        </div>
       }
     </span>
   </ng-template>
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index a3537e220d..7626b63a6d 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -180,6 +180,10 @@ export class FooterComponent implements OnInit {
     return true;
   }
 
+  public get completeButtonEnabled(): boolean {
+    return this.actionButtonEnabled && !!this.selectedTask?.canMarkComplete;
+  }
+
   public get hideMainActionButtonsForModeration(): boolean {
     return this.viewType === 'moderation' && !this.showModerationStatusButtons;
   }
diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
index d08c1b1ffd..8738a0bffd 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-status-card/task-status-card.component.ts
@@ -55,7 +55,15 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
   reapplyTriggers(): void {
     // if tutor is in queryParam
     if (this.router.globals.params.tutor != null) {
-      this.triggers = this.taskService.statusKeys.map((k) => this.taskService.statusData(k));
+      this.triggers = this.taskService.statusKeys
+        .map((k) => this.taskService.statusData(k))
+        .filter((trigger) => {
+          if (trigger.status !== 'complete') {
+            return true;
+          }
+
+          return this.task.canMarkComplete || this.task.status === 'complete';
+        });
     } else {
       const studentTriggers = _.map(
         this.taskService.switchableStates.student as TaskStatusEnum[],
@@ -80,6 +88,10 @@ export class TaskStatusCardComponent implements OnChanges, AfterViewInit {
   }
 
   triggerTransition(trigger: TaskStatusEnum): void {
+    if (trigger === 'complete' && !this.task.canMarkComplete) {
+      return;
+    }
+
     if (trigger === 'ready_for_feedback') {
       this.uploadSubmission();
     } else {
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
index 9c262fcede..97c5d30809 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.html
@@ -190,7 +190,7 @@ <h4 class="text-[15px] mb-[2px] mt-[8px]">{{ task.definition.name }}</h4>
           <button
             class="bg-green-400 medium-icon-button"
             mat-fab
-            [disabled]="!tasks.selectedOptions.selected.length"
+            [disabled]="!canMarkSelectedTasksComplete"
             (click)="setSelectedTasksStatus('complete')"
           >
             <!-- Mark as Complete -->
diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index f08edf198c..43416b60c1 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -263,9 +263,31 @@ export class TutorDiscussionComponent implements AfterViewInit {
   }
 
   public setSelectedTasksStatus(status: TaskStatusEnum) {
-    const selectedTasks = this.tasksList.selectedOptions.selected;
-    for (const taskOption of selectedTasks) {
-      const task = taskOption.value as Task;
+    const selectedTasks = this.tasksList.selectedOptions.selected.map((taskOption) => {
+      return taskOption.value as Task;
+    });
+
+    if (status === 'complete') {
+      const blockedTasks = selectedTasks.filter(
+        (task) => !task.definition.assessInPortfolioOnly && !task.canMarkComplete,
+      );
+      if (blockedTasks.length > 0) {
+        this.alertService.error(
+          'Some selected tasks cannot be marked as complete until they are marked as discussed in class.',
+          5000,
+        );
+      }
+    }
+
+    for (const task of selectedTasks) {
+      if (
+        status === 'complete' &&
+        !task.definition.assessInPortfolioOnly &&
+        !task.canMarkComplete
+      ) {
+        continue;
+      }
+
       if (task.definition.assessInPortfolioOnly) {
         task.updateTaskStatus(status === 'complete' ? 'working_on_it' : status, true);
       } else {
@@ -274,6 +296,18 @@ export class TutorDiscussionComponent implements AfterViewInit {
     }
   }
 
+  public get canMarkSelectedTasksComplete(): boolean {
+    const selectedTasks = this.tasksList?.selectedOptions?.selected ?? [];
+    if (!selectedTasks.length) {
+      return false;
+    }
+
+    return selectedTasks.every((taskOption) => {
+      const task = taskOption.value as Task;
+      return task.definition.assessInPortfolioOnly || task.canMarkComplete;
+    });
+  }
+
   public markSelectedTasksDicussed() {
     const selectedTasks = this.tasksList.selectedOptions.selected;
     for (const taskOption of selectedTasks) {
diff --git a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
index 6ef203ae27..5d00855580 100644
--- a/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
+++ b/src/app/units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-options/task-definition-options.component.html
@@ -24,6 +24,16 @@
     </span>
   </div>
 
+  <div class="flex-grow flex flex-row gap-5 items-center">
+    <mat-checkbox class="basis-1/2" matInput [(ngModel)]="taskDefinition.requiresDiscussion">
+      Requires Discussion
+    </mat-checkbox>
+    <span class="basis-1/2">
+      Tutors cannot mark this task as complete unless it has first been marked as discussed in
+      class.
+    </span>
+  </div>
+
   <div class="flex-grow flex flex-row gap-5 items-center">
     <mat-checkbox class="basis-1/2" matInput [(ngModel)]="taskDefinition.isGraded"
       >Graded</mat-checkbox
diff --git a/src/app/units/states/tasks/inbox/inbox.component.ts b/src/app/units/states/tasks/inbox/inbox.component.ts
index 9f2bd164ab..118aae62d1 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.ts
+++ b/src/app/units/states/tasks/inbox/inbox.component.ts
@@ -102,9 +102,18 @@ export class InboxComponent implements OnInit, OnDestroy {
           keys: 'control.Shift.c',
           description: 'Mark selected task as complete',
         })
-        .subscribe(() =>
-          this.selectedTask.selectedTask?.updateTaskStatus('complete')
-      );
+        .subscribe(() => {
+          const task = this.selectedTask.selectedTask;
+          if (!task) {
+            return;
+          }
+
+          if (!task.canMarkComplete) {
+            return;
+          }
+
+          task.updateTaskStatus('complete');
+        });
     }
 
     if (!registeredHotkeys.includes('control.shift.d')) {

From 9e5be591b9a0cf72d01efa5e28e5b2b9e7eba043 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 18 Mar 2026 10:44:29 +1100
Subject: [PATCH 744/776] fix: avoid rendering the staff list twice

- prevents inbox queries from being called twice
---
 src/app/units/states/tasks/inbox/inbox.component.html | 4 +++-
 src/app/units/states/tasks/inbox/inbox.component.ts   | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/tasks/inbox/inbox.component.html b/src/app/units/states/tasks/inbox/inbox.component.html
index 42297b6ad8..ca024e39d3 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.html
+++ b/src/app/units/states/tasks/inbox/inbox.component.html
@@ -1,3 +1,4 @@
+@if (!isMobileView) {
 <div fxLayout="column" fxFill fxHide fxShow.gt-sm>
   <div fxLayout="row" fxLayoutAlign="center stretch" fxFill>
     <div id="inboxpanel" #inboxpanel class="staff-task-list inbox-panel">
@@ -45,7 +46,7 @@
   </div>
   <f-footer class="z-10" [viewType]="viewType"></f-footer>
 </div>
-
+} @else {
 <div #mobile fxLayout="row" fxFill fxHide fxShow.lt-md>
   <div id="inboxpanel" #inboxpanel class="inbox-panel mobile" [hidden]="taskSelected">
     @if (taskData) {
@@ -86,3 +87,4 @@ <h3 class="mb-0">{{ taskData?.selectedTask?.project.student.nickname }}</h3>
     </div>
   </div>
 </div>
+}
diff --git a/src/app/units/states/tasks/inbox/inbox.component.ts b/src/app/units/states/tasks/inbox/inbox.component.ts
index 118aae62d1..554222dd75 100644
--- a/src/app/units/states/tasks/inbox/inbox.component.ts
+++ b/src/app/units/states/tasks/inbox/inbox.component.ts
@@ -55,6 +55,10 @@ export class InboxComponent implements OnInit, OnDestroy {
     return this.inboxPanel?.nativeElement.getBoundingClientRect().width < 150;
   }
 
+  get isMobileView(): boolean {
+    return this.mediaObserver.isActive('lt-md');
+  }
+
   constructor(
     private hotkeys: HotkeysService,
     private selectedTask: SelectedTaskService,

From a9b7db07eb2de7747036eb455c29d30304694443 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 12:17:51 +0000
Subject: [PATCH 745/776] build(deps): bump immutable from 4.3.6 to 4.3.8

Bumps [immutable](https://github.com/immutable-js/immutable-js) from 4.3.6 to 4.3.8.
- [Release notes](https://github.com/immutable-js/immutable-js/releases)
- [Changelog](https://github.com/immutable-js/immutable-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/immutable-js/immutable-js/compare/v4.3.6...v4.3.8)

---
updated-dependencies:
- dependency-name: immutable
  dependency-version: 4.3.8
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 350 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 335 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 355382f4f5..6c20707620 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3937,6 +3937,96 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@material/animation": {
       "version": "15.0.0-canary.7f224ddd4.0",
       "license": "MIT",
@@ -6249,7 +6339,7 @@
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/accepts": {
@@ -6646,6 +6736,28 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/aproba": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
+      "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==",
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/arg": {
       "version": "5.0.2",
       "dev": true,
@@ -7769,6 +7881,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/canvas": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "nan": "^2.17.0",
+        "simple-get": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/canvas-confetti": {
       "version": "1.9.3",
       "license": "ISC",
@@ -8155,6 +8283,16 @@
       "version": "1.1.3",
       "license": "MIT"
     },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
     "node_modules/colorette": {
       "version": "2.0.20",
       "dev": true,
@@ -8268,7 +8406,7 @@
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/concurrently": {
@@ -8369,6 +8507,13 @@
         "date-now": "^0.1.4"
       }
     },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/constantinople": {
       "version": "3.1.2",
       "dev": true,
@@ -8975,6 +9120,19 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "dev": true,
@@ -9129,6 +9287,13 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "dev": true,
@@ -9162,6 +9327,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "dev": true,
@@ -11007,14 +11182,13 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -11056,6 +11230,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gaze": {
       "version": "1.1.3",
       "dev": true,
@@ -11185,7 +11381,7 @@
     },
     "node_modules/glob": {
       "version": "7.1.7",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -11220,7 +11416,7 @@
     },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -11229,7 +11425,7 @@
     },
     "node_modules/glob/node_modules/minimatch": {
       "version": "3.1.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -12681,6 +12877,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "dev": true,
@@ -13136,7 +13339,9 @@
       "license": "MIT"
     },
     "node_modules/immutable": {
-      "version": "4.3.5",
+      "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.8.tgz",
+      "integrity": "sha512-d/Ld9aLbKpNwyl0KiM2CT1WYvkitQ1TSvmRtkcV8FKStiDoA7Slzgjmb/1G2yhKM1p0XeNOieaTbFZmU1d3Xuw==",
       "dev": true,
       "license": "MIT"
     },
@@ -13179,7 +13384,7 @@
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
@@ -15532,6 +15737,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "dev": true,
@@ -15920,7 +16138,6 @@
       "version": "2.22.2",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
       "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
-      "dev": true,
       "optional": true
     },
     "node_modules/nanoid": {
@@ -16193,6 +16410,27 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "dev": true,
@@ -16565,6 +16803,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "dev": true,
@@ -16878,7 +17130,7 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -17039,7 +17291,7 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "wrappy": "1"
@@ -17473,7 +17725,7 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -19698,7 +19950,7 @@
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
@@ -20515,11 +20767,44 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/simple-fmt": {
       "version": "0.1.0",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/simple-get": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^4.2.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
     "node_modules/simple-is": {
       "version": "0.2.0",
       "dev": true,
@@ -21765,6 +22050,13 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "dev": true,
@@ -23030,6 +23322,13 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause",
+      "optional": true
+    },
     "node_modules/webpack": {
       "version": "5.90.3",
       "dev": true,
@@ -23335,6 +23634,17 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "license": "ISC",
@@ -23385,6 +23695,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "node_modules/wildcard": {
       "version": "2.0.1",
       "dev": true,
@@ -23520,7 +23840,7 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/ws": {

From a954a7bc4761dde84eb8f7478f2fc52d6c380ba4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 12:20:46 +0000
Subject: [PATCH 746/776] build(deps): bump rxjs from 7.4.0 to 7.8.2

Bumps [rxjs](https://github.com/reactivex/rxjs) from 7.4.0 to 7.8.2.
- [Release notes](https://github.com/reactivex/rxjs/releases)
- [Changelog](https://github.com/ReactiveX/rxjs/blob/7.8.2/CHANGELOG.md)
- [Commits](https://github.com/reactivex/rxjs/compare/7.4.0...7.8.2)

---
updated-dependencies:
- dependency-name: rxjs
  dependency-version: 7.8.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 365 ++++++++++++++++++++++++++++++++++++++++++----
 package.json      |   2 +-
 2 files changed, 338 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 355382f4f5..f3cc13f7e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -75,7 +75,7 @@
         "ngx-monaco-editor-v2": "^17.0.1",
         "nvd3": "1.8.6",
         "qrcode": "^1.5.4",
-        "rxjs": "~7.4.0",
+        "rxjs": "~7.8.2",
         "ts-md5": "^1.3.1",
         "tslib": "^2.6.2",
         "underscore.string": "2.3.3",
@@ -3937,6 +3937,96 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@material/animation": {
       "version": "15.0.0-canary.7f224ddd4.0",
       "license": "MIT",
@@ -6249,7 +6339,7 @@
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/accepts": {
@@ -6646,6 +6736,28 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/aproba": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
+      "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==",
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/arg": {
       "version": "5.0.2",
       "dev": true,
@@ -7769,6 +7881,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/canvas": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "nan": "^2.17.0",
+        "simple-get": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/canvas-confetti": {
       "version": "1.9.3",
       "license": "ISC",
@@ -8155,6 +8283,16 @@
       "version": "1.1.3",
       "license": "MIT"
     },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
     "node_modules/colorette": {
       "version": "2.0.20",
       "dev": true,
@@ -8268,7 +8406,7 @@
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/concurrently": {
@@ -8369,6 +8507,13 @@
         "date-now": "^0.1.4"
       }
     },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/constantinople": {
       "version": "3.1.2",
       "dev": true,
@@ -8975,6 +9120,19 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "dev": true,
@@ -9129,6 +9287,13 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "dev": true,
@@ -9162,6 +9327,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "dev": true,
@@ -11007,14 +11182,13 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -11056,6 +11230,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gaze": {
       "version": "1.1.3",
       "dev": true,
@@ -11185,7 +11381,7 @@
     },
     "node_modules/glob": {
       "version": "7.1.7",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -11220,7 +11416,7 @@
     },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -11229,7 +11425,7 @@
     },
     "node_modules/glob/node_modules/minimatch": {
       "version": "3.1.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -12681,6 +12877,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "dev": true,
@@ -13179,7 +13382,7 @@
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
@@ -13231,13 +13434,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/inquirer/node_modules/rxjs": {
-      "version": "7.8.1",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/internal-slot": {
       "version": "1.0.7",
       "dev": true,
@@ -15532,6 +15728,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "dev": true,
@@ -15920,7 +16129,6 @@
       "version": "2.22.2",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
       "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
-      "dev": true,
       "optional": true
     },
     "node_modules/nanoid": {
@@ -16193,6 +16401,27 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "dev": true,
@@ -16565,6 +16794,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "dev": true,
@@ -16878,7 +17121,7 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -17039,7 +17282,7 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "wrappy": "1"
@@ -17473,7 +17716,7 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -19698,7 +19941,7 @@
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
@@ -19804,16 +20047,14 @@
       "dev": true
     },
     "node_modules/rxjs": {
-      "version": "7.4.0",
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "tslib": "~2.1.0"
+        "tslib": "^2.1.0"
       }
     },
-    "node_modules/rxjs/node_modules/tslib": {
-      "version": "2.1.0",
-      "license": "0BSD"
-    },
     "node_modules/safe-array-concat": {
       "version": "1.1.2",
       "dev": true,
@@ -20515,11 +20756,44 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/simple-fmt": {
       "version": "0.1.0",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/simple-get": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^4.2.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
     "node_modules/simple-is": {
       "version": "0.2.0",
       "dev": true,
@@ -21765,6 +22039,13 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "dev": true,
@@ -23030,6 +23311,13 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause",
+      "optional": true
+    },
     "node_modules/webpack": {
       "version": "5.90.3",
       "dev": true,
@@ -23335,6 +23623,17 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "license": "ISC",
@@ -23385,6 +23684,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "node_modules/wildcard": {
       "version": "2.0.1",
       "dev": true,
@@ -23520,7 +23829,7 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/ws": {
diff --git a/package.json b/package.json
index 8544221e10..4f0bd239b6 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "ngx-monaco-editor-v2": "^17.0.1",
     "nvd3": "1.8.6",
     "qrcode": "^1.5.4",
-    "rxjs": "~7.4.0",
+    "rxjs": "~7.8.2",
     "ts-md5": "^1.3.1",
     "tslib": "^2.6.2",
     "underscore.string": "2.3.3",

From e6822a91736483b89f44903505c5006c6c9ff9b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 12:21:15 +0000
Subject: [PATCH 747/776] build(deps-dev): bump axios from 1.7.2 to 1.12.2

Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.12.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.7.2...v1.12.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-version: 1.12.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 462 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 426 insertions(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 355382f4f5..d722d97b23 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3937,6 +3937,96 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@material/animation": {
       "version": "15.0.0-canary.7f224ddd4.0",
       "license": "MIT",
@@ -6249,7 +6339,7 @@
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/accepts": {
@@ -6646,6 +6736,28 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/aproba": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
+      "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==",
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/arg": {
       "version": "5.0.2",
       "dev": true,
@@ -7035,12 +7147,14 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.6.8",
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz",
+      "integrity": "sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.0",
+        "follow-redirects": "^1.15.11",
+        "form-data": "^4.0.5",
         "proxy-from-env": "^1.1.0"
       }
     },
@@ -7692,6 +7806,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "dev": true,
@@ -7769,6 +7896,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/canvas": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "nan": "^2.17.0",
+        "simple-get": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/canvas-confetti": {
       "version": "1.9.3",
       "license": "ISC",
@@ -8155,6 +8298,16 @@
       "version": "1.1.3",
       "license": "MIT"
     },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
     "node_modules/colorette": {
       "version": "2.0.20",
       "dev": true,
@@ -8268,7 +8421,7 @@
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/concurrently": {
@@ -8369,6 +8522,13 @@
         "date-now": "^0.1.4"
       }
     },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/constantinople": {
       "version": "3.1.2",
       "dev": true,
@@ -8975,6 +9135,19 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "dev": true,
@@ -9129,6 +9302,13 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "dev": true,
@@ -9162,6 +9342,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "dev": true,
@@ -9335,6 +9525,20 @@
         "node": ">=12"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "dev": true,
@@ -9583,11 +9787,10 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
       "engines": {
         "node": ">= 0.4"
       }
@@ -9605,8 +9808,9 @@
       "license": "MIT"
     },
     "node_modules/es-object-atoms": {
-      "version": "1.0.0",
-      "dev": true,
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
@@ -9616,13 +9820,16 @@
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.4",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
         "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10836,7 +11043,9 @@
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
+      "version": "1.15.11",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
       "dev": true,
       "funding": [
         {
@@ -10921,12 +11130,16 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -11007,14 +11220,13 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -11056,6 +11268,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gaze": {
       "version": "1.1.3",
       "dev": true,
@@ -11083,14 +11317,21 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11107,6 +11348,19 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stdin": {
       "version": "4.0.1",
       "dev": true,
@@ -11185,7 +11439,7 @@
     },
     "node_modules/glob": {
       "version": "7.1.7",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -11220,7 +11474,7 @@
     },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -11229,7 +11483,7 @@
     },
     "node_modules/glob/node_modules/minimatch": {
       "version": "3.1.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -11374,10 +11628,12 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -12649,6 +12905,7 @@
     },
     "node_modules/has-proto": {
       "version": "1.0.3",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -12658,7 +12915,9 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -12681,6 +12940,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "dev": true,
@@ -13179,7 +13445,7 @@
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
@@ -15377,6 +15643,15 @@
         "node": ">= 18"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "dev": true,
@@ -15532,6 +15807,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "dev": true,
@@ -15920,7 +16208,6 @@
       "version": "2.22.2",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
       "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
-      "dev": true,
       "optional": true
     },
     "node_modules/nanoid": {
@@ -16193,6 +16480,27 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "dev": true,
@@ -16565,6 +16873,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "dev": true,
@@ -16878,7 +17200,7 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -17039,7 +17361,7 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "wrappy": "1"
@@ -17473,7 +17795,7 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -19698,7 +20020,7 @@
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
@@ -20515,11 +20837,44 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/simple-fmt": {
       "version": "0.1.0",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/simple-get": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^4.2.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
     "node_modules/simple-is": {
       "version": "0.2.0",
       "dev": true,
@@ -21765,6 +22120,13 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "dev": true,
@@ -23030,6 +23392,13 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause",
+      "optional": true
+    },
     "node_modules/webpack": {
       "version": "5.90.3",
       "dev": true,
@@ -23335,6 +23704,17 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "license": "ISC",
@@ -23385,6 +23765,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "node_modules/wildcard": {
       "version": "2.0.1",
       "dev": true,
@@ -23520,7 +23910,7 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/ws": {

From 77d8068266fb079c38ee7683f3d5f1f63ec99d83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:04:57 +0000
Subject: [PATCH 748/776] build(deps-dev): bump node-forge from 1.3.1 to 1.3.2

Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.1 to 1.3.2.
- [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md)
- [Commits](https://github.com/digitalbazaar/forge/compare/v1.3.1...v1.3.2)

---
updated-dependencies:
- dependency-name: node-forge
  dependency-version: 1.3.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 350 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 335 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 355382f4f5..13e0a363ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3937,6 +3937,96 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@material/animation": {
       "version": "15.0.0-canary.7f224ddd4.0",
       "license": "MIT",
@@ -6249,7 +6339,7 @@
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/accepts": {
@@ -6646,6 +6736,28 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/aproba": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
+      "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==",
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/arg": {
       "version": "5.0.2",
       "dev": true,
@@ -7769,6 +7881,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/canvas": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "nan": "^2.17.0",
+        "simple-get": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/canvas-confetti": {
       "version": "1.9.3",
       "license": "ISC",
@@ -8155,6 +8283,16 @@
       "version": "1.1.3",
       "license": "MIT"
     },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
     "node_modules/colorette": {
       "version": "2.0.20",
       "dev": true,
@@ -8268,7 +8406,7 @@
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/concurrently": {
@@ -8369,6 +8507,13 @@
         "date-now": "^0.1.4"
       }
     },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/constantinople": {
       "version": "3.1.2",
       "dev": true,
@@ -8975,6 +9120,19 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "dev": true,
@@ -9129,6 +9287,13 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "dev": true,
@@ -9162,6 +9327,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "dev": true,
@@ -11007,14 +11182,13 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -11056,6 +11230,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gaze": {
       "version": "1.1.3",
       "dev": true,
@@ -11185,7 +11381,7 @@
     },
     "node_modules/glob": {
       "version": "7.1.7",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -11220,7 +11416,7 @@
     },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -11229,7 +11425,7 @@
     },
     "node_modules/glob/node_modules/minimatch": {
       "version": "3.1.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -12681,6 +12877,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "dev": true,
@@ -13179,7 +13382,7 @@
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
@@ -15532,6 +15735,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "dev": true,
@@ -15920,7 +16136,6 @@
       "version": "2.22.2",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
       "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
-      "dev": true,
       "optional": true
     },
     "node_modules/nanoid": {
@@ -16193,8 +16408,31 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/node-forge": {
-      "version": "1.3.1",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.3.tgz",
+      "integrity": "sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==",
       "dev": true,
       "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {
@@ -16565,6 +16803,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "dev": true,
@@ -16878,7 +17130,7 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -17039,7 +17291,7 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "wrappy": "1"
@@ -17473,7 +17725,7 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -19698,7 +19950,7 @@
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
@@ -20515,11 +20767,44 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/simple-fmt": {
       "version": "0.1.0",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/simple-get": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^4.2.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
     "node_modules/simple-is": {
       "version": "0.2.0",
       "dev": true,
@@ -21765,6 +22050,13 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "dev": true,
@@ -23030,6 +23322,13 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause",
+      "optional": true
+    },
     "node_modules/webpack": {
       "version": "5.90.3",
       "dev": true,
@@ -23335,6 +23634,17 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "license": "ISC",
@@ -23385,6 +23695,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "node_modules/wildcard": {
       "version": "2.0.1",
       "dev": true,
@@ -23520,7 +23840,7 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/ws": {

From ac5684ebbd174f5023f3779d83748cf0d4a548c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2026 00:29:52 +0000
Subject: [PATCH 749/776] chore(deps-dev): bump flatted from 3.3.1 to 3.4.2

Bumps [flatted](https://github.com/WebReflection/flatted) from 3.3.1 to 3.4.2.
- [Commits](https://github.com/WebReflection/flatted/compare/v3.3.1...v3.4.2)

---
updated-dependencies:
- dependency-name: flatted
  dependency-version: 3.4.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 350 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 335 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 355382f4f5..36ebb772c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3937,6 +3937,96 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+      "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@material/animation": {
       "version": "15.0.0-canary.7f224ddd4.0",
       "license": "MIT",
@@ -6249,7 +6339,7 @@
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/accepts": {
@@ -6646,6 +6736,28 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/aproba": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
+      "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==",
+      "license": "ISC",
+      "optional": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/arg": {
       "version": "5.0.2",
       "dev": true,
@@ -7769,6 +7881,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/canvas": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "nan": "^2.17.0",
+        "simple-get": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/canvas-confetti": {
       "version": "1.9.3",
       "license": "ISC",
@@ -8155,6 +8283,16 @@
       "version": "1.1.3",
       "license": "MIT"
     },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
     "node_modules/colorette": {
       "version": "2.0.20",
       "dev": true,
@@ -8268,7 +8406,7 @@
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/concurrently": {
@@ -8369,6 +8507,13 @@
         "date-now": "^0.1.4"
       }
     },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/constantinople": {
       "version": "3.1.2",
       "dev": true,
@@ -8975,6 +9120,19 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "dev": true,
@@ -9129,6 +9287,13 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "dev": true,
@@ -9162,6 +9327,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "dev": true,
@@ -10831,7 +11006,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "license": "ISC"
     },
@@ -11007,14 +11184,13 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -11056,6 +11232,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gaze": {
       "version": "1.1.3",
       "dev": true,
@@ -11185,7 +11383,7 @@
     },
     "node_modules/glob": {
       "version": "7.1.7",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -11220,7 +11418,7 @@
     },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "1.1.11",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -11229,7 +11427,7 @@
     },
     "node_modules/glob/node_modules/minimatch": {
       "version": "3.1.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -12681,6 +12879,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "license": "ISC",
+      "optional": true
+    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "dev": true,
@@ -13179,7 +13384,7 @@
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
@@ -15532,6 +15737,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "dev": true,
@@ -15920,7 +16138,6 @@
       "version": "2.22.2",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
       "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
-      "dev": true,
       "optional": true
     },
     "node_modules/nanoid": {
@@ -16193,6 +16410,27 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "dev": true,
@@ -16565,6 +16803,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "deprecated": "This package is no longer supported.",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
     "node_modules/nth-check": {
       "version": "2.1.1",
       "dev": true,
@@ -16878,7 +17130,7 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -17039,7 +17291,7 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "wrappy": "1"
@@ -17473,7 +17725,7 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -19698,7 +19950,7 @@
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
@@ -20515,11 +20767,44 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/simple-fmt": {
       "version": "0.1.0",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/simple-get": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^4.2.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
     "node_modules/simple-is": {
       "version": "0.2.0",
       "dev": true,
@@ -21765,6 +22050,13 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "dev": true,
@@ -23030,6 +23322,13 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause",
+      "optional": true
+    },
     "node_modules/webpack": {
       "version": "5.90.3",
       "dev": true,
@@ -23335,6 +23634,17 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "license": "ISC",
@@ -23385,6 +23695,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
     "node_modules/wildcard": {
       "version": "2.0.1",
       "dev": true,
@@ -23520,7 +23840,7 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "dev": true,
+      "devOptional": true,
       "license": "ISC"
     },
     "node_modules/ws": {

From d717b270eb80c0b0245e6b39f0b3f0567c379512 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Mar 2026 11:24:41 +1100
Subject: [PATCH 750/776] feat: display portfolio submission time

---
 src/app/api/models/project.ts                       |  1 +
 src/app/api/services/project.service.ts             |  1 +
 src/app/units/states/portfolios/portfolios.tpl.html | 12 +++++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/app/api/models/project.ts b/src/app/api/models/project.ts
index 6eed890270..b799ed01d6 100644
--- a/src/app/api/models/project.ts
+++ b/src/app/api/models/project.ts
@@ -45,6 +45,7 @@ export class Project extends Entity {
   public portfolioStatus: number;
   public portfolioFiles: {kind: string; name: string; idx: number}[];
   public escalationAttemptsRemaining: number;
+  public portfolioSubmissionDate: Date;
 
   public taskStats: {
     key: TaskStatusEnum;
diff --git a/src/app/api/services/project.service.ts b/src/app/api/services/project.service.ts
index f5573dafcb..fe7aaa30d0 100644
--- a/src/app/api/services/project.service.ts
+++ b/src/app/api/services/project.service.ts
@@ -208,6 +208,7 @@ export class ProjectService extends CachedEntityService<Project> {
         },
       },
       'escalationAttemptsRemaining',
+      'portfolioSubmissionDate',
     );
 
     this.mapping.addJsonKey(
diff --git a/src/app/units/states/portfolios/portfolios.tpl.html b/src/app/units/states/portfolios/portfolios.tpl.html
index eaff240d73..8625891202 100644
--- a/src/app/units/states/portfolios/portfolios.tpl.html
+++ b/src/app/units/states/portfolios/portfolios.tpl.html
@@ -1,4 +1,4 @@
-<div id="student-portfolios" class="container">
+<div id="student-portfolios" class="w-full max-w-[1600px] mx-auto">
   <tabset>
     <tab
       ng-repeat="tab in tabs | toArray | orderBy: 'seq'"
@@ -157,6 +157,15 @@ <h4 class="panel-title">Mark Portfolios</h4>
                 ></i>
               </a>
             </th>
+            <th>
+              <a ng-click="sortOrder='portfolioSubmissionDate'; reverse=!reverse">
+                Submission Date
+                <i
+                  ng-show="sortOrder=='portfolioSubmissionDate'"
+                  class="fa fa-caret-{{reverse ? 'down' : 'up'}}"
+                ></i>
+              </a>
+            </th>
             <th>
               <a ng-click="sortOrder='orderScale'; reverse=!reverse">
                 Stats<i
@@ -199,6 +208,7 @@ <h4 class="panel-title">Mark Portfolios</h4>
             <td class="flags-data">
               <f-grade-icon [grade]="student.submittedGrade"></f-grade-icon>
             </td>
+            <td>{{student.portfolioSubmissionDate | date: 'EEE d MMM y, h:mm a'}}</td>
             <td class="task-progress-bar">
               <progress class="task-progress" animate="true">
                 <bar

From ab03681ec483ee7b739aeeb52cb4461dd3ac25df Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:41:05 +1100
Subject: [PATCH 751/776] chore: update package-lock

---
 package-lock.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package-lock.json b/package-lock.json
index 83ee2e1ca7..6afb2809c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11191,6 +11191,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [

From 30e24e1dbfb44e97be21aa1a38e5c1b28a6cff0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 02:48:37 +0000
Subject: [PATCH 752/776] build(deps-dev): bump @commitlint/cli from 16.3.0 to
 20.1.0

Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 16.3.0 to 20.1.0.
- [Release notes](https://github.com/conventional-changelog/commitlint/releases)
- [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md)
- [Commits](https://github.com/conventional-changelog/commitlint/commits/v20.1.0/@commitlint/cli)

---
updated-dependencies:
- dependency-name: "@commitlint/cli"
  dependency-version: 20.1.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 1178 +++++++++++++--------------------------------
 package.json      |    2 +-
 2 files changed, 338 insertions(+), 842 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 04d645a66f..d1fba9e09e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -90,7 +90,7 @@
         "@angular-eslint/template-parser": "^17.3.0",
         "@angular/compiler-cli": "^17.3.6",
         "@angular/language-service": "^17.3.6",
-        "@commitlint/cli": "^16.0.1",
+        "@commitlint/cli": "^20.5.0",
         "@commitlint/config-conventional": "^17",
         "@types/angular": "1.5.11",
         "@types/canvas-confetti": "^1.6.0",
@@ -2648,25 +2648,25 @@
       }
     },
     "node_modules/@commitlint/cli": {
-      "version": "16.3.0",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-20.5.0.tgz",
+      "integrity": "sha512-yNkyN/tuKTJS3wdVfsZ2tXDM4G4Gi7z+jW54Cki8N8tZqwKBltbIvUUrSbT4hz1bhW/h0CdR+5sCSpXD+wMKaQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/format": "^16.2.1",
-        "@commitlint/lint": "^16.2.4",
-        "@commitlint/load": "^16.3.0",
-        "@commitlint/read": "^16.2.1",
-        "@commitlint/types": "^16.2.1",
-        "lodash": "^4.17.19",
-        "resolve-from": "5.0.0",
-        "resolve-global": "1.0.0",
+        "@commitlint/format": "^20.5.0",
+        "@commitlint/lint": "^20.5.0",
+        "@commitlint/load": "^20.5.0",
+        "@commitlint/read": "^20.5.0",
+        "@commitlint/types": "^20.5.0",
+        "tinyexec": "^1.0.0",
         "yargs": "^17.0.0"
       },
       "bin": {
         "commitlint": "cli.js"
       },
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/config-conventional": {
@@ -2681,444 +2681,263 @@
       }
     },
     "node_modules/@commitlint/config-validator": {
-      "version": "16.2.1",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-20.5.0.tgz",
+      "integrity": "sha512-T/Uh6iJUzyx7j35GmHWdIiGRQB+ouZDk0pwAaYq4SXgB54KZhFdJ0vYmxiW6AMYICTIWuyMxDBl1jK74oFp/Gw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/types": "^16.2.1",
-        "ajv": "^6.12.6"
+        "@commitlint/types": "^20.5.0",
+        "ajv": "^8.11.0"
       },
       "engines": {
-        "node": ">=v12"
-      }
-    },
-    "node_modules/@commitlint/config-validator/node_modules/ajv": {
-      "version": "6.12.6",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "node": ">=v18"
       }
     },
-    "node_modules/@commitlint/config-validator/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@commitlint/ensure": {
-      "version": "16.2.1",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-20.5.0.tgz",
+      "integrity": "sha512-IpHqAUesBeW1EDDdjzJeaOxU9tnogLAyXLRBn03SHlj1SGENn2JGZqSWGkFvBJkJzfXAuCNtsoYzax+ZPS+puw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/types": "^16.2.1",
-        "lodash": "^4.17.19"
+        "@commitlint/types": "^20.5.0",
+        "lodash.camelcase": "^4.3.0",
+        "lodash.kebabcase": "^4.1.1",
+        "lodash.snakecase": "^4.1.1",
+        "lodash.startcase": "^4.4.0",
+        "lodash.upperfirst": "^4.3.1"
       },
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/execute-rule": {
-      "version": "16.2.1",
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-20.0.0.tgz",
+      "integrity": "sha512-xyCoOShoPuPL44gVa+5EdZsBVao/pNzpQhkzq3RdtlFdKZtjWcLlUFQHSWBuhk5utKYykeJPSz2i8ABHQA+ZZw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/format": {
-      "version": "16.2.1",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-20.5.0.tgz",
+      "integrity": "sha512-TI9EwFU/qZWSK7a5qyXMpKPPv3qta7FO4tKW+Wt2al7sgMbLWTsAcDpX1cU8k16TRdsiiet9aOw0zpvRXNJu7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/types": "^16.2.1",
-        "chalk": "^4.0.0"
+        "@commitlint/types": "^20.5.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
-        "node": ">=v12"
-      }
-    },
-    "node_modules/@commitlint/format/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@commitlint/format/node_modules/chalk": {
-      "version": "4.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@commitlint/format/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@commitlint/format/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@commitlint/format/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@commitlint/format/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/is-ignored": {
-      "version": "16.2.4",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-20.5.0.tgz",
+      "integrity": "sha512-JWLarAsurHJhPozbuAH6GbP4p/hdOCoqS9zJMfqwswne+/GPs5V0+rrsfOkP68Y8PSLphwtFXV0EzJ+GTXTTGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/types": "^16.2.1",
-        "semver": "7.3.7"
-      },
-      "engines": {
-        "node": ">=v12"
-      }
-    },
-    "node_modules/@commitlint/is-ignored/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@commitlint/is-ignored/node_modules/semver": {
-      "version": "7.3.7",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "@commitlint/types": "^20.5.0",
+        "semver": "^7.6.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=v18"
       }
     },
-    "node_modules/@commitlint/is-ignored/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/@commitlint/lint": {
-      "version": "16.2.4",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-20.5.0.tgz",
+      "integrity": "sha512-jiM3hNUdu04jFBf1VgPdjtIPvbuVfDTBAc6L98AWcoLjF5sYqkulBHBzlVWll4rMF1T5zeQFB6r//a+s+BBKlA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/is-ignored": "^16.2.4",
-        "@commitlint/parse": "^16.2.1",
-        "@commitlint/rules": "^16.2.4",
-        "@commitlint/types": "^16.2.1"
+        "@commitlint/is-ignored": "^20.5.0",
+        "@commitlint/parse": "^20.5.0",
+        "@commitlint/rules": "^20.5.0",
+        "@commitlint/types": "^20.5.0"
       },
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/load": {
-      "version": "16.3.0",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-20.5.0.tgz",
+      "integrity": "sha512-sLhhYTL/KxeOTZjjabKDhwidGZan84XKK1+XFkwDYL/4883kIajcz/dZFAhBJmZPtL8+nBx6bnkzA95YxPeDPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/config-validator": "^16.2.1",
-        "@commitlint/execute-rule": "^16.2.1",
-        "@commitlint/resolve-extends": "^16.2.1",
-        "@commitlint/types": "^16.2.1",
-        "@types/node": ">=12",
-        "chalk": "^4.0.0",
-        "cosmiconfig": "^7.0.0",
-        "cosmiconfig-typescript-loader": "^2.0.0",
-        "lodash": "^4.17.19",
-        "resolve-from": "^5.0.0",
-        "typescript": "^4.4.3"
+        "@commitlint/config-validator": "^20.5.0",
+        "@commitlint/execute-rule": "^20.0.0",
+        "@commitlint/resolve-extends": "^20.5.0",
+        "@commitlint/types": "^20.5.0",
+        "cosmiconfig": "^9.0.1",
+        "cosmiconfig-typescript-loader": "^6.1.0",
+        "is-plain-obj": "^4.1.0",
+        "lodash.mergewith": "^4.6.2",
+        "picocolors": "^1.1.1"
       },
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
-    "node_modules/@commitlint/load/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/@commitlint/load/node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@commitlint/load/node_modules/chalk": {
-      "version": "4.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@commitlint/load/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@commitlint/load/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@commitlint/load/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@commitlint/load/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@commitlint/load/node_modules/typescript": {
-      "version": "4.9.5",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@commitlint/message": {
-      "version": "16.2.1",
+      "version": "20.4.3",
+      "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-20.4.3.tgz",
+      "integrity": "sha512-6akwCYrzcrFcTYz9GyUaWlhisY4lmQ3KvrnabmhoeAV8nRH4dXJAh4+EUQ3uArtxxKQkvxJS78hNX2EU3USgxQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/parse": {
-      "version": "16.2.1",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-20.5.0.tgz",
+      "integrity": "sha512-SeKWHBMk7YOTnnEWUhx+d1a9vHsjjuo6Uo1xRfPNfeY4bdYFasCH1dDpAv13Lyn+dDPOels+jP6D2GRZqzc5fA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/types": "^16.2.1",
-        "conventional-changelog-angular": "^5.0.11",
-        "conventional-commits-parser": "^3.2.2"
+        "@commitlint/types": "^20.5.0",
+        "conventional-changelog-angular": "^8.2.0",
+        "conventional-commits-parser": "^6.3.0"
       },
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/read": {
-      "version": "16.2.1",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-20.5.0.tgz",
+      "integrity": "sha512-JDEIJ2+GnWpK8QqwfmW7O42h0aycJEWNqcdkJnyzLD11nf9dW2dWLTVEa8Wtlo4IZFGLPATjR5neA5QlOvIH1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/top-level": "^16.2.1",
-        "@commitlint/types": "^16.2.1",
-        "fs-extra": "^10.0.0",
-        "git-raw-commits": "^2.0.0"
+        "@commitlint/top-level": "^20.4.3",
+        "@commitlint/types": "^20.5.0",
+        "git-raw-commits": "^5.0.0",
+        "minimist": "^1.2.8",
+        "tinyexec": "^1.0.0"
       },
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/resolve-extends": {
-      "version": "16.2.1",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-20.5.0.tgz",
+      "integrity": "sha512-3SHPWUW2v0tyspCTcfSsYml0gses92l6TlogwzvM2cbxDgmhSRc+fldDjvGkCXJrjSM87BBaWYTPWwwyASZRrg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/config-validator": "^16.2.1",
-        "@commitlint/types": "^16.2.1",
-        "import-fresh": "^3.0.0",
-        "lodash": "^4.17.19",
-        "resolve-from": "^5.0.0",
-        "resolve-global": "^1.0.0"
+        "@commitlint/config-validator": "^20.5.0",
+        "@commitlint/types": "^20.5.0",
+        "global-directory": "^4.0.1",
+        "import-meta-resolve": "^4.0.0",
+        "lodash.mergewith": "^4.6.2",
+        "resolve-from": "^5.0.0"
       },
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/rules": {
-      "version": "16.2.4",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-20.5.0.tgz",
+      "integrity": "sha512-5NdQXQEdnDPT5pK8O39ZA7HohzPRHEsDGU23cyVCNPQy4WegAbAwrQk3nIu7p2sl3dutPk8RZd91yKTrMTnRkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@commitlint/ensure": "^16.2.1",
-        "@commitlint/message": "^16.2.1",
-        "@commitlint/to-lines": "^16.2.1",
-        "@commitlint/types": "^16.2.1",
-        "execa": "^5.0.0"
+        "@commitlint/ensure": "^20.5.0",
+        "@commitlint/message": "^20.4.3",
+        "@commitlint/to-lines": "^20.0.0",
+        "@commitlint/types": "^20.5.0"
       },
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/to-lines": {
-      "version": "16.2.1",
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-20.0.0.tgz",
+      "integrity": "sha512-2l9gmwiCRqZNWgV+pX1X7z4yP0b3ex/86UmUFgoRt672Ez6cAM2lOQeHFRUTuE6sPpi8XBCGnd8Kh3bMoyHwJw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/top-level": {
-      "version": "16.2.1",
+      "version": "20.4.3",
+      "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-20.4.3.tgz",
+      "integrity": "sha512-qD9xfP6dFg5jQ3NMrOhG0/w5y3bBUsVGyJvXxdWEwBm8hyx4WOk3kKXw28T5czBYvyeCVJgJJ6aoJZUWDpaacQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "find-up": "^5.0.0"
+        "escalade": "^3.2.0"
       },
       "engines": {
-        "node": ">=v12"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/types": {
-      "version": "16.2.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=v12"
-      }
-    },
-    "node_modules/@commitlint/types/node_modules/ansi-styles": {
-      "version": "4.3.0",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-20.5.0.tgz",
+      "integrity": "sha512-ZJoS8oSq2CAZEpc/YI9SulLrdiIyXeHb/OGqGrkUP6Q7YV+0ouNAa7GjqRdXeQPncHQIDz/jbCTlHScvYvO/gA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "conventional-commits-parser": "^6.3.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=v18"
       }
     },
-    "node_modules/@commitlint/types/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/@conventional-changelog/git-client": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@conventional-changelog/git-client/-/git-client-2.6.0.tgz",
+      "integrity": "sha512-T+uPDciKf0/ioNNDpMGc8FDsehJClZP0yR3Q5MN6wE/Y/1QZ7F+80OgznnTCOlMEG4AV0LvH2UJi3C/nBnaBUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@simple-libs/child-process-utils": "^1.0.0",
+        "@simple-libs/stream-utils": "^1.2.0",
+        "semver": "^7.5.2"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@commitlint/types/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
+        "node": ">=18"
       },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@commitlint/types/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@commitlint/types/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@commitlint/types/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
+      "peerDependencies": {
+        "conventional-commits-filter": "^5.0.0",
+        "conventional-commits-parser": "^6.3.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependenciesMeta": {
+        "conventional-commits-filter": {
+          "optional": true
+        },
+        "conventional-commits-parser": {
+          "optional": true
+        }
       }
     },
     "node_modules/@cspotcode/source-map-support": {
@@ -5555,6 +5374,35 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/@simple-libs/child-process-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@simple-libs/child-process-utils/-/child-process-utils-1.0.2.tgz",
+      "integrity": "sha512-/4R8QKnd/8agJynkNdJmNw2MBxuFTRcNFnE5Sg/G+jkSsV8/UBgULMzhizWWW42p8L5H7flImV2ATi79Ove2Tw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@simple-libs/stream-utils": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/dangreen"
+      }
+    },
+    "node_modules/@simple-libs/stream-utils": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@simple-libs/stream-utils/-/stream-utils-1.2.0.tgz",
+      "integrity": "sha512-KxXvfapcixpz6rVEB6HPjOUZT22yN6v0vI0urQSk1L8MlEWPDFCZkhw2xmkyoTGYeFw7tWTZd7e3lVzRZRN/EA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/dangreen"
+      }
+    },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "dev": true,
@@ -5789,11 +5637,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/minimist": {
-      "version": "1.2.5",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/node": {
       "version": "20.12.11",
       "dev": true,
@@ -5810,16 +5653,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/q": {
       "version": "0.0.32",
       "dev": true,
@@ -7851,22 +7684,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/caniuse-db": {
       "version": "1.0.30001617",
       "dev": true,
@@ -8584,15 +8401,16 @@
       "dev": true
     },
     "node_modules/conventional-changelog-angular": {
-      "version": "5.0.13",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-8.3.0.tgz",
+      "integrity": "sha512-DOuBwYSqWzfwuRByY9O4oOIvDlkUCTDzfbOgcSbkY+imXXj+4tmrEFao3K+FxemClYfYnZzsvudbwrhje9VHDA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "compare-func": "^2.0.0",
-        "q": "^1.5.1"
+        "compare-func": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/conventional-changelog-conventionalcommits": {
@@ -8607,22 +8425,20 @@
       }
     },
     "node_modules/conventional-commits-parser": {
-      "version": "3.2.4",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-6.3.0.tgz",
+      "integrity": "sha512-RfOq/Cqy9xV9bOA8N+ZH6DlrDR+5S3Mi0B5kACEjESpE+AviIpAptx9a9cFpWCCvgRtWT+0BbUw+e1BZfts9jg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-text-path": "^1.0.1",
-        "JSONStream": "^1.0.4",
-        "lodash": "^4.17.15",
-        "meow": "^8.0.0",
-        "split2": "^3.0.0",
-        "through2": "^4.0.0"
+        "@simple-libs/stream-utils": "^1.2.0",
+        "meow": "^13.0.0"
       },
       "bin": {
-        "conventional-commits-parser": "cli.js"
+        "conventional-commits-parser": "dist/cli/index.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/convert-source-map": {
@@ -8763,36 +8579,78 @@
       }
     },
     "node_modules/cosmiconfig": {
-      "version": "7.1.0",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.1.tgz",
+      "integrity": "sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
     "node_modules/cosmiconfig-typescript-loader": {
-      "version": "2.0.2",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-6.2.0.tgz",
+      "integrity": "sha512-GEN39v7TgdxgIoNcdkRE3uiAzQt3UXLyHbRHD6YoL048XAeOomyxaP+Hh/+2C6C2wYjxJ2onhJcsQp+L4YEkVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cosmiconfig": "^7",
-        "ts-node": "^10.8.1"
+        "jiti": "^2.6.1"
       },
       "engines": {
-        "node": ">=12",
-        "npm": ">=6"
+        "node": ">=v18"
       },
       "peerDependencies": {
         "@types/node": "*",
-        "cosmiconfig": ">=7",
-        "typescript": ">=3"
+        "cosmiconfig": ">=9",
+        "typescript": ">=5"
+      }
+    },
+    "node_modules/cosmiconfig-typescript-loader/node_modules/jiti": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
+      "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jiti": "lib/jiti-cli.mjs"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/cosmiconfig/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
     "node_modules/create-require": {
@@ -8985,14 +8843,6 @@
       "version": "3.5.17",
       "license": "BSD-3-Clause"
     },
-    "node_modules/dargs": {
-      "version": "7.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dashdash": {
       "version": "1.14.1",
       "dev": true,
@@ -9104,29 +8954,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/decode-uri-component": {
       "version": "0.2.2",
       "dev": true,
@@ -9945,7 +9772,9 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -11192,19 +11021,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/fs-extra": {
-      "version": "10.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/fs-minipass": {
       "version": "3.0.3",
       "license": "ISC",
@@ -11422,21 +11238,20 @@
       }
     },
     "node_modules/git-raw-commits": {
-      "version": "2.0.11",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-5.0.1.tgz",
+      "integrity": "sha512-Y+csSm2GD/PCSh6Isd/WiMjNAydu0VBiG9J7EdQsNA5P9uXvLayqjmTsNlK5Gs9IhblFZqOU0yid5Il5JPoLiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "dargs": "^7.0.0",
-        "lodash": "^4.17.15",
-        "meow": "^8.0.0",
-        "split2": "^3.0.0",
-        "through2": "^4.0.0"
+        "@conventional-changelog/git-client": "^2.6.0",
+        "meow": "^13.0.0"
       },
       "bin": {
-        "git-raw-commits": "cli.js"
+        "git-raw-commits": "src/cli.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       }
     },
     "node_modules/glob": {
@@ -11494,21 +11309,31 @@
         "node": "*"
       }
     },
-    "node_modules/global-dirs": {
-      "version": "0.1.1",
+    "node_modules/global-directory": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz",
+      "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ini": "^1.3.4"
+        "ini": "4.1.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/global-dirs/node_modules/ini": {
-      "version": "1.3.8",
+    "node_modules/global-directory/node_modules/ini": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz",
+      "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
     },
     "node_modules/global-modules": {
       "version": "1.0.0",
@@ -12844,14 +12669,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/has": {
       "version": "1.0.4",
       "dev": true,
@@ -13043,33 +12860,6 @@
         "node": "*"
       }
     },
-    "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/hosted-git-info/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/hpack.js": {
       "version": "2.1.6",
       "dev": true,
@@ -13433,6 +13223,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/import-meta-resolve": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz",
+      "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "license": "MIT",
@@ -13970,17 +13771,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-text-path": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "text-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-typed-array": {
       "version": "1.1.13",
       "dev": true,
@@ -14789,21 +14579,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/JSONStream": {
-      "version": "1.3.5",
-      "dev": true,
-      "license": "(MIT OR Apache-2.0)",
-      "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/jsprim": {
       "version": "1.4.2",
       "dev": true,
@@ -15404,6 +15179,13 @@
       "version": "4.17.21",
       "license": "MIT"
     },
+    "node_modules/lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
       "dev": true,
@@ -15414,11 +15196,46 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash.kebabcase": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
+      "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash.mergewith": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.snakecase": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz",
+      "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.startcase": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz",
+      "integrity": "sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.upperfirst": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz",
+      "integrity": "sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "license": "MIT",
@@ -15608,17 +15425,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/map-obj": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/map-visit": {
       "version": "1.0.0",
       "dev": true,
@@ -15676,46 +15482,16 @@
       }
     },
     "node_modules/meow": {
-      "version": "8.1.2",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz",
+      "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/type-fest": {
-      "version": "0.18.1",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/merge-descriptors": {
@@ -15817,14 +15593,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/mini-css-extract-plugin": {
       "version": "2.8.1",
       "dev": true,
@@ -15870,35 +15638,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/minimist-options": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/minimist-options/node_modules/arrify": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/minimist-options/node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/minipass": {
       "version": "7.1.1",
       "license": "ISC",
@@ -16622,20 +16361,6 @@
         "nopt": "bin/nopt.js"
       }
     },
-    "node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "devOptional": true,
@@ -17894,7 +17619,9 @@
       "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true,
       "license": "ISC"
     },
@@ -18302,47 +18029,6 @@
         }
       }
     },
-    "node_modules/postcss-loader/node_modules/argparse": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/postcss-loader/node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/postcss-loader/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/postcss-media-query-parser": {
       "version": "0.2.3",
       "dev": true,
@@ -19272,14 +18958,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "dev": true,
@@ -19429,124 +19107,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/read-pkg": {
-      "version": "5.2.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/semver": {
-      "version": "5.7.2",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/read-pkg/node_modules/hosted-git-info": {
       "version": "2.8.9",
       "dev": true,
@@ -19627,18 +19187,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/reflect-metadata": {
       "version": "0.2.2",
       "dev": true,
@@ -19902,17 +19450,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-global": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "global-dirs": "^0.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/resolve-pkg": {
       "version": "2.0.0",
       "dev": true,
@@ -21240,14 +20777,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/split2": {
-      "version": "3.2.2",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "readable-stream": "^3.0.0"
-      }
-    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "dev": true,
@@ -21506,17 +21035,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "dev": true,
@@ -21901,14 +21419,6 @@
         "node": "*"
       }
     },
-    "node_modules/text-extensions": {
-      "version": "1.9.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/text-segmentation": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
@@ -21947,14 +21457,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/through2": {
-      "version": "4.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
     "node_modules/thunky": {
       "version": "1.1.0",
       "dev": true,
@@ -21981,6 +21483,16 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/tinyexec": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.4.tgz",
+      "integrity": "sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/tmp": {
       "version": "0.2.3",
       "dev": true,
@@ -22132,14 +21644,6 @@
         "tree-kill": "cli.js"
       }
     },
-    "node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/tryor": {
       "version": "0.1.2",
       "dev": true,
@@ -23967,14 +23471,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "license": "MIT",
diff --git a/package.json b/package.json
index 4f0bd239b6..2b2f750af0 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "@angular-eslint/template-parser": "^17.3.0",
     "@angular/compiler-cli": "^17.3.6",
     "@angular/language-service": "^17.3.6",
-    "@commitlint/cli": "^16.0.1",
+    "@commitlint/cli": "^20.5.0",
     "@commitlint/config-conventional": "^17",
     "@types/angular": "1.5.11",
     "@types/canvas-confetti": "^1.6.0",

From 04986a0e501f0185dbd199b8d2554133217f7e75 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:55:59 +1100
Subject: [PATCH 753/776] fix: only render if submission date is valid

---
 .../task-submission-card.component.html                | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html
index 7d1fd9f9b9..368d4b8343 100644
--- a/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html
+++ b/src/app/projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component.html
@@ -11,10 +11,12 @@
       You can choose to download your <em [hidden]="!submission?.isProcessing">previous</em>
       submission or the files you uploaded below.
     </p>
-    <p [hidden]="!submission?.isUploaded">
-      You uploaded this submission <strong>{{ task.submissionDate | date: 'dd/MM/yyyy' }}</strong
-      >.
-    </p>
+    @if (submission?.isUploaded && task.submissionDate) {
+      <p>
+        You uploaded this submission <strong>{{ task.submissionDate | date: 'dd/MM/yyyy' }}</strong
+        >.
+      </p>
+    }
     <p [hidden]="!canRegeneratePdf">
       If you feel there has been an error in your submission, you can request to regenerate your submission under the
       "Actions" dropdown menu.

From 495a661a8e0338c867298fc34096f4b28174a9fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 03:00:28 +0000
Subject: [PATCH 754/776] build(deps): bump lottie-web from 5.12.2 to 5.13.0

Bumps [lottie-web](https://github.com/airbnb/lottie-web) from 5.12.2 to 5.13.0.
- [Changelog](https://github.com/airbnb/lottie-web/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/lottie-web/compare/v5.12.2...v5.13.0)

---
updated-dependencies:
- dependency-name: lottie-web
  dependency-version: 5.13.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 ++++--
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1fba9e09e..72a08b3851 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,7 +61,7 @@
         "jquery": "2.1.4",
         "jszip": "^3.10.1",
         "lodash": "~4.17",
-        "lottie-web": "^5.12.2",
+        "lottie-web": "^5.13.0",
         "marked": "^11.1.0",
         "moment": "^2.29.4",
         "monaco-editor": "^0.44.0",
@@ -15333,7 +15333,9 @@
       }
     },
     "node_modules/lottie-web": {
-      "version": "5.12.2",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.13.0.tgz",
+      "integrity": "sha512-+gfBXl6sxXMPe8tKQm7qzLnUy5DUPJPKIyRHwtpCpyUEYjHYRJC/5gjUvdkuO2c3JllrPtHXH5UJJK8LRYl5yQ==",
       "license": "MIT"
     },
     "node_modules/lower-case": {
diff --git a/package.json b/package.json
index 2b2f750af0..4e2c62fb13 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "jquery": "2.1.4",
     "jszip": "^3.10.1",
     "lodash": "~4.17",
-    "lottie-web": "^5.12.2",
+    "lottie-web": "^5.13.0",
     "marked": "^11.1.0",
     "moment": "^2.29.4",
     "monaco-editor": "^0.44.0",

From ed8a2d3ce418b3e5068fb3e7ad34052e8406081f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 03:00:52 +0000
Subject: [PATCH 755/776] build(deps-dev): bump rollup from 4.18.0 to 4.59.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.18.0 to 4.59.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.18.0...v4.59.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-version: 4.59.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 317 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 223 insertions(+), 94 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1fba9e09e..ddd0ecdcd5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5081,206 +5081,348 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz",
-      "integrity": "sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.0.tgz",
+      "integrity": "sha512-WOhNW9K8bR3kf4zLxbfg6Pxu2ybOUbB2AjMDHSQx86LIF4rH4Ft7vmMwNt0loO0eonglSNy4cpD3MKXXKQu0/A==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.17.2.tgz",
-      "integrity": "sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.0.tgz",
+      "integrity": "sha512-u6JHLll5QKRvjciE78bQXDmqRqNs5M/3GVqZeMwvmjaNODJih/WIrJlFVEihvV0MiYFmd+ZyPr9wxOVbPAG2Iw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.17.2.tgz",
-      "integrity": "sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.0.tgz",
+      "integrity": "sha512-qEF7CsKKzSRc20Ciu2Zw1wRrBz4g56F7r/vRwY430UPp/nt1x21Q/fpJ9N5l47WWvJlkNCPJz3QRVw008fi7yA==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.17.2.tgz",
-      "integrity": "sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.0.tgz",
+      "integrity": "sha512-WADYozJ4QCnXCH4wPB+3FuGmDPoFseVCUrANmA5LWwGmC6FL14BWC7pcq+FstOZv3baGX65tZ378uT6WG8ynTw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.0.tgz",
+      "integrity": "sha512-6b8wGHJlDrGeSE3aH5mGNHBjA0TTkxdoNHik5EkvPHCt351XnigA4pS7Wsj/Eo9Y8RBU6f35cjN9SYmCFBtzxw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.0.tgz",
+      "integrity": "sha512-h25Ga0t4jaylMB8M/JKAyrvvfxGRjnPQIR8lnCayyzEjEOx2EJIlIiMbhpWxDRKGKF8jbNH01NnN663dH638mA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.17.2.tgz",
-      "integrity": "sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.0.tgz",
+      "integrity": "sha512-RzeBwv0B3qtVBWtcuABtSuCzToo2IEAIQrcyB/b2zMvBWVbjo8bZDjACUpnaafaxhTw2W+imQbP2BD1usasK4g==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.17.2.tgz",
-      "integrity": "sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.0.tgz",
+      "integrity": "sha512-Sf7zusNI2CIU1HLzuu9Tc5YGAHEZs5Lu7N1ssJG4Tkw6e0MEsN7NdjUDDfGNHy2IU+ENyWT+L2obgWiguWibWQ==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.39.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.39.0.tgz",
-      "integrity": "sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.0.tgz",
+      "integrity": "sha512-DX2x7CMcrJzsE91q7/O02IJQ5/aLkVtYFryqCjduJhUfGKG6yJV8hxaw8pZa93lLEpPTP/ohdN4wFz7yp/ry9A==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.17.2.tgz",
-      "integrity": "sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.0.tgz",
+      "integrity": "sha512-09EL+yFVbJZlhcQfShpswwRZ0Rg+z/CsSELFCnPt3iK+iqwGsI4zht3secj5vLEs957QvFFXnzAT0FFPIxSrkQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.17.2.tgz",
-      "integrity": "sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==",
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.0.tgz",
+      "integrity": "sha512-i9IcCMPr3EXm8EQg5jnja0Zyc1iFxJjZWlb4wr7U2Wx/GrddOuEafxRdMPRYVaXjgbhvqalp6np07hN1w9kAKw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.0.tgz",
+      "integrity": "sha512-DGzdJK9kyJ+B78MCkWeGnpXJ91tK/iKA6HwHxF4TAlPIY7GXEvMe8hBFRgdrR9Ly4qebR/7gfUs9y2IoaVEyog==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.0.tgz",
+      "integrity": "sha512-RwpnLsqC8qbS8z1H1AxBA1H6qknR4YpPR9w2XX0vo2Sz10miu57PkNcnHVaZkbqyw/kUWfKMI73jhmfi9BRMUQ==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.0.tgz",
+      "integrity": "sha512-Z8pPf54Ly3aqtdWC3G4rFigZgNvd+qJlOE52fmko3KST9SoGfAdSRCwyoyG05q1HrrAblLbk1/PSIV+80/pxLg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.17.2.tgz",
-      "integrity": "sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.0.tgz",
+      "integrity": "sha512-3a3qQustp3COCGvnP4SvrMHnPQ9d1vzCakQVRTliaz8cIp/wULGjiGpbcqrkv0WrHTEp8bQD/B3HBjzujVWLOA==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.0.tgz",
+      "integrity": "sha512-pjZDsVH/1VsghMJ2/kAaxt6dL0psT6ZexQVrijczOf+PeP2BUqTHYejk3l6TlPRydggINOeNRhvpLa0AYpCWSQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.17.2.tgz",
-      "integrity": "sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.0.tgz",
+      "integrity": "sha512-3ObQs0BhvPgiUVZrN7gqCSvmFuMWvWvsjG5ayJ3Lraqv+2KhOsp+pUbigqbeWqueGIsnn+09HBw27rJ+gYK4VQ==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.39.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz",
-      "integrity": "sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.0.tgz",
+      "integrity": "sha512-EtylprDtQPdS5rXvAayrNDYoJhIz1/vzN2fEubo3yLE7tfAw+948dO0g4M0vkTVFhKojnF+n6C8bDNe+gDRdTg==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.17.2.tgz",
-      "integrity": "sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.0.tgz",
+      "integrity": "sha512-k09oiRCi/bHU9UVFqD17r3eJR9bn03TyKraCrlz5ULFJGdJGi7VOmm9jl44vOJvRJ6P7WuBi/s2A97LxxHGIdw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.0.tgz",
+      "integrity": "sha512-1o/0/pIhozoSaDJoDcec+IVLbnRtQmHwPV730+AOD29lHEEo4F5BEUB24H0OBdhbBBDwIOSuf7vgg0Ywxdfiiw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.0.tgz",
+      "integrity": "sha512-pESDkos/PDzYwtyzB5p/UoNU/8fJo68vcXM9ZW2V0kjYayj1KaaUfi1NmTUTUpMn4UhU4gTuK8gIaFO4UGuMbA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.17.2.tgz",
-      "integrity": "sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.0.tgz",
+      "integrity": "sha512-hj1wFStD7B1YBeYmvY+lWXZ7ey73YGPcViMShYikqKT1GtstIKQAtfUI6yrzPjAy/O7pO0VLXGmUVWXQMaYgTQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.17.2.tgz",
-      "integrity": "sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.0.tgz",
+      "integrity": "sha512-SyaIPFoxmUPlNDq5EHkTbiKzmSEmq/gOYFI/3HHJ8iS/v1mbugVa7dXUzcJGQfoytp9DJFLhHH4U3/eTy2Bq4w==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.0.tgz",
+      "integrity": "sha512-RdcryEfzZr+lAr5kRm2ucN9aVlCCa2QNq4hXelZxb8GG0NJSazq44Z3PCCc8wISRuCVnGs0lQJVX5Vp6fKA+IA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz",
-      "integrity": "sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.0.tgz",
+      "integrity": "sha512-PrsWNQ8BuE00O3Xsx3ALh2Df8fAj9+cvvX9AIA6o4KpATR98c9mud4XtDWVvsEuyia5U4tVSTKygawyJkjm60w==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -5550,7 +5692,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "dev": true,
       "license": "MIT"
     },
@@ -19569,11 +19713,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.17.2",
+      "version": "4.60.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.0.tgz",
+      "integrity": "sha512-yqjxruMGBQJ2gG4HtjZtAfXArHomazDHoFwFFmZZl0r7Pdo7qCIXKqKHZc8yeoMgzJJ+pO6pEEHa+V7uzWlrAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.8"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -19583,51 +19729,34 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.17.2",
-        "@rollup/rollup-android-arm64": "4.17.2",
-        "@rollup/rollup-darwin-arm64": "4.17.2",
-        "@rollup/rollup-darwin-x64": "4.17.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.17.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.17.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.17.2",
-        "@rollup/rollup-linux-arm64-musl": "4.17.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.17.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.17.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.17.2",
-        "@rollup/rollup-linux-x64-gnu": "4.17.2",
-        "@rollup/rollup-linux-x64-musl": "4.17.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.17.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.17.2",
-        "@rollup/rollup-win32-x64-msvc": "4.17.2",
+        "@rollup/rollup-android-arm-eabi": "4.60.0",
+        "@rollup/rollup-android-arm64": "4.60.0",
+        "@rollup/rollup-darwin-arm64": "4.60.0",
+        "@rollup/rollup-darwin-x64": "4.60.0",
+        "@rollup/rollup-freebsd-arm64": "4.60.0",
+        "@rollup/rollup-freebsd-x64": "4.60.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.60.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.60.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.60.0",
+        "@rollup/rollup-linux-arm64-musl": "4.60.0",
+        "@rollup/rollup-linux-loong64-gnu": "4.60.0",
+        "@rollup/rollup-linux-loong64-musl": "4.60.0",
+        "@rollup/rollup-linux-ppc64-gnu": "4.60.0",
+        "@rollup/rollup-linux-ppc64-musl": "4.60.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.60.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.60.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.60.0",
+        "@rollup/rollup-linux-x64-gnu": "4.60.0",
+        "@rollup/rollup-linux-x64-musl": "4.60.0",
+        "@rollup/rollup-openbsd-x64": "4.60.0",
+        "@rollup/rollup-openharmony-arm64": "4.60.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.60.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.60.0",
+        "@rollup/rollup-win32-x64-gnu": "4.60.0",
+        "@rollup/rollup-win32-x64-msvc": "4.60.0",
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/rollup/node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.17.2.tgz",
-      "integrity": "sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/rollup/node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.17.2.tgz",
-      "integrity": "sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
     "node_modules/run-async": {
       "version": "3.0.0",
       "license": "MIT",

From cb06e15209fc333726749d882cb9e9e3ae264ab1 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:03:04 +1100
Subject: [PATCH 756/776] chore: update package-lock

---
 package-lock.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package-lock.json b/package-lock.json
index 72a08b3851..5a3d1170d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11045,6 +11045,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [

From 1ee5efe67496c867ed03867da2178f5714a53ced Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 04:42:42 +0000
Subject: [PATCH 757/776] build(deps): bump angular-mocks from 1.5.11 to 1.8.3

Bumps [angular-mocks](https://github.com/angular/angular.js) from 1.5.11 to 1.8.3.
- [Changelog](https://github.com/angular/angular.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular.js/compare/v1.5.11...v1.8.3)

---
updated-dependencies:
- dependency-name: angular-mocks
  dependency-version: 1.8.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 7 ++++---
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5a3d1170d9..4f2b12c03e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
         "angular-filter": "0.5.17",
         "angular-markdown-filter": "1.3.2",
         "angular-md5": "0.1.10",
-        "angular-mocks": "1.5.11",
+        "angular-mocks": "1.8.3",
         "angular-nvd3": "1.0.9",
         "angular-resource": "1.5.11",
         "angular-sanitize": "1.5.11",
@@ -6429,7 +6429,9 @@
       "version": "0.1.10"
     },
     "node_modules/angular-mocks": {
-      "version": "1.5.11",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.8.3.tgz",
+      "integrity": "sha512-vqsT6zwu80cZ8RY7qRQBZuy6Fq5X7/N5hkV9LzNT0c8b546rw4ErGK6muW1u2JnDKYa7+jJuaGM702bWir4HGw==",
       "license": "MIT"
     },
     "node_modules/angular-nvd3": {
@@ -11045,7 +11047,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
diff --git a/package.json b/package.json
index 4e2c62fb13..82ea72800d 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "angular-filter": "0.5.17",
     "angular-markdown-filter": "1.3.2",
     "angular-md5": "0.1.10",
-    "angular-mocks": "1.5.11",
+    "angular-mocks": "1.8.3",
     "angular-nvd3": "1.0.9",
     "angular-resource": "1.5.11",
     "angular-sanitize": "1.5.11",

From c51e2d8cf1cc8730b75d6c381e6a04fc51c9207e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 04:42:56 +0000
Subject: [PATCH 758/776] build(deps-dev): bump @commitlint/config-conventional

Bumps [@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/config-conventional) from 17.8.1 to 20.5.0.
- [Release notes](https://github.com/conventional-changelog/commitlint/releases)
- [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/config-conventional/CHANGELOG.md)
- [Commits](https://github.com/conventional-changelog/commitlint/commits/v20.5.0/@commitlint/config-conventional)

---
updated-dependencies:
- dependency-name: "@commitlint/config-conventional"
  dependency-version: 20.5.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 18 +++++++++++-------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5a3d1170d9..e38f50e924 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -91,7 +91,7 @@
         "@angular/compiler-cli": "^17.3.6",
         "@angular/language-service": "^17.3.6",
         "@commitlint/cli": "^20.5.0",
-        "@commitlint/config-conventional": "^17",
+        "@commitlint/config-conventional": "^20",
         "@types/angular": "1.5.11",
         "@types/canvas-confetti": "^1.6.0",
         "@types/d3": "^3.5.17",
@@ -2670,14 +2670,17 @@
       }
     },
     "node_modules/@commitlint/config-conventional": {
-      "version": "17.8.1",
+      "version": "20.5.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-20.5.0.tgz",
+      "integrity": "sha512-t3Ni88rFw1XMa4nZHgOKJ8fIAT9M2j5TnKyTqJzsxea7FUetlNdYFus9dz+MhIRZmc16P0PPyEfh6X2d/qw8SA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "conventional-changelog-conventionalcommits": "^6.1.0"
+        "@commitlint/types": "^20.5.0",
+        "conventional-changelog-conventionalcommits": "^9.2.0"
       },
       "engines": {
-        "node": ">=v14"
+        "node": ">=v18"
       }
     },
     "node_modules/@commitlint/config-validator": {
@@ -8414,14 +8417,16 @@
       }
     },
     "node_modules/conventional-changelog-conventionalcommits": {
-      "version": "6.1.0",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-9.3.0.tgz",
+      "integrity": "sha512-kYFx6gAyjSIMwNtASkI3ZE99U1fuVDJr0yTYgVy+I2QG46zNZfl2her+0+eoviG82c5WQvW1jMt1eOQTeJLodA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "compare-func": "^2.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/conventional-commits-parser": {
@@ -11045,7 +11050,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
diff --git a/package.json b/package.json
index 4e2c62fb13..5d93f895c9 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "@angular/compiler-cli": "^17.3.6",
     "@angular/language-service": "^17.3.6",
     "@commitlint/cli": "^20.5.0",
-    "@commitlint/config-conventional": "^17",
+    "@commitlint/config-conventional": "^20",
     "@types/angular": "1.5.11",
     "@types/canvas-confetti": "^1.6.0",
     "@types/d3": "^3.5.17",

From 5878fb964b9cda3ce014712cc9e319321d3b10d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 04:43:05 +0000
Subject: [PATCH 759/776] build(deps-dev): bump @types/jasmine from 3.9.1 to
 6.0.0

Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.9.1 to 6.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)

---
updated-dependencies:
- dependency-name: "@types/jasmine"
  dependency-version: 6.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 7 ++++---
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5a3d1170d9..2b1cb86bd3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -96,7 +96,7 @@
         "@types/canvas-confetti": "^1.6.0",
         "@types/d3": "^3.5.17",
         "@types/file-saver": "^2.0.1",
-        "@types/jasmine": "~3.9.1",
+        "@types/jasmine": "~6.0.0",
         "@types/jasminewd2": "~2.0.3",
         "@types/lodash": "^4.14.115",
         "@types/node": "^20.9.0",
@@ -5595,7 +5595,9 @@
       }
     },
     "node_modules/@types/jasmine": {
-      "version": "3.9.1",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-6.0.0.tgz",
+      "integrity": "sha512-18lgGsLmEh3VJk9eZ5wAjTISxdqzl6YOwu8UdMpolajN57QOCNbl+AbHUd+Yu9ItrsFdB+c8LSZSGNg8nHaguw==",
       "dev": true,
       "license": "MIT"
     },
@@ -11045,7 +11047,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
diff --git a/package.json b/package.json
index 4e2c62fb13..47368e107a 100644
--- a/package.json
+++ b/package.json
@@ -115,7 +115,7 @@
     "@types/canvas-confetti": "^1.6.0",
     "@types/d3": "^3.5.17",
     "@types/file-saver": "^2.0.1",
-    "@types/jasmine": "~3.9.1",
+    "@types/jasmine": "~6.0.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/lodash": "^4.14.115",
     "@types/node": "^20.9.0",

From 3dc20a78f0d71a16c423c9f7407f9ecdb58af283 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 04:43:15 +0000
Subject: [PATCH 760/776] build(deps): bump @ctrl/ngx-emoji-mart from 9.2.0 to
 9.3.0

Bumps [@ctrl/ngx-emoji-mart](https://github.com/scttcper/ngx-emoji-mart) from 9.2.0 to 9.3.0.
- [Release notes](https://github.com/scttcper/ngx-emoji-mart/releases)
- [Commits](https://github.com/scttcper/ngx-emoji-mart/compare/v9.2.0...v9.3.0)

---
updated-dependencies:
- dependency-name: "@ctrl/ngx-emoji-mart"
  dependency-version: 9.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 7 ++++---
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5a3d1170d9..753b8ecc4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@angular/router": "^17.3.6",
         "@angular/service-worker": "^17.3.6",
         "@angular/upgrade": "^17.3.6",
-        "@ctrl/ngx-emoji-mart": "^9.2.0",
+        "@ctrl/ngx-emoji-mart": "^9.3.0",
         "@ngneat/hotkeys": "^4.0.0",
         "@ngstack/code-editor": "7.3.0",
         "@uirouter/angular": "^13.0",
@@ -2961,7 +2961,9 @@
       }
     },
     "node_modules/@ctrl/ngx-emoji-mart": {
-      "version": "9.2.0",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/@ctrl/ngx-emoji-mart/-/ngx-emoji-mart-9.3.0.tgz",
+      "integrity": "sha512-9uFzAvlFT21OLsTfhL3ZEO5mp51qvL1F4ErIZVBIsvAlji46u6p2KGgVA60oIheFBX4JoZI7HBDGOkGnm9dTUQ==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -11045,7 +11047,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
diff --git a/package.json b/package.json
index 4e2c62fb13..bf09852b09 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "^17.3.6",
     "@angular/service-worker": "^17.3.6",
     "@angular/upgrade": "^17.3.6",
-    "@ctrl/ngx-emoji-mart": "^9.2.0",
+    "@ctrl/ngx-emoji-mart": "^9.3.0",
     "@ngneat/hotkeys": "^4.0.0",
     "@ngstack/code-editor": "7.3.0",
     "@uirouter/angular": "^13.0",

From 2fefab2bbab1c698482fd224ccf334cf13a1e361 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:47:53 +1100
Subject: [PATCH 761/776] chore: update package-lock

---
 package-lock.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package-lock.json b/package-lock.json
index 9e5fdd1ef7..06415bae1d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11200,6 +11200,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [

From c57c1c3206073f7b45fba69eefe9875985a4bee9 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Mon, 23 Mar 2026 20:48:41 +1100
Subject: [PATCH 762/776] chore(release): 10.0.1-22

---
 CHANGELOG.md      | 14 ++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d54a7397ca..9a119c3b7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 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.
 
+### [10.0.1-22](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-21...v10.0.1-22) (2026-03-23)
+
+
+### Features
+
+* display portfolio submission time ([d717b27](https://github.com/b0ink/doubtfire-deploy/commit/d717b270eb80c0b0245e6b39f0b3f0567c379512))
+* require discussion before marking complete ([#1103](https://github.com/b0ink/doubtfire-deploy/issues/1103)) ([86ae886](https://github.com/b0ink/doubtfire-deploy/commit/86ae8865268ee19e4b3430ff679358cc075e1346))
+
+
+### Bug Fixes
+
+* avoid rendering the staff list twice ([9e5be59](https://github.com/b0ink/doubtfire-deploy/commit/9e5be591b9a0cf72d01efa5e28e5b2b9e7eba043))
+* only render if submission date is valid ([04986a0](https://github.com/b0ink/doubtfire-deploy/commit/04986a0e501f0185dbd199b8d2554133217f7e75))
+
 ### [10.0.1-21](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-20...v10.0.1-21) (2026-03-13)
 
 ### [10.0.1-20](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-19...v10.0.1-20) (2026-03-13)
diff --git a/package-lock.json b/package-lock.json
index 06415bae1d..19291ceb8e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-21",
+  "version": "10.0.1-22",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-21",
+      "version": "10.0.1-22",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 1b0b8a59b2..6a353dbcaa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-21",
+  "version": "10.0.1-22",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 45e6141e8c2b68f33b7f5687bfbd33a9c929973f Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 24 Mar 2026 12:39:46 +1100
Subject: [PATCH 763/776] refactor: confirm recursive fix and resubmit for
 dependent tasks (#1132)

* refactor: confirm recursive fix and resubmit for dependent tasks

* refactor: move logic to task model
---
 src/app/api/models/task.ts                    | 65 ++++++++++++++++++-
 src/app/common/footer/footer.component.html   |  2 +-
 src/app/common/footer/footer.component.ts     | 36 ++++++++++
 .../confirmation-modal.component.html         |  4 +-
 .../confirmation-modal.component.ts           | 17 ++++-
 .../confirmation-modal.service.ts             |  8 ++-
 6 files changed, 124 insertions(+), 8 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 2d7d995792..1ef90ca39e 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -24,10 +24,11 @@ import {
 import {Grade} from './grade';
 import {LOCALE_ID} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
-import {Observable, map} from 'rxjs';
+import {Observable, firstValueFrom, map} from 'rxjs';
 import {gradeTaskModal, uploadSubmissionModal} from 'src/app/ajs-upgraded-providers';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {MappingFunctions} from '../services/mapping-fn';
+import {TaskPrerequisite} from './task-prerequisite';
 
 export const FeedbackModerationAction = {
   ShowMore: 'show_more',
@@ -681,6 +682,58 @@ export class Task extends Entity {
       );
   }
 
+  private mapUnitTaskPrerequisites(prerequisites: TaskPrerequisite[]): TaskPrerequisite[] {
+    const definitions = this.unit.taskDefinitions;
+
+    return prerequisites.map((prerequisite) => {
+      prerequisite.taskDefinition = definitions.find(
+        (td) => td.id === prerequisite.taskDefinitionId,
+      );
+      prerequisite.prerequisite = definitions.find((td) => td.id === prerequisite.prerequisiteId);
+      return prerequisite;
+    });
+  }
+
+  private buildProjectTaskForDefinition(definition: TaskDefinition): Task {
+    const dependentTask = new Task(this.project);
+    dependentTask.project = this.project;
+    dependentTask.definition = definition;
+    return dependentTask;
+  }
+
+  private async dependentTaskNeedsRecursiveFix(definition: TaskDefinition): Promise<boolean> {
+    const cachedTask = this.project.findTaskForDefinition(definition.id);
+    if (cachedTask) {
+      return cachedTask.status === 'ready_for_feedback';
+    }
+
+    const dependentTask = this.buildProjectTaskForDefinition(definition);
+    const taskWithSubmissionDetails = await firstValueFrom(dependentTask.getSubmissionDetails());
+    return taskWithSubmissionDetails.status === 'ready_for_feedback';
+  }
+
+  public async hasReadyForFeedbackDependents(): Promise<boolean> {
+    const allPrerequisites = await firstValueFrom(this.unit.getTaskPrerequisites());
+    const dependentPrerequisites = this.mapUnitTaskPrerequisites(allPrerequisites).filter(
+      (prerequisite) => prerequisite.prerequisiteId === this.definition.id,
+    );
+
+    for (const prerequisite of dependentPrerequisites) {
+      if (!prerequisite.taskDefinition) {
+        continue;
+      }
+
+      const shouldTriggerRecursiveFix = await this.dependentTaskNeedsRecursiveFix(
+        prerequisite.taskDefinition,
+      );
+      if (shouldTriggerRecursiveFix) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   public get overseerEnabled(): boolean {
     return this.unit.overseerEnabled && this.definition.assessmentEnabled;
   }
@@ -826,7 +879,11 @@ export class Task extends Entity {
       });
   }
 
-  public updateTaskStatus(status: TaskStatusEnum, markAsDiscussed?: boolean) {
+  public updateTaskStatus(
+    status: TaskStatusEnum,
+    markAsDiscussed?: boolean,
+    triggerRecursiveFix?: boolean,
+  ) {
     const oldStatus = this.status;
     const alerts: AlertService = AppInjector.get(AlertService);
 
@@ -851,6 +908,10 @@ export class Task extends Entity {
         options.body['discussed'] = true;
       }
 
+      if (triggerRecursiveFix === true) {
+        options.body['trigger_recursive_fix'] = true;
+      }
+
       const hasId: boolean = this.id > 0;
 
       taskService
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index cb6e238c38..fb9eca0065 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -45,7 +45,7 @@
         matTooltipPosition="above"
         aria-label=""
         class="button large-button"
-        (click)="selectedTask?.updateTaskStatus('fix')"
+        (click)="markAsResubmit(selectedTask)"
       >
         <mat-icon>construction</mat-icon>
       </button>
diff --git a/src/app/common/footer/footer.component.ts b/src/app/common/footer/footer.component.ts
index 7626b63a6d..aab80e6fd5 100644
--- a/src/app/common/footer/footer.component.ts
+++ b/src/app/common/footer/footer.component.ts
@@ -7,6 +7,9 @@ import {FileDownloaderService} from '../file-downloader/file-downloader.service'
 import {TaskAssessmentModalService} from '../modals/task-assessment-modal/task-assessment-modal.service';
 import {UnitRole} from 'src/app/api/models/unit-role';
 import {UserService} from 'src/app/api/services/user.service';
+import {ProjectService} from 'src/app/api/services/project.service';
+import {ConfirmationModalService} from '../modals/confirmation-modal/confirmation-modal.service';
+import {AlertService} from '../services/alert.service';
 
 @Component({
   selector: 'f-footer',
@@ -20,6 +23,9 @@ export class FooterComponent implements OnInit {
     private fileDownloader: FileDownloaderService,
     private taskAssessmentModal: TaskAssessmentModalService,
     private userService: UserService,
+    private projectService: ProjectService,
+    private confirmationModalService: ConfirmationModalService,
+    private alertService: AlertService,
   ) {}
 
   @Input() viewType: 'inbox' | 'explorer' | 'moderation' | 'overflow';
@@ -191,4 +197,34 @@ export class FooterComponent implements OnInit {
   public toggleModerationStatusButtons() {
     this.showModerationStatusButtons = !this.showModerationStatusButtons;
   }
+
+  async markAsResubmit(task: Task) {
+    if (!task?.definition || !task?.project) {
+      return;
+    }
+
+    try {
+      const hasReadyDependents = await task.hasReadyForFeedbackDependents();
+      if (!hasReadyDependents) {
+        task.updateTaskStatus('fix_and_resubmit');
+        return;
+      }
+
+      this.confirmationModalService.show(
+        'Move dependent tasks to Fix and Resubmit?',
+        'This task is a prerequisite for one or more other tasks submitted by this student that are Ready for Feedback. Do you want to move those tasks to Fix and Resubmit as well?',
+        () => {
+          task.updateTaskStatus('fix_and_resubmit', false, true);
+        },
+        () => {
+          task.updateTaskStatus('fix_and_resubmit');
+        },
+        'Yes, update dependent tasks',
+        'No, just this task',
+      );
+    } catch (error) {
+      this.alertService.error(`Failed to check dependent task statuses: ${error}`, 6000);
+      task.updateTaskStatus('fix_and_resubmit');
+    }
+  }
 }
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.component.html b/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
index 3ec07fc729..c976c7c75a 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.html
@@ -13,8 +13,8 @@ <h3 mat-dialog-title>
   </mat-dialog-content>
   <mat-dialog-actions align="end">
     <button mat-raised-button color="primary" (click)="confirmAction()">
-      <i class="fa fa-check"></i> Confirm
+      <i class="fa fa-check"></i> {{ confirmText }}
     </button>
-    <button mat-button color="warn" (click)="cancelAction()">Cancel</button>
+    <button mat-button color="warn" (click)="cancelAction()">{{ cancelText }}</button>
   </mat-dialog-actions>
 </div>
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts b/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
index f9506e5b8b..d0ef5a3691 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.component.ts
@@ -5,7 +5,10 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 export interface ConfirmationModalData {
   title: string;
   message: string;
-  action?: any;
+  action?: () => void;
+  cancelAction?: () => void;
+  confirmText?: string;
+  cancelText?: string;
 }
 
 @Component({
@@ -17,6 +20,9 @@ export class ConfirmationModalComponent implements OnInit {
   @Input() title: string;
   @Input() message: string;
   @Input() action: () => void;
+  @Input() cancelActionFn: () => void;
+  @Input() confirmText: string;
+  @Input() cancelText: string;
 
   constructor(
     @Inject(AlertService) private alertService: AlertService,
@@ -29,6 +35,9 @@ export class ConfirmationModalComponent implements OnInit {
     this.title = this.data.title;
     this.message = this.data.message;
     this.action = this.data.action;
+    this.cancelActionFn = this.data.cancelAction;
+    this.confirmText = this.data.confirmText ?? 'Confirm';
+    this.cancelText = this.data.cancelText ?? 'Cancel';
   }
 
   public confirmAction() {
@@ -41,7 +50,11 @@ export class ConfirmationModalComponent implements OnInit {
   }
 
   public cancelAction() {
-    this.alertService.success(`${this.title} action cancelled.`);
+    if (typeof this.cancelActionFn === 'function') {
+      this.cancelActionFn();
+    } else {
+      this.alertService.success(`${this.title} action cancelled.`);
+    }
     this.dialogRef.close();
   }
 }
diff --git a/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
index 660ddec60c..b14d252ebb 100644
--- a/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
+++ b/src/app/common/modals/confirmation-modal/confirmation-modal.service.ts
@@ -11,7 +11,10 @@ export class ConfirmationModalService {
   public show(
     title: string,
     message: string,
-    action?: any,
+    action?: () => void,
+    cancelAction?: () => void,
+    confirmText?: string,
+    cancelText?: string,
   ): MatDialogRef<ConfirmationModalComponent, ConfirmationModalData> {
     return this.dialog.open<ConfirmationModalComponent, ConfirmationModalData>(
       ConfirmationModalComponent,
@@ -20,6 +23,9 @@ export class ConfirmationModalService {
           title,
           message,
           action,
+          cancelAction,
+          confirmText,
+          cancelText,
         },
         position: {top: '2.5%'},
         width: '100%',

From 04f4d30043acf3d363acac2b141e84bdc4c11e41 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 24 Mar 2026 12:40:24 +1100
Subject: [PATCH 764/776] chore(release): 10.0.1-23

---
 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 9a119c3b7d..7131db231d 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.
 
+### [10.0.1-23](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-22...v10.0.1-23) (2026-03-24)
+
 ### [10.0.1-22](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-21...v10.0.1-22) (2026-03-23)
 
 
diff --git a/package-lock.json b/package-lock.json
index 19291ceb8e..a94f140396 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-22",
+  "version": "10.0.1-23",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-22",
+      "version": "10.0.1-23",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 6a353dbcaa..b352e08f51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-22",
+  "version": "10.0.1-23",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From b64601a425c7a64bccfaf47c1e4fccb0343b1589 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 24 Mar 2026 14:31:42 +1100
Subject: [PATCH 765/776] feat: confirm recursive fix in mobile tutor view

---
 .../tutor-discussion.component.ts             | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
index 43416b60c1..84095a5436 100644
--- a/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
+++ b/src/app/projects/states/tutor-discussion/tutor-discussion.component.ts
@@ -17,6 +17,7 @@ import {
   UnitService,
   UserService,
 } from 'src/app/api/models/doubtfire-model';
+import {ConfirmationModalService} from 'src/app/common/modals/confirmation-modal/confirmation-modal.service';
 import {AlertService} from 'src/app/common/services/alert.service';
 import {GradeService} from 'src/app/common/services/grade.service';
 
@@ -66,6 +67,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
     private gradeService: GradeService,
     private state: StateService,
     private alertService: AlertService,
+    private confirmationModalService: ConfirmationModalService,
     private route: UIRouter,
     private taskCommentService: TaskCommentService,
     private taskService: TaskService,
@@ -262,7 +264,7 @@ export class TutorDiscussionComponent implements AfterViewInit {
     this.selectedTask = task;
   }
 
-  public setSelectedTasksStatus(status: TaskStatusEnum) {
+  public async setSelectedTasksStatus(status: TaskStatusEnum) {
     const selectedTasks = this.tasksList.selectedOptions.selected.map((taskOption) => {
       return taskOption.value as Task;
     });
@@ -279,6 +281,44 @@ export class TutorDiscussionComponent implements AfterViewInit {
       }
     }
 
+    if (status === 'fix_and_resubmit') {
+      try {
+        const hasReadyDependents = (
+          await Promise.all(
+            selectedTasks.map((task) =>
+              task?.definition && task?.project ? task.hasReadyForFeedbackDependents() : false,
+            ),
+          )
+        ).some(Boolean);
+
+        if (hasReadyDependents) {
+          this.confirmationModalService.show(
+            'Move dependent tasks to Fix and Resubmit?',
+            'One or more selected tasks are prerequisites for other tasks submitted by this student that are Ready for Feedback. Do you want to move those tasks to Fix and Resubmit as well?',
+            () => {
+              this.updateSelectedTasksStatus(selectedTasks, status, true);
+            },
+            () => {
+              this.updateSelectedTasksStatus(selectedTasks, status, false);
+            },
+            'Yes, update dependent tasks',
+            'No, just selected tasks',
+          );
+          return;
+        }
+      } catch (error) {
+        this.alertService.error(`Failed to check dependent task statuses: ${error}`, 6000);
+      }
+    }
+
+    this.updateSelectedTasksStatus(selectedTasks, status, false);
+  }
+
+  private updateSelectedTasksStatus(
+    selectedTasks: Task[],
+    status: TaskStatusEnum,
+    moveDependentTasks: boolean,
+  ) {
     for (const task of selectedTasks) {
       if (
         status === 'complete' &&
@@ -290,6 +330,8 @@ export class TutorDiscussionComponent implements AfterViewInit {
 
       if (task.definition.assessInPortfolioOnly) {
         task.updateTaskStatus(status === 'complete' ? 'working_on_it' : status, true);
+      } else if (status === 'fix_and_resubmit') {
+        task.updateTaskStatus(status, true, moveDependentTasks);
       } else {
         task.updateTaskStatus(status, true);
       }

From f50a58e9737ce32eef772c48ef936f7819a1b9e1 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Tue, 24 Mar 2026 14:32:08 +1100
Subject: [PATCH 766/776] chore(release): 10.0.1-24

---
 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 7131db231d..876c5cdbf4 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.
 
+### [10.0.1-24](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-23...v10.0.1-24) (2026-03-24)
+
+
+### Features
+
+* confirm recursive fix in mobile tutor view ([b64601a](https://github.com/b0ink/doubtfire-deploy/commit/b64601a425c7a64bccfaf47c1e4fccb0343b1589))
+
 ### [10.0.1-23](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-22...v10.0.1-23) (2026-03-24)
 
 ### [10.0.1-22](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-21...v10.0.1-22) (2026-03-23)
diff --git a/package-lock.json b/package-lock.json
index a94f140396..92ccf1dec9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-23",
+  "version": "10.0.1-24",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-23",
+      "version": "10.0.1-24",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index b352e08f51..17bf3a09bd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-23",
+  "version": "10.0.1-24",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From 34fed4772fc2ed14586f53b6fac4ad695a18eb90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Mar 2026 04:42:37 +0000
Subject: [PATCH 767/776] build(deps): bump angular-sanitize from 1.5.11 to
 1.8.3

Bumps [angular-sanitize](https://github.com/angular/angular.js) from 1.5.11 to 1.8.3.
- [Changelog](https://github.com/angular/angular.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular.js/compare/v1.5.11...v1.8.3)

---
updated-dependencies:
- dependency-name: angular-sanitize
  dependency-version: 1.8.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 +++++---
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 92ccf1dec9..484310a5bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,7 +40,7 @@
         "angular-mocks": "1.8.3",
         "angular-nvd3": "1.0.9",
         "angular-resource": "1.5.11",
-        "angular-sanitize": "1.5.11",
+        "angular-sanitize": "1.8.3",
         "angular-ui-bootstrap": "0.13.4",
         "angular-ui-codemirror": "0.3.0",
         "angular-xeditable": "0.9.0",
@@ -6611,7 +6611,10 @@
       "license": "MIT"
     },
     "node_modules/angular-sanitize": {
-      "version": "1.5.11",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.8.3.tgz",
+      "integrity": "sha512-2rxdqzlUVafUeWOwvY/FtyWk1pFTyCtzreeiTytG9m4smpuAEKaIJAjYeVwWsoV+nlTOcgpwV4W1OCmR+BQbUg==",
+      "deprecated": "For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward.",
       "license": "MIT"
     },
     "node_modules/angular-ui-bootstrap": {
@@ -11200,7 +11203,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
diff --git a/package.json b/package.json
index 17bf3a09bd..4f08306194 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "angular-mocks": "1.8.3",
     "angular-nvd3": "1.0.9",
     "angular-resource": "1.5.11",
-    "angular-sanitize": "1.5.11",
+    "angular-sanitize": "1.8.3",
     "angular-ui-bootstrap": "0.13.4",
     "angular-ui-codemirror": "0.3.0",
     "angular-xeditable": "0.9.0",

From 248c992f46488f61916e00a87ca32ed987721f31 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Wed, 25 Mar 2026 12:19:11 +1100
Subject: [PATCH 768/776] feat: display sso redirecting state

---
 src/app/sessions/states/sign-in/sign-in.component.html | 9 ++++++++-
 src/app/sessions/states/sign-in/sign-in.component.ts   | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/app/sessions/states/sign-in/sign-in.component.html b/src/app/sessions/states/sign-in/sign-in.component.html
index 74fd6b7b99..29b7743d41 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.html
+++ b/src/app/sessions/states/sign-in/sign-in.component.html
@@ -57,7 +57,14 @@ <h1 class="welcome-heading flex flex-row place-content-start">
               type="form"
               [disabled]="form.invalid"
             >
-              Sign In
+              <div class="flex items-center gap-2">
+                @if (redirectingSSO) {
+                  Signing In...
+                  <mat-spinner diameter="20"></mat-spinner>
+                } @else {
+                  Sign In
+                }
+              </div>
             </button>
           </form>
         </div>
diff --git a/src/app/sessions/states/sign-in/sign-in.component.ts b/src/app/sessions/states/sign-in/sign-in.component.ts
index 8f047489d4..2196ee83c9 100644
--- a/src/app/sessions/states/sign-in/sign-in.component.ts
+++ b/src/app/sessions/states/sign-in/sign-in.component.ts
@@ -54,6 +54,8 @@ export class SignInComponent implements OnInit {
   public isLoading: boolean = true;
   public authMethodFailed: boolean = false;
 
+  public redirectingSSO: boolean = false;
+
   // Get query params from the resolve in the router state
   @Input() username: string;
   @Input() authToken: string;
@@ -163,10 +165,13 @@ export class SignInComponent implements OnInit {
             });
         } else if (this.SSOLoginUrl) {
           if (this.autoLogin) {
+            this.redirectingSSO = true;
             return wait.then(() => {
               // Double check in case changed in the meantime
               if (this.autoLogin) {
                 this.redirectToSSO();
+              } else {
+                this.redirectingSSO = false;
               }
             });
           } else {

From 12fbf8147107dc185a9a9cbea940efac93a0f316 Mon Sep 17 00:00:00 2001
From: Boink <40929320+b0ink@users.noreply.github.com>
Date: Thu, 26 Mar 2026 13:05:50 +1100
Subject: [PATCH 769/776] feat: pause feedback threshold during teaching period
 breaks (#1138)

* feat: pause feedback threshold during teaching period breaks

* chore: round down days
---
 src/app/api/models/task.ts                    | 43 +++++++++++++++++++
 .../staff-task-list.component.ts              |  5 +--
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/app/api/models/task.ts b/src/app/api/models/task.ts
index 1ef90ca39e..26488452d3 100644
--- a/src/app/api/models/task.ts
+++ b/src/app/api/models/task.ts
@@ -152,6 +152,49 @@ export class Task extends Entity {
     return this.project.unit;
   }
 
+  private getBreakOverlapMilliseconds(
+    startTime: number,
+    endTime: number,
+    breaks: readonly {startDate: Date; numberOfWeeks: number}[],
+  ): number {
+    const millisecondsPerDay = 1000 * 60 * 60 * 24;
+
+    return breaks.reduce((overlap, teachingBreak) => {
+      const breakStart = new Date(teachingBreak.startDate).getTime();
+      const breakDuration = (teachingBreak.numberOfWeeks ?? 0) * 7 * millisecondsPerDay;
+      const breakEnd = breakStart + breakDuration;
+
+      if (!Number.isFinite(breakStart) || breakDuration <= 0) {
+        return overlap;
+      }
+
+      const overlapStart = Math.max(startTime, breakStart);
+      const overlapEnd = Math.min(endTime, breakEnd);
+
+      return overlap + Math.max(0, overlapEnd - overlapStart);
+    }, 0);
+  }
+
+  public daysSinceSubmission(nowTime = Date.now()): number {
+    const millisecondsPerDay = 1000 * 60 * 60 * 24;
+    const submissionTime = new Date(this.submissionDate).getTime();
+
+    if (!Number.isFinite(submissionTime) || nowTime <= submissionTime) {
+      return 0;
+    }
+
+    const teachingBreaks = this.unit.teachingPeriod?.breaks ?? [];
+    const pausedMilliseconds = this.getBreakOverlapMilliseconds(
+      submissionTime,
+      nowTime,
+      teachingBreaks,
+    );
+
+    return Math.floor(
+      Math.max(0, nowTime - submissionTime - pausedMilliseconds) / millisecondsPerDay,
+    );
+  }
+
   /**
    * Determine if a task matches a given search text.
    *
diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
index 1d3c166609..3b65b4247e 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.ts
@@ -572,10 +572,7 @@ export class StaffTaskListComponent implements OnInit, OnChanges, OnDestroy {
       return null;
     }
 
-    const now = Date.now();
-    const submission = new Date(task.submissionDate).getTime();
-
-    const daysSinceSubmission = (now - submission) / (1000 * 60 * 60 * 24);
+    const daysSinceSubmission = task.daysSinceSubmission();
 
     if (daysSinceSubmission >= task.unit.feedbackOverflowThresholdDays) {
       return 'overflow';

From 01a407e99ecaf66ea4fed5babba5a9ae091ab80f Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 27 Mar 2026 10:41:15 +1100
Subject: [PATCH 770/776] chore: ensure tasks not in overflow are filtered out

- this may be due to the breaks re-calculated client-side
---
 src/app/api/services/task.service.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/api/services/task.service.ts b/src/app/api/services/task.service.ts
index 8aaa3805a2..d3d517fe1e 100644
--- a/src/app/api/services/task.service.ts
+++ b/src/app/api/services/task.service.ts
@@ -188,6 +188,9 @@ export class TaskService extends CachedEntityService<Task> {
         constructorParams: unit,
       },
     ).pipe(
+      map((tasks: Task[]) =>
+        tasks.filter((t) => t.daysSinceSubmission() >= t.unit.feedbackOverflowThresholdDays),
+      ),
       tap((tasks: Task[]) => {
         unit.incorporateTasks(tasks);
       }),

From 5eb855fb03273e1bcc73ffb983ab3f2e44e7ddb9 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 27 Mar 2026 10:42:30 +1100
Subject: [PATCH 771/776] chore(release): 10.0.1-25

---
 CHANGELOG.md      | 8 ++++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 876c5cdbf4..466f028547 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.
 
+### [10.0.1-25](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-24...v10.0.1-25) (2026-03-26)
+
+
+### Features
+
+* display sso redirecting state ([248c992](https://github.com/b0ink/doubtfire-deploy/commit/248c992f46488f61916e00a87ca32ed987721f31))
+* pause feedback threshold during teaching period breaks ([#1138](https://github.com/b0ink/doubtfire-deploy/issues/1138)) ([12fbf81](https://github.com/b0ink/doubtfire-deploy/commit/12fbf8147107dc185a9a9cbea940efac93a0f316))
+
 ### [10.0.1-24](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-23...v10.0.1-24) (2026-03-24)
 
 
diff --git a/package-lock.json b/package-lock.json
index 92ccf1dec9..f5b9dd4f50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-24",
+  "version": "10.0.1-25",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-24",
+      "version": "10.0.1-25",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 17bf3a09bd..2385105a13 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-24",
+  "version": "10.0.1-25",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From a9bd5c6ad1cb9d63ad5e7e9c67ff86b9496f8875 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 27 Mar 2026 10:50:41 +1100
Subject: [PATCH 772/776] chore: display days since submission in tooltip

---
 .../staff-task-list/staff-task-list.component.html          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
index 5912585804..2f96b676bb 100644
--- a/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
+++ b/src/app/units/states/tasks/inbox/directives/staff-task-list/staff-task-list.component.html
@@ -269,7 +269,11 @@ <h4 class="student-name flex items-center gap-1">
                       </mat-icon>
                     } @else if (getWarningIcon(task) === 'overflow') {
                       <mat-icon
-                        matTooltip="Feedback overdue — this task has been escalated for urgent review."
+                        [matTooltip]="
+                          'Feedback overdue by ' +
+                          task.daysSinceSubmission() +
+                          ' days — this task has been escalated for urgent review.'
+                        "
                         class="shrink-0 text-red-500"
                       >
                         watch_later

From 6d283c805d209447821526b785d7341272aac544 Mon Sep 17 00:00:00 2001
From: b0ink <40929320+b0ink@users.noreply.github.com>
Date: Fri, 27 Mar 2026 10:51:47 +1100
Subject: [PATCH 773/776] chore(release): 10.0.1-26

---
 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 466f028547..9f6d6fd1f9 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.
 
+### [10.0.1-26](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-25...v10.0.1-26) (2026-03-26)
+
 ### [10.0.1-25](https://github.com/b0ink/doubtfire-deploy/compare/v10.0.1-24...v10.0.1-25) (2026-03-26)
 
 
diff --git a/package-lock.json b/package-lock.json
index f5b9dd4f50..fafb6cfb40 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-25",
+  "version": "10.0.1-26",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "doubtfire",
-      "version": "10.0.1-25",
+      "version": "10.0.1-26",
       "license": "AGPL-3.0",
       "dependencies": {
         "@angular/animations": "^17.3.6",
diff --git a/package.json b/package.json
index 2385105a13..7fb9743a25 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doubtfire",
-  "version": "10.0.1-25",
+  "version": "10.0.1-26",
   "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",

From fe1813f2bcf63fb1d448bc5e1606e09d557048f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2026 00:47:30 +0000
Subject: [PATCH 774/776] build(deps-dev): bump node-forge from 1.3.3 to 1.4.0

Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.3 to 1.4.0.
- [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md)
- [Commits](https://github.com/digitalbazaar/forge/compare/v1.3.3...v1.4.0)

---
updated-dependencies:
- dependency-name: node-forge
  dependency-version: 1.4.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fafb6cfb40..ca3c60ad20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11200,7 +11200,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -16396,9 +16395,9 @@
       }
     },
     "node_modules/node-forge": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.3.tgz",
-      "integrity": "sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz",
+      "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==",
       "dev": true,
       "license": "(BSD-3-Clause OR GPL-2.0)",
       "engines": {

From 27e9733193afc41f353e2f773edb7bb63ebe2fce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Mar 2026 13:55:39 +0000
Subject: [PATCH 775/776] build(deps-dev): bump brace-expansion from 1.1.11 to
 1.1.13

Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.11 to 1.1.13.
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.13)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 1.1.13
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 57 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fafb6cfb40..b185c46c35 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3413,7 +3413,9 @@
       "license": "Python-2.0"
     },
     "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3495,7 +3497,9 @@
       }
     },
     "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7580,7 +7584,9 @@
       "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
+      "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -10081,7 +10087,9 @@
       }
     },
     "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10253,7 +10261,9 @@
       "license": "Python-2.0"
     },
     "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11200,7 +11210,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -11446,7 +11455,9 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -11591,7 +11602,9 @@
       }
     },
     "node_modules/globule/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12761,7 +12774,9 @@
       }
     },
     "node_modules/grunt/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14232,7 +14247,9 @@
       "license": "MIT"
     },
     "node_modules/jake/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14550,7 +14567,9 @@
       }
     },
     "node_modules/jshint/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14867,7 +14886,9 @@
       }
     },
     "node_modules/karma-coverage-istanbul-reporter/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14938,7 +14959,9 @@
       }
     },
     "node_modules/karma/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16062,7 +16085,9 @@
       }
     },
     "node_modules/multimatch/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -21543,7 +21568,9 @@
       }
     },
     "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 3f4fe386eca3b4f48320c5c51e7e2aef8968a866 Mon Sep 17 00:00:00 2001
From: Sujay-Deakin <s225044103@deakin.edu.au>
Date: Fri, 15 May 2026 17:23:01 +1000
Subject: [PATCH 776/776] feat: migrate units/states/tasks/definition from
 CoffeeScript to Angular

---
 src/app/doubtfire-angular.module.ts           |  2 +
 src/app/doubtfire-angularjs.module.ts         | 37 ++++++++++++++++++-
 .../states/tasks/definition/definition.coffee | 31 ----------------
 .../definition/definition.component.html      |  1 +
 .../definition/definition.component.scss      |  0
 .../tasks/definition/definition.component.ts  |  8 ++++
 6 files changed, 47 insertions(+), 32 deletions(-)
 delete mode 100644 src/app/units/states/tasks/definition/definition.coffee
 create mode 100644 src/app/units/states/tasks/definition/definition.component.html
 create mode 100644 src/app/units/states/tasks/definition/definition.component.scss
 create mode 100644 src/app/units/states/tasks/definition/definition.component.ts

diff --git a/src/app/doubtfire-angular.module.ts b/src/app/doubtfire-angular.module.ts
index ae030bcc3e..da94cc73dd 100644
--- a/src/app/doubtfire-angular.module.ts
+++ b/src/app/doubtfire-angular.module.ts
@@ -213,6 +213,7 @@ import {TaskAssessmentCardComponent} from './projects/states/dashboard/directive
 import {TaskSubmissionCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component';
 import {TaskDashboardComponent} from './projects/states/dashboard/directives/task-dashboard/task-dashboard.component';
 import {InboxComponent} from './units/states/tasks/inbox/inbox.component';
+import {TaskDefinitionStateComponent} from './units/states/tasks/definition/definition.component';
 import {ProjectProgressBarComponent} from './common/project-progress-bar/project-progress-bar.component';
 import {TeachingPeriodListComponent} from './admin/states/teaching-periods/teaching-period-list/teaching-period-list.component';
 import {FChipComponent} from './common/f-chip/f-chip.component';
@@ -454,6 +455,7 @@ const GANTT_CHART_CONFIG = {
     TaskSubmissionCardComponent,
     TaskDashboardComponent,
     InboxComponent,
+    TaskDefinitionStateComponent,
     ProjectProgressBarComponent,
     TeachingPeriodListComponent,
     CreateNewUnitModal,
diff --git a/src/app/doubtfire-angularjs.module.ts b/src/app/doubtfire-angularjs.module.ts
index ca57426fd2..f2c8e29c4f 100644
--- a/src/app/doubtfire-angularjs.module.ts
+++ b/src/app/doubtfire-angularjs.module.ts
@@ -94,7 +94,6 @@ import 'build/src/app/units/states/tasks/inbox/inbox.js';
 import 'build/src/app/units/states/tasks/tasks.js';
 import 'build/src/app/units/states/tasks/viewer/directives/directives.js';
 import 'build/src/app/units/states/tasks/viewer/viewer.js';
-import 'build/src/app/units/states/tasks/definition/definition.js';
 import 'build/src/app/units/states/tasks/moderation/moderation.js';
 import 'build/src/app/units/states/tasks/overflow/overflow.js';
 import 'build/src/app/units/states/portfolios/portfolios.js';
@@ -203,6 +202,7 @@ import {FooterComponent} from './common/footer/footer.component';
 import {TaskAssessmentCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-assessment-card/task-assessment-card.component';
 import {TaskSubmissionCardComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-submission-card/task-submission-card.component';
 import {InboxComponent} from './units/states/tasks/inbox/inbox.component';
+import {TaskDefinitionStateComponent} from './units/states/tasks/definition/definition.component';
 import {TaskDefinitionEditorComponent} from './units/states/edit/directives/unit-tasks-editor/task-definition-editor/task-definition-editor.component';
 import {UnitAnalyticsComponent} from './units/states/analytics/unit-analytics-route.component';
 import {UnitTaskEditorComponent} from './units/states/edit/directives/unit-tasks-editor/unit-task-editor.component';
@@ -242,6 +242,35 @@ import {TaskPlannerCardComponent} from './projects/states/dashboard/directives/p
 import {TaskOverseerReportComponent} from './projects/states/dashboard/directives/task-dashboard/directives/task-overseer-report/task-overseer-report.component';
 import {TutorNotesComponent} from './projects/states/tutor-notes/tutor-notes.component';
 
+angular.module('doubtfire.units.states.tasks.definition', [])
+.config(($stateProvider: any) => {
+  $stateProvider.state('units/tasks/definition', {
+    parent: 'units/tasks',
+    url: '/definition/{taskKey:any}',
+    templateUrl: 'units/states/tasks/inbox/inbox.tpl.html',
+    controller: 'TaskDefinitionStateCtrl',
+    params: {
+      taskKey: {dynamic: true},
+    },
+    data: {
+      task: 'Task Explorer',
+      pageTitle: '_Home_',
+      roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor'],
+    },
+  });
+})
+.controller('TaskDefinitionStateCtrl', ['$scope', 'newTaskService',
+  function($scope: any, newTaskService: any) {
+    $scope.taskData.source = newTaskService.queryTasksForTaskExplorer.bind(newTaskService);
+    $scope.viewType = 'explorer';
+    $scope.taskData.taskDefMode = true;
+    $scope.showSearchOptions = true;
+    $scope.filters = {
+      taskDefinitionIdSelected: $scope.unit?.taskDefinitions?.[0]?.id ?? null,
+    };
+  }
+]);
+
 export const DoubtfireAngularJSModule = angular
   .module('doubtfire', [
     'doubtfire.config',
@@ -417,6 +446,12 @@ DoubtfireAngularJSModule.directive(
   downgradeComponent({component: TasksViewerComponent}),
 );
 DoubtfireAngularJSModule.directive('fInbox', downgradeComponent({component: InboxComponent}));
+
+DoubtfireAngularJSModule.directive(
+  'unitsTasksDefinitionState',
+  downgradeComponent({component: TaskDefinitionStateComponent}),
+);
+
 DoubtfireAngularJSModule.directive(
   'fTaskDueCard',
   downgradeComponent({component: TaskDueCardComponent}),
diff --git a/src/app/units/states/tasks/definition/definition.coffee b/src/app/units/states/tasks/definition/definition.coffee
deleted file mode 100644
index 9dbdc249ea..0000000000
--- a/src/app/units/states/tasks/definition/definition.coffee
+++ /dev/null
@@ -1,31 +0,0 @@
-angular.module('doubtfire.units.states.tasks.definition', [
-])
-
-#
-# Mark tasks by task definition ID
-#
-.config(($stateProvider) ->
-  $stateProvider.state 'units/tasks/definition', {
-    parent: 'units/tasks'
-    url: '/definition/{taskKey:any}'
-    # We can recycle the task inbox, switching the data source scope variable
-    templateUrl: "units/states/tasks/inbox/inbox.tpl.html"
-    controller: "TaskDefinitionStateCtrl"
-    params:
-      taskKey: dynamic: true
-    data:
-      task: "Task Explorer"
-      pageTitle: "_Home_"
-      roleWhitelist: ['Tutor', 'Convenor', 'Admin', 'Auditor']
-   }
-)
-
-.controller('TaskDefinitionStateCtrl', ($scope, newTaskService) ->
-  $scope.taskData.source = newTaskService.queryTasksForTaskExplorer.bind(newTaskService)
-  $scope.viewType = 'explorer'
-  $scope.taskData.taskDefMode = true
-  $scope.showSearchOptions = true
-  $scope.filters = {
-    taskDefinitionIdSelected: _.first($scope.unit.taskDefinitions)?.id
-  }
-)
diff --git a/src/app/units/states/tasks/definition/definition.component.html b/src/app/units/states/tasks/definition/definition.component.html
new file mode 100644
index 0000000000..5105d51131
--- /dev/null
+++ b/src/app/units/states/tasks/definition/definition.component.html
@@ -0,0 +1 @@
+<ui-view></ui-view>
diff --git a/src/app/units/states/tasks/definition/definition.component.scss b/src/app/units/states/tasks/definition/definition.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/units/states/tasks/definition/definition.component.ts b/src/app/units/states/tasks/definition/definition.component.ts
new file mode 100644
index 0000000000..9f208f62b8
--- /dev/null
+++ b/src/app/units/states/tasks/definition/definition.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'units-tasks-definition-state',
+  templateUrl: 'definition.component.html',
+  styleUrls: ['definition.component.scss'],
+})
+export class TaskDefinitionStateComponent {}