Merge pull request #127 from satikaj/add-numbas-integration

Merge add-tii-integration into add-numbas-integration
thoth-tech · Dec 5, 2023 · fb31f77 · fb31f77
2 parents 61bb7e8 + 32fcbcd
commit fb31f77
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/app/api/models/user/user.ts b/src/app/api/models/user/user.ts
@@ -3,6 +3,7 @@ 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;
 
@@ -59,6 +60,10 @@ 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)));
+    return httpClient.put(uri, {}).pipe(map(() => {
+      this.acceptedTiiEula = true;
+      AppInjector.get(AuthenticationService).saveCurrentUser();
+      return true;
+    }));
   }
 }
diff --git a/...rectives/task-dashboard/directives/task-submission-card/task-submission-card.component.ts b/...rectives/task-dashboard/directives/task-submission-card/task-submission-card.component.ts
@@ -9,11 +9,11 @@ import { FileDownloaderService } from 'src/app/common/file-downloader/file-downl
   templateUrl: './task-submission-card.component.html',
   styleUrls: ['./task-submission-card.component.scss'],
 })
-export class TaskSubmissionCardComponent implements OnChanges {
+export class TaskSubmissionCardComponent implements OnChanges, OnInit {
   @Input() task: Task;
   canReuploadEvidence: boolean;
   canRegeneratePdf: boolean;
-  submission: { isProcessing: boolean; isUploaded: boolean };
+  submission: { isProcessing: boolean; isUploaded: boolean } = { isProcessing: false, isUploaded: false };
   urls: { pdf: string; files: string };
 
   constructor(
@@ -23,6 +23,12 @@ export class TaskSubmissionCardComponent implements OnChanges {
     private fileDownloader: FileDownloaderService
   ) {}
 
+  ngOnInit(): void {
+    if (this.task) {
+      this.reapplySubmissionData();
+    }
+  }
+
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.task) {
       this.reapplySubmissionData();

diff --git a/src/app/sessions/transition-hooks.service.ts b/src/app/sessions/transition-hooks.service.ts
@@ -76,7 +76,6 @@ export class TransitionHooksService {
       if ( this.tiiEnabled &&
         !this.userService.isAnonymousUser() &&
         userService.currentUser.hasRunFirstTimeSetup &&
-        userService.currentUser.isStaff &&
         !userService.currentUser.acceptedTiiEula &&
         toState !== 'eula'
       ) {