X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fmanagement-tab-requests.html;h=eea48461ac9a3e544a725a316a555fba56d2f51f;hb=c21dc8a15adb119f7335d40e73c930796a0dd38f;hp=e32799fb33c445007e7a0b4fbbc69f27e6131cf8;hpb=a0d99ae0a4c71fe5d88652f45004b68cd6de384a;p=myslice.git

diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index e32799fb..eea48461 100644
--- a/portal/templates/management-tab-requests.html
+++ b/portal/templates/management-tab-requests.html
@@ -1,94 +1,10 @@
-<script type="text/javascript">
-	$(document).ready(function() {
-		$("li#nav-request").addClass("active");
-		$('table.requests').dataTable();
-	});
-	function on_click_event() {
-		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/validate_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">OK</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);
-
-
-					});
-				}
-			);
-		}
-	}
-	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>From your authorities</h2>
 </div>
 {% if my_authorities %}
-	<table class="table-responsive requests">
+<div class="col-md-12">
+	<table class="table requests">
 	    <thead>
         <tr>
             <th>ID</th>
@@ -97,6 +13,7 @@
             <th>Authority</th>
             <th>Info</th>
             <th>Date</th>
+            <th>Status</th>
         </tr>
         </thead>
         <tbody>
@@ -126,13 +43,20 @@
                 <b>{{request.first_name}} {{request.last_name}}</b> &lt;<a href="mailto:{{request.email}}">{{request.email}}</a>&gt;
             {% 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}}
+            {% elif request.type == 'project' %}
+            <b>{{request.project_name}}</b>  -- {{ request.user_hrn }} -- Purpose: {{request.purpose}}
+            {% elif request.type == 'join' %}
+            <b>{{request.user_hrn}}</b> --  to join {{ request.authority_hrn }}
             {% 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>
+    		<td>
+            <span id='portal__status__{{request.type}}__{{request.id}}'></span>
+            <div id='{{request.type}}__{{request.id}}-status-loading' style="display:none;"><img src="{{ STATIC_URL }}img/loading.gif"></div>
+            </td>
     
         <!--<div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'> -->
     	  </tr>
@@ -142,131 +66,13 @@
 	{% 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>From your sub-authorities</h2>
-</div>
-{% if sub_authorities %}
-	
-	{% for authority, requests in sub_authorities.items %}
-	<div class="col-md-12">
-	<h3>{{authority}}</h3>
-	    <table class="table">
-	      <th>
-	        <td>Type</td>
-	        <td>Id</td>
-	        <td>Details</td>
-	        <td>Timestamp</td>
-	        <td>Status</td>
-	      </th>
-	    {% for request in requests %}
-		  <tr>
-			<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 #}
-					denied
-				{% endif %}
-			{% endif %}
-			</td>
-			<td>{{ request.type }}</td>
-			<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}}
-	        {% else %}
-	            {% if request.type == 'slice' %}
-	        Slice name: {{request.slice_name}} -- 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}}
-	            {% endif %}
-	        {% 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 %}
-	    </table>
-	</div>
-	{% endfor %}
-{% else %}
-<div class="col-md-12">
-	<i>There is no pending request waiting for validation.</i>
-</div>
-{% endif %}
-<br />
-<div class="col-md-12">
-	<h2>From your authorities with delegation</h2>
-</div>
-
-{% if delegation_authorities %}
-	
-	{% for authority, requests in delegation_authorities.items %}
-	<div class="col-md-12">
-		<h3>{{authority}}</h3>
-		    <table class="table">
-		      <th>
-		        <td>Type</td>
-		        <td>Id</td>
-		        <td>Details</td>
-		        <td>Timestamp</td>
-		        <td>Status</td>
-		      </th>
-		    {% for request in requests %}
-			  <tr>
-				<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 #}
-						denied
-					{% endif %}
-				{% endif %}
-				</td>
-				<td>{{ request.type }}</td>
-				<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}}
-		        {% else %}
-		            {% if request.type == 'slice' %}
-		        Slice name: {{request.slice_name}} -- 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}}
-		            {% endif %}
-		       {% 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 %}
-		    </table>
-		</div>
-		{% endfor %}
-{% else %}
-<div class="col-md-12">
-	<i>There is no pending request waiting for validation.</i>
-</div>
-{% endif %}
 <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>