From d4d8039297bb2399cf94a81ee5afcf4f2ae80146 Mon Sep 17 00:00:00 2001
From: Nile Walker <niwal7@morgan.edu>
Date: Mon, 1 Feb 2021 08:36:38 -0500
Subject: [PATCH] Readded Test Inclusion

---
 src/app/app.module.ts                |  2 ++
 src/app/graphs/graphs.component.css  |  7 ++++---
 src/app/graphs/graphs.component.html | 17 +++++++++--------
 src/app/graphs/graphs.component.ts   |  1 +
 src/app/services/graph.service.ts    |  1 +
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index d558fd7..a2af765 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,6 +4,7 @@ import {NgModule} from '@angular/core';
 import {FlexLayoutModule} from '@angular/flex-layout';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {MatButtonModule} from '@angular/material/button';
+import {MatCheckboxModule} from '@angular/material/checkbox';
 import {MatCardModule} from '@angular/material/card';
 import {MatOptionModule} from '@angular/material/core';
 import {MAT_FORM_FIELD_DEFAULT_OPTIONS, MatFormFieldModule} from '@angular/material/form-field';
@@ -98,6 +99,7 @@ export function getBaseHref(platformLocation: PlatformLocation): string {
     MatGridListModule,
     MatTableModule,
     MatNativeDateModule,
+    MatCheckboxModule,
     BrowserModule,
     ChartsModule,
     BrowserAnimationsModule,
diff --git a/src/app/graphs/graphs.component.css b/src/app/graphs/graphs.component.css
index f1a6c00..be9ccf6 100644
--- a/src/app/graphs/graphs.component.css
+++ b/src/app/graphs/graphs.component.css
@@ -4,13 +4,16 @@
 
   align-items: center;
 }
+
 .flex-grid .col {
   flex: 1;
 }
+
 .flex-grid-thirds {
   display: flex;
   justify-content: space-between;
 }
+
 .flex-grid-thirds .col {
   width: 32%;
 }
@@ -26,10 +29,10 @@
   }
 }
 
-
 * {
   box-sizing: border-box;
 }
+
 mat-form-field {
   margin: 20px;
 }
@@ -38,7 +41,6 @@ mat-card {
   margin: 20px;
 }
 
-
 body {
   padding: 20px;
 }
@@ -46,7 +48,6 @@ body {
   margin: 0 20px 20px 0;
 }
 .col {
-  /* background: salmon; */
   padding: 20px;
 }
 
diff --git a/src/app/graphs/graphs.component.html b/src/app/graphs/graphs.component.html
index 3930a2b..f8ec308 100644
--- a/src/app/graphs/graphs.component.html
+++ b/src/app/graphs/graphs.component.html
@@ -43,6 +43,9 @@
     <div class="flex-grid">
       <div class="col">
         <h1>Search</h1>
+        <br>
+        <mat-checkbox [(ngModel)]="form.include_tests">Include Tests</mat-checkbox>
+
       </div>
       <div class="col">
         <button mat-raised-button class="btn-lg" color="primary" (click)="searchToday()">Today</button>
@@ -74,18 +77,17 @@
       <div class="col">
         <mat-form-field>
           <mat-label>Student ID(s)</mat-label>
-          <textarea matInput [(ngModel)]="form.student_id" placeholder="Ex. It makes me feel..."></textarea>
+          <textarea matInput [(ngModel)]="form.student_id" placeholder="Ex. 00224483"></textarea>
         </mat-form-field>
       </div>
 
       <div class="col">
         <mat-form-field>
           <mat-label>Compute ID(s)</mat-label>
-          <textarea matInput [(ngModel)]="form.compute_id" placeholder="Ex. It makes me feel..."></textarea>
+          <textarea matInput [(ngModel)]="form.compute_id" placeholder="Ex. ECC8Z"></textarea>
         </mat-form-field>
       </div>
     </div>
-
   </mat-card>
 
   <div class="flex-grid">
@@ -95,9 +97,10 @@
       </mat-card-header>
 
       <div style="display: block">
-      <canvas baseChart [datasets]="dailyChartsData" [labels]="dailyChartLabels" [options]="barChartOptions"
-        [legend]="true" chartType="bar" (chartClick)="chartClicked($event)">
-      </canvas></div>
+        <canvas baseChart [datasets]="dailyChartsData" [labels]="dailyChartLabels" [options]="barChartOptions"
+          [legend]="true" chartType="bar" (chartClick)="chartClicked($event)">
+        </canvas>
+      </div>
     </mat-card>
 
     <mat-card class="col">
@@ -122,9 +125,7 @@
           [legend]=false chartType="horizontalBar">
         </canvas>
       </div>
-
     </mat-card>
-
   </div>
 
   <mat-card>
diff --git a/src/app/graphs/graphs.component.ts b/src/app/graphs/graphs.component.ts
index 312d298..5776b76 100644
--- a/src/app/graphs/graphs.component.ts
+++ b/src/app/graphs/graphs.component.ts
@@ -118,6 +118,7 @@ export class GraphsComponent implements OnInit {
     this.end_date = new Date();
     this.updateGraphData();
   }
+  
   searchAll(): void {
     this.start_date = new Date(2020,9,5);
     this.end_date = new Date();
diff --git a/src/app/services/graph.service.ts b/src/app/services/graph.service.ts
index cae3854..832387f 100644
--- a/src/app/services/graph.service.ts
+++ b/src/app/services/graph.service.ts
@@ -69,6 +69,7 @@ export class GraphService {
       .set("student_id", form.student_id)
       .set("compute_id", form.compute_id)
       .set("location", form.location)
+      .set("include_tests", String(form.include_tests))
     return params;
   }