Update Notes
Update Notes to include Match Number, Set Number, Comp Level, and No Show
Signed-off-by: Emily Markova <emily.markova@gmail.com>
Change-Id: I26550c0ea32b81bb8124d326cf1bef2bf912886a
diff --git a/scouting/www/view/view.component.ts b/scouting/www/view/view.component.ts
index 8aa3784..d88c25a 100644
--- a/scouting/www/view/view.component.ts
+++ b/scouting/www/view/view.component.ts
@@ -80,9 +80,7 @@
if (!this.ascendingSort) {
this.driverRankingList.sort((a, b) => b.matchNumber() - a.matchNumber());
this.noteList.sort(function (a, b) {
- return b[0]
- .team()
- .localeCompare(a[0].team(), undefined, {numeric: true});
+ return b.team().localeCompare(a.team(), undefined, {numeric: true});
});
this.pitImageList.sort(function (a, b) {
return b[0]
@@ -93,9 +91,7 @@
} else {
this.driverRankingList.sort((a, b) => a.matchNumber() - b.matchNumber());
this.noteList.sort(function (a, b) {
- return b[0]
- .team()
- .localeCompare(a[0].team(), undefined, {numeric: true});
+ return a.team().localeCompare(b.team(), undefined, {numeric: true});
});
this.pitImageList.sort(function (a, b) {
return a[0]
@@ -311,6 +307,9 @@
if (entry.badDriving()) {
parsedKeywords += 'Bad Driving ';
}
+ if (entry.noShow()) {
+ parsedKeywords += 'No Show ';
+ }
if (entry.solidPlacing()) {
parsedKeywords += 'Solid Placing ';
}
diff --git a/scouting/www/view/view.ng.html b/scouting/www/view/view.ng.html
index 14e8c8a..f870178 100644
--- a/scouting/www/view/view.ng.html
+++ b/scouting/www/view/view.ng.html
@@ -71,7 +71,7 @@
</div>
</th>
<th scope="col">Match</th>
- <th scope="col">Note</th>
+ <th scope="col">Notes</th>
<th scope="col">Keywords</th>
<th scope="col"></th>
</tr>
@@ -79,8 +79,7 @@
<tbody>
<tr *ngFor="let note of noteList; index as i;">
<th scope="row">{{note.team()}}</th>
- <!-- Placeholder for match number. -->
- <td>0</td>
+ <th scope="row">{{note.matchNumber()}}</th>
<td>{{note.notes()}}</td>
<td>{{parseKeywords(note)}}</td>
<!-- Delete Icon. -->