X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fmanagement-tab-requests.html;h=9f53c4d7e24785d5009df24e466e6094435f13e7;hb=b750078af620edc1c8cc7c0caf5a1851d63a1f12;hp=f148759c452b2189f0686a9b82e9f6b986984b9a;hpb=36782e4a0fc3872b2d47b3c5dfc81e87450014f9;p=myslice.git

diff --git a/portal/templates/management-tab-requests.html b/portal/templates/management-tab-requests.html
index f148759c..9f53c4d7 100644
--- a/portal/templates/management-tab-requests.html
+++ b/portal/templates/management-tab-requests.html
@@ -40,7 +40,20 @@
 				}
 			);
 		}
-	}
+        };
+        function showMore(buttonId, divId){
+          var element = document.getElementById(buttonId);
+          var div_element = document.getElementById(divId);
+          if (element.value === '(+)'){
+            element.value = '(-)';
+            $('#'+divId).slideDown('fast');
+          }
+          else {
+            element.value = '(+)';
+            $('#'+divId).slideUp('fast');
+          }
+          return false;
+        }
 </script>
 
 <div class="col-md-12">
@@ -49,57 +62,57 @@
 {% if my_authorities %}
 	
 	{% for authority, requests in my_authorities.items %}
-		{% if authority == auth_hrn or "fibre" %}
-		<div class="col-md-12">
-			<h2>{{authority}}</h2>
-		</div>
-	
-	    <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>
+	{% if authority == pi_authority or 'fibre'%}
+	<div class="col-md-12">
+		<h2>{{authority}}</h2>
+		<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>
+					{% if request.object_auth == pi_authority %}
+						<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}}
+							<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}}
+				           		{% 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>
 
-	    {% endfor %}
+			    <!--<div class='portal_validate_request {{request.type}} {% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}'> -->
+		    		{% endif %}
+				</tr>
+			{% endfor %}
 		</table>
-		</div>
-		{% endif %}
+	</div>
+	{% endif %}
 	{% endfor %}
 
 {% else %}
@@ -114,7 +127,7 @@
 {% if sub_authorities %}
 	
 	{% for authority, requests in sub_authorities.items %}
-		{% if authority == auth_hrn or "fibre" %}
+	{% if authority == pi_authority or 'fibre'%}
 		<div class="col-md-12">
 		<h3>{{authority}}</h3>
 		    <table class="table">
@@ -127,6 +140,7 @@
 		      </th>
 		    {% for request in requests %}
 			  <tr>
+			  	{% if request.object_auth == pi_authority %}
 				<td>
 				{% if request.allowed == 'allowed' %}
 				<input class='portal__validate__checkbox' id='portal__validate__checkbox__{{request.type}}__{{request.id}}' type='checkbox'/>
@@ -156,11 +170,12 @@
 				<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 %}'> -->
+	    		{% endif %}
 			  </tr>
 		    {% endfor %}
 		    </table>
 		</div>
-		{% endif %}
+	{% endif %}
 	{% endfor %}
 {% else %}
 <div class="col-md-12">
@@ -175,54 +190,56 @@
 {% if delegation_authorities %}
 	
 	{% for authority, requests in delegation_authorities.items %}
+	{% if authority == pi_authority  or 'fibre'%}
 	<div class="col-md-12">
-		{% if authority == "fibre" or auth_hrn %}
-			<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 %}
+		<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>
+			  	{% if request.object_auth == pi_authority %}
+				<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 %}
-					</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}} -- user_hrn: {{ request.user_hrn }} -- 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>
-		{% endif %}
-		</div>
-		{% endfor %}
+				{% 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 %}'> -->
+	    		{% endif %}
+			  </tr>
+		    {% endfor %}
+		    </table>
+	</div>
+	{% endif %}
+	{% endfor %}
 {% else %}
 <div class="col-md-12">
 	<i>There is no pending request waiting for validation.</i>