Merge branch 'staging' of github.com:amosproj/amos-ss2021-is-project-…

…linter into staging
amosproj · Jun 9, 2021 · 0228a8b · 0228a8b
2 parents fe32732 + 8c580ce
commit 0228a8b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html
@@ -41,19 +41,23 @@
 <mat-tab-group mat-align-tabs="center" color="accent">
   <mat-tab label="Repositories">
     <mat-card>
-      <mat-card-title>Filter Repositories nach:</mat-card-title>
-      <mat-card-content style="background-color:white; height: 100px;">
+      <mat-card-title>Sortiere Projekte nach:<mat-icon matTooltip="Bitte wählen Sie mindestens eine Kategorie und ein Sortierkriterium" style=" padding-left: 10px;" color="primary">
+        info
+      </mat-icon></mat-card-title>
+      <div style="font-size: large;">Kategorie:</div>
+      <mat-card-content style="background-color:white; height: 100px; padding-left: 3%;">
         <mat-chip-list selectable multiple [formControl]="chipsControl">
           <mat-chip #chip="matChip"   (click)="chip.toggleSelected(true)" *ngFor="let option of getChipOptions()" [value]="option">
             <mat-icon *ngIf="chip.selected" color="accent">check</mat-icon>
             {{option}}
           </mat-chip>
         </mat-chip-list>
         <br />
-        <div>Value: {{chipsValue$ | async}}</div>
+        <!-- <div>Wert: {{chipsValue$ | async}}</div> -->
       </mat-card-content>
 
-      <mat-card-content style="background-color:white; height: 100px;">
+      <div style="font-size: large;">Sortierkriterium:</div>
+      <mat-card-content style="background-color:white; height: 100px; padding-left: 3%;">
         <mat-radio-group
         aria-labelledby="example-radio-group-label"
         class="example-radio-group"
@@ -65,7 +69,7 @@
       </mat-card-content>
       <!-- kategorie.value == bestandene_tests_pro_kategorie-->
       <button mat-raised-button [disabled]=" chipsControl.value.length == 0 ||  searchCriteria.value.length == 0 "
-        (click)="sortProjects()" >Filter</button>
+        (click)="sortProjects()">Sortieren</button>
       <mat-icon matTooltip="{{filterInfo}}" style=" padding-left: 10px;" color="primary">
         info
       </mat-icon>
@@ -113,7 +117,7 @@
   <mat-tab label="Statistiken">
     <mat-card-content
       style="background-color: white; height: 10%; padding-top: 3%; padding-left: 2%; font-size: large; padding-bottom: 2%; border-bottom: 2px solid lightgray">
-      Datenbank als CSV exportieren: <a download href={{csvExportLink}}>download</a>
+      Ergebnisse des Crawlers als .csv exportieren: <a mat-raised-button download href={{csvExportLink}} color="primary">Download</a>
     </mat-card-content>
 
     <!----Footer of statistics-->

diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
@@ -39,7 +39,7 @@ export class AppComponent implements OnInit {
     'Neue bestandene Tests in den letzten 30 Tagen',
   ];
   chipOptions: string[];
-  filterInfo = 'Momentan sortierts nach Tag: - und Kategorie: -';
+  filterInfo = 'Momentan sortiert nach Kategorie: - und Sortierkriterium: -';
   toggleToTrue = true;
   csvExportLink = environment.baseURL + '/export/csv';
 
@@ -228,14 +228,14 @@ export class AppComponent implements OnInit {
     this.all_projects = this.init_all_projects.slice();
 
     //aktualisiere die Filter Info
-    this.filterInfo = 'Momentan sortiert nach Tag: ';
+    this.filterInfo = 'Momentan sortiert nach Kategorie: ';
     for (var i = 0; i < this.chipsControl.value.length; i++) {
       this.filterInfo += this.chipsControl.value[i];
       if (i != this.chipsControl.value.length - 1) {
         this.filterInfo += ', ';
       }
     }
-    this.filterInfo += ' und Kategorie: ' + this.searchCriteria.value;
+    this.filterInfo += ' und Sortierkriterium: ' + this.searchCriteria.value;
 
     this.removeAllProjectsFromOverview();