operation history fix
Change-Id: I6d743f1a19558b3ad69293d8d055213a351b2796
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/instancehandler/template/instance_list.html b/instancehandler/template/instance_list.html
index 97eac57..4ba6fe0 100644
--- a/instancehandler/template/instance_list.html
+++ b/instancehandler/template/instance_list.html
@@ -164,7 +164,7 @@
' <i class="fa fa-magic"></i> Exec NS Primitive</a></li>' +
' <li>' +
' <a href="/instances/ns/' +row["_id"] +'/operation">' +
- ' <i class="fa fa-list"></i> Active operations</a></li>' +
+ ' <i class="fa fa-list"></i> History of operations</a></li>' +
' <li class="divider"></li>' +
' <li><a href="#"' +
' onclick="javascript:newAlarmNs(\''+ row["short-name"] +'\', \''+row["_id"]+'\')">' +
diff --git a/instancehandler/template/instance_operations_list.html b/instancehandler/template/instance_operations_list.html
index 7e84658..c4b352f 100644
--- a/instancehandler/template/instance_operations_list.html
+++ b/instancehandler/template/instance_operations_list.html
@@ -28,7 +28,7 @@
{% block breadcrumb_body %}
{{ block.super }}
<li><a href="{% url 'instances:list' type=type %}">Instances</a></li>
- <li><a href="#">Operations</a></li>
+ <li><a href="#">History of Operations</a></li>
{% endblock %}
{% block content_body %}
@@ -40,7 +40,7 @@
<div class="box">
<div class="box-header with-border">
- <h3 class="box-title">Active operations</h3>
+ <h3 class="box-title">History of operations</h3>
</div>
<div class="box-body">
@@ -139,13 +139,13 @@
},
{
"render": function (data, type, row) {
- return row["startTime"];
+ return moment.unix(row['startTime']).format('YYYY-MM-DD hh:mm:ss a')
},
"targets": 3
},
{
"render": function (data, type, row) {
- return row["statusEnteredTime"];
+ return moment.unix(row['statusEnteredTime']).format('YYYY-MM-DD hh:mm:ss a')
},
"targets": 4
},