X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=instancehandler%2Ftemplate%2Finstance_operations_list.html;h=a9d12cba348f1700a38b7ad4a73b0b3477ca2c3d;hb=refs%2Fchanges%2F14%2F8414%2F1;hp=7e846581752194d2e7e8d86b728eb78bb347dfda;hpb=4908f382154fddb84d72ce8d516229649c01b606;p=osm%2FLW-UI.git

diff --git a/instancehandler/template/instance_operations_list.html b/instancehandler/template/instance_operations_list.html
index 7e84658..a9d12cb 100644
--- a/instancehandler/template/instance_operations_list.html
+++ b/instancehandler/template/instance_operations_list.html
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "base.html" %}
 {% load get %}
 {% load date_tag %}
@@ -8,13 +24,13 @@
 {% block head_block %}
     {{ block.super }}
     <!-- Codemirror core CSS -->
-    <link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css" />
-    <link rel="stylesheet" href="/static/bower_components/codemirror/theme/neat.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/dialog/dialog.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/display/fullscreen.css">
-    <link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
-        <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css" />
+    <link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css">
+    <link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
+        <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 
 {% endblock %}
 {% block title_header_big %}
@@ -28,7 +44,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 +56,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">
@@ -70,22 +86,22 @@
 {% block resource_block %}
     {{ block.super }}
     <!-- Utility JS -->
-    <script src="/static/bower_components/select2/dist/js/select2.js"></script>
-    <script src="/static/bower_components/codemirror/lib/codemirror.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldcode.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldgutter.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/brace-fold.js"></script>
-    <script src="/static/bower_components/codemirror/mode/javascript/javascript.js"></script>
-    <script src="/static/bower_components/codemirror/addon/search/searchcursor.js"></script>
-    <script src="/static/bower_components/codemirror/addon/search/search.js"></script>
-    <script src="/static/bower_components/codemirror/addon/dialog/dialog.js"></script>
-    <script src="/static/bower_components/codemirror/addon/display/autorefresh.js"></script>
-    <script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js"></script>
-    <script src="/static/bower_components/codemirror/addon/edit/closebrackets.js"></script>
-    <script src="/static/bower_components/codemirror/addon/display/fullscreen.js"></script>
-    <script src="/static/bower_components/codemirror/keymap/sublime.js"></script>
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/select2/dist/js/select2.js"></script>
+    <script src="/static/node_modules/codemirror/lib/codemirror.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldcode.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js"></script>
+    <script src="/static/node_modules/codemirror/mode/javascript/javascript.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/searchcursor.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/search.js"></script>
+    <script src="/static/node_modules/codemirror/addon/dialog/dialog.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/autorefresh.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/fullscreen.js"></script>
+    <script src="/static/node_modules/codemirror/keymap/sublime.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
     <script src="/static/src/instancehandler/instance_operations_list.js"></script>
 
     <script>
@@ -139,13 +155,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
                 },
@@ -153,15 +169,17 @@
                     "render": function (data, type, row) {
                         return '<div class="btn-group">\n' +
                             '     <button type="button" class="btn btn-default"\n' +
-                            '             onclick="javascript:showOperationDetails(\''+row["nsInstanceId"]+'\', \''+row["_id"]+'\')"\n' +
+                            '             onclick="javascript:showOperationDetails(\''+instance_type+'\', \''+instance_id+'\', \''+row["_id"]+'\')"\n' +
                             '             data-toggle="tooltip" data-placement="top" data-container="body" title="Show Info">\n' +
                             '         <i class="fa fa-info"></i>\n' +
                             '     </button>\n' +
                             ' </div>';
                     },
-                    "targets": 5
+                    "targets": 5,
+                    "orderable": false
                 }
-                ]
+                ],
+                "order": [[ 3, "asc" ]]
             });
 
 
@@ -176,4 +194,4 @@
 
 {% block footer %}
     {% include "footer.html" %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}