babolivier
/
burger-quizz
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Activity
Explorar el Código

++ gestion reponsesV3

PCYoshi hace 9 años
padre
cd3789ecbb
commit
a4b2838097
Se han modificado 13 ficheros con 250 adiciones y 146 borrados
Dividir vista Mostrar estadísticas de diff
  1. 138
    119
      java/.idea/workspace.xml
  2. BIN
      java/out/production/java/ConnexionBDD.class
  3. BIN
      java/out/production/java/GestionCategories.class
  4. BIN
      java/out/production/java/GestionQuestions.class
  5. BIN
      java/out/production/java/GestionReponses.class
  6. BIN
      java/out/production/java/InterfacePrincipale$PanQuestionsListener.class
  7. BIN
      java/out/production/java/InterfacePrincipale$PanReponsesListener.class
  8. BIN
      java/out/production/java/Question.class
  9. 7
    0
      java/src/ConnexionBDD.java
  10. 38
    0
      java/src/GestionQuestions.java
  11. 10
    4
      java/src/InterfacePrincipale.java
  12. 2
    2
      java/src/NouvelleReponseDialog.java
  13. 55
    21
      java/src/Question.java

+ 138
- 119
java/.idea/workspace.xml Ver fichero 

@@ -6,14 +6,19 @@
6 6 
     </artifacts-to-build>
7 7 
   </component>
8 8 
   <component name="ChangeListManager">
9 
-    <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
10 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanCategoriesListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanCategoriesListener.class" />
11 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" />
9 
+    <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="++ gestion reponsesV3">
10 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" afterPath="$PROJECT_DIR$/out/production/java/ConnexionBDD.class" />
11 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionCategories.class" afterPath="$PROJECT_DIR$/out/production/java/GestionCategories.class" />
12 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionQuestions.class" afterPath="$PROJECT_DIR$/out/production/java/GestionQuestions.class" />
13 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/GestionReponses.class" afterPath="$PROJECT_DIR$/out/production/java/GestionReponses.class" />
14 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" />
15 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" />
16 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/Question.class" afterPath="$PROJECT_DIR$/out/production/java/Question.class" />
12 17 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ConnexionBDD.java" afterPath="$PROJECT_DIR$/src/ConnexionBDD.java" />
13 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionCategories.java" afterPath="$PROJECT_DIR$/src/GestionCategories.java" />
14 
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionReponses.java" afterPath="$PROJECT_DIR$/src/GestionReponses.java" />
18 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/GestionQuestions.java" afterPath="$PROJECT_DIR$/src/GestionQuestions.java" />
15 19 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
16 20 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" afterPath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
21 
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Question.java" afterPath="$PROJECT_DIR$/src/Question.java" />
17 22 
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
18 23 
     </list>
19 24 
     <ignored path="java.iws" />
 
@@ -36,31 +41,13 @@
36 41 
   </component>
37 42 
   <component name="FileEditorManager">
38 43 
     <leaf>
39 
-      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
44 
+      <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="false">
40 45 
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
41 46 
           <provider selected="true" editor-type-id="text-editor">
42 
-            <state vertical-scroll-proportion="0.45895523">
43 
-              <caret line="470" column="79" selection-start-line="470" selection-start-column="79" selection-end-line="470" selection-end-column="79" />
44 
-              <folding>
45 
-                <element signature="imports" expanded="true" />
46 
-              </folding>
47 
-            </state>
48 
-          </provider>
49 
-        </entry>
50 
-      </file>
51 
-      <file leaf-file-name="NouvelleReponseDialog.java" pinned="false" current-in-tab="false">
52 
-        <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
53 
-          <provider selected="true" editor-type-id="text-editor">
54 47 
             <state vertical-scroll-proportion="0.0">
55 
-              <caret line="59" column="31" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="31" />
48 
+              <caret line="469" column="42" selection-start-line="469" selection-start-column="42" selection-end-line="469" selection-end-column="42" />
56 49 
               <folding>
57 50 
                 <element signature="imports" expanded="true" />
58 
-                <element signature="e#2268#2269#0" expanded="true" />
59 
-                <element signature="e#2296#2297#0" expanded="true" />
60 
-                <element signature="e#2324#2325#0" expanded="true" />
61 
-                <element signature="e#2352#2353#0" expanded="true" />
62 
-                <element signature="e#2379#2380#0" expanded="true" />
63 
-                <element signature="e#2430#2431#0" expanded="true" />
64 51 
               </folding>
65 52 
             </state>
66 53 
           </provider>
 
@@ -70,7 +57,7 @@
70 57 
         <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
71 58 
           <provider selected="true" editor-type-id="text-editor">
72 59 
             <state vertical-scroll-proportion="0.0">
73 
-              <caret line="78" column="54" selection-start-line="78" selection-start-column="54" selection-end-line="78" selection-end-column="54" />
60 
+              <caret line="92" column="52" selection-start-line="92" selection-start-column="52" selection-end-line="92" selection-end-column="52" />
74 61 
               <folding>
75 62 
                 <element signature="imports" expanded="true" />
76 63 
                 <element signature="e#1239#1240#0" expanded="true" />
 
@@ -84,50 +71,56 @@
84 71 
           </provider>
85 72 
         </entry>
86 73 
       </file>
87 
-      <file leaf-file-name="GestionCategories.java" pinned="false" current-in-tab="false">
88 
-        <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
74 
+      <file leaf-file-name="GestionReponses.java" pinned="false" current-in-tab="false">
75 
+        <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
89 76 
           <provider selected="true" editor-type-id="text-editor">
90 77 
             <state vertical-scroll-proportion="0.0">
91 
-              <caret line="93" column="38" selection-start-line="93" selection-start-column="38" selection-end-line="93" selection-end-column="38" />
78 
+              <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
92 79 
               <folding>
93 80 
                 <element signature="imports" expanded="true" />
94 
-                <element signature="e#2160#2161#0" expanded="true" />
95 
-                <element signature="e#2188#2189#0" expanded="true" />
81 
+                <element signature="e#2635#2636#0" expanded="true" />
82 
+                <element signature="e#2661#2662#0" expanded="true" />
96 83 
               </folding>
97 84 
             </state>
98 85 
           </provider>
99 86 
         </entry>
100 87 
       </file>
101 
-      <file leaf-file-name="GestionReponses.java" pinned="false" current-in-tab="false">
102 
-        <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
88 
+      <file leaf-file-name="GestionQuestions.java" pinned="false" current-in-tab="true">
89 
+        <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
103 90 
           <provider selected="true" editor-type-id="text-editor">
104 
-            <state vertical-scroll-proportion="0.0">
105 
-              <caret line="99" column="38" selection-start-line="99" selection-start-column="38" selection-end-line="99" selection-end-column="38" />
91 
+            <state vertical-scroll-proportion="0.56160456">
92 
+              <caret line="34" column="165" selection-start-line="34" selection-start-column="165" selection-end-line="34" selection-end-column="165" />
106 93 
               <folding>
107 94 
                 <element signature="imports" expanded="true" />
108 
-                <element signature="e#2635#2636#0" expanded="true" />
109 
-                <element signature="e#2661#2662#0" expanded="true" />
95 
+                <element signature="e#1151#1152#0" expanded="true" />
96 
+                <element signature="e#1179#1180#0" expanded="true" />
110 97 
               </folding>
111 98 
             </state>
112 99 
           </provider>
113 100 
         </entry>
114 101 
       </file>
115 
-      <file leaf-file-name="Reponses.java" pinned="false" current-in-tab="false">
116 
-        <entry file="file://$PROJECT_DIR$/src/Reponses.java">
102 
+      <file leaf-file-name="Question.java" pinned="false" current-in-tab="false">
103 
+        <entry file="file://$PROJECT_DIR$/src/Question.java">
117 104 
           <provider selected="true" editor-type-id="text-editor">
118 105 
             <state vertical-scroll-proportion="0.0">
119 
-              <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
106 
+              <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
120 107 
               <folding>
121 
-                <element signature="e#223#224#0" expanded="true" />
122 
-                <element signature="e#245#246#0" expanded="true" />
123 
-                <element signature="e#290#291#0" expanded="true" />
124 
-                <element signature="e#321#322#0" expanded="true" />
125 
-                <element signature="e#353#354#0" expanded="true" />
126 
-                <element signature="e#375#376#0" expanded="true" />
127 
-                <element signature="e#420#421#0" expanded="true" />
128 
-                <element signature="e#451#452#0" expanded="true" />
129 
-                <element signature="e#480#481#0" expanded="true" />
130 
-                <element signature="e#539#540#0" expanded="true" />
108 
+                <element signature="e#359#360#0" expanded="true" />
109 
+                <element signature="e#381#382#0" expanded="true" />
110 
+                <element signature="e#426#427#0" expanded="true" />
111 
+                <element signature="e#457#458#0" expanded="true" />
112 
+                <element signature="e#489#490#0" expanded="true" />
113 
+                <element signature="e#511#512#0" expanded="true" />
114 
+                <element signature="e#556#557#0" expanded="true" />
115 
+                <element signature="e#587#588#0" expanded="true" />
116 
+                <element signature="e#619#620#0" expanded="true" />
117 
+                <element signature="e#641#642#0" expanded="true" />
118 
+                <element signature="e#686#687#0" expanded="true" />
119 
+                <element signature="e#717#718#0" expanded="true" />
120 
+                <element signature="e#745#746#0" expanded="true" />
121 
+                <element signature="e#766#767#0" expanded="true" />
122 
+                <element signature="e#806#807#0" expanded="true" />
123 
+                <element signature="e#835#836#0" expanded="true" />
131 124 
               </folding>
132 125 
             </state>
133 126 
           </provider>
 
@@ -168,12 +161,12 @@
168 161 
         <option value="$PROJECT_DIR$/src/Bouton.java" />
169 162 
         <option value="$PROJECT_DIR$/src/Categorie.java" />
170 163 
         <option value="$PROJECT_DIR$/src/Reponses.java" />
171 
-        <option value="$PROJECT_DIR$/src/Question.java" />
172 
-        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
173 
-        <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
174 
-        <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
175 164 
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
176 165 
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
166 
+        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
167 
+        <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
168 
+        <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
169 
+        <option value="$PROJECT_DIR$/src/Question.java" />
177 170 
         <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
178 171 
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
179 172 
       </list>
 
@@ -294,6 +287,9 @@
294 287 
       <sortByType />
295 288 
     </navigator>
296 289 
     <panes>
290 
+      <pane id="PackagesPane" />
291 
+      <pane id="Scope" />
292 
+      <pane id="Scratches" />
297 293 
       <pane id="ProjectPane">
298 294 
         <subPane>
299 295 
           <PATH>
 
@@ -328,9 +324,6 @@
328 324 
           </PATH>
329 325 
         </subPane>
330 326 
       </pane>
331 
-      <pane id="PackagesPane" />
332 
-      <pane id="Scratches" />
333 
-      <pane id="Scope" />
334 327 
     </panes>
335 328 
   </component>
336 329 
   <component name="PropertiesComponent">
 
@@ -372,7 +365,7 @@
372 365 
           <option name="mySupportsDeletion" value="false" />
373 366 
           <option name="myCanBeAbsent" value="false" />
374 367 
           <option name="myId" value="UPDATED" />
375 
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/model/class.questset.php</PATH>
368 
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/api/controller/palmares.php</PATH>
376 369 
           <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/index.htm</PATH>
377 370 
           <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/js/game.js</PATH>
378 371 
         </FILE-GROUP>
 
@@ -731,7 +724,13 @@
731 724 
       <option name="project" value="LOCAL" />
732 725 
       <updated>1433172079872</updated>
733 726 
     </task>
734 
-    <option name="localTasksCounter" value="17" />
727 
+    <task id="LOCAL-00017" summary="++ gestion reponsesV2">
728 
+      <created>1433236557607</created>
729 
+      <option name="number" value="00017" />
730 
+      <option name="project" value="LOCAL" />
731 
+      <updated>1433236557607</updated>
732 
+    </task>
733 
+    <option name="localTasksCounter" value="18" />
735 734 
     <servers />
736 735 
   </component>
737 736 
   <component name="TodoView">
 
@@ -745,31 +744,31 @@
745 744 
   </component>
746 745 
   <component name="ToolWindowManager">
747 746 
     <frame x="-1" y="27" width="1368" height="712" extended-state="6" />
748 
-    <editor active="true" />
747 
+    <editor active="false" />
749 748 
     <layout>
750 749 
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
751 750 
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
752 751 
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
753 752 
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
754 
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
753 
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
755 754 
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
755 
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3996479" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
756 756 
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5030441" order="7" side_tool="true" content_ui="tabs" />
757 757 
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
758 
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.49695587" order="7" side_tool="false" content_ui="tabs" />
759 
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
760 
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
758 
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.49695587" order="8" side_tool="false" content_ui="tabs" />
759 
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32864675" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
760 
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
761 761 
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
762 762 
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
763 
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
763 
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
764 764 
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16717325" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
765 
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
765 
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30579966" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
766 
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
766 767 
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
767 768 
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
768 
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3996479" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
769 769 
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
770 
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
770 771 
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
771 
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
772 
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30579966" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
773 772 
     </layout>
774 773 
   </component>
775 774 
   <component name="Vcs.Log.UiProperties">
 
@@ -799,7 +798,9 @@
799 798 
     <MESSAGE value="++" />
800 799 
     <MESSAGE value="correction de bug" />
801 800 
     <MESSAGE value="++ gestion reponses" />
802 
-    <option name="LAST_COMMIT_MESSAGE" value="++ gestion reponses" />
801 
+    <MESSAGE value="++ gestion reponsesV2" />
802 
+    <MESSAGE value="++ gestion reponsesV3" />
803 
+    <option name="LAST_COMMIT_MESSAGE" value="++ gestion reponsesV3" />
803 804 
   </component>
804 805 
   <component name="XDebuggerManager">
805 806 
     <breakpoint-manager>
 
@@ -1084,37 +1085,36 @@
1084 1085 
         </state>
1085 1086 
       </provider>
1086 1087 
     </entry>
1087 
-    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1088 
-      <provider selected="true" editor-type-id="text-editor">
1089 
-        <state vertical-scroll-proportion="0.6130031">
1090 
-          <caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
1091 
-        </state>
1092 
-      </provider>
1093 
-    </entry>
1094 
-    <entry file="file://$PROJECT_DIR$/src/Question.java">
1088 
+    <entry file="file://$PROJECT_DIR$/src/Categorie.java">
1095 1089 
       <provider selected="true" editor-type-id="text-editor">
1096 
-        <state vertical-scroll-proportion="0.26915887">
1097 
-          <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
1090 
+        <state vertical-scroll-proportion="0.0">
1091 
+          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
1098 1092 
         </state>
1099 1093 
       </provider>
1100 1094 
     </entry>
1101 
-    <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
1095 
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1102 1096 
       <provider selected="true" editor-type-id="text-editor">
1103 
-        <state vertical-scroll-proportion="0.24930748">
1104 
-          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
1097 
+        <state vertical-scroll-proportion="0.51657456">
1098 
+          <caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
1099 
+          <folding />
1105 1100 
         </state>
1106 1101 
       </provider>
1107 1102 
     </entry>
1108 
-    <entry file="file://$PROJECT_DIR$/src/Categorie.java">
1103 
+    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
1109 1104 
       <provider selected="true" editor-type-id="text-editor">
1110 
-        <state vertical-scroll-proportion="0.0">
1111 
-          <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
1105 
+        <state vertical-scroll-proportion="2.4738805">
1106 
+          <caret line="93" column="38" selection-start-line="93" selection-start-column="38" selection-end-line="93" selection-end-column="38" />
1107 
+          <folding>
1108 
+            <element signature="imports" expanded="true" />
1109 
+            <element signature="e#2160#2161#0" expanded="true" />
1110 
+            <element signature="e#2188#2189#0" expanded="true" />
1111 
+          </folding>
1112 1112 
         </state>
1113 1113 
       </provider>
1114 1114 
     </entry>
1115 1115 
     <entry file="file://$PROJECT_DIR$/src/Reponses.java">
1116 1116 
       <provider selected="true" editor-type-id="text-editor">
1117 
-        <state vertical-scroll-proportion="0.0">
1117 
+        <state vertical-scroll-proportion="0.3488806">
1118 1118 
           <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
1119 1119 
           <folding>
1120 1120 
             <element signature="e#223#224#0" expanded="true" />
 
@@ -1131,73 +1131,92 @@
1131 1131 
         </state>
1132 1132 
       </provider>
1133 1133 
     </entry>
1134 
-    <entry file="file://$PROJECT_DIR$/mcd.png">
1135 
-      <provider selected="true" editor-type-id="images">
1136 
-        <state />
1137 
-      </provider>
1138 
-    </entry>
1139 
-    <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
1134 
+    <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
1140 1135 
       <provider selected="true" editor-type-id="text-editor">
1141 1136 
         <state vertical-scroll-proportion="0.0">
1142 
-          <caret line="93" column="38" selection-start-line="93" selection-start-column="38" selection-end-line="93" selection-end-column="38" />
1137 
+          <caret line="92" column="52" selection-start-line="92" selection-start-column="52" selection-end-line="92" selection-end-column="52" />
1143 1138 
           <folding>
1144 1139 
             <element signature="imports" expanded="true" />
1145 
-            <element signature="e#2160#2161#0" expanded="true" />
1146 
-            <element signature="e#2188#2189#0" expanded="true" />
1140 
+            <element signature="e#1239#1240#0" expanded="true" />
1141 
+            <element signature="e#1294#1295#0" expanded="true" />
1142 
+            <element signature="e#1349#1350#0" expanded="true" />
1143 
+            <element signature="e#1404#1405#0" expanded="true" />
1144 
+            <element signature="e#1960#1961#0" expanded="true" />
1145 
+            <element signature="e#2017#2018#0" expanded="true" />
1147 1146 
           </folding>
1148 1147 
         </state>
1149 1148 
       </provider>
1150 1149 
     </entry>
1151 
-    <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
1150 
+    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
1152 1151 
       <provider selected="true" editor-type-id="text-editor">
1153 1152 
         <state vertical-scroll-proportion="0.0">
1154 
-          <caret line="59" column="31" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="31" />
1153 
+          <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
1155 1154 
           <folding>
1156 1155 
             <element signature="imports" expanded="true" />
1157 
-            <element signature="e#2268#2269#0" expanded="true" />
1158 
-            <element signature="e#2296#2297#0" expanded="true" />
1159 
-            <element signature="e#2324#2325#0" expanded="true" />
1160 
-            <element signature="e#2352#2353#0" expanded="true" />
1161 
-            <element signature="e#2379#2380#0" expanded="true" />
1162 
-            <element signature="e#2430#2431#0" expanded="true" />
1156 
+            <element signature="e#2635#2636#0" expanded="true" />
1157 
+            <element signature="e#2661#2662#0" expanded="true" />
1163 1158 
           </folding>
1164 1159 
         </state>
1165 1160 
       </provider>
1166 1161 
     </entry>
1167 
-    <entry file="file://$PROJECT_DIR$/src/ConnexionBDD.java">
1162 
+    <entry file="file://$PROJECT_DIR$/mcd.png">
1163 
+      <provider selected="true" editor-type-id="images">
1164 
+        <state />
1165 
+      </provider>
1166 
+    </entry>
1167 
+    <entry file="file://$PROJECT_DIR$/src/Question.java">
1168 1168 
       <provider selected="true" editor-type-id="text-editor">
1169 1169 
         <state vertical-scroll-proportion="0.0">
1170 
-          <caret line="78" column="54" selection-start-line="78" selection-start-column="54" selection-end-line="78" selection-end-column="54" />
1170 
+          <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
1171 
+          <folding>
1172 
+            <element signature="e#359#360#0" expanded="true" />
1173 
+            <element signature="e#381#382#0" expanded="true" />
1174 
+            <element signature="e#426#427#0" expanded="true" />
1175 
+            <element signature="e#457#458#0" expanded="true" />
1176 
+            <element signature="e#489#490#0" expanded="true" />
1177 
+            <element signature="e#511#512#0" expanded="true" />
1178 
+            <element signature="e#556#557#0" expanded="true" />
1179 
+            <element signature="e#587#588#0" expanded="true" />
1180 
+            <element signature="e#619#620#0" expanded="true" />
1181 
+            <element signature="e#641#642#0" expanded="true" />
1182 
+            <element signature="e#686#687#0" expanded="true" />
1183 
+            <element signature="e#717#718#0" expanded="true" />
1184 
+            <element signature="e#745#746#0" expanded="true" />
1185 
+            <element signature="e#766#767#0" expanded="true" />
1186 
+            <element signature="e#806#807#0" expanded="true" />
1187 
+            <element signature="e#835#836#0" expanded="true" />
1188 
+          </folding>
1189 
+        </state>
1190 
+      </provider>
1191 
+    </entry>
1192 
+    <entry file="file://$PROJECT_DIR$/src/NouvelleReponseDialog.java">
1193 
+      <provider selected="true" editor-type-id="text-editor">
1194 
+        <state vertical-scroll-proportion="0.28544775">
1195 
+          <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
1171 1196 
           <folding>
1172 1197 
             <element signature="imports" expanded="true" />
1173 
-            <element signature="e#1239#1240#0" expanded="true" />
1174 
-            <element signature="e#1294#1295#0" expanded="true" />
1175 
-            <element signature="e#1349#1350#0" expanded="true" />
1176 
-            <element signature="e#1404#1405#0" expanded="true" />
1177 
-            <element signature="e#1960#1961#0" expanded="true" />
1178 
-            <element signature="e#2017#2018#0" expanded="true" />
1179 1198 
           </folding>
1180 1199 
         </state>
1181 1200 
       </provider>
1182 1201 
     </entry>
1183 
-    <entry file="file://$PROJECT_DIR$/src/GestionReponses.java">
1202 
+    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
1184 1203 
       <provider selected="true" editor-type-id="text-editor">
1185 1204 
         <state vertical-scroll-proportion="0.0">
1186 
-          <caret line="99" column="38" selection-start-line="99" selection-start-column="38" selection-end-line="99" selection-end-column="38" />
1205 
+          <caret line="469" column="42" selection-start-line="469" selection-start-column="42" selection-end-line="469" selection-end-column="42" />
1187 1206 
           <folding>
1188 1207 
             <element signature="imports" expanded="true" />
1189 
-            <element signature="e#2635#2636#0" expanded="true" />
1190 
-            <element signature="e#2661#2662#0" expanded="true" />
1191 1208 
           </folding>
1192 1209 
         </state>
1193 1210 
       </provider>
1194 1211 
     </entry>
1195 
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
1212 
+    <entry file="file://$PROJECT_DIR$/src/GestionQuestions.java">
1196 1213 
       <provider selected="true" editor-type-id="text-editor">
1197 
-        <state vertical-scroll-proportion="0.45895523">
1198 
-          <caret line="470" column="79" selection-start-line="470" selection-start-column="79" selection-end-line="470" selection-end-column="79" />
1214 
+        <state vertical-scroll-proportion="0.56160456">
1215 
+          <caret line="34" column="165" selection-start-line="34" selection-start-column="165" selection-end-line="34" selection-end-column="165" />
1199 1216 
           <folding>
1200 1217 
             <element signature="imports" expanded="true" />
1218 
+            <element signature="e#1151#1152#0" expanded="true" />
1219 
+            <element signature="e#1179#1180#0" expanded="true" />
1201 1220 
           </folding>
1202 1221 
         </state>
1203 1222 
       </provider>

BIN
java/out/production/java/ConnexionBDD.class Ver fichero


BIN
java/out/production/java/GestionCategories.class Ver fichero


BIN
java/out/production/java/GestionQuestions.class Ver fichero


BIN
java/out/production/java/GestionReponses.class Ver fichero


BIN
java/out/production/java/InterfacePrincipale$PanQuestionsListener.class Ver fichero


BIN
java/out/production/java/InterfacePrincipale$PanReponsesListener.class Ver fichero


BIN
java/out/production/java/Question.class Ver fichero


+ 7
- 0
java/src/ConnexionBDD.java Ver fichero 

@@ -85,4 +85,11 @@ public class ConnexionBDD
85 85 
 	{
86 86 
 		gestionReponses.updateReponsesReponses(categorie, oldRep1, oldRep2, newRep1, newRep2);
87 87 
 	}
88 
+
89 
+	//Gestion questions
90 
+	public ArrayList<Question> getListeQuestions(String reponse1, String reponse2)
91 
+	{
92 
+		gestionQuestions.readQuestions(reponse1, reponse2);
93 
+		return gestionQuestions.getListeQuestions();
94 
+	}
88 95 
 }

+ 38
- 0
java/src/GestionQuestions.java Ver fichero 

@@ -1,4 +1,7 @@
1 1 
 import java.sql.Connection;
2 
+import java.sql.PreparedStatement;
3 
+import java.sql.ResultSet;
4 
+import java.sql.SQLException;
2 5 
 import java.util.ArrayList;
3 6
4 7 
 public class GestionQuestions
 
@@ -9,5 +12,40 @@ public class GestionQuestions
9 12 
 	public GestionQuestions(Connection bdd)
10 13 
 	{
11 14 
 		this.bdd = bdd;
15 
+		this.listeQuestions = new ArrayList<Question>();
16 
+	}
17 
+
18 
+	public void readQuestions(String reponse1, String reponse2)
19 
+	{
20 
+		String rq = "SELECT *" +
21 
+				" FROM questions" +
22 
+				" WHERE reponse1 = ? AND reponse2 = ?";
23 
+
24 
+		try
25 
+		{
26 
+			PreparedStatement preparedStatement = bdd.prepareStatement(rq);
27 
+			preparedStatement.setString(1, reponse1);
28 
+			preparedStatement.setString(2, reponse2);
29 
+			ResultSet resultat = preparedStatement.executeQuery();
30 
+
31 
+			listeQuestions.clear();
32 
+
33 
+			while(resultat.next())
34 
+			{
35 
+				listeQuestions.add(new Question(resultat.getString("intitule"), resultat.getString("reponse1"), resultat.getString("reponse2"), resultat.getInt("num_reponse")));
36 
+			}
37 
+
38 
+			resultat.close();
39 
+			preparedStatement.close();
40 
+
41 
+		}
42 
+		catch (SQLException e)
43 
+		{
44 
+			e.printStackTrace();
45 
+		}
46 
+	}
47 
+
48 
+	public ArrayList<Question> getListeQuestions() {
49 
+		return listeQuestions;
12 50 
 	}
13 51 
 }

+ 10
- 4
java/src/InterfacePrincipale.java Ver fichero 

@@ -186,7 +186,7 @@ public class InterfacePrincipale extends JFrame
186 186 
 		panReponses.add(delR);
187 187 
 		panReponses.add(Box.createRigidArea(new Dimension(1, 10)));
188 188 
 		panReponses.add(sp);
189 
-		panReponses.add(Box.createRigidArea(new Dimension(1, 5)));
189 
+		panReponses.add(Box.createRigidArea(new Dimension(1, 10)));
190 190 
 		panReponses.add(editR);
191 191
192 192 
 
@@ -205,8 +205,7 @@ public class InterfacePrincipale extends JFrame
205 205 
 		editQ = new Bouton("Modifier la question", editImg);
206 206 
 		comboQueRep = new JComboBox();
207 207
208 
-		String tab[] = {"a","b","c","d","e","f"};
209 
-		listQ = new JList(tab);
208 
+		listQ = new JList();
210 209 
 		JScrollPane sp = new JScrollPane(listQ,
211 210 
 				JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
212 211 
 				JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 
@@ -342,6 +341,7 @@ public class InterfacePrincipale extends JFrame
342 341 
 				bdd.createCategorie(catName);
343 342 
 				listC.setListData(bdd.getListeCategorie().toArray());
344 343 
 				reSelectCategorie(catName);
344 
+				listQ.setListData(new Vector(0));
345 345 
 			}
346 346 
 			else if(e.getSource() == delC)
347 347 
 			{
 
@@ -362,6 +362,7 @@ public class InterfacePrincipale extends JFrame
362 362 
 					bdd.deleteCategorie(categorieName);
363 363 
 					listC.setListData(bdd.getListeCategorie().toArray());
364 364 
 					listR.setListData(new Vector(0));
365 
+					listQ.setListData(new Vector(0));
365 366 
 				}
366 367 
 			}
367 368 
 			else if(e.getSource() == editC)
 
@@ -403,6 +404,7 @@ public class InterfacePrincipale extends JFrame
403 404 
 			if(!listC.isSelectionEmpty())
404 405 
 			{
405 406 
 				listR.setListData(bdd.getListeReponses(listC.getSelectedValue().toString()).toArray());
407 
+				listQ.setListData(new Vector(0));
406 408 
 			}
407 409 
 		}
408 410 
 	}
 
@@ -477,7 +479,11 @@ public class InterfacePrincipale extends JFrame
477 479
478 480 
 		public void valueChanged(ListSelectionEvent listSelectionEvent)
479 481 
 		{
480 
-
482 
+			if(!listR.isSelectionEmpty())
483 
+			{
484 
+				Reponses r = (Reponses) listR.getSelectedValue();
485 
+				listQ.setListData(bdd.getListeQuestions(r.getReponse1(), r.getReponse2()).toArray());
486 
+			}
481 487 
 		}
482 488 
 	}
483 489

+ 2
- 2
java/src/NouvelleReponseDialog.java Ver fichero 

@@ -14,7 +14,7 @@ public class NouvelleReponseDialog extends JDialog implements ActionListener
14 14
15 15 
 	public NouvelleReponseDialog(String title, String defRep1, String defRep2, String defCategorie, String[] tabCategorie,JFrame parent)
16 16 
 	{
17 
-		super(parent,title,true);
17 
+		super(parent, title, true);
18 18 
 		createInterface(defRep1, defRep2, defCategorie, tabCategorie);
19 19 
 		pack();
20 20 
 		setLocationRelativeTo(null);
 
@@ -43,7 +43,7 @@ public class NouvelleReponseDialog extends JDialog implements ActionListener
43 43 
 		champs.add(new JLabel("Réponse 2:"));
44 44 
 		champs.add(rep2);
45 45
46 
-		if(defCategorie == null)
46 
+		if(defCategorie != null)
47 47 
 		{
48 48 
 			comboCat = new JComboBox();
49 49 
 			comboCat.setOpaque(true);

+ 55
- 21
java/src/Question.java Ver fichero 

@@ -1,30 +1,64 @@
1 1 
 public class Question
2 2 
 {
3 
-    protected String intitule;
4 
-    protected int reponse;
3 
+	protected String intitule;
4 
+	protected String reponse1;
5 
+	protected String reponse2;
6 
+	protected int reponse;
5 7
6 
-    public Question(String intitule, int reponse) {
7 
-        this.intitule = intitule;
8 
-        this.reponse = reponse;
9 
-    }
8 
+	public Question(String intitule, String reponse1, String reponse2, int reponse) {
9 
+		this.intitule = intitule;
10 
+		this.reponse1 = reponse1;
11 
+		this.reponse2 = reponse2;
12 
+		this.reponse = reponse;
13 
+	}
10 14
11 
-    public String getIntitule() {
12 
-        return intitule;
13 
-    }
15 
+	public String getIntitule() {
16 
+		return intitule;
17 
+	}
14 18
15 
-    public void setIntitule(String intitule) {
16 
-        this.intitule = intitule;
17 
-    }
19 
+	public void setIntitule(String intitule) {
20 
+		this.intitule = intitule;
21 
+	}
18 22
19 
-    public int getReponse() {
20 
-        return reponse;
21 
-    }
23 
+	public String getReponse1() {
24 
+		return reponse1;
25 
+	}
22 26
23 
-    public void setReponse(int reponse) {
24 
-        this.reponse = reponse;
25 
-    }
27 
+	public void setReponse1(String reponse1) {
28 
+		this.reponse1 = reponse1;
29 
+	}
26 30
27 
-    public String toString() {
28 
-        return intitule + " - " + reponse;
29 
-    }
31 
+	public String getReponse2() {
32 
+		return reponse2;
33 
+	}
34 
+
35 
+	public void setReponse2(String reponse2) {
36 
+		this.reponse2 = reponse2;
37 
+	}
38 
+
39 
+	public int getReponse() {
40 
+		return reponse;
41 
+	}
42 
+
43 
+	public void setReponse(int reponse) {
44 
+		this.reponse = reponse;
45 
+	}
46 
+
47 
+	public String toString() {
48 
+		String bonneReponse = new String();
49 
+		if(reponse == 0)
50 
+		{
51 
+			bonneReponse = "Les deux";
52 
+		}
53 
+		else if(reponse == 1)
54 
+		{
55 
+			bonneReponse = reponse1;
56 
+		}
57 
+		else
58 
+		{
59 
+			bonneReponse = reponse2;
60 
+		}
61 
+
62 
+		return intitule + " " + bonneReponse;
63 
+	}
30 64 
 }