#383 Fix project empty status

crossminer · Sep 30, 2019 · 6c9a81f · 6c9a81f
1 parent fa93ad1
commit 6c9a81f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/administration/scava-administration/src/app/layout/project/project.component.html b/administration/scava-administration/src/app/layout/project/project.component.html
@@ -20,11 +20,10 @@ <h4 style="margin: 0px; white-space: nowrap; overflow: hidden;" class="card-titl
             <b style="white-space: nowrap">Status :</b>
           </div>
           <div class="col-sm-9 col-md-9 col-lg-9 col-xl-9">
-            <span style="white-space: nowrap" *ngIf="!project?.hasTasks">Not Defined</span>
-            <span style="white-space: nowrap" *ngIf="project?.globalStatus == 'up-to-date' && project?.hasTasks">Up To
-              Date</span>
-            <span style="white-space: nowrap" *ngIf="project?.globalStatus == 'in-progress' && project?.hasTasks">Analysis
-              In Progress</span>
+            <span style="white-space: nowrap" *ngIf="project?.globalStatus == 'none'">Not Data</span>
+            <span style="white-space: nowrap" *ngIf="project?.globalStatus == 'up-to-date' && project?.hasTasks">Up To Date</span>
+            <span style="white-space: nowrap" *ngIf="project?.globalStatus == 'in-progress' && project?.hasTasks">Analysis In Progress</span>
+            <span style="white-space: nowrap" *ngIf="project?.globalStatus == 'error' && project?.hasTasks">Error</span>
           </div>
         </div>
         <div *ngIf="project.homePage" class="row">

diff --git a/administration/scava-administration/src/app/layout/worker/worker.component.html b/administration/scava-administration/src/app/layout/worker/worker.component.html
@@ -88,7 +88,7 @@ <h4 style="margin: 0px;" class="card-title">{{worker.workerId}}</h4>
       </div>
       <div class="card-footer text-right" style="padding: 0.5rem;">
         <div *ngIf="worker.currentTask != null">
-          <button type="submit" queryParamsHandling="merge" (click)="stopTask(worker.currentTask.analysisTaskId)" class="btn btn-outline-dark btn-sm">Interupt
+          <button type="submit" queryParamsHandling="merge" (click)="stopTask(worker.currentTask.analysisTaskId)" class="btn btn-outline-dark btn-sm">Interrupt
             Analysis</button>
         </div>
         <div *ngIf="worker.currentTask == null">