fix: show delete and download buttons in editor when Numbas test exists

thoth-tech · Mar 22, 2024 · a09a039 · a09a039
1 parent 96286c0
commit a09a039
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git 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;
@@ -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.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
@@ -104,7 +104,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskResources',
       'hasTaskAssessmentResources',
       'hasEnabledNumbasTest',
-      'hasUploadedNumbasTest',
+      'hasNumbasData',
       'hasUnlimitedRetriesForNumbas',
       'hasTimeDelayForNumbas',
       'isNumbasRestrictedTo1Attempt',
@@ -121,7 +121,7 @@ export class TaskDefinitionService extends CachedEntityService<TaskDefinition> {
       'hasTaskSheet',
       'hasTaskResources',
       'hasTaskAssessmentResources',
-      'hasUploadedNumbasTest'
+      'hasNumbasData'
     );
   }
 

diff --git a/...ditor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.html b/...ditor/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/...-editor/task-definition-editor/task-definition-numbas/task-definition-numbas.component.ts b/...-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);
     }