Skip to content

Commit 6959e41

Browse files
gsa-brigsa-bri
authored
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.
2 parents f9be3d3 + 05e91bd commit 6959e41

5 files changed

Lines changed: 27 additions & 24 deletions

File tree

‎src/app/analytics/analytics.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1 class="srt-blue analytic-big-title">LAST 30 DAYS</h1>
3434
[ngModel]="selectedGovernment"
3535
(ngModelChange)="onChange($event)" >
3636
<option value="Government-wide" >Government-wide</option>
37-
<option *ngFor="let data of agencyList" >{{data}}</option>
37+
<option *ngFor="let data of agencyList" >{{data.Agency}}</option>
3838
</select>
3939
</div>
4040
</div>

‎src/app/analytics/line-charts/line-charts.component.ts‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ export class LineChartsComponent implements OnInit {
4747
pointHoverBorderColor: 'rgba(44,129,192,1)',
4848
}
4949
},
50-
legend: {
51-
display: false
50+
plugins: {
51+
legend: {
52+
display: false
53+
}
5254
},
5355
maintainAspectRatio: false,
5456
responsive: true,
@@ -102,13 +104,13 @@ export class LineChartsComponent implements OnInit {
102104
const array = this.TopAgenciesChart.topAgencies[this.selectedGovernment];
103105

104106
if (this.selectedPeriod === 'This Year' || this.selectedPeriod === 'All') {
105-
const percentage: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
106-
const pass: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
107-
const total: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
107+
let percentage: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
108+
let pass: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
109+
let total: any[] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
108110
for (const item of this.TopAgenciesChart.topAgencies[this.selectedGovernment])
109111
{
110112
if (item.date != null) {
111-
const date = +item.date.split('/')[0];
113+
const date = +item.date.split('-')[1];
112114
if (item.predictions.value === 'green') {
113115
pass[date - 1]++;
114116
}
@@ -134,12 +136,13 @@ export class LineChartsComponent implements OnInit {
134136
};
135137
this.xAxis = 'Month';
136138
this.forceChartRefresh();
137-
} else if (this.selectedPeriod === 'This Month') {
139+
}
140+
else if (this.selectedPeriod === 'This Month') {
138141
const indexFrom = 1;
139142
const indexTo = this.toPeriod.getDate() + 1;
140-
const percentage: any[] = [];
141-
const pass: any[] = [];
142-
const total: any[] = [];
143+
let percentage: any[] = [];
144+
let pass: any[] = [];
145+
let total: any[] = [];
143146
this.lineChartLabels = [];
144147
const month = new Date().getMonth() + 1;
145148
for (let i = 1; i < indexTo; i ++) {
@@ -148,11 +151,10 @@ export class LineChartsComponent implements OnInit {
148151
pass.push(0);
149152
total.push(0);
150153
}
151-
152154
for (const item of this.TopAgenciesChart.topAgencies[this.selectedGovernment])
153155
{
154-
if (item.date != null) {
155-
const date = +item.date.split('/')[1];
156+
if (item.date != null && +item.date.split('-')[1] === month) {
157+
const date = +item.date.split('T')[0].split('-')[2];
156158
if (item.predictions.value === 'green') {
157159
pass[date - 1]++;
158160
}

‎src/app/analytics/undetermined-solicitations/undetermined-solicitations.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ <h2 class="srt-blue chart">Last 30 Days Excluded Solicitations from SRT Predicti
1717
[type]="pieChartType">
1818
</canvas>
1919
</div>
20-
<div class="undeter-solic-dispaly1" aria-hidden="true">
20+
<div *ngIf="displayPresolicitation != '0%'" class="undeter-solic-dispaly1" aria-hidden="true">
2121
{{displayPresolicitation}}
2222
</div>
23-
<div class="undeter-solic-dispaly2" aria-hidden="true">
23+
<div *ngIf="displayNonMachineReadable != '0%'" class="undeter-solic-dispaly2" aria-hidden="true">
2424
{{displayNonMachineReadable}}
2525
</div>
26-
<div class="undeter-solic-dispaly3" aria-hidden="true">
26+
<div *ngIf="displayNoDocument != '0%'" class="undeter-solic-dispaly3" aria-hidden="true">
2727
{{displayNoDocument}}
2828
</div>
29-
<div class="undeter-solic-dispaly4" aria-hidden="true">
29+
<div *ngIf="displayOtherUndetermined != '0%'" class="undeter-solic-dispaly4" aria-hidden="true">
3030
{{displayOtherUndetermined}}
3131
</div>
3232
<div class="visually-hidden">

‎src/app/solicitation/solicitation-report/solicitation-report.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h1 class="srt-page-title srt-blue" style="padding-bottom: 5px;" role="heading"
4646
<span class=" glyphicon glyphicon-search"></span>
4747
</button>
4848
</span>
49-
<input pInputText id="ksearch" #gb
49+
<input pInputText id="ksearch"
5050
type="text"
5151
class="search-query form-control"
5252
placeholder="search string"

‎src/index.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
<link rel="icon" type="image/x-icon" href="favicon.ico">
1010

1111
<!-- Latest compiled and minified CSS -->
12-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
13-
12+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
13+
14+
<!-- Optional theme -->
15+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap-theme.min.css" integrity="sha384-6pzBo3FDv/PJ8r2KRkGHifhEocL+1X2rVCTTkUfGk7/0pbek5mMa1upzvWbrUbOZ" crossorigin="anonymous">
1416
<script>
1517
__Zone_enable_cross_context_check = true;
1618
</script>
@@ -22,10 +24,9 @@
2224
<body>
2325
<app-root>Loading...</app-root>
2426

25-
<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>
27+
<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>
2628
<!-- Latest compiled and minified JavaScript -->
27-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
28-
29+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
2930
<script src="https://use.fontawesome.com/22ad9bb71f.js"></script>
3031

3132

0 commit comments

Comments
 (0)