From 5df9c2d914e0b8bd6ade407a799fd6c159e54deb Mon Sep 17 00:00:00 2001 From: Eoin Hanan Date: Wed, 5 Dec 2018 11:34:22 +0000 Subject: [PATCH] Changes to UI Time Variables Change-Id: If1289c7a7addf032b6c8d98fd58fca92ffcd5a7c Issue-ID: SO-1265 Signed-off-by: Eoin Hanan --- .../src/app/details/details.component.html | 202 +++++----- .../main/frontend/src/app/home/home.component.html | 406 ++++++++++----------- 2 files changed, 304 insertions(+), 304 deletions(-) diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/details/details.component.html b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/details/details.component.html index 45301c7945..a98095ca00 100644 --- a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/details/details.component.html +++ b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/details/details.component.html @@ -1,101 +1,101 @@ - - -
-
-
- - Process Information -
- Process Instance Id: - {{ processInstanceID }} -
- Process Definition Id: - {{ processDefinitionID }} -
- Process Definition Name: - {{ processDefinitionName }} -
-
-
- -
- - - - - Activity Id - {{ activity.activityId }} - - - Activity Name - - - - - - Activity Type - {{ activity.activityType }} - - - Start Time - {{ activity.startTime }} - - - End Time - {{ activity.endTime }} - - - Duration (ms) - {{ activity.durationInMillis }} - - - - - - - - - - Name - {{ variable.name }} - - - Type - {{ variable.type }} - - - Value - {{ variable.value }} - - - - - - -
-
- - + + +
+
+
+ + Process Information +
+ Process Instance Id: + {{ processInstanceID }} +
+ Process Definition Id: + {{ processDefinitionID }} +
+ Process Definition Name: + {{ processDefinitionName }} +
+
+
+ +
+ + + + + Activity Id + {{ activity.activityId }} + + + Activity Name + + + + + + Activity Type + {{ activity.activityType }} + + + Start Time + {{ (activity.startTime | date:'yyyy-MM-dd HH:mm:sss Z') }} + + + End Time + {{ (activity.endTime | date:'yyyy-MM-dd HH:mm:sss Z') }} + + + Duration (ms) + {{ activity.durationInMillis }} + + + + + + + + + + Name + {{ variable.name }} + + + Type + {{ variable.type }} + + + Value + {{ variable.value }} + + + + + + +
+
+ + diff --git a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/home/home.component.html b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/home/home.component.html index 2b580e26a1..e4556ca840 100644 --- a/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/home/home.component.html +++ b/so-monitoring/so-monitoring-ui/src/main/frontend/src/app/home/home.component.html @@ -1,203 +1,203 @@ - - - - - - -
-
- - -
- - - {{option.name}} - - - - - -
- - -
- - - {{option.name}} - - - - - - - - - - - - - - - - - {{option}} - - - - - - - {{option}} - - -
- - -
- - - {{option.name}} - - - - - - - - - - - - - - - - - {{option}} - - - - - - - {{option}} - - -
- - -
- - - {{ statusOption.name }} - - -
-
- - - -
- -
- - -
- - - - - Request Id - {{ process.requestId }} - - - Instance Id - {{ process.serviceInstanceId }} - - - Instance Name - {{ process.serviceIstanceName }} - - - Network Id - {{ process.networkId }} - - - Request Status - {{ process.requestStatus }} - - - Service Type - {{ process.serviceType }} - - - Start Time - {{ process.startTime }} - - - End Time - {{ process.endTime }} - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Total: {{ totalVal }}
Complete: {{ completeVal }} {{ percentageComplete }}%
Failed: {{ failedVal }} {{ percentageFailed }}%
In Progress: {{ inProgressVal }} {{ percentageInProg }}%
Pending: {{ pendingVal }} {{ percentagePending }}%
Unlocked: {{ unlockedVal }} {{ percentageUnlocked }}%
-
-
-
-
-
- - - + + + + + + +
+
+ + +
+ + + {{option.name}} + + + + + +
+ + +
+ + + {{option.name}} + + + + + + + + + + + + + + + + + {{option}} + + + + + + + {{option}} + + +
+ + +
+ + + {{option.name}} + + + + + + + + + + + + + + + + + {{option}} + + + + + + + {{option}} + + +
+ + +
+ + + {{ statusOption.name }} + + +
+
+ + + +
+ +
+ + +
+ + + + + Request Id + {{ process.requestId }} + + + Instance Id + {{ process.serviceInstanceId }} + + + Instance Name + {{ process.serviceIstanceName }} + + + Network Id + {{ process.networkId }} + + + Request Status + {{ process.requestStatus }} + + + Service Type + {{ process.serviceType }} + + + Start Time + {{ (process.startTime | date:'yyyy-MM-dd HH:mm:sss Z') }} + + + End Time + {{ (process.endTime | date:'yyyy-MM-dd HH:mm:sss Z') }} + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Total: {{ totalVal }}
Complete: {{ completeVal }} {{ percentageComplete }}%
Failed: {{ failedVal }} {{ percentageFailed }}%
In Progress: {{ inProgressVal }} {{ percentageInProg }}%
Pending: {{ pendingVal }} {{ percentagePending }}%
Unlocked: {{ unlockedVal }} {{ percentageUnlocked }}%
+
+
+
+
+
+ + + -- 2.16.6