diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-27 02:26:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-27 02:26:15 +0000 |
| commit | bbcfa11445c007015ba3adc2f2e57c8326c68b09 (patch) | |
| tree | d3329f9e7ff47a261e5039fee6e5edf420170b94 | |
| parent | 153008da12c0c4f5e335d2c4e150279a24eb8f29 (diff) | |
| parent | ef49936ac04cf3338f5b157cf2971120d4a18b7d (diff) | |
| download | test_serving-bbcfa11445c007015ba3adc2f2e57c8326c68b09.tar.gz | |
Merge "Display device heartbeat."
| -rw-r--r-- | gae/frontend/src/app/menu/device/device.component.html | 6 | ||||
| -rw-r--r-- | gae/frontend/src/app/menu/device/device.component.ts | 1 | ||||
| -rw-r--r-- | gae/frontend/src/app/model/device.ts | 1 | ||||
| -rw-r--r-- | gae/webapp/src/proto/model.py | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/gae/frontend/src/app/menu/device/device.component.html b/gae/frontend/src/app/menu/device/device.component.html index 2ff28f4..b36491e 100644 --- a/gae/frontend/src/app/menu/device/device.component.html +++ b/gae/frontend/src/app/menu/device/device.component.html @@ -59,6 +59,12 @@ <mat-cell *matCellDef="let device"> {{device.device_equipment ? device.device_equipment.join(", ") : "None"}} </mat-cell> </ng-container> + <!-- Timestamp Column --> + <ng-container matColumnDef="timestamp"> + <mat-header-cell *matHeaderCellDef>Timestamp</mat-header-cell> + <mat-cell *matCellDef="let device">{{getRelativeTime(device.timestamp)}}</mat-cell> + </ng-container> + <mat-header-row *matHeaderRowDef="columnTitles"></mat-header-row> <mat-row *matRowDef="let row; columns: columnTitles;"></mat-row> </mat-table> diff --git a/gae/frontend/src/app/menu/device/device.component.ts b/gae/frontend/src/app/menu/device/device.component.ts index 2fc9a72..6258aed 100644 --- a/gae/frontend/src/app/menu/device/device.component.ts +++ b/gae/frontend/src/app/menu/device/device.component.ts @@ -41,6 +41,7 @@ export class DeviceComponent extends MenuBaseClass implements OnInit { 'status', 'scheduling_status', 'device_equipment', + 'timestamp', ]; dataSource = new MatTableDataSource<Device>(); pageEvent: PageEvent; diff --git a/gae/frontend/src/app/model/device.ts b/gae/frontend/src/app/model/device.ts index 3a6394b..21fdfb7 100644 --- a/gae/frontend/src/app/model/device.ts +++ b/gae/frontend/src/app/model/device.ts @@ -20,4 +20,5 @@ export class Device { scheduling_status: number = void 0; hostname: string = void 0; device_equipment: string[] = void 0; + timestamp: any = void 0; } diff --git a/gae/webapp/src/proto/model.py b/gae/webapp/src/proto/model.py index 375dcc4..4541e68 100644 --- a/gae/webapp/src/proto/model.py +++ b/gae/webapp/src/proto/model.py @@ -237,6 +237,7 @@ class DeviceInfoMessage(messages.Message): scheduling_status = messages.IntegerField(4) hostname = messages.StringField(5) device_equipment = messages.StringField(6, repeated=True) + timestamp = message_types.DateTimeField(7) class HostInfoMessage(messages.Message): |