diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1a3a51303960ba590c3d347cee95d1808c59ad16..6126668a7f96fcac77f42c34ff03e15252d226b4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,6 +4,9 @@ <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/templates/polls/code_inscription.html" afterPath="$PROJECT_DIR$/Projet/polls/templates/polls/code_inscription.html" /> + <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/views.py" afterPath="$PROJECT_DIR$/Projet/polls/views.py" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -12,13 +15,34 @@ <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="views.py" pinned="false" current-in-tab="false"> + <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="101"> - <caret line="332" column="28" lean-forward="false" selection-start-line="332" selection-start-column="28" selection-end-line="332" selection-end-column="28" /> + <state relative-caret-position="342"> + <caret line="163" column="29" lean-forward="false" selection-start-line="163" selection-start-column="29" selection-end-line="163" selection-end-column="29" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="code_inscription.html" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/code_inscription.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="306"> + <caret line="17" column="11" lean-forward="true" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" /> + <folding /> + </state> + </provider> + </entry> + </file> + <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="270"> + <caret line="18" column="31" lean-forward="false" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" /> <folding /> </state> </provider> @@ -27,18 +51,18 @@ <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="396"> + <state relative-caret-position="324"> <caret line="121" column="0" lean-forward="false" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="eleve.html" pinned="false" current-in-tab="true"> + <file leaf-file-name="eleve.html" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/eleve.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="396"> - <caret line="22" column="36" lean-forward="true" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" /> + <caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" /> <folding /> </state> </provider> @@ -49,9 +73,7 @@ <provider selected="true" editor-type-id="text-editor"> <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> - <element signature="e#24#52#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -73,7 +95,6 @@ <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" /> - <marker date="1513092476555" expanded="true" signature="1117:1231" ph="..." /> </folding> </state> </provider> @@ -82,7 +103,7 @@ <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="756"> + <state relative-caret-position="846"> <caret line="47" column="0" lean-forward="false" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" /> <folding /> </state> @@ -108,7 +129,6 @@ <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" /> @@ -117,8 +137,10 @@ <option value="$PROJECT_DIR$/Projet/polls/urls.py" /> <option value="$PROJECT_DIR$/Projet/polls/forms.py" /> <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/templates/polls/eleve.html" /> + <option value="$PROJECT_DIR$/Projet/polls/templates/polls/code_inscription.html" /> + <option value="$PROJECT_DIR$/Projet/polls/templates/polls/inscription.html" /> + <option value="$PROJECT_DIR$/Projet/polls/views.py" /> </list> </option> </component> @@ -150,65 +172,102 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="Scope" /> <pane id="Scratches" /> <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="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> - <path> - <item name="ChandelIIEr" type="b2602c69:ProjectViewProjectNode" /> - <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> - <item name="rapports_iterations" 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> </subPane> </pane> - <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -315,20 +374,19 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="64" y="-11" width="1303" height="780" extended-state="0" /> + <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.2494244" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2490392" 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="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="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="-1" 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="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="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="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="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="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" /> @@ -336,6 +394,7 @@ <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="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="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="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> </component> @@ -354,17 +413,6 @@ <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" /> - <marker date="1513092476555" expanded="true" signature="1117:1231" ph="..." /> - </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"> @@ -376,9 +424,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> - <element signature="e#24#52#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -418,7 +464,6 @@ <caret line="6" column="26" lean-forward="true" 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" /> - <marker date="1513092476555" expanded="true" signature="1117:1231" ph="..." /> </folding> </state> </provider> @@ -434,9 +479,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> - <element signature="e#24#52#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -488,9 +531,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> - <element signature="e#24#52#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -500,7 +541,6 @@ <caret line="16" column="1" lean-forward="true" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" /> <folding> <element signature="e#0#32#0" expanded="true" /> - <marker date="1513092476555" expanded="true" signature="1117:1231" ph="..." /> </folding> </state> </provider> @@ -533,7 +573,6 @@ <caret line="14" column="36" lean-forward="false" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" /> <folding> <element signature="e#0#32#0" expanded="true" /> - <marker date="1513092476555" expanded="true" signature="1117:1231" ph="..." /> </folding> </state> </provider> @@ -549,9 +588,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> - <element signature="e#24#52#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -591,7 +628,6 @@ <caret line="14" column="50" lean-forward="false" selection-start-line="14" selection-start-column="50" selection-end-line="14" selection-end-column="50" /> <folding> <element signature="e#0#32#0" expanded="true" /> - <marker date="1513092476555" expanded="true" signature="1117:1231" ph="..." /> </folding> </state> </provider> @@ -600,9 +636,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> - <element signature="e#24#52#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -670,13 +704,6 @@ </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="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/index.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="306"> @@ -687,7 +714,7 @@ <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="756"> + <state relative-caret-position="846"> <caret line="47" column="0" lean-forward="false" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" /> <folding /> </state> @@ -697,9 +724,7 @@ <provider selected="true" editor-type-id="text-editor"> <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> - <element signature="e#24#52#0" expanded="true" /> - </folding> + <folding /> </state> </provider> </entry> @@ -710,7 +735,6 @@ <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" /> - <marker date="1513092476555" expanded="true" signature="1117:1231" ph="..." /> </folding> </state> </provider> @@ -724,26 +748,42 @@ </provider> </entry> <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/code_passwd.html" /> - <entry file="file://$PROJECT_DIR$/Projet/polls/views.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/eleve.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="101"> - <caret line="332" column="28" lean-forward="false" selection-start-line="332" selection-start-column="28" selection-end-line="332" selection-end-column="28" /> + <state relative-caret-position="396"> + <caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" /> <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="396"> + <state relative-caret-position="324"> <caret line="121" column="0" lean-forward="false" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/eleve.html"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/code_inscription.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="396"> - <caret line="22" column="36" lean-forward="true" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" /> + <state relative-caret-position="306"> + <caret line="17" column="11" lean-forward="true" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" /> + <folding /> + </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="270"> + <caret line="18" column="31" lean-forward="false" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" /> + <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="342"> + <caret line="163" column="29" lean-forward="false" selection-start-line="163" selection-start-column="29" selection-end-line="163" selection-end-column="29" /> <folding /> </state> </provider> diff --git a/Projet/db.sqlite3 b/Projet/db.sqlite3 index db5157bc4f46362e0ac17bab9588ad56bebfcb65..cf39e8fe605f663d55f0cb36166af1d4e7e68f82 100644 Binary files a/Projet/db.sqlite3 and b/Projet/db.sqlite3 differ diff --git a/Projet/polls/__pycache__/views.cpython-35.pyc b/Projet/polls/__pycache__/views.cpython-35.pyc index 30f357b48279b9fd83e8f91557a5c59dd0f1ef76..d763d2a7374f7c537656c47f8c9330703e6ad3bc 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/templates/polls/code_inscription.html b/Projet/polls/templates/polls/code_inscription.html index 46e6452695c62e5801091e230402037fc580a977..bdaea0ca0723d3e76ca7fe7f62fd184a94b60b76 100644 --- a/Projet/polls/templates/polls/code_inscription.html +++ b/Projet/polls/templates/polls/code_inscription.html @@ -10,12 +10,6 @@ <body> -{% if user.is_authenticated %} - -Vous êtes connecté, {{ user.username }} ! - -{% else %} - <form method="post" action="/polls/manage_code_inscription"> {% csrf_token %} @@ -39,7 +33,5 @@ Vous êtes connecté, {{ user.username }} ! </form> -{% endif %} - </body> </html> \ No newline at end of file diff --git a/Projet/polls/templates/polls/inscription.html b/Projet/polls/templates/polls/inscription.html index 1a6cfbeb2fc5fe14f00a2ac9e926ff8de006e379..eb0bba1b9821837b82f498fa15e0df6b39db5b4c 100644 --- a/Projet/polls/templates/polls/inscription.html +++ b/Projet/polls/templates/polls/inscription.html @@ -16,7 +16,7 @@ <div class="inscription-block"> <h3 class="inscription-data">Adresse mail</h3> {% if error %} - <p><strong>Adresse mail invalide</strong></p> + <p><strong>Adresse mail ou pseudonyme déjà existant</strong></p> {% endif %} <div class="inscription-form"> {{ form.mail }} diff --git a/Projet/polls/views.py b/Projet/polls/views.py index c0f6afbba74fb798e9c29c8ba2f469e75137d8e5..6e61e0330136acd6852008bb637f131be7625705 100644 --- a/Projet/polls/views.py +++ b/Projet/polls/views.py @@ -142,19 +142,7 @@ def manage_inscription(request): mail = form.cleaned_data['mail'] passwd = form.cleaned_data['passwd'] try: - send_mail('Confirmation de l\'inscription', 'Votre code de confirmation est le suivant : 4321', 'noreply.chandeliier@gmail.com', [mail]) - template = loader.get_template('polls/code_inscription.html') - form1 = CodeInscriptionForm(request.POST) - context = { - 'form': form1, - 'mail': mail, - 'prenom' : prenom, - 'nom' : nom, - 'username' : username, - 'passwd' : passwd, - } - return HttpResponse(template.render(context, request)) - except: + User.objects.get(username=username) error = True template = loader.get_template('polls/inscription.html') context = { @@ -162,6 +150,30 @@ def manage_inscription(request): 'form': form, } return HttpResponse(template.render(context, request)) + except: + try: + User.objects.get(email=mail) + error = True + template = loader.get_template('polls/inscription.html') + context = { + 'error': error, + 'form': form, + } + return HttpResponse(template.render(context, request)) + except: + error = False + send_mail('Confirmation de l\'inscription', 'Votre code de confirmation est le suivant : 4321', 'noreply.chandeliier@gmail.com', [mail]) + template = loader.get_template('polls/code_inscription.html') + form1 = CodeInscriptionForm(request.POST) + context = { + 'form': form1, + 'mail': mail, + 'prenom' : prenom, + 'nom' : nom, + 'username' : username, + 'passwd' : passwd, + } + return HttpResponse(template.render(context, request)) def manage_code_inscription(request): error = False