Merge branch 'master' of https://github.com/babolivier/burger-quizz

java/src/Bouton.java

@@ -1,9 +1,17 @@
 import javax.swing.*;
+import javax.swing.border.Border;
+import java.awt.*;
 
 public class Bouton extends JButton
 {
 	public Bouton(String text, Icon icon)
 	{
 		super(text, icon);
+		setBackground(Color.WHITE);
+		setFocusPainted(false);
+		Border border = BorderFactory.createLineBorder(Color.BLACK, 2);
+		//http://stackoverflow.com/questions/10274750/java-swing-setting-margins-on-textarea-with-line-border
+		setBorder(BorderFactory.createCompoundBorder(border, BorderFactory.createEmptyBorder(5, 5, 5, 5)));
+		setIconTextGap(10);
 	}
 }

java/src/InterfacePrincipale.java

@@ -1,6 +1,8 @@
 import javax.swing.*;
 import java.awt.*;
 
+import static javax.swing.BoxLayout.*;
+
 public class InterfacePrincipale extends JFrame
 {
 	//Panel des catégories
@@ -24,16 +26,115 @@ public class InterfacePrincipale extends JFrame
 	private Bouton delQ;
 	private Bouton editQ;
 	private JComboBox comboQueRep;
-	private JList list;
+	private JList listQ;
+
+	//image pour les boutons
+	private ImageIcon plusImg;
+	private ImageIcon delImg;
+	private ImageIcon editImg;
 
 	public InterfacePrincipale()
 	{
+		setTitle("Administration base de données de l'aplication BurgerQuizz");
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+		loadImgBouton();
+		createPanelCategories();
+		createPanelReponses();
+		createPanelQuestion();
+
+		getContentPane().add(new JLabel(new ImageIcon("rsc/burgerquizz.png")), BorderLayout.NORTH);
+		pack();
 		setLocationRelativeTo(null);
-		setTitle("Administration base de données de l'aplication BurgerQuizz ce titre est trop long");
 		setVisible(true);
 	}
 
-	private void createPanelCategories(){}
-	private void createPanelReponses(){}
-	private void createPanelQuestion(){}
+	private void loadImgBouton()
+	{
+		plusImg = new ImageIcon("rsc/plus.png");
+		delImg = new ImageIcon("rsc/del.png");
+		editImg = new ImageIcon("rsc/edit.png");
+	}
+
+	private void createPanelCategories()
+	{
+		panCategories = new JPanel();
+		addC = new Bouton("Ajouter une catégorie", plusImg);
+		delC = new Bouton("Supprimer la catégorie", delImg);
+		editC = new Bouton("Modifier la catégorie", editImg);
+
+		String tab[] = {"a","b","c","d","e","f"};
+		listC = new JList(tab);
+		JScrollPane sp = new JScrollPane(listC,
+				JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+				JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+
+
+		panCategories.setLayout(new BoxLayout(panCategories,Y_AXIS));
+		addC.setAlignmentX(CENTER_ALIGNMENT);
+		delC.setAlignmentX(CENTER_ALIGNMENT);
+		editC.setAlignmentX(CENTER_ALIGNMENT);
+
+		panCategories.add(addC);
+		panCategories.add(delC);
+		panCategories.add(sp);
+		panCategories.add(editC);
+		getContentPane().add(panCategories, BorderLayout.WEST);
+	}
+
+	private void createPanelReponses()
+	{
+		panReponses = new JPanel();
+		addR = new Bouton("Ajouter un jeu de réponses", plusImg);
+		delR = new Bouton("Supprimer le jeu de réponses", delImg);
+		editR = new Bouton("Modifier le jeu de réponse", editImg);
+		comboRepCat = new JComboBox();
+
+		String tab[] = {"a","b","c","d","e","f"};
+		listR = new JList(tab);
+		JScrollPane sp = new JScrollPane(listR,
+				JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+				JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+
+
+		panReponses.setLayout(new BoxLayout(panReponses,Y_AXIS));
+		addR.setAlignmentX(CENTER_ALIGNMENT);
+		delR.setAlignmentX(CENTER_ALIGNMENT);
+		editR.setAlignmentX(CENTER_ALIGNMENT);
+
+		panReponses.add(addR);
+		panReponses.add(delR);
+		panReponses.add(sp);
+		panReponses.add(editR);
+		panReponses.add(comboRepCat);
+		getContentPane().add(panReponses, BorderLayout.CENTER);
+	}
+
+	private void createPanelQuestion()
+	{
+		panQuestions = new JPanel();
+		addQ = new Bouton("Ajouter une question", plusImg);
+		delQ = new Bouton("Supprimer la question", delImg);
+		editQ = new Bouton("Modifier la question", editImg);
+		comboQueRep = new JComboBox();
+
+		String tab[] = {"a","b","c","d","e","f"};
+		listQ = new JList(tab);
+		JScrollPane sp = new JScrollPane(listQ,
+				JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+				JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+
+
+		panQuestions.setLayout(new BoxLayout(panQuestions,Y_AXIS));
+		addQ.setAlignmentX(CENTER_ALIGNMENT);
+		delQ.setAlignmentX(CENTER_ALIGNMENT);
+		editQ.setAlignmentX(CENTER_ALIGNMENT);
+
+		panQuestions.add(addQ);
+		panQuestions.add(delQ);
+		panQuestions.add(sp);
+		panQuestions.add(editQ);
+		panQuestions.add(comboQueRep);
+		getContentPane().add(panQuestions, BorderLayout.EAST);
+	}
 }

web/model/class.connector.php

@@ -11,7 +11,7 @@ class Connector {
 		$pass = "chabat";
 
 		$this->bdd = new PDO("mysql:host=$host;dbname=$db", $user, $pass);
-		$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		$this->bdd->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 	}
 
 	/*

web/model/class.question.php

@@ -8,7 +8,7 @@ class Question {
 
 	function __construct($intitule) {
 		try{
-			$this->intitule;
+			$this->intitule = $intitule;
 
 			$bdd = new Connector();
 

web/model/class.questset.php

@@ -8,16 +8,16 @@ class Questset {
 
 	function __construct($reponses) {
 		if(is_array($reponses)) {
-			$this->intitules = array();
-			$this->reponse1 = $reponse[0];
-			$this->reponse2 = $reponse[1];
+			$this->questions = array();
+			$this->reponse1 = $reponses[0];
+			$this->reponse2 = $reponses[1];
 			try {
 				$bdd = new Connector();
 
 				$options = array(
 					"where" => array(
-						array("reponse1", "=", $reponse1),
-						array("reponse2", "=", $reponse2)
+						array("reponse1", "=", $this->reponse1),
+						array("reponse2", "=", $this->reponse2)
 					)
 				);
 
@@ -27,10 +27,11 @@ class Questset {
 					array_push($this->questions, new Question($question['intitule']));
 				}
 
-				$this->categorie = $bdd->Select('*', 'reponses', $options)['nom_cat'];
+				$this->categorie = $bdd->Select('*', 'reponses', $options)[0]['nom_cat'];
 			} catch(Exception $e) {
 				throw $e;
 			}
+			echo "Initialized\n";
 		} else {
 			throw new Exception('Un tableau de réponses est attendu dans le constructeur.');
 		}

web/model/classes.php

@@ -2,5 +2,5 @@
 
 // Call this file from the root folder
 require_once('model/class.connector.php');
-require_once('model/class.questions.php');
+require_once('model/class.question.php');
 require_once('model/class.questset.php');