From 88126ad00b13e40f454c08c912fb5d6ddc5cefaa Mon Sep 17 00:00:00 2001
From: yasevret <yannis.sevret@etu.uca.fr>
Date: Sun, 17 Jan 2021 10:22:50 +0100
Subject: [PATCH] Affichage des variables JS de la Partie

---
 SwichGIT/src/css/PartieGame.css | 20 ++++++++
 SwichGIT/src/index.html         | 84 ++++++++++++++++++---------------
 SwichGIT/src/js/main.js         |  9 ++--
 3 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/SwichGIT/src/css/PartieGame.css b/SwichGIT/src/css/PartieGame.css
index c65ccdc..9d4bfcb 100644
--- a/SwichGIT/src/css/PartieGame.css
+++ b/SwichGIT/src/css/PartieGame.css
@@ -18,6 +18,26 @@
     top:-60%;
 }
 
+#affPoints {
+    position: absolute;
+    text-align: center;
+    font-family: Montserrat, impact, Arial Black;
+    font-size: 2.5vw;
+    margin-top: 2vw;
+    margin-left: 25vw;
+    color: var(--lightsedonca);
+}
+
+#affSolution {
+    position: absolute;
+    text-align: center;
+    font-family: Montserrat, impact, Arial Black;
+    font-size: 2.5vw;
+    margin-top: 22.5vw;
+    margin-left: 25vw;
+    color: var(--lightsedonca);
+}
+
 #textjouer2 {
     position: absolute;
     text-align: center;
diff --git a/SwichGIT/src/index.html b/SwichGIT/src/index.html
index 46d376f..65d248b 100644
--- a/SwichGIT/src/index.html
+++ b/SwichGIT/src/index.html
@@ -621,45 +621,51 @@
     </div>
 
    <div id="pageGame">
-        <div class="menuhaut">
-            <div id="Redistribution">
-                <a onclick="redistribuer()" id="relancerbtn">
-                    <div id="contourbuttonvalider">
-                        <div class="bouttonvalider">
-                            <h1 id="textjouer2">RELANCER</h1>
-                        </div>
-                    </div>
-                </a>
-            </div>
-            <div id="Redistribution2">
-                <a id="relancerbtn" onclick="testPourJeuClassique()">
-                    <div id="contourbuttonvalider">
-                        <div class="bouttonvalider2">
-                            <h1 id="btnvalider2">VALIDER</h1>
-                        </div>
-                    </div>
-                </a>
-            </div>
-            <div id="Redistribution3">
-                <a id="relancerbtn" onclick="chercheCombi2()">
-                    <div id="contourbuttonvalider">
-                        <div class="bouttonvalider2">
-                            <h1 id="btnvalider3">CHERCHER</h1>
-                        </div>
-                    </div>
-                </a>
-            </div>
-            <div class="logop2">
-                <a onclick="journuit()">
-                    <img src="imgs/swishjour.png" id="imglogo2">
-                </a>
-            </div>
-            <a class="retourstp" onclick="retour()">
-                <div class="buttonretour">
-                    <h1 class="txt">X</h1>
-                </div>
-            </a>
-        </div>
+       <div class="menuhaut">
+           <div id="Redistribution">
+               <a onclick="redistribuer()" id="relancerbtn">
+                   <div id="contourbuttonvalider">
+                       <div class="bouttonvalider">
+                           <h1 id="textjouer2">RELANCER</h1>
+                       </div>
+                   </div>
+               </a>
+           </div>
+           <div>
+               <p id="affSolution"></p>
+           </div>
+           <div>
+               <p id="affPoints">PTN : 0</p>
+           </div>
+           <div id="Redistribution2">
+               <a id="relancerbtn" onclick="testPourJeuClassique()">
+                   <div id="contourbuttonvalider">
+                       <div class="bouttonvalider2">
+                           <h1 id="btnvalider2">VALIDER</h1>
+                       </div>
+                   </div>
+               </a>
+           </div>
+           <div id="Redistribution3">
+               <a id="relancerbtn" onclick="chercheCombi2()">
+                   <div id="contourbuttonvalider">
+                       <div class="bouttonvalider2">
+                           <h1 id="btnvalider3">CHERCHER</h1>
+                       </div>
+                   </div>
+               </a>
+           </div>
+           <div class="logop2">
+               <a onclick="journuit()">
+                   <img src="imgs/swishjour.png" id="imglogo2">
+               </a>
+           </div>
+           <a class="retourstp" onclick="retour()">
+               <div class="buttonretour">
+                   <h1 class="txt">X</h1>
+               </div>
+           </a>
+       </div>
 
         <div id="containcards" class="containcards">
 
diff --git a/SwichGIT/src/js/main.js b/SwichGIT/src/js/main.js
index 8449b51..34c3db4 100644
--- a/SwichGIT/src/js/main.js
+++ b/SwichGIT/src/js/main.js
@@ -11,6 +11,8 @@ var carteselect = [];
 var deckPartie = []; //Ensemble des cartes affichees a l'ecran
 var TasDuJEU = []; // Ensemble de toutes les cartes presente dans le jeu
 
+var lesPoints = 0; //Points du Joueur1
+
 
 
 
@@ -845,16 +847,17 @@ function testPourJeuClassique() {
 		for (var i = 0; i < tab.length; i++) {
 			if (tab[i].code == carteselect.length) {
 				solution = false;
+				lesPoints += carteselect.length;
+				document.getElementById("affPoints").textContent = 'PTN : ' + lesPoints;
 				changerlesCartesDeTasDeJeu();
 			}
 		}
 		if (solution) {
-			window.alert("Rien trouve chef !!!");
+			document.getElementById("affSolution").textContent = 'Aucune solution trouvée...'
 		}
 		if (!solution) {
-			window.alert("J'ai une solution chef !!!!");
+			document.getElementById("affSolution").textContent = 'Assemblage de ' + copie.length + ' cartes trouvé ! Il reste encore ' + TasDuJEU.length + ' cartes !';
 		}
-		window.alert(TasDuJEU.length)
 	}
 	/*} catch (e) {
 		window.alert(e);