X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fvalidate_pending.html;h=c9b971fe44cee28abfaea870f1ecaa5c4285d83d;hb=cd4ef6cdd7ea6d4ead183970d20d4c3739481251;hp=dd7d5c27e1274a8a13dd3fd4aba3b1716a37494a;hpb=bfaf128417660246d7e5916129886bfbd3a878b0;p=unfold.git

diff --git a/portal/templates/validate_pending.html b/portal/templates/validate_pending.html
index dd7d5c27..c9b971fe 100644
--- a/portal/templates/validate_pending.html
+++ b/portal/templates/validate_pending.html
@@ -2,26 +2,75 @@
 
 {% block head %}
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/validate_pending.css" />
-{% endblock %}
+<script type="text/javascript">
+	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('/');
 
-{% block unfold1_main %}
+			// 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)
 
-<h1>Pending requests</h1>
 
+					});
+				}
+			);
+		}
+	}
+</script>
+{% endblock %}
+
+{% block unfold_main %}
+<div class="onelab-title well-lg">
+<h1>Pending requests</h1>
+</div>
+<hr/>
 <h2>My authorities</h2>
 
 {% if my_authorities %}
 
 {% for authority, requests in my_authorities.items %}
 <h3>{{authority}}</h3>
+<div class="container">
+    <table width=100% border=1 style="color:white;">
+      <th>
+        <td>type</td>
+        <td>id</td>
+        <td>details</td>
+        <td>timestamp</td>
+        <td>status</td>
+      </th>
     {% for request in requests %}
-    <div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'>
-		<span class='type'>{{ request.type }}</span>
-		<span class='id'>{{ request.id }}</span>
-		<span class='timestamp'>{{ request.timestamp }}</span>
-		<span class='details'>{{ request.details }}</span>
+
+	  <tr>
+		<td>
 		{% if request.allowed == 'allowed' %}
-		<input type='checkbox'/>
+		<input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
 		{% else %}
 			{% if request.allowed == 'expired' %}
 				expired
@@ -29,27 +78,108 @@
 				denied
 			{% endif %}
 		{% endif %}
-	</div>
+		</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>
 {% endfor %}
 
 {% else %}
 <i>There is no pending request waiting for validation.</i>
 {% endif %}
 
+{% if sub_authorities %}
+<hr/>
+<h2>Sub-Authorities</h2>
+
+{% for authority, requests in sub_authorities.items %}
+<h3>{{authority}}</h3>
+    <table width=100% border=1>
+      <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>
+{% endfor %}
+<hr/>
+
+{% endif %}
+
+
 {% if delegation_authorities %}
+<hr/>
 <h2>Authorities with delegation</h2>
 
 {% for authority, requests in delegation_authorities.items %}
 <h3>{{authority}}</h3>
+    <table width=100% border=1>
+      <th>
+        <td>type</td>
+        <td>id</td>
+        <td>details</td>
+        <td>timestamp</td>
+        <td>status</td>
+      </th>
     {% for request in requests %}
-    <div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'>
-		<span class='type'>{{ request.type }}</span>
-		<span class='id'>{{ request.id }}</span>
-		<span class='timestamp'>{{ request.timestamp }}</span>
-		<span class='details'>{{ request.details }}</span>
+	  <tr>
+		<td>
 		{% if request.allowed == 'allowed' %}
-		<input type='checkbox'/>
+		<input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
 		{% else %}
 			{% if request.allowed == 'expired' %}
 				expired
@@ -57,10 +187,34 @@
 				denied
 			{% endif %}
 		{% endif %}
-	</div>
+		</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>
 {% endfor %}
+<hr/>
 
 {% endif %}
 
+<input type='button' id='portal__validate' value='Validate' onclick='on_click_event();'/>
+</div>
+<!-- End of the container div -->
 {% endblock %}