Slice Request page added /portal/slice_request

diff --git a/portal/forms.py b/portal/forms.py
index f28a9ed..ab563d9 100644 (file)
--- a/portal/forms.py
+++ b/portal/forms.py
@@ -121,3 +121,12 @@ class ContactForm(forms.Form):
     message = forms.CharField(widget=forms.Textarea)
     email = forms.EmailField()
     cc_myself = forms.BooleanField(required=False)
+
+class SliceRequestForm(forms.Form):
+    slice_name = forms.CharField()
+    number_of_nodes  = forms.DecimalField()
+    type_of_nodes = forms.CharField()
+    purpose = forms.CharField(widget=forms.Textarea)
+    email = forms.EmailField()
+    cc_myself = forms.BooleanField(required=False)
+

diff --git a/portal/templates/slice_request.html b/portal/templates/slice_request.html
index 01f48d0..e60e881 100644 (file)
--- a/portal/templates/slice_request.html
+++ b/portal/templates/slice_request.html
@@ -3,16 +3,14 @@
 
 {% block head %}
 {{ wizard.form.media }}
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}css/smart_wizard.css" />
 {% endblock %}
 
 {% block unfold1_main %}
 
-  <h1>Slice request</h1>
+  <h1>Request a Slice</h1>
 
-{% if envoi %}Votre message a bien été envoyé !{% endif %}
  
-<form action="" method="post">{% csrf_token %}
+<form action="#" method="post">{% csrf_token %}
 {{ form.as_p }}
 <input type="submit" value="Submit" />
 </form>

diff --git a/portal/templates/slicereq_recvd.html b/portal/templates/slicereq_recvd.html
new file mode 100644 (file)
index 0000000..7ea26ed
--- /dev/null
+++ b/portal/templates/slicereq_recvd.html
@@ -0,0 +1,9 @@
+{% extends "layout-unfold1.html" %}
+
+{% block unfold1_main %}
+
+  <h1>Slice request Received !</h1>
+
+We will process your request and get back to you as soon as possible.
+{% endblock %}
+

diff --git a/portal/urls.py b/portal/urls.py
index 1cb551e..64333b6 100644 (file)
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -44,6 +44,7 @@ urlpatterns = patterns('',
     url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'),
     url(r'^contact/?$', views.contact),
     # Slice request
+    url(r'^slice_request/?$', views.slice_request),
     #url(r'^slice/request/?$',  views.slice_request,  name='slice_request'),
     # Slice confirmation
     #url(r'^slice/validate/?$', views.slice_validate, name='slice_validate'),

diff --git a/portal/views.py b/portal/views.py
index efa58d4..74c56ea 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -435,15 +435,15 @@ def contact(request):
             affiliation = form.cleaned_data['affiliation']
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
-            email = form.cleaned_data['email']
+            email = form.cleaned_data['email'] # email of the sender
             cc_myself = form.cleaned_data['cc_myself']
 
             recipients = ['yasin.upmc@gmail.com']
             if cc_myself:
-                recipients.append(sender)
+                recipients.append(email)
 
             from django.core.mail import send_mail
-            send_mail(subject, message, email, recipients)
+            send_mail("Onelab user submitted a query ", [first_name,last_name,affiliation,subject,message], email, recipients)
             return render(request,'contact_sent.html') # Redirect after POST
     else:
         form = ContactForm() # An unbound form
@@ -452,3 +452,30 @@ def contact(request):
         'form': form,
     })
 
+
+def slice_request(request):
+    if request.method == 'POST': # If the form has been submitted...
+        form = SliceRequestForm(request.POST) # A form bound to the POST data
+        if form.is_valid(): # All validation rules pass
+            # Process the data in form.cleaned_data
+            slice_name = form.cleaned_data['slice_name']
+            number_of_nodes = form.cleaned_data['number_of_nodes']
+            type_of_nodes = form.cleaned_data['type_of_nodes']
+            purpose = form.cleaned_data['purpose']
+            email = form.cleaned_data['email'] # email of the sender
+            cc_myself = form.cleaned_data['cc_myself']
+
+            recipients = ['yasin.upmc@gmail.com','jordan.auge@lip6.fr']
+            if cc_myself:
+                recipients.append(email)
+
+            from django.core.mail import send_mail
+            send_mail("Onelab New Slice request form submitted", [slice_name,number_of_nodes,type_of_nodes,purpose], email, recipients)
+            return render(request,'slicereq_recvd.html') # Redirect after POST
+    else:
+        form = SliceRequestForm() # An unbound form
+
+    return render(request, 'slice_request.html', {
+        'form': form,
+    })
+