diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cffc9bc07792f32fe2df6246590a5edaf804f926..79b77d6d44c947fc485b37e5d5927302d300f08e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<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/static/polls/style.css" afterPath="$PROJECT_DIR$/Projet/polls/static/polls/style.css" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html" afterPath="$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Projet/ChandelIIEr/settings.py" afterPath="$PROJECT_DIR$/Projet/ChandelIIEr/settings.py" />
+ <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/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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -14,109 +16,88 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
+ <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="forms.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Projet/polls/forms.py">
+ <file leaf-file-name="views.py" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="594">
- <caret line="33" column="56" lean-forward="false" selection-start-line="33" selection-start-column="56" selection-end-line="33" selection-end-column="56" />
+ <state relative-caret-position="324">
+ <caret line="222" column="28" lean-forward="false" selection-start-line="222" selection-start-column="28" selection-end-line="222" selection-end-column="28" />
<folding>
- <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." />
+ <element signature="e#24#63#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="models.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Projet/polls/models.py">
+ <file leaf-file-name="code_passwd.html" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/code_passwd.html">
<provider selected="true" editor-type-id="text-editor">
- <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" />
+ <state relative-caret-position="378">
+ <caret line="30" column="10" lean-forward="true" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="connexion.html" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html">
+ <file leaf-file-name="forgotten_passwd.html" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/forgotten_passwd.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="509">
- <caret line="41" column="28" lean-forward="false" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
+ <state relative-caret-position="432">
+ <caret line="24" column="10" lean-forward="true" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</file>
- <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="486">
- <caret line="27" column="69" lean-forward="false" selection-start-line="27" selection-start-column="69" selection-end-line="27" selection-end-column="69" />
- <folding>
- <element signature="e#0#32#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <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="567">
- <caret line="245" column="0" lean-forward="false" selection-start-line="245" selection-start-column="0" selection-end-line="245" selection-end-column="0" />
- <folding>
- <element signature="e#24#63#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
<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="252">
- <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+ <state relative-caret-position="396">
+ <caret line="125" column="0" lean-forward="true" selection-start-line="125" selection-start-column="0" selection-end-line="125" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="eleve.html" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/eleve.html">
+ <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="216">
- <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="15" selection-end-column="4" />
+ <state relative-caret-position="36">
+ <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/urls.py">
+ <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="342">
- <caret line="20" column="37" lean-forward="true" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+ <state relative-caret-position="504">
+ <caret line="44" column="10" lean-forward="false" selection-start-line="44" selection-start-column="10" selection-end-line="44" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="wsgi.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/wsgi.py">
+ <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="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 relative-caret-position="162">
+ <caret line="9" column="35" lean-forward="false" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" />
+ <folding>
+ <element signature="e#0#32#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="style.css" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/Projet/polls/static/polls/style.css">
+ <file leaf-file-name="connexion.html" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="540">
- <caret line="285" column="22" lean-forward="false" selection-start-line="285" selection-start-column="22" selection-end-line="285" selection-end-column="22" />
+ <state relative-caret-position="756">
+ <caret line="42" column="15" lean-forward="false" selection-start-line="42" selection-start-column="15" selection-end-line="42" selection-end-column="15" />
<folding />
</state>
</provider>
@@ -141,30 +122,24 @@
<option value="$PROJECT_DIR$/Projet/polls/templates/polls/index.html" />
<option value="$PROJECT_DIR$/Projet/polls/templates/polls/name.html" />
<option value="$PROJECT_DIR$/Projet/polls/templates/polls/report.html" />
+ <option value="$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html" />
<option value="$PROJECT_DIR$/Projet/polls/models.py" />
+ <option value="$PROJECT_DIR$/Projet/polls/templates/polls/new_passwd.html" />
+ <option value="$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html" />
+ <option value="$PROJECT_DIR$/Projet/polls/templates/polls/forgotten_passwd.html" />
+ <option value="$PROJECT_DIR$/Projet/ChandelIIEr/settings.py" />
+ <option value="$PROJECT_DIR$/Projet/polls/urls.py" />
<option value="$PROJECT_DIR$/Projet/polls/forms.py" />
- <option value="$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html" />
- <option value="$PROJECT_DIR$/Projet/polls/templates/polls/gestionperso.html" />
- <option value="$PROJECT_DIR$/Projet/polls/templates/polls/gestiongroupe.html" />
- <option value="$PROJECT_DIR$/Projet/polls/templates/polls/forgotpassword.html" />
+ <option value="$PROJECT_DIR$/Projet/polls/templates/polls/code_passwd.html" />
<option value="$PROJECT_DIR$/Projet/polls/views.py" />
- <option value="$PROJECT_DIR$/Projet/polls/urls.py" />
- <option value="$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html" />
- <option value="$PROJECT_DIR$/Projet/polls/static/polls/style.css" />
</list>
</option>
</component>
- <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
- <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
- <component name="JsGulpfileManager">
- <detection-done>true</detection-done>
- <sorting>DEFINITION_ORDER</sorting>
- </component>
- <component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="273" />
- <option name="y" value="120" />
+ <component name="ProjectFrameBounds">
+ <option name="x" value="64" />
+ <option name="y" value="-11" />
<option name="width" value="1303" />
- <option name="height" value="772" />
+ <option name="height" value="780" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -184,60 +159,158 @@
<panes>
<pane id="ProjectPane">
<subPane>
- <expand>
- <path>
- <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" />
- <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" />
- <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" />
- <item name="Projet" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" />
- <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" />
- <item name="Projet" type="462c0819:PsiDirectoryNode" />
- <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" />
- <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" />
- <item name="Projet" type="462c0819:PsiDirectoryNode" />
- <item name="polls" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" />
- <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" />
- <item name="Projet" type="462c0819:PsiDirectoryNode" />
- <item name="polls" type="462c0819:PsiDirectoryNode" />
- <item name="static" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" />
- <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" />
- <item name="Projet" type="462c0819:PsiDirectoryNode" />
- <item name="polls" type="462c0819:PsiDirectoryNode" />
- <item name="static" type="462c0819:PsiDirectoryNode" />
- <item name="polls" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" />
- <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" />
- <item name="Projet" type="462c0819:PsiDirectoryNode" />
- <item name="polls" type="462c0819:PsiDirectoryNode" />
- <item name="templates" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" />
- <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" />
- <item name="Projet" type="462c0819:PsiDirectoryNode" />
- <item name="polls" type="462c0819:PsiDirectoryNode" />
- <item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="polls" type="462c0819:PsiDirectoryNode" />
- </path>
- </expand>
- <select />
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Projet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Projet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="polls" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Projet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="polls" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="templates" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Projet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="polls" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="templates" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="polls" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Projet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="polls" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="static" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Projet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="polls" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="migrations" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Projet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="ChandelIIEr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</pane>
<pane id="Scope" />
@@ -246,16 +319,6 @@
</component>
<component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
- </component>
- <component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="$PROJECT_DIR$/Projet/polls/templates/polls" />
- </key>
- <key name="CopyFile.RECENT_KEYS">
- <recent name="$PROJECT_DIR$/Projet/polls/static/polls" />
- </key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -269,7 +332,7 @@
</list>
</option>
</component>
- <component name="RunManager" selected="JavaScript Debug.forgotpassword.html">
+ <component name="RunManager">
<configuration default="true" type="PythonConfigurationType" factoryName="Python">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
@@ -334,7 +397,6 @@
<option name="_new_targetType" value=""PATH"" />
<method />
</configuration>
- <configuration name="forgotpassword.html" type="JavascriptDebugType" factoryName="JavaScript Debug" nameIsGenerated="true" uri="http://localhost:63342/ChandelIIEr/Projet/polls/templates/polls/forgotpassword.html" />
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
@@ -347,85 +409,87 @@
<option name="presentableId" value="Default" />
<updated>1508143607607</updated>
</task>
- <task id="LOCAL-00001" summary="amélioration graphique, ajout de css sur les parties groupe et perso">
- <created>1512936872261</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1512936872261</updated>
- </task>
- <option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="65" y="-4" width="1535" height="904" extended-state="6" />
+ <frame x="64" y="-11" width="1303" height="780" extended-state="6" />
<editor active="true" />
<layout>
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24980783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2495114" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32957393" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- </layout>
- <layout-to-restore>
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24980783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- </layout-to-restore>
- </component>
- <component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="1" />
+ </layout>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
- <component name="VcsManagerConfiguration">
- <MESSAGE value="amélioration graphique, ajout de css sur les parties groupe et perso" />
- <option name="LAST_COMMIT_MESSAGE" value="amélioration graphique, ajout de css sur les parties groupe et perso" />
- </component>
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/urls.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="72">
+ <caret line="6" column="26" lean-forward="false" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
+ <folding>
+ <element signature="e#0#32#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/urls.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="252">
+ <caret line="14" column="3" lean-forward="false" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Projet/polls/models.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="126">
+ <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" 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="126">
+ <caret line="7" column="16" lean-forward="false" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Projet/polls/views.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="108">
+ <caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
+ <folding>
+ <element signature="e#24#63#0" expanded="true" />
+ </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="378">
<caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" />
- <folding>
- <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -457,6 +521,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
@@ -464,9 +529,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
- <folding>
- <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." />
- </folding>
</state>
</provider>
</entry>
@@ -474,6 +536,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="15" column="10" lean-forward="false" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
+ <folding>
+ <element signature="e#24#63#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -481,9 +546,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="3" column="6" lean-forward="false" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
- <folding>
- <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." />
- </folding>
</state>
</provider>
</entry>
@@ -491,9 +553,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="3" column="66" lean-forward="false" selection-start-line="3" selection-start-column="66" selection-end-line="3" selection-end-column="66" />
- <folding>
- <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -515,6 +575,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
@@ -532,9 +593,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="29" lean-forward="false" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
- <folding>
- <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -549,9 +608,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="10" column="18" lean-forward="false" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" />
- <folding>
- <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." />
- </folding>
</state>
</provider>
</entry>
@@ -576,6 +632,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
@@ -583,6 +640,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
<caret line="36" column="0" lean-forward="true" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
+ <folding>
+ <element signature="e#24#63#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -590,9 +650,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54">
<caret line="3" column="26" lean-forward="false" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
- <folding>
- <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -607,9 +665,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="9" column="14" lean-forward="true" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="14" />
- <folding>
- <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." />
- </folding>
</state>
</provider>
</entry>
@@ -627,6 +682,7 @@
<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>
@@ -634,208 +690,155 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+ <folding>
+ <element signature="e#24#63#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/bdd.html">
+ <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/urls.py">
<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" />
+ <state relative-caret-position="252">
+ <caret line="14" column="3" lean-forward="false" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/admin.py">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/eleve.html">
<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" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/tests.py">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/gestiongroupe.html">
<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" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/visualisation.html">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/bdd.html">
<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" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="306">
- <caret line="17" column="5" lean-forward="false" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$APPLICATION_HOME_DIR$/lib/pycharm.jar!/resources/html5-schema/html5/web-forms2.rnc">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/admin.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="11052">
- <caret line="614" column="22" lean-forward="false" selection-start-line="614" selection-start-column="22" selection-end-line="614" selection-end-column="22" />
- <folding />
+ <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" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/static/polls/read_md.js">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/tests.py">
<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>
- <element signature="n#!!doc" expanded="false" />
- </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/prof.html">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/apps.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="342">
- <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
- <folding />
+ <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" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/groupe_default.jpg">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/gestionperso.html">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/visualisation.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="414">
- <caret line="23" column="45" lean-forward="false" selection-start-line="23" selection-start-column="45" selection-end-line="23" selection-end-column="45" />
- <folding />
+ <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" />
</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="194">
- <caret line="15" column="18" lean-forward="false" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
- <folding>
- <marker date="1512386430931" expanded="true" signature="7229:7243" ph="..." />
- </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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="18">
- <caret line="1" column="2" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="17" />
- <folding />
+ <state relative-caret-position="216">
+ <caret line="29" column="12" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/gestiongroupe.html">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/index.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="563">
- <caret line="32" column="47" lean-forward="false" selection-start-line="32" selection-start-column="47" selection-end-line="32" selection-end-column="47" />
- <folding />
+ <state relative-caret-position="306">
+ <caret line="17" column="5" lean-forward="false" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/apps.py">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/new_passwd.html" />
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html">
<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" />
+ <state relative-caret-position="756">
+ <caret line="42" column="15" lean-forward="false" selection-start-line="42" selection-start-column="15" selection-end-line="42" selection-end-column="15" />
<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="594">
- <caret line="33" column="56" lean-forward="false" selection-start-line="33" selection-start-column="56" selection-end-line="33" selection-end-column="56" />
- <folding>
- <marker date="1512377229398" expanded="true" signature="1312:1355" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/models.py">
+ <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <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" />
+ <state relative-caret-position="396">
+ <caret line="125" column="0" lean-forward="true" selection-start-line="125" selection-start-column="0" selection-end-line="125" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/wsgi.py">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/models.py">
<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" />
+ <state relative-caret-position="36">
+ <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/forgotpassword.html">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/forgotten_passwd.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="10" column="6" lean-forward="true" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="6" />
+ <state relative-caret-position="432">
+ <caret line="24" column="10" lean-forward="true" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
<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="252">
- <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/views.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="567">
- <caret line="245" column="0" lean-forward="false" selection-start-line="245" selection-start-column="0" selection-end-line="245" selection-end-column="0" />
- <folding>
- <element signature="e#24#63#0" expanded="true" />
- </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="69" lean-forward="false" selection-start-line="27" selection-start-column="69" selection-end-line="27" selection-end-column="69" />
+ <state relative-caret-position="162">
+ <caret line="9" column="35" lean-forward="false" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/eleve.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="216">
- <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="15" selection-end-column="4" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Projet/ChandelIIEr/urls.py">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/forms.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="342">
- <caret line="20" column="37" lean-forward="true" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+ <state relative-caret-position="504">
+ <caret line="44" column="10" lean-forward="false" selection-start-line="44" selection-start-column="10" selection-end-line="44" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/connexion.html">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/code_passwd.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="509">
- <caret line="41" column="28" lean-forward="false" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
+ <state relative-caret-position="378">
+ <caret line="30" column="10" lean-forward="true" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Projet/polls/static/polls/style.css">
+ <entry file="file://$PROJECT_DIR$/Projet/polls/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="540">
- <caret line="285" column="22" lean-forward="false" selection-start-line="285" selection-start-column="22" selection-end-line="285" selection-end-column="22" />
- <folding />
+ <state relative-caret-position="324">
+ <caret line="222" column="28" lean-forward="false" selection-start-line="222" selection-start-column="28" selection-end-line="222" selection-end-column="28" />
+ <folding>
+ <element signature="e#24#63#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
diff --git a/Projet/ChandelIIEr/__pycache__/settings.cpython-35.pyc b/Projet/ChandelIIEr/__pycache__/settings.cpython-35.pyc
index d64aa55e566b7565570f752f1d0bc02b87c95c66..4c134608226764eb580809b4cd50bfaffc1d5804 100644
Binary files a/Projet/ChandelIIEr/__pycache__/settings.cpython-35.pyc and b/Projet/ChandelIIEr/__pycache__/settings.cpython-35.pyc differ
diff --git a/Projet/ChandelIIEr/settings.py b/Projet/ChandelIIEr/settings.py
index da417fd9cd250fdc6253cf39bf3ed7f4a68a077d..76841bb9fa784e9d7ce9bf3f72faffca7912e857 100644
--- a/Projet/ChandelIIEr/settings.py
+++ b/Projet/ChandelIIEr/settings.py
@@ -119,3 +119,13 @@ USE_TZ = True
# https://docs.djangoproject.com/en/1.11/howto/static-files/
STATIC_URL = '/static/'
+
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+'''EMAIL_HOST = 'localhost'
+EMAIL_PORT = 1025'''
+
+EMAIL_HOST = 'smtp.gmail.com'
+EMAIL_HOST_USER = 'noreply.chandeliier@gmail.com'
+EMAIL_HOST_PASSWORD = 'a1234a1234'
+EMAIL_PORT = 587
+EMAIL_USE_TLS = True
diff --git a/Projet/db.sqlite3 b/Projet/db.sqlite3
index c11d7b2bfdf66646c83f09ecbacaa265cccb17de..def8d9bf8cfca756e47c5c00e8c407947ac203d4 100644
Binary files a/Projet/db.sqlite3 and b/Projet/db.sqlite3 differ
diff --git a/Projet/polls/__pycache__/forms.cpython-35.pyc b/Projet/polls/__pycache__/forms.cpython-35.pyc
index 1ff7aa6b41a6cadb6b8a97c73eee0676316b51ce..416126d3c6bcb6bfa341d6adabfd75b72766e2a7 100644
Binary files a/Projet/polls/__pycache__/forms.cpython-35.pyc and b/Projet/polls/__pycache__/forms.cpython-35.pyc differ
diff --git a/Projet/polls/__pycache__/urls.cpython-35.pyc b/Projet/polls/__pycache__/urls.cpython-35.pyc
index ec50b3b08cd9b5fc4231125056ae3ac151acec9a..9b818b00ab46b0b3ec1d6dffca3ea88ec61d6f04 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 8c2f6f8d801f01086645f9a86a85c983ba32276c..03791002546e068969285cf769f409b91ac55172 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/forms.py b/Projet/polls/forms.py
index 9354fe6aa137d2bc8dfa5439414f1e913e3aa5f6..99a2e9f6a4368e4fa95abf183848143f394e2b61 100644
--- a/Projet/polls/forms.py
+++ b/Projet/polls/forms.py
@@ -39,4 +39,8 @@ class ConnexionForm(forms.Form):
class ForgottenPasswdForm(forms.Form):
mail = forms.EmailField()
- new = forms.CharField(widget=forms.PasswordInput)
\ No newline at end of file
+ new = forms.CharField(widget=forms.PasswordInput)
+
+class CodePasswdForm(forms.Form):
+ code = forms.CharField(max_length=4)
+ mail_hidden = forms.CharField(widget=forms.HiddenInput())
\ No newline at end of file
diff --git a/Projet/polls/templates/polls/code_passwd.html b/Projet/polls/templates/polls/code_passwd.html
new file mode 100644
index 0000000000000000000000000000000000000000..113c183923feba5830db5be50b7695d38d1d89f9
--- /dev/null
+++ b/Projet/polls/templates/polls/code_passwd.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+{% load static %}
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Code de confirmation</title>
+</head>
+
+<link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}" />
+
+<body>
+
+{% if user.is_authenticated %}
+
+Vous êtes connecté, {{ user.username }} !
+
+{% else %}
+
+<form method="post" action="/polls/manage_code_passwd">
+
+ {% csrf_token %}
+ <h2 class="inscription-title-block">Code de confirmation</h2>
+ <div class="inscription-block">
+ <h3 class="inscription-data">Veuillez entrer le code de confirmation qui vous a été envoyé par mail</h3>
+ {% if error %}
+ <p><strong>Code invalide</strong></p>
+ {% endif %}
+ <div class="inscription-form">
+ <br/>
+ {{ form.code }}
+ </div>
+ <input type='hidden' name="mail_hidden" value={{ mail }} />
+ </div>
+ <input class="button_submit" type="submit" value="Valider" />
+
+</form>
+
+{% endif %}
+
+</body>
+</html>
\ No newline at end of file
diff --git a/Projet/polls/urls.py b/Projet/polls/urls.py
index 78aaba6a1251143040d4847356a706fe0900d627..cc45f4e58c8a2ac40378d887dd1943129efca71d 100644
--- a/Projet/polls/urls.py
+++ b/Projet/polls/urls.py
@@ -15,6 +15,7 @@ urlpatterns = [
url(r'^deconnexion$', views.deconnexion, name='deconnexion'),
url(r'^forgotten_passwd$', views.forgotten_passwd, name='forgotten_passwd'),
url(r'^manage_forgotten_passwd$', views.manage_forgotten_passwd, name='manage_forgotten_passwd'),
+ url(r'^manage_code_passwd$', views.manage_code_passwd, name='manage_code_passwd'),
url(r'^(?P<urlrapport>[0-9A-Za-z]+)/$',views.rapport,name='rapport'),
# ex: /polls/5/
# url(r'^(?P<question_id>[0-9]+)/$', views.detail, name='detail'),
diff --git a/Projet/polls/views.py b/Projet/polls/views.py
index d83426fbfc51041d4da0e0a0a2943a8be973f1fa..d1778d5fcacbbf985664d3c45677ee9c7640b663 100644
--- a/Projet/polls/views.py
+++ b/Projet/polls/views.py
@@ -12,7 +12,7 @@ from django.template import loader
from django.contrib.auth import login, authenticate, logout
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
-
+from django.core.mail import send_mail
# def index(request):
# latest_question_list = Question.objects.order_by('-pub_date')[:5]
@@ -193,8 +193,15 @@ def manage_forgotten_passwd(request):
try:
user = User.objects.get(email=mail)
user.set_password(new)
- user.save()
- return HttpResponse("Votre nouveau mot de passe a bien été pris en compte")
+ send_mail('Nouveau mot de passe', 'Votre code de confirmation est le suivant : 1234', 'noreply.chandeliier@gmail.com', [mail])
+ template = loader.get_template('polls/code_passwd.html')
+ form1 = CodePasswdForm(request.POST)
+ context = {
+ 'form': form1,
+ 'mail': mail,
+ }
+ return HttpResponse(template.render(context, request))
+
except:
error = True
template = loader.get_template('polls/forgotten_passwd.html')
@@ -204,6 +211,26 @@ def manage_forgotten_passwd(request):
}
return HttpResponse(template.render(context, request))
+def manage_code_passwd(request):
+ error = False
+ form = CodePasswdForm(request.POST)
+ if form.is_valid():
+ code = form.cleaned_data['code']
+ mail = form.cleaned_data['mail_hidden']
+ if code == '1234':
+ user = User.objects.get(email=mail)
+ user.save()
+ login(request, user)
+ return HttpResponse("Votre nouveau mot de passe a bien été pris en compte !")
+ else:
+ error = True
+ template = loader.get_template('polls/code_passwd.html')
+ context = {
+ 'error': error,
+ 'form': form,
+ }
+ return HttpResponse(template.render(context, request))
+
def prof(request):
latest_rapport_list = Rapport.objects.order_by('url')[:5]
template = loader.get_template('polls/prof.html')