X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fmanagement-tab-requests.html;h=d22bdebb902d4208c5bce12aa2c39a9aceb0a47c;hb=6a3f5d4949171451d5df2df5d0f96e9eb396f29c;hp=eeb84a65456e733a68a59d018c50afb59852845d;hpb=583c62239bbf6be5222e170609e547349389c1c1;p=myslice.git

diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index eeb84a65..d22bdebb 100644
--- a/portal/templates/management-tab-requests.html
+++ b/portal/templates/management-tab-requests.html
@@ -1,6 +1,18 @@
 <script type="text/javascript">
 	$(document).ready(function() {
 		$("li#nav-request").addClass("active");
+		$('table.requests').dataTable({
+		    "sDom": "frtiS",
+            "bScrollCollapse": true,
+            "bStateSave": true,
+            "bPaginate": false,
+            "bLengthChange": false,
+            "bFilter": false,
+            "bSort": true,
+            "bInfo": false,
+            "bAutoWidth": true,
+            "bAutoHeight": false,
+		});
 	});
 	function on_click_event() {
 		var ids = []; 
@@ -40,8 +52,8 @@
 				}
 			);
 		}
-        };
-        function showMore(buttonId, divId){
+     };
+     function showMore(buttonId, divId){
           var element = document.getElementById(buttonId);
           var div_element = document.getElementById(divId);
           if (element.value === '(+)'){
@@ -53,16 +65,71 @@
             $('#'+divId).slideUp('fast');
           }
           return false;
-        }
+     }
+	 function on_click_reject() {
+		var ids = []; 
+		$('.portal__validate__checkbox').each(function(i, el) {
+			if ($(el).prop('checked')) {
+				// portal__validate__checkbox__slice__2
+				var id_array = $(el).attr('id').split('__');
+				// push(slice__2)
+				ids.push(id_array[3] + '__' + id_array[4]);
+			}
+		});
+		if (ids.length > 0) {
+			var id_str = ids.join('/');
+
+			// XXX spinner
+
+			$.getJSON('/portal/reject_action/' + id_str,
+				function(status) {
+					$.each(status, function(request_type__id, request_status) {
+						// request_status: NAME -> dict (status, description)
+						var status_str = '';
+						$.each(request_status, function(name, result) {
+							if (status_str != '')
+								status_str += ' -- ';
+
+							if (result.status) {
+								status_str += '<font color="green">Rejected</font>';
+								$('#portal__validate__checkbox__' + request_type__id).hide();
+							} else {
+								status_str += '<font color="red">ERROR: ' + result.description + '</font>';
+							}
+						});
+						$('#portal__status__' + request_type__id).html(status_str);
+
+
+					});
+				}
+			);
+		}
+	}
 </script>
 
+<div class="container-fluid">
 <div class="col-md-12">
-	<h2>Authorities</h2>
+	<h2>From your authorities</h2>
 </div>
 {% if my_authorities %}
-	
+<div class="col-md-12">
+	<table class="table requests">
+	    <thead>
+        <tr>
+            <th>ID</th>
+            <th></th>
+            <th>Type</th>
+            <th>Authority</th>
+            <th>Info</th>
+            <th>Date</th>
+            <th>Status</th>
+        </tr>
+        </thead>
+        <tbody>
 	{% for authority, requests in my_authorities.items %}
 	{% if authority == pi_authority or authority == "fibre" %}
+
+<!--
 	<div class="col-md-12">
 		<h2>{{authority}}</h2>
 		<table class="table">
@@ -91,14 +158,14 @@
 						<td>{{ request.id }}</td>
 						<td>
 				        	{% if request.type == 'user' %}
-				       		 	Login: {{request.login}} -- First name: {{request.first_name}} -- Last name: {{request.last_name}} -- Email: {{request.email}}
+				       		 	Login: {{request.login}} - First name: {{request.first_name}} - Last name: {{request.last_name}} - Email: {{request.email}}
 							<input type = "button" id = "moreBtn_{{request.id}}" value = "(+)" onclick = "showMore('moreBtn_{{request.id}}','reasons_{{request.id}}')" style="color:blue; padding:0; border:none; background:none">
                 					<div id="reasons_{{request.id}}" style="display:none"> Reasons for Applying:<br> {{request.reasons}} </div> 
 				       		{% else %}
 				            	{% if request.type == 'slice' %}
-				        			Slice name: {{request.slice_name}} -- User_hrn: {{ request.user_hrn }} -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
+				        			Slice name: {{request.slice_name}} - User_hrn: {{ request.user_hrn }} - Number of nodes: {{request.number_of_nodes}} - Type of nodes: {{request.type_of_nodes}} - Purpose: {{request.purpose}}
 				           		{% else %} {# authority #}
-				        			Authority name: {{request.site_name}} -- authority_hrn: {{request.site_authority}} -- City: {{request.address_city}} -- Country: {{request.address_country}}
+				        			Authority name: {{request.site_name}} - authority_hrn: {{request.site_authority}} - City: {{request.address_city}} - Country: {{request.address_country}}
 				            	{% endif %}
 				        	{% endif %}
 						</td>
@@ -106,23 +173,70 @@
 					
 						<td><span id='portal__status__{{request.type}}__{{request.id}}'></span></td>
 
-			    <!--<div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'> -->
+			    <!- <div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'> 
 		    		{% endif %}
 				</tr>
 			{% endfor %}
 		</table>
 	</div>
 	{% endif %}
-	{% endfor %}
+-->
+	
+        {% for request in requests %}
+        
+        {% if request.type == 'user' %}
+    	<tr>
+    	{% elif request.type == 'slice' %}
+    	<tr class="info">
+    	{% else %}
+    	<tr class="active">
+    	{% endif %}
+    	    <td><span class="gray small">{{ request.id }}</span></td>
+    	    <td>
+            {% if request.allowed == 'allowed' %}
+            <input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
+            {% else %}
+                {% if request.allowed == 'expired' %}expired{% else %}denied{% endif %}
+            {% endif %}
+            </td>
+            <td><span class="type">{{ request.type }}</span></td>
+    	    <td><i>{{authority}}{{request.site_authority}}</i></td>
+    		<td>
+            {% if request.type == 'user' %}
+                <b>{{request.first_name}} {{request.last_name}}</b> &lt;<a href="mailto:{{request.email}}">{{request.email}}</a>&gt;
+    			<input type = "button" id = "moreBtn_{{request.id}}" value = "(+)" onclick = "showMore('moreBtn_{{request.id}}','reasons_{{request.id}}')" style="color:blue; padding:0; border:none; background:none">
+            	<div id="reasons_{{request.id}}" style="display:none"> Reasons for Applying:<br> {{request.reasons}} </div> 
 
+            {% elif request.type == 'slice' %}
+            <b>{{request.slice_name}}</b> -- Number of nodes: {{request.number_of_nodes}} -- Type of nodes: {{request.type_of_nodes}} -- Purpose: {{request.purpose}}
+            {% else %}
+            <b>{{request.site_name}}</b> ({{request.site_authority}}) -- {{request.address_city}}, {{request.address_country}}
+            {% endif %}
+    		</td>
+    		<td>{{ request.timestamp }}</td>
+    		
+    		<td><span id='portal__status__{{request.type}}__{{request.id}}'></span></td>
+    
+        <!--<div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'> -->
+    	  </tr>
+    
+        {% endfor %}
+    	
+	{% endfor %}
+	   </tbody>
+    </table>
+   </div>
 {% else %}
 	<div class="col-md-12">
 		<i>There is no pending request waiting for validation.</i>
 	</div>
 {% endif %}
+</div>
+
+
 <br />
 <div class="col-md-12">
-	<h2>Sub-Authorities</h2>
+	<h2>From your sub-authorities</h2>
 </div>
 {% if sub_authorities %}
 	
@@ -184,7 +298,7 @@
 {% endif %}
 <br />
 <div class="col-md-12">
-	<h2>Authorities with delegation</h2>
+	<h2>From your authorities with delegation</h2>
 </div>
 
 {% if delegation_authorities %}
@@ -248,4 +362,5 @@
 <br />
 <div class="col-md-12">
 	<button class="btn btn-onelab" type="button" id="portal__validate" onclick="on_click_event();"><span class="glyphicon glyphicon-ok"></span> Validate</button>
+	<button class="btn btn-danger" type="button" id="portal__reject" onclick="on_click_reject();"><span class="glyphicon glyphicon-remove"></span> Reject</button>
 </div>