From 9a23f283e1d8532232b1625ebc5b8a305f13351c Mon Sep 17 00:00:00 2001 From: Hugal <hugo.boulanger.oib@gmail.com> Date: Mon, 18 Dec 2017 00:08:49 +0100 Subject: [PATCH] debug --- .idea/workspace.xml | 210 ++++++++++++++++++++++++----------------- Projet/polls/models.py | 34 +++---- 2 files changed, 141 insertions(+), 103 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7fd4239..e32545e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,6 @@ <component name="ChangeListManager"> <list default="true" id="00a63665-454a-40e6-8b9f-7a09d949e062" name="Default" comment=""> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change beforePath="$PROJECT_DIR$/Projet/polls/forms.py" afterPath="$PROJECT_DIR$/Projet/polls/forms.py" /> <change beforePath="$PROJECT_DIR$/Projet/polls/models.py" afterPath="$PROJECT_DIR$/Projet/polls/models.py" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -18,7 +17,7 @@ <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="2331"> + <state relative-caret-position="2058"> <caret line="111" column="4" lean-forward="false" selection-start-line="111" selection-start-column="4" selection-end-line="111" selection-end-column="4" /> <folding> <element signature="e#24#63#0" expanded="true" /> @@ -27,17 +26,39 @@ </provider> </entry> </file> - <file leaf-file-name="models.py" pinned="false" current-in-tab="false"> + <file leaf-file-name="models.py" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/Projet/polls/models.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="431"> - <caret line="71" column="10" lean-forward="false" selection-start-line="71" selection-start-column="10" selection-end-line="71" selection-end-column="10" /> + <state relative-caret-position="420"> + <caret line="56" column="45" lean-forward="false" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" /> + <folding> + <element signature="e#24#52#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="print_rapport.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Projet/polls/templatetags/print_rapport.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-658"> + <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> + </file> + <file leaf-file-name="admin.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Projet/polls/admin.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="147"> + <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> </file> - <file leaf-file-name="forms.py" pinned="false" current-in-tab="true"> + <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="42"> @@ -52,7 +73,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="2362"> + <state relative-caret-position="4011"> <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 /> </state> @@ -89,8 +110,9 @@ <option value="$PROJECT_DIR$/Projet/polls/templates/polls/visualisation.html" /> <option value="$PROJECT_DIR$/Projet/ChandelIIEr/settings.py" /> <option value="$PROJECT_DIR$/Projet/polls/views.py" /> - <option value="$PROJECT_DIR$/Projet/polls/models.py" /> <option value="$PROJECT_DIR$/Projet/polls/forms.py" /> + <option value="$PROJECT_DIR$/Projet/polls/admin.py" /> + <option value="$PROJECT_DIR$/Projet/polls/models.py" /> </list> </option> </component> @@ -122,49 +144,34 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <expand> <path> - <item name="ChandelIIE" type="b2602c69:ProjectViewProjectNode" /> - <item name="ChandelIIE" type="462c0819:PsiDirectoryNode" /> + <item name="ChandelII" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelII" type="462c0819:PsiDirectoryNode" /> </path> <path> - <item name="ChandelIIE" type="b2602c69:ProjectViewProjectNode" /> - <item name="ChandelIIE" type="462c0819:PsiDirectoryNode" /> + <item name="ChandelII" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelII" type="462c0819:PsiDirectoryNode" /> <item name="Projet" type="462c0819:PsiDirectoryNode" /> </path> <path> - <item name="ChandelIIE" type="b2602c69:ProjectViewProjectNode" /> - <item name="ChandelIIE" type="462c0819:PsiDirectoryNode" /> - <item name="Projet" type="462c0819:PsiDirectoryNode" /> - <item name="ChandelIIEr" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="ChandelIIE" type="b2602c69:ProjectViewProjectNode" /> - <item name="ChandelIIE" type="462c0819:PsiDirectoryNode" /> - <item name="Projet" type="462c0819:PsiDirectoryNode" /> - <item name="polls" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="ChandelIIE" type="b2602c69:ProjectViewProjectNode" /> - <item name="ChandelIIE" type="462c0819:PsiDirectoryNode" /> + <item name="ChandelII" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelII" 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="ChandelIIE" type="b2602c69:ProjectViewProjectNode" /> - <item name="ChandelIIE" type="462c0819:PsiDirectoryNode" /> + <item name="ChandelII" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelII" 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" /> + <item name="migrations" type="462c0819:PsiDirectoryNode" /> </path> <path> - <item name="ChandelIIE" type="b2602c69:ProjectViewProjectNode" /> - <item name="ChandelIIE" type="462c0819:PsiDirectoryNode" /> + <item name="ChandelII" type="b2602c69:ProjectViewProjectNode" /> + <item name="ChandelII" type="462c0819:PsiDirectoryNode" /> <item name="Projet" type="462c0819:PsiDirectoryNode" /> <item name="polls" type="462c0819:PsiDirectoryNode" /> <item name="templatetags" type="462c0819:PsiDirectoryNode" /> @@ -174,6 +181,7 @@ </subPane> </pane> <pane id="Scratches" /> + <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -193,7 +201,43 @@ </list> </option> </component> - <component name="RunManager"> + <component name="RunManager" selected="Python.Migrate"> + <configuration name="Makemigration" type="PythonConfigurationType" factoryName="Python"> + <option name="INTERPRETER_OPTIONS" value="" /> + <option name="PARENT_ENVS" value="true" /> + <envs> + <env name="PYTHONUNBUFFERED" value="1" /> + </envs> + <option name="SDK_HOME" value="C:\Users\Frozule\AppData\Local\Programs\Python\Python36-32\python.exe" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Projet" /> + <option name="IS_MODULE_SDK" value="false" /> + <option name="ADD_CONTENT_ROOTS" value="true" /> + <option name="ADD_SOURCE_ROOTS" value="true" /> + <module name="ChandelIIEr" /> + <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Projet/manage.py" /> + <option name="PARAMETERS" value="makemigrations" /> + <option name="SHOW_COMMAND_LINE" value="false" /> + <option name="EMULATE_TERMINAL" value="false" /> + <option name="MODULE_MODE" value="false" /> + </configuration> + <configuration name="Migrate" type="PythonConfigurationType" factoryName="Python"> + <option name="INTERPRETER_OPTIONS" value="" /> + <option name="PARENT_ENVS" value="true" /> + <envs> + <env name="PYTHONUNBUFFERED" value="1" /> + </envs> + <option name="SDK_HOME" value="C:\Users\Frozule\AppData\Local\Programs\Python\Python36-32\python.exe" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Projet" /> + <option name="IS_MODULE_SDK" value="false" /> + <option name="ADD_CONTENT_ROOTS" value="true" /> + <option name="ADD_SOURCE_ROOTS" value="true" /> + <module name="ChandelIIEr" /> + <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Projet/manage.py" /> + <option name="PARAMETERS" value="migrate" /> + <option name="SHOW_COMMAND_LINE" value="false" /> + <option name="EMULATE_TERMINAL" value="false" /> + <option name="MODULE_MODE" value="false" /> + </configuration> <configuration name="Runserver" type="PythonConfigurationType" factoryName="Python"> <option name="INTERPRETER_OPTIONS" value="" /> <option name="PARENT_ENVS" value="true" /> @@ -276,6 +320,11 @@ <option name="_new_targetType" value=""PATH"" /> <method /> </configuration> + <list size="3"> + <item index="0" class="java.lang.String" itemvalue="Python.Runserver" /> + <item index="1" class="java.lang.String" itemvalue="Python.Makemigration" /> + <item index="2" class="java.lang.String" itemvalue="Python.Migrate" /> + </list> </component> <component name="ShelveChangesManager" show_recycled="false"> <option name="remove_strategy" value="false" /> @@ -317,9 +366,8 @@ </component> <component name="ToolWindowManager"> <frame x="-9" y="-9" width="1938" height="1048" 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.16614583" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16614583" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32928178" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> @@ -378,9 +426,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="72"> <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" /> - </folding> </state> </provider> </entry> @@ -395,7 +440,9 @@ <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 /> + <folding> + <element signature="e#24#52#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -451,7 +498,9 @@ <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 /> + <folding> + <element signature="e#24#52#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -459,9 +508,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="252"> <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" /> - </folding> </state> </provider> </entry> @@ -493,9 +539,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="216"> <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" /> - </folding> </state> </provider> </entry> @@ -510,7 +553,9 @@ <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 /> + <folding> + <element signature="e#24#52#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -552,9 +597,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="216"> <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" /> - </folding> </state> </provider> </entry> @@ -562,7 +604,9 @@ <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 /> + <folding> + <element signature="e#24#52#0" expanded="true" /> + </folding> </state> </provider> </entry> @@ -597,13 +641,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/admin.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> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/Projet/polls/tests.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> @@ -637,9 +674,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="147"> <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> @@ -669,7 +703,6 @@ <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> @@ -677,7 +710,6 @@ <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> @@ -685,7 +717,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="357"> <caret line="17" column="5" lean-forward="false" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" /> - <folding /> </state> </provider> </entry> @@ -693,15 +724,6 @@ <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="27" selection-end-column="7" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/templatetags/print_rapport.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> </provider> </entry> @@ -709,7 +731,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="525"> <caret line="25" column="74" lean-forward="false" selection-start-line="25" selection-start-column="74" selection-end-line="25" selection-end-column="74" /> - <folding /> </state> </provider> </entry> @@ -717,13 +738,12 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="399"> <caret line="34" column="39" lean-forward="false" selection-start-line="34" selection-start-column="39" selection-end-line="34" selection-end-column="39" /> - <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="2331"> + <state relative-caret-position="2058"> <caret line="111" column="4" lean-forward="false" selection-start-line="111" selection-start-column="4" selection-end-line="111" selection-end-column="4" /> <folding> <element signature="e#24#63#0" expanded="true" /> @@ -733,26 +753,44 @@ </entry> <entry file="file://$PROJECT_DIR$/Projet/polls/templates/polls/report.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2362"> + <state relative-caret-position="4011"> <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 /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Projet/polls/models.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/forms.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="431"> - <caret line="71" column="10" lean-forward="false" selection-start-line="71" selection-start-column="10" selection-end-line="71" selection-end-column="10" /> + <state relative-caret-position="42"> + <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> + <folding> + <element signature="e#0#24#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Projet/polls/templatetags/print_rapport.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-658"> + <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/forms.py"> + <entry file="file://$PROJECT_DIR$/Projet/polls/admin.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="42"> - <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> + <state relative-caret-position="147"> + <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/models.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="420"> + <caret line="56" column="45" lean-forward="false" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" /> <folding> - <element signature="e#0#24#0" expanded="true" /> + <element signature="e#24#52#0" expanded="true" /> </folding> </state> </provider> diff --git a/Projet/polls/models.py b/Projet/polls/models.py index 0aaa3a6..47c7b2e 100644 --- a/Projet/polls/models.py +++ b/Projet/polls/models.py @@ -25,20 +25,20 @@ class Prof(models.Model): return "{0} {1}".format(self.nom,self.prenom) -# class Eleve(models.Model): -# nom = models.CharField(default="Dupont",max_length=50) -# prenom = models.CharField(default="Paul",max_length=50) -# email = models.EmailField(default="adresse@mail.fr") -# mot_de_passe = models.CharField(default="0000", max_length=50) -# -# def __str__(self): -# return "{0} {1}".format(self.nom,self.prenom) +class Eleve(models.Model): + nom = models.CharField(default="Dupont",max_length=50) + prenom = models.CharField(default="Paul",max_length=50) + email = models.EmailField(default="adresse@mail.fr") + mot_de_passe = models.CharField(default="0000", max_length=50) + + def __str__(self): + return "{0} {1}".format(self.nom,self.prenom) class Groupe(models.Model): nom = models.CharField(default="nom du groupe",max_length=50) - prof = models.ForeignKey(User,null=True, blank=True) - eleves=models.ManyToManyField(User) + prof = models.ForeignKey(Prof,null=True, blank=True) + eleves = models.ManyToManyField(Eleve) def __str__(self): return self.nom @@ -48,13 +48,13 @@ class Rapport(models.Model): groupe = models.ForeignKey(Groupe, on_delete=models.CASCADE) nIteration = models.IntegerField(default=0) brouillon = models.BooleanField(default=False) - product_owner = models.ForeignKey(Eleve) - scrum_master = models.ForeignKey(Eleve) - dev1 = models.ForeignKey(Eleve) - dev2 = models.ForeignKey(Eleve) - dev3 = models.ForeignKey(Eleve) - dev4 = models.ForeignKey(Eleve) - dev5 = models.ForeignKey(Eleve) + product_owner = models.CharField(max_length = 150) + scrum_master = models.CharField(max_length = 150) + dev1 = models.CharField(max_length = 150) + dev2 = models.CharField(max_length = 150) + dev3 = models.CharField(max_length = 150) + dev4 = models.CharField(max_length = 150) + dev5 = models.CharField(max_length = 150) events = models.CharField(max_length = 5000) taux_completion = models.CharField(max_length = 1000) user_stories = models.CharField(max_length = 5000) -- GitLab