Scheduler2: display nodes, each new_record create a row, to be optimized may require...

diff --git a/plugins/scheduler2/static/css/scheduler2.css b/plugins/scheduler2/static/css/scheduler2.css
index 1133433..d58f6d8 100755 (executable)
--- a/plugins/scheduler2/static/css/scheduler2.css
+++ b/plugins/scheduler2/static/css/scheduler2.css
@@ -93,7 +93,8 @@
     border-spacing: 0;\r
     max-width: 500px;\r
     width: 450px;\r
-    margin-top:55px;\r
+    margin-top: 6px !important;\r
+    /* margin-top:55px; */\r
 }\r
 \r
 #ShedulerNodes th{\r

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 7c6c323..f883002 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -78,6 +78,7 @@ var schdlr_PartsInOneHour = 6;
             //this.listen_query(options.query_lease_uuid, 'lease');\r
             if (Debug) console.timeEnd("Listening_to_queries");\r
 \r
+            $("#ShedulerNodes tbody").html('<tr><td id="schdlr_frstTD" style="background:transparent; height:45px; border:none;"></td></tr>');\r
         },\r
 \r
         /* PLUGIN EVENTS */\r
@@ -101,7 +102,8 @@ var schdlr_PartsInOneHour = 6;
             // same output as a jquery selector with some guarantees\r
         },\r
 \r
-        drawResources: function () {\r
+        //drawResources: function () {\r
+        drawLeases: function () {\r
             \r
             //if (Debug) this.debug('foo');\r
             if (Debug) console.time("each:SchedulerResources");\r
@@ -114,7 +116,7 @@ var schdlr_PartsInOneHour = 6;
             var totalCell = "";\r
             for (var i = 0; i < totalColums; i++) totalCell +="<td></td>"; \r
             var srt_body = "";\r
-            \r
+            /*\r
             $.each(SchedulerResources, function (i, group) {\r
                 console.log(group.groupName);\r
                 //var groupTR = $("#ShedulerNodes tbody").html('<tr><td class="no-image verticalIndex" rowspan="' + group.resources.length + '"><div class="verticalText">' + group.groupName + '</div></td><td id="schdlr_frstTD" class="info fixed"></td></tr>');\r
@@ -135,9 +137,10 @@ var schdlr_PartsInOneHour = 6;
                     //srt_body.push('<tr>'); srt_body = srt_body.concat(totalCell.concat()); srt_body.push('/<tr>');\r
                 });\r
             });\r
-\r
+            */\r
+            srt_body += "<tr>" + totalCell + "</tr>";\r
             //$("#scheduler-reservation-table tbody").html(srt_body.join(""));\r
-            $("#scheduler-reservation-table tbody").html(srt_body);\r
+            $("#scheduler-reservation-table tbody").append(srt_body);\r
 \r
             if (Debug) console.timeEnd("each:SchedulerResources");\r
             \r
@@ -185,6 +188,8 @@ var schdlr_PartsInOneHour = 6;
             //data is empty on load\r
         },\r
         on_all_resources_new_record: function (data) {\r
+            $("#ShedulerNodes tbody").find("tr:last").after('<tr><td class="info fixed">' + data.urn + '</td></tr>');\r
+            this.drawLeases();\r
             //console.log(data);\r
             var tmpGroup = lookup(SchedulerResources, 'groupName', data.type);\r
             if (tmpGroup == null) {\r
@@ -196,7 +201,7 @@ var schdlr_PartsInOneHour = 6;
             //alert('new_record');\r
         },\r
         on_all_resources_query_done: function (data) {\r
-            this.drawResources();\r
+            //this.drawResources();\r
             //data is empty on load\r
             /* GUI setup and event binding */\r
             this._initUI();\r

diff --git a/portal/templates/onelab/onelab_slice-resource-view.html b/portal/templates/onelab/onelab_slice-resource-view.html
index 8cb357b..f92a1a3 100644 (file)
--- a/portal/templates/onelab/onelab_slice-resource-view.html
+++ b/portal/templates/onelab/onelab_slice-resource-view.html
@@ -10,6 +10,7 @@
 
 {% block content %}
        <div class="col-md-2">
+        test
                <div id="select-platform" class="list-group">
                </div>
                        
@@ -63,7 +64,7 @@
                 {{map_resources}}
                        </div>
                        <div id="scheduler-tab" class="panel" style="height:370px;display:none;">
-                {{scheduler_leases}}
+                {{scheduler_lease}}
                        </div>
                        <div id="pending" class="panel" style="height:370px;display:none;">
                 {{pending_resources}}