X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sla%2Ftemplates%2Fslice-tab-sla.html;h=a737577ef137a1742760d895c7dc015c2d336589;hb=5df37d96aa758faa548091932a5d00a76aa16551;hp=c605b6d3c4b77141a720a890e61a535d70d896e4;hpb=c99f1bd98ff355bd3f63b4929739ea5bd92cd6a3;p=myslice.git

diff --git a/sla/templates/slice-tab-sla.html b/sla/templates/slice-tab-sla.html
index c605b6d3..a737577e 100755
--- a/sla/templates/slice-tab-sla.html
+++ b/sla/templates/slice-tab-sla.html
@@ -1,34 +1,15 @@
 
-<div class="col-md-2">
+<div class="col-md-1">
 </div>
 
- <div class="col-md-8">
-   <div class="row" id="agreements">
-    <table class="table dataTable" id="sla_table" >
-        <thead>
-        <tr class="header">
-            <th colspan="2">Provider</th>
-            <!-- <th>Testbed</th>
-            <th>Slice_Id</th>
-            <th>Agreement</th>
-            <th>Metric</th>
-            <th>Violations</th>
-            <th>Result</th> -->
-        </tr>
-        </thead>
-        <tbody>
+ <div class="col-md-10">
+   <div class="row" id="agreements" style="padding-top:1em;">
+    
         
-       <tr class="header">
-       		<td><span class="glyphicon glyphicon-chevron-down"></span></td>
-       		<td>iMinds</td>
-       </tr>
-       
-       
-        {% for a in agreements %}
-
+{% for row in ag_info %}
 
 <!-- Modal - columns selector -->
-<div class="modal fade" id="agreementModal{{a.agreement_id}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="agreementModal{{row.agreement.agreement_id}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   			
 <style type="text/css" scoped>
         .modal-lg {
@@ -44,18 +25,24 @@
 			</div>
 			<div class="modal-body">
 
-                 <dt>Agreement Id</dt>
-                 <dd>{{ a.agreement_id|default:"&nbsp;" }}</dd>
-                 <dt>Provider</dt>
-                 <dd>{{ a.context.provider|default:"&nbsp;" }}</dd>
-                 <dt>Consumer</dt>
-                 <dd>{{ a.context.consumer|default:"&nbsp;" }}</dd>
-                 <dt>Service</dt>
-                 <dd>Testbed guarantees 0.99 Uptime rate for 0.99 rate of the resources during the sliver lifetime</dd>
-                 <dt>Testbed</dt>
-                 <dd>{{ a.context.testbed_formatted }}</dd>
-                 <dt>Accepted on:</dt>
-                 <dd>{{ a.context.expirationtime|default:"&nbsp;" }}</dd>
+                <dt>Agreement Id</dt>
+                <dd>{{ row.agreement.agreement_id|default:"&nbsp;" }}</dd>
+                <dt>Provider</dt>
+                <dd>{{ row.provider|default:"&nbsp;" }}</dd>
+                <dt>Experimenter</dt>
+                <dd>{{ row.agreement.context.consumer|default:"&nbsp;" }}</dd>
+                <dt>Service</dt>
+                <dd>Testbed guarantees 0.99 Uptime rate for 0.99 rate of the selected resources</dd>
+                <dt>Testbed</dt>
+                <dd>{{ row.agreement.context.testbed_formatted }}</dd>
+                <dt>Expiration date:</dt>
+                <dd>{{ row.date|default:"&nbsp;" }}</dd>
+
+                <dt>Covered resources:</dt>
+                {% for sliver in row.slivers %}
+                <dd>{{ sliver|default:"&nbsp;" }}</dd>
+                {% endfor %}
+
 			</div>
 			<div class="modal-footer">
  				<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -63,51 +50,50 @@
 		</div>
 	</div>
 </div>
-       
-       <tr>
-       		{% if a.guaranteestatus == "VIOLATED" %}
-       		<td class="glyphicon glyphicon-remove-sign" style="color:red;"></td>
-        	{% else %}
-        	<td class="glyphicon glyphicon-ok-sign" style="color:green;"></td>
-        	{% endif %}
-    		<td>{{ a.context.template_id }}</td>
-            <td>{{ a.context.expirationtime }}</td>
-            <td>
-                {% with a.agreement_id as key %}
-                {% if enforcements.key == false %}
-                  Disabled
-                {% else %}
-                  Enabled
-                {% endif %}
-                {% endwith %}
-            </td>
-            <!-- <td>{{slicename}}</td> -->
-            <td>
-                <!-- <a class="agreement-detail" href="{% url "agreement_details" a.agreement_id %}" data-toggle="modal" data-target="#agreementModal">View Agreement</a> -->
-                <!-- <a class="agreement-detail" href="#" data-agreement="{{ a.agreement_id }}">View Agreement</a> -->
-                <a class="agreement-detail" data-toggle="modal" data-target="#agreementModal{{a.agreement_id}}">View Agreement</a>
-            </td>
-
-            {% for tname,t in a.guaranteeterms.items %}
-            <td> {{ t.servicelevelobjective.kpiname }}</td>
-            <td>
-                {% if t.status == "VIOLATED" %}
-
-                  <!-- <a class="violation-detail" href="{% url "agreement_term_violations" a.agreement_id t.name %}" data-toggle="modal" data-target="#violationModal">View Violations</a>
-                  <a class="violation-detail" href="#"
-                  			data-agreement="{{ a.agreement_id }}" 
-                  			data-violation="{{ t.name }}">View Violations</a> -->
-                  <a class="violation-detail" href="#" data-agreement="{{ a.agreement_id }}" data-violation="{{ t.name }}">View Violations</a>
-
-                {% endif %}
-            </td>
-            <td id="status" style="display:none;">
-                {{ a.statusclass }}
-            </td>
-            {% endfor %}
+
+{% endfor %}
+
+      <table class="table table-striped table-bordered" id="sla_table">
+      
+        <thead>
+          <tr> 
+            <th>Provider</th>
+            <th>Agreement</th>
+            <th>Date</th>
+            <th>Status</th>
+            <th>Result</th>
+          </tr>
+        </thead>
+
+        <tbody>
+        {% for row in ag_info %}
+
+        <tr>
+        	
+          <td>{{ row.provider }}</td>
+
+          <td><a class="agreement-detail" data-toggle="modal" data-target="#agreementModal{{row.agreement.agreement_id}}">{{ row.agreement.agreement_id }}</a></td>
+    		  
+          <td>{{ row.date }}</td>
+          <td>{{ row.status }}</td>
+          {% if row.ok == "true" %}
+          <td class="success">99% uptime for {{ row.result }}% resources</td>
+          {% elif row.ok == "false" %}
+          <td class="danger">99% uptime for {{ row.result }}% resources</td>
+          {% else %}
+          <td></td>
+          {% endif %}
+          <!-- {% if row.ok == "false" %}
+          <td class="glyphicon glyphicon-remove-sign" style="color:red;"></td>
+          {% elif row.ok == "true" %}
+          <td class="glyphicon glyphicon-ok-sign" style="color:green;"></td>
+          {% else %}
+          <td></td>
+          {% endif %} -->
+
+          
         </tr>
         
-        {% empty %}
         {% endfor %}
         </tbody>
 
@@ -120,6 +106,17 @@
 
 <script>
 $(document).ready(function() {
+
+  $('#sla_table').dataTable({
+        "aoColumns": [
+            null,
+            null,
+            null,
+            null,
+            { "orderSequence": [ "desc", "asc" ] }
+        ]
+    });
+
 	$('a.violation-detail').click(function () {
 		var a = $(this).data('agreement');
 		var v = $(this).data('violation');