diff --git a/src/app/admin/myfiles/myfiles.component.html b/src/app/admin/myfiles/myfiles.component.html index 7f0df9fba7c99dc08d024cf8805b5188c839cc51..b934cbbecd76adfa27cc226989c1998257dd54af 100644 --- a/src/app/admin/myfiles/myfiles.component.html +++ b/src/app/admin/myfiles/myfiles.component.html @@ -53,9 +53,9 @@ <mat-icon>check</mat-icon> </button> - <input #hiddenfileinput type="file" name="fileforopencba" multiple [iqbFileUploadInputFor]="fileUploadQueue" [hidden]="true"/> + <input #hiddenfileinput type="file" name="fileforopencba" multiple [iqbFilesUploadInputFor]="fileUploadQueue" [hidden]="true"/> - <iqb-file-upload-queue #fileUploadQueue + <iqb-files-upload-queue #fileUploadQueue [httpUrl]="uploadUrl" [fileAlias]="fileNameAlias" [tokenName]="'at'" @@ -63,7 +63,7 @@ [folderName]="'ws'" [folder]="workspace" (uploadCompleteEvent)="updateFileList()"> - </iqb-file-upload-queue> + </iqb-files-upload-queue> <p *ngFor="let e of checkErrors" class="checkerror"> {{ e }} diff --git a/src/app/admin/myfiles/myfiles.component.ts b/src/app/admin/myfiles/myfiles.component.ts index 668e8ee3c20e13bc16493bfacfec919c66667332..af2ef10e67d58647c27a32abd11ed133bf6fd662 100644 --- a/src/app/admin/myfiles/myfiles.component.ts +++ b/src/app/admin/myfiles/myfiles.component.ts @@ -10,7 +10,7 @@ import { Input, Output, EventEmitter, Component, OnInit, Inject, ElementRef } fr import { NgModule, ViewChild } from '@angular/core'; import { MatSort, MatDialog } from '@angular/material'; import { HttpEventType, HttpErrorResponse, HttpEvent } from '@angular/common/http'; -import { IqbFileUploadQueueComponent, IqbFileUploadInputForDirective } from '../../iqb-files'; +import { IqbFilesUploadQueueComponent, IqbFilesUploadInputForDirective } from '../../iqb-files'; @Component({ diff --git a/src/app/admin/results/results.component.html b/src/app/admin/results/results.component.html index c1275b76c79d663aa1ee9132e80fca83197cbd75..199630158eb736e98147d7dae408538c66997314 100644 --- a/src/app/admin/results/results.component.html +++ b/src/app/admin/results/results.component.html @@ -1,5 +1,10 @@ <table mat-table [dataSource]="groupStats" matSort class="mat-elevation-z8"> + + <ng-container matColumnDef="check"> + <th mat-header-cell *matHeaderCellDef mat-sort-header>Select</th> + <td mat-cell *matCellDef="let element"><mat-checkbox></mat-checkbox></td> + </ng-container> <ng-container matColumnDef="name"> <th mat-header-cell *matHeaderCellDef mat-sort-header>Group Name</th> @@ -23,10 +28,15 @@ <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> +</table> + + + + + + -</table> -<button name="downloadButton" mat-raised-button>Download to CSV</button> diff --git a/src/app/admin/results/results.component.ts b/src/app/admin/results/results.component.ts index 618c7c423d6f9f4898060f593650f0c83ebe6939..b14c578b4863911d8e3d0e7889956d155c51c4e4 100644 --- a/src/app/admin/results/results.component.ts +++ b/src/app/admin/results/results.component.ts @@ -8,7 +8,7 @@ import { MatSnackBar, MatSort, MatTableDataSource } from '@angular/material'; styleUrls: ['./results.component.css'] }) export class ResultsComponent implements OnInit { - displayedColumns: string[] = ['name', 'testsTotal', 'testsStarted', 'responsesGiven']; + displayedColumns: string[] = ['check', 'name', 'testsTotal', 'testsStarted', 'responsesGiven']; private groupStats = new MatTableDataSource<GroupResponse>([]); private isAdmin = false; private downloadButton = Object;