diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5992e41181de338c4700faab698ce51387dcff93..cb009b725889dea9d094f094e54385deb758d01a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,6 @@
<list default="true" id="00a63665-454a-40e6-8b9f-7a09d949e062" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/db.sqlite3" afterPath="$PROJECT_DIR$/Projet/db.sqlite3" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/polls/forms.py" afterPath="$PROJECT_DIR$/Projet/polls/forms.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html" afterPath="$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/polls/urls.py" afterPath="$PROJECT_DIR$/Projet/polls/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/polls/views.py" afterPath="$PROJECT_DIR$/Projet/polls/views.py" />
</list>
@@ -22,8 +20,8 @@
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Projet/polls/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="306">
- <caret line="166" column="29" lean-forward="true" selection-start-line="166" selection-start-column="29" selection-end-line="166" selection-end-column="29" />
+ <state relative-caret-position="76">
+ <caret line="155" column="30" lean-forward="false" selection-start-line="155" selection-start-column="30" selection-end-line="155" selection-end-column="30" />
<folding>
<element signature="e#24#63#0" expanded="true" />
</folding>
@@ -34,7 +32,7 @@
<file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-432">
+ <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
@@ -44,7 +42,7 @@
<file leaf-file-name="inscription.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
+ <state relative-caret-position="252">
<caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
<folding />
</state>
@@ -54,28 +52,28 @@
<file leaf-file-name="forms.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Projet/polls/forms.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="396">
+ <state relative-caret-position="558">
<caret line="31" column="44" lean-forward="false" selection-start-line="31" selection-start-column="44" selection-end-line="31" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="connexion.html" pinned="false" current-in-tab="false">
+ <file leaf-file-name="connexion.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="324">
- <caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
+ <state relative-caret-position="234">
+ <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="urls.py" pinned="false" current-in-tab="true">
+ <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Projet/polls/urls.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
+ <state relative-caret-position="486">
+ <caret line="27" column="24" lean-forward="false" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
@@ -86,7 +84,7 @@
<file leaf-file-name="report.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/report.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2547">
+ <state relative-caret-position="576">
<caret line="191" column="10" lean-forward="false" selection-start-line="191" selection-start-column="10" selection-end-line="191" selection-end-column="10" />
<folding>
<marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." />
@@ -98,8 +96,8 @@
<file leaf-file-name="models.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Projet/polls/models.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="144">
- <caret line="14" column="31" lean-forward="true" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
+ <state relative-caret-position="252">
+ <caret line="14" column="31" lean-forward="false" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
<folding />
</state>
</provider>
@@ -166,6 +164,7 @@
</navigator>
<panes>
<pane id="Scratches" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -322,7 +321,6 @@
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -803,8 +801,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Projet/polls/models.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="144">
- <caret line="14" column="31" lean-forward="true" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
+ <state relative-caret-position="252">
+ <caret line="14" column="31" lean-forward="false" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
<folding />
</state>
</provider>
@@ -813,23 +811,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/report.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2547">
- <caret line="191" column="10" lean-forward="false" selection-start-line="191" selection-start-column="10" selection-end-line="191" selection-end-column="10" />
- <folding>
- <marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." />
- </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Projet/polls/forms.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="396">
+ <state relative-caret-position="558">
<caret line="31" column="44" lean-forward="false" selection-start-line="31" selection-start-column="44" selection-end-line="31" selection-end-column="44" />
<folding />
</state>
@@ -837,23 +824,35 @@
</entry>
<entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
+ <state relative-caret-position="252">
<caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/report.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="324">
- <caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
- <folding />
+ <state relative-caret-position="576">
+ <caret line="191" column="10" lean-forward="false" selection-start-line="191" selection-start-column="10" selection-end-line="191" selection-end-column="10" />
+ <folding>
+ <marker date="1512238067761" expanded="true" signature="7188:7196" ph="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Projet/polls/urls.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="486">
+ <caret line="27" column="24" lean-forward="false" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
+ <folding>
+ <element signature="e#0#32#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-432">
+ <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
@@ -861,21 +860,19 @@
</entry>
<entry file="file://$PROJECT_DIR$/Projet/polls/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="306">
- <caret line="166" column="29" lean-forward="true" selection-start-line="166" selection-start-column="29" selection-end-line="166" selection-end-column="29" />
+ <state relative-caret-position="76">
+ <caret line="155" column="30" lean-forward="false" selection-start-line="155" selection-start-column="30" selection-end-line="155" selection-end-column="30" />
<folding>
<element signature="e#24#63#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/urls.py">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
- <folding>
- <element signature="e#0#32#0" expanded="true" />
- </folding>
+ <state relative-caret-position="234">
+ <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
diff --git a/Projet/db.sqlite3 b/Projet/db.sqlite3
index bb69b532caed2103a0abcb46f9e8fd2e19085138..783e4fd91cf1b17edc6a1f5d41b804076084513f 100644
Binary files a/Projet/db.sqlite3 and b/Projet/db.sqlite3 differ
diff --git a/Projet/polls/__pycache__/urls.cpython-35.pyc b/Projet/polls/__pycache__/urls.cpython-35.pyc
index 20b7d9a814be680080669f4ce2b25a89f1bbb803..dfdc90427abe6ffb2d3d849494bbbf9eda0da9b6 100644
Binary files a/Projet/polls/__pycache__/urls.cpython-35.pyc and b/Projet/polls/__pycache__/urls.cpython-35.pyc differ
diff --git a/Projet/polls/__pycache__/views.cpython-35.pyc b/Projet/polls/__pycache__/views.cpython-35.pyc
index d98a2f8115b1dd4f7350750e2328f7b67a9f2a99..c8aa3094274342976cb849659ac4bc653f439f55 100644
Binary files a/Projet/polls/__pycache__/views.cpython-35.pyc and b/Projet/polls/__pycache__/views.cpython-35.pyc differ
diff --git a/Projet/polls/static/polls/style.css b/Projet/polls/static/polls/style.css
index 25e98e1a441db7c69f2414a9750bf36913f8e977..eaf928e21030774c520f285bdf18c07dd126d26e 100644
--- a/Projet/polls/static/polls/style.css
+++ b/Projet/polls/static/polls/style.css
@@ -1,4 +1,3 @@
-
/*
Cette partie concerne les éléments principaux de la page
*/
diff --git a/Projet/polls/templates/polls/connexion.html b/Projet/polls/templates/polls/connexion.html
index ea660922714c4aaf3ead94cb70bd0a834ece0770..2d381c11c5ee58e8684eedcef037b6d7d34652f2 100644
--- a/Projet/polls/templates/polls/connexion.html
+++ b/Projet/polls/templates/polls/connexion.html
@@ -1,17 +1,14 @@
<!DOCTYPE html>
+{% load static %}
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Connexion</title>
</head>
-<body>
-
-{% if error %}
-<p><strong>Utilisateur inconnu ou mauvais de mot de passe.</strong></p>
-
-{% endif %}
+<link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}" />
+<body>
{% if user.is_authenticated %}
@@ -22,24 +19,23 @@ Vous êtes connecté, {{ user.username }} !
<form method="post" action="/polls/manage_connexion">
{% csrf_token %}
- <div class="right-report-block">
- <h1 class="right-report-title">Connexion</h1>
- </div>
- <h2 class="right-report-part2">Pseudo</h2>
- <div class="right-report-block2">
- <div class="right-report-form">
+ <h2 class="inscription-title-block">Connexion</h2>
+ <div class="inscription-block">
+ <h3 class="inscription-data">Utilisateur</h3>
+ {% if error %}
+ <p><strong>Utilisateur inconnu ou mauvais de mot de passe</strong></p>
+ {% endif %}
+ <div class="inscription-form">
<br/>
{{ form.username }}
</div>
- </div>
- <h2 class="right-report-part2">Mot de passe</h2>
- <div class="right-report-block2">
- <div class="right-report-form">
+ <h3 class="inscription-data">Mot de passe</h3>
+ <div class="inscription-form">
<br/>
{{ form.passwd }}
</div>
</div>
- <input type="submit" value="Se connecter" />
+ <input class="button_submit" type="submit" value="Se connecter" />
</form>
diff --git a/Projet/polls/urls.py b/Projet/polls/urls.py
index f9ccfe18997125af5fa4cec2ccba9cc58a5a14de..1343c5ea956f18362247ec7615ada0397646cdeb 100644
--- a/Projet/polls/urls.py
+++ b/Projet/polls/urls.py
@@ -6,11 +6,11 @@ urlpatterns = [
# ex: /polls/
url(r'^$', views.index, name='index'),
url(r'^groupe/$', views.groupe, name='groupe'),
- url(r'^report.html$', views.report, name='report'),
+ url(r'^report$', views.report, name='report'),
url(r'^manage_report$', views.manage_report, name='manage_report'),
- url(r'^inscription.html$', views.inscription, name='inscription'),
+ url(r'^inscription$', views.inscription, name='inscription'),
url(r'^manage_inscription$', views.manage_inscription, name='manage_inscription'),
- url(r'^connexion.html$', views.connexion, name='connexion'),
+ url(r'^connexion$', views.connexion, name='connexion'),
url(r'^manage_connexion$', views.manage_connexion, name='manage_connexion'),
url(r'^deconnexion$', views.deconnexion, name='deconnexion'),
url(r'^(?P<urlrapport>[0-9A-Za-z]+)/$',views.rapport,name='rapport'),
@@ -20,10 +20,10 @@ urlpatterns = [
url(r'^(?P<question_id>[0-9]+)/results/$', views.results, name='results'),
# ex: /polls/5/vote/
url(r'^(?P<question_id>[0-9]+)/vote/$', views.vote, name='vote'),
- url(r'^prof.html$',views.prof,name='prof'),
- url(r'^eleve.html$',views.eleve,name='eleve'),
+ url(r'^prof$',views.prof,name='prof'),
+ url(r'^eleve$',views.eleve,name='eleve'),
url(r'^bdd.html$',views.bdd,name='bdd'),
- url(r'^gestiongroupe.html$',views.gestiongroupe,name='gestiongroupe'),
- url(r'^gestionperso.html$',views.gestionperso,name='gestionperso'),
- url(r'^visualisation.html$',views.visualisation,name='visualisation'),
+ url(r'^gestiongroupe$',views.gestiongroupe,name='gestiongroupe'),
+ url(r'^gestionperso$',views.gestionperso,name='gestionperso'),
+ url(r'^visualisation$',views.visualisation,name='visualisation'),
]
\ No newline at end of file
diff --git a/Projet/polls/views.py b/Projet/polls/views.py
index 31f77a866b0c214b70e7e050379614c7c1433038..b11af0ceca02058d7d56461473c8651cd060e75d 100644
--- a/Projet/polls/views.py
+++ b/Projet/polls/views.py
@@ -157,14 +157,20 @@ def manage_connexion(request):
error = False
form = ConnexionForm(request.POST)
if form.is_valid():
- username = form.cleaned_data["username"]
- password = form.cleaned_data["passwd"]
+ username = form.cleaned_data['username']
+ password = form.cleaned_data['passwd']
user = authenticate(username=username, password=password)
if user:
login(request, user)
+ return HttpResponse("Vous êtes bien connecté !")
else:
error = True
- return HttpResponse("Vous êtes bien connecté !")
+ template = loader.get_template('polls/connexion.html')
+ context = {
+ 'error' : error,
+ 'form': form,
+ }
+ return HttpResponse(template.render(context, request))
def deconnexion(request):
logout(request)