Merge pull request #77 from GSA/bugfix/43_test_flow_failures

Fixing the bugs found in the test flow by downgrading JQuery to 3.5.1.
GSA · Jul 12, 2023 · 6959e41 · 6959e41
2 parents f9be3d3 + 05e91bd
commit 6959e41
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 24 deletions.
diff --git a/src/app/analytics/analytics.component.html b/src/app/analytics/analytics.component.html
@@ -34,7 +34,7 @@ <h1 class="srt-blue analytic-big-title">LAST 30 DAYS</h1>
                                 [ngModel]="selectedGovernment"
                                 (ngModelChange)="onChange($event)"  >
                             <option value="Government-wide" >Government-wide</option>
-                            <option *ngFor="let data of agencyList" >{{data}}</option>
+                            <option *ngFor="let data of agencyList" >{{data.Agency}}</option>
                         </select>
                     </div>
                 </div>

diff --git a/src/app/analytics/line-charts/line-charts.component.ts b/src/app/analytics/line-charts/line-charts.component.ts
@@ -47,8 +47,10 @@ export class LineChartsComponent implements OnInit {
         pointHoverBorderColor: 'rgba(44,129,192,1)',
       }
     },
-    legend: {
-        display: false
+    plugins: {
+      legend: {
+          display: false
+        }
     },
     maintainAspectRatio: false,
     responsive: true,
@@ -102,13 +104,13 @@ export class LineChartsComponent implements OnInit {
         const array = this.TopAgenciesChart.topAgencies[this.selectedGovernment];
 
         if (this.selectedPeriod === 'This Year' || this.selectedPeriod === 'All') {
-          const percentage: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-          const pass: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-          const total: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+          let percentage: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+          let pass: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+          let total: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
           for (const item of this.TopAgenciesChart.topAgencies[this.selectedGovernment])
           {
               if (item.date != null) {
-                  const date = +item.date.split('/')[0];
+                  const date = +item.date.split('-')[1];
                   if (item.predictions.value === 'green') {
                     pass[date - 1]++;
                   }
@@ -134,12 +136,13 @@ export class LineChartsComponent implements OnInit {
           };
           this.xAxis = 'Month';
           this.forceChartRefresh();
-        } else if (this.selectedPeriod === 'This Month') {
+        } 
+        else if (this.selectedPeriod === 'This Month') {
           const indexFrom = 1;
           const indexTo = this.toPeriod.getDate() + 1;
-          const percentage: any[] = [];
-          const pass: any[] = [];
-          const total: any[] = [];
+          let percentage: any[] = [];
+          let pass: any[] = [];
+          let total: any[] = [];
           this.lineChartLabels = [];
           const month = new Date().getMonth() + 1;
           for (let i = 1;  i < indexTo; i ++) {
@@ -148,11 +151,10 @@ export class LineChartsComponent implements OnInit {
             pass.push(0);
             total.push(0);
           }
-
           for (const item of this.TopAgenciesChart.topAgencies[this.selectedGovernment])
           {
-              if (item.date != null) {
-                  const date = +item.date.split('/')[1];
+              if (item.date != null && +item.date.split('-')[1] === month) {
+                  const date = +item.date.split('T')[0].split('-')[2];
                   if (item.predictions.value === 'green') {
                     pass[date - 1]++;
                   }

diff --git a/src/app/analytics/undetermined-solicitations/undetermined-solicitations.component.html b/src/app/analytics/undetermined-solicitations/undetermined-solicitations.component.html
@@ -17,16 +17,16 @@ <h2 class="srt-blue chart">Last 30 Days Excluded Solicitations from SRT Predicti
                   [type]="pieChartType">
           </canvas>
       </div>
-      <div class="undeter-solic-dispaly1" aria-hidden="true">
+      <div *ngIf="displayPresolicitation != '0%'" class="undeter-solic-dispaly1" aria-hidden="true">
             {{displayPresolicitation}}
       </div>
-      <div class="undeter-solic-dispaly2" aria-hidden="true">
+      <div *ngIf="displayNonMachineReadable != '0%'" class="undeter-solic-dispaly2" aria-hidden="true">
             {{displayNonMachineReadable}}
       </div>
-      <div class="undeter-solic-dispaly3" aria-hidden="true">
+      <div *ngIf="displayNoDocument != '0%'" class="undeter-solic-dispaly3" aria-hidden="true">
             {{displayNoDocument}}
       </div>
-      <div class="undeter-solic-dispaly4" aria-hidden="true">
+      <div  *ngIf="displayOtherUndetermined != '0%'" class="undeter-solic-dispaly4" aria-hidden="true">
             {{displayOtherUndetermined}}
       </div>
       <div class="visually-hidden">

diff --git a/src/app/solicitation/solicitation-report/solicitation-report.component.html b/src/app/solicitation/solicitation-report/solicitation-report.component.html
@@ -46,7 +46,7 @@ <h1 class="srt-page-title srt-blue" style="padding-bottom: 5px;"  role="heading"
                                 <span class=" glyphicon glyphicon-search"></span>
                             </button>
                         </span>
-                        <input pInputText id="ksearch" #gb
+                        <input pInputText id="ksearch"
                                type="text"
                                class="search-query form-control"
                                placeholder="search string"

diff --git a/src/index.html b/src/index.html
@@ -9,8 +9,10 @@
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 
   <!-- Latest compiled and minified CSS -->
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">  
-
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+
+<!-- Optional theme -->
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap-theme.min.css" integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
   <script>
       __Zone_enable_cross_context_check = true;
   </script>
@@ -22,10 +24,9 @@
 <body>
   <app-root>Loading...</app-root>
 
-  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
   <!-- Latest compiled and minified JavaScript -->
-  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
-
+  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>  
   <script src="https://use.fontawesome.com/22ad9bb71f.js"></script>