From: Olga Brani <olgabrani@grnet.gr>
Date: Thu, 8 Nov 2012 12:09:08 +0000 (+0200)
Subject: Group summary page
X-Git-Url: https://code.grnet.gr/git/astakos/commitdiff_plain/7c4980e1293e45eaa04e13a115286dc81554ad40

Group summary page
---

diff --git a/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html
index 65f465d..e43223a 100644
--- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html
+++ b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html
@@ -4,7 +4,7 @@
 
 {% block page.body %}
  
-{{ data }}
+<!--{{ data }}-->
 <div class="projects summary">
 	<h2>CONFIRM YOUR REQUEST</h2>
 	<p>Lorem ipsum</p>
@@ -28,7 +28,7 @@
 			 	<dt>Expiration Date</dt>
 			 	<dd>{{ data.expiration_date|date:"d/m/Y"}}&nbsp;</dd>
 			 	<dt>Modaration</dt>
-			 	<dd>{% if object.moderation_enabled%}Yes{% else %}No{% endif %}</dd>
+			 	<dd>{% if data.moderation_enabled%}Yes{% else %}No{% endif %}</dd>
 			 	<dt>Max members per group</dt>
 			 	<dd>{% if  data.max_participants %}{{ data.max_participants }}{% else %}Unlimited{% endif %}</dd>
 			 </dl>
@@ -36,14 +36,37 @@
 		 <div class="full-dotted">
 			 <h3>RESOURCES:</h3>
 	           <dl class="alt-style">
-			 	<dt>Max Vms per user</dt>
+	           	
+	           	{% for r in data.policies %}
+	           		{% with r.service|add:'.'|add:r.resource as t %}
+	           		{% with resource_catalog|lookup:'resources' as resources %}
+	           		{% with resources|lookup:t as info %}
+	           		{% with resource_presentation|lookup:t as resource_info %}
+	           			<dt>
+	           				Max {% if resource_info.is_abbreviation %}{{ r.resource|upper }}{% else %}{{ r.resource }}{% endif %}{% if not info.unit %}s {% endif  %}  per user
+	           			</dt>
+	           			
+	           			<dd>
+	           			{% if r.uplimit %}
+	           				{{ r.uplimit }} {% if info.unit %}({{ info.unit}}){% endif %}
+	           			{% else %}
+	           				Unlimited
+	           			{% endif %}
+	           			</dd>
+	           		{% endwith %}
+	           		{% endwith %}
+	           		{% endwith %}
+	           		{% endwith %}
+	           	{% endfor %}
+			 	
+			 	<!--<dt>Max Vms per user</dt>
 			 	<dd>3</dd>
 			 	<dt>Max diskspace per user</dt>
 			 	<dd>5GB</dd>
 			 	<dt>Max RAM per user</dt>
 		 		<dd>2GB</dd>
 			 	<dt>Max CPU per user</dt>
-			 	<dd>2</dd>
+			 	<dd>2</dd>-->
 			 </dl>
 	         
 		 </div>
diff --git a/snf-astakos-app/astakos/im/views.py b/snf-astakos-app/astakos/im/views.py
index 7023e95..50a28a4 100644
--- a/snf-astakos-app/astakos/im/views.py
+++ b/snf-astakos-app/astakos/im/views.py
@@ -737,7 +737,9 @@ def group_add(request, kind_name='default'):
             return render_response(
                 template='im/astakosgroup_form_summary.html',
                 context_instance=get_context(request),
-                data=form.cleaned_data
+                data=form.cleaned_data,
+                resource_catalog=resource_catalog,
+                resource_presentation=resource_presentation
             )
     else:
         now = datetime.now()