Skip to content
Snippets Groups Projects
Commit a37df5f3 authored by Janet Goldstein's avatar Janet Goldstein
Browse files

WS-769: show current version in UI mockup

parent 60924f04
No related branches found
No related tags found
1 merge request!626WS-769: show current version in UI mockup
Pipeline #3542 passed
......@@ -30,7 +30,7 @@ export class TestDataService {
}
Init(): Promise<any> {
return new Promise<void>((resolve, reject) => {
return new Promise<void>((resolve) => {
const users: Array<User> = [
{name: 'Drew Medlin', email: 'dmedlin@nrao.edu', role: 'admin', id: 1},
{name: 'Rachel Roberts', email: 'rroberts@nrao.edu', role: 'DA', id: 2},
......@@ -42,6 +42,8 @@ export class TestDataService {
const jobs: Array<Job> = [
{
requestId: 1,
currentVersion: 2,
state: "Created",
sdmId: "13B-014.sb12345.eb98765",
obsDate: "2016-08-23",
bands: ["C", "D", "B"],
......@@ -50,6 +52,8 @@ export class TestDataService {
},
{
requestId: 2,
currentVersion: 2,
state: "Complete",
sdmId: "14A-000.sb12345.eb98765",
obsDate: "2016-11-01",
bands: ["C"],
......@@ -58,6 +62,8 @@ export class TestDataService {
},
{
requestId: 3,
currentVersion: 1,
state: "Submitted",
sdmId: "13B-014.sb12345.eb98765",
obsDate: "2016-08-23",
bands: ["C", "D", "B"],
......@@ -66,6 +72,8 @@ export class TestDataService {
},
{
requestId: 4,
currentVersion: 3,
state: "Cancelled",
sdmId: "20A-465.sb34343.eb98765.23984239",
obsDate: "2016-08-23",
bands: ["C", "D", "B"],
......@@ -74,6 +82,8 @@ export class TestDataService {
},
{
requestId: 5,
currentVersion: 1,
state: "Failed",
sdmId: "19B-324.sb38254745.eb38257021.59004",
obsDate: "2020-06-19",
bands: ["D"],
......
<div class="row border-bottom py-2" *ngIf="job">
<div class="col-1">
{{ job.requestId }}
</div>
<div class="col">
{{job.sdmId}}
</div>
<div class="col-1">
{{job.bands}}
</div>
<div class="col-2">
{{job.obsDate}}
</div>
<div class="col-1">
{{job.arrayConfiguration}}
</div>
<div class="col-1">
{{ job.srdp }}
</div>
<div class="container-fluid">
<div class="row border-bottom py-2" *ngIf="job">
<div class="col-1">
{{ job.requestId }}
</div>
<div class="col-1">
{{ job.currentVersion }}
</div>
<div class="col-1">
{{ job.state }}
</div>
<div class="col text-sm-left">
{{job.sdmId}}
</div>
<div class="col-1">
{{job.bands}}
</div>
<div class="col-2">
{{job.obsDate}}
</div>
<div class="col-1">
{{job.arrayConfiguration}}
</div>
<div class="col-1">
{{ job.srdp }}
</div>
</div>
</div>
<div class="row bg-light py-2 border-bottom font-weight-bold">
<div class="col-1">
Request ID
</div>
<div class="col">
SDM ID
</div>
<div class="col-1">
Bands
</div>
<div class="col-2">
Observation Date
</div>
<div class="col-1">
Config
</div>
<div class="col-1">
SRDP?
<div class="container-fluid">
<div class="row bg-light py-2 border-bottom font-weight-bold">
<div class="col-1">
Request ID
</div>
<div class="col-1">
Current Version
</div>
<div class="col-2">
State
</div>
<div class="col">
SDM ID
</div>
<div class="col-1">
Bands
</div>
<div class="col-2">
Observation Date
</div>
<div class="col-1">
Config
</div>
<div class="col-1">
SRDP?
</div>
</div>
</div>
<app-job-item *ngFor="let job of jobs" [job]="job">
</app-job-item>
......@@ -19,13 +19,16 @@
export class Job {
static _id: number = 0;
requestId: number;
currentVersion: number;
state: string;
sdmId: string | undefined;
obsDate: string | undefined;
bands: Array<string> | undefined = [];
arrayConfiguration: string | undefined;
srdp: boolean | undefined;
constructor(requestId?: number) {
constructor(requestId?: number, state?: string, currentVersion?: number,) {
if (requestId ) {
Job._id = requestId > Job._id ? requestId : Job._id;
} else {
......@@ -33,5 +36,15 @@ export class Job {
requestId = ++Job._id;
}
this.requestId = requestId;
if (currentVersion) {
if (this.currentVersion < currentVersion) {
this.currentVersion = currentVersion
}
}
if (state) {
this.state = state;
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment