accueil-bug suppression résolu- ajout de Tp dynamique

BddCorrect/BDD/OracleDb.php

@@ -14,7 +14,7 @@ class OracleDb {
     function __construct() {
         //$this->conn = oci_connect('u_prems', '123456', 'localhost/orcl');
         $this->conn = oci_connect('meelaichao', 'meelaichao', 'kirov:1521/kirov');
-        $this->createRandomTables();
+        //$this->createRandomTables();
     }
     
     function createRandomTables() {

BddCorrect/DAL/QuestionsGateway.php

@@ -1,5 +1,7 @@
 <?php
  //require_once ('Question.php');
+
+
 class QuestionsGateway {
     private $db;
    
@@ -9,16 +11,28 @@ class QuestionsGateway {
     }
     
     public function afficherQuestions() {
-        $i = 0;
+        $tabQuestions=array();
-        $query = 'SELECT numTp,numquestion,question,reponse FROM Correct UNION SELECT numTp,numquestion,question,reponse FROM FunctionCorrect';
+        $query = 'SELECT numTp FROM Correct  UNION SELECT numTp FROM FunctionCorrect';
         $query = $this->db->prepare($query);
         $result = $query->execute();
-        //$resultats = $this->db->query('SELECT found_rows()');     
+        //$nbTpRow = $result->fetchArray(SQLITE3_NUM);
-        while($q = $result->fetchArray()){
+        $i = 0;
-            $i= $i+1;
+        while ($tp = $result->fetchArray(SQLITE3_NUM)){
+            $questionQuery = 'SELECT numTp,numquestion,question,reponse FROM Correct WHERE numTp = ?  UNION SELECT numTp,numquestion,question,reponse FROM FunctionCorrect WHERE numTp = ? ';
+            $questionQuery = $this->db->prepare($questionQuery);
+            $questionQuery->bindParam(1, $tp[0]);
+            $questionQuery->bindParam(2, $tp[0]);
+            $questionResult = $questionQuery->execute();
+            while($q = $questionResult->fetchArray()){
                 $tabQuestions[] = new Question($q['numTp'],$q['numquestion'],$q['question'],$q['reponse']);
             }
-        return $tabQuestions;
+            $tabTp['tp'.$tp[0]] = $tabQuestions ;  
+            unset($tabQuestions);
+            $tabQuestions = array();            
+        }
+        
+        //die("<pre>".print_r($tabTp)."</pre");
+        return $tabTp;
     }
     
     public function afficherDemonstrations() {

BddCorrect/Traitement/AjoutQuestion.php

@@ -5,7 +5,7 @@ require_once('../controleur/Controleur.php');
 
 
 $db = new SqliteDb('o');
-
+$lol = 'ok';
 
 if (empty($_GET['tp']) || empty($_GET['bdd']) || empty($_GET['num']) || empty($_GET['consigne']) || empty($_GET['reponse']) || empty($_GET['points']) || empty($_GET['aleatoire']) || empty($_GET['type'])) {
     echo '<strong>ERREUR : Veuillez remplir tous les champs </strong>';
@@ -15,8 +15,8 @@ else if(!is_numeric($_GET['tp']))
     echo '<strong>ERREUR : une valeur non numérique à été détectée dans le champ \'Numéro de question :\' </strong>';
 else if(!is_numeric($_GET['num']))
     echo '<strong>ERREUR : une valeur non numérique à été détectée dans le champ \'TP n° :\' </strong>';
-
+else if(!is_numeric($_GET['points']))
-
+    echo '<strong>ERREUR : une valeur non numérique à été détectée dans le champ \'Barème:\' </strong>';
 else {  
     if(isset($_GET['modif'])){
         if ($_GET["type"] == 'fonction')

BddCorrect/Traitement/Suppression.php

@@ -4,6 +4,10 @@
 require_once('../BDD/SqliteDb.php');
 $db = new SqliteDb('o');
         
+$numQuestionSuiv = $_GET['numQuestion']+1;
+
+
+
 
 $sqliteQuery = $db->prepare('SELECT type FROM Type WHERE numQuestion=? AND numTp = ?');
 $sqliteQuery->bindParam(1, $_GET['numQuestion']);
@@ -11,20 +15,101 @@ $db = new SqliteDb('o');
 $result = $sqliteQuery->execute();
 $typeRow = $result->fetchArray();
 
+$sqliteQuery = $db->prepare('DELETE FROM Type WHERE numquestion= ? AND numTp=? ');
+$sqliteQuery->bindParam(1, $_GET['numQuestion']);
+$sqliteQuery->bindParam(2, $_GET['numTp']);
+$result = $sqliteQuery->execute();
+
+
 if($typeRow['type'] == 'query'){   
+    $sqliteQuery = $db->prepare('SELECT count(*) FROM (SELECT numQuestion FROM Correct WHERE numTp=? UNION SELECT numQuestion FROM FunctionCorrect WHERE numTp=?)');
+    $sqliteQuery->bindParam(1, $_GET['numTp']);
+    $sqliteQuery->bindParam(2, $_GET['numTp']);
+    $result = $sqliteQuery->execute();
+    $nbQuestionsRow =   $result->fetchArray();
+    
     $sqliteQuery = $db->prepare('DELETE FROM Correct WHERE numquestion= ? AND numTp=? ');
     $sqliteQuery->bindParam(1, $_GET['numQuestion']);
     $sqliteQuery->bindParam(2, $_GET['numTp']);
     $result = $sqliteQuery->execute();
+    
+    
+    for( $iSuiv = $numQuestionSuiv, $j=$_GET['numQuestion'] ; $iSuiv <= $nbQuestionsRow['count(*)'] ; $iSuiv++ , $j++ ){
+        
+        $typeQuery = $db->prepare('SELECT type FROM Type WHERE numQuestion = ? AND numTp= ?');
+        $typeQuery->bindParam(1, $iSuiv);
+        $typeQuery->bindParam(2, $_GET['numTp']);
+        $resultType = $typeQuery->execute();
+        $typeRow = $resultType->fetchArray();
+
+        if($typeRow['type'] == 'query'){
+            $table = 'Correct';
+            $type = 'query';
+        }
+        else{
+            $table = 'FunctionCorrect';
+            $type = 'functionCorrect';
+        }
+    
+        $sqliteQuery = $db->prepare('UPDATE '.$table.' SET numQuestion=? WHERE numQuestion=? AND numTp=? ');
+        $sqliteQuery->bindParam(1, $j);
+        $sqliteQuery->bindParam(2, $iSuiv);
+        $sqliteQuery->bindParam(3, $_GET['numTp']);
+        $result = $sqliteQuery->execute();
+        
+        $sqliteQuery = $db->prepare('UPDATE Type SET numQuestion=? WHERE numQuestion=? AND numTp=? ');
+        $sqliteQuery->bindParam(1, $j);
+        $sqliteQuery->bindParam(2, $iSuiv);
+        $sqliteQuery->bindParam(3, $_GET['numTp']);
+        $result = $sqliteQuery->execute();
+    }
 }
 else {
+    
+    $sqliteQuery = $db->prepare('SELECT count(*) FROM (SELECT numQuestion FROM Correct WHERE numTp=? UNION SELECT numQuestion FROM FunctionCorrect WHERE numTp=?)');
+    $sqliteQuery->bindParam(1, $_GET['numTp']);
+    $sqliteQuery->bindParam(2, $_GET['numTp']);
+    $result = $sqliteQuery->execute();
+    $nbQuestionsRow =   $result->fetchArray();
+    
     $sqliteQueryF = $db->prepare('DELETE FROM FunctionCorrect WHERE numquestion= ? AND numTp=?');
     $sqliteQueryF->bindParam(1, $_GET['numQuestion']);
     $sqliteQueryF->bindParam(2, $_GET['numTp']);
     $result = $sqliteQueryF->execute();   
+    
+
+    
+    for( $iSuiv = $numQuestionSuiv, $j=$_GET['numQuestion'] ; $iSuiv <= $nbQuestionsRow['count(*)'] ; $iSuiv++ , $j++ ){
+        
+        $typeQuery = $db->prepare('SELECT type FROM Type WHERE numQuestion = ? AND numTp= ?');
+        $typeQuery->bindParam(1, $numQuestionSuiv);
+        $typeQuery->bindParam(2, $_GET['numTp']);
+        $resultType = $typeQuery->execute();
+        $typeRow = $resultType->fetchArray();
+
+        
+        if($typeRow['type'] == 'query'){
+            $table = 'Correct';
+            $type = 'query';
+        }
+        else{
+            $table = 'FunctionCorrect';
+            $type = 'functionCorrect';
         }
     
-        $sqliteQuery = $db->prepare('DELETE FROM Type WHERE numquestion= ? AND numTp=? ');
+        $sqliteQuery = $db->prepare('UPDATE '.$table.' SET numQuestion=? WHERE numQuestion=? AND numTp=? ');
-        $sqliteQuery->bindParam(1, $_GET['numQuestion']);
+        $sqliteQuery->bindParam(1, $j);
-        $sqliteQuery->bindParam(2, $_GET['numTp']);
+        $sqliteQuery->bindParam(2, $iSuiv);
+        $sqliteQuery->bindParam(3, $_GET['numTp']);
+        $result = $sqliteQuery->execute();
+        
+        $sqliteQuery = $db->prepare('UPDATE Type SET numQuestion=? WHERE numQuestion=? AND numTp=? ');
+        $sqliteQuery->bindParam(1, $j);
+        $sqliteQuery->bindParam(2, $iSuiv);
+        $sqliteQuery->bindParam(3, $_GET['numTp']);
         $result = $sqliteQuery->execute();
+    }
+}
+
+
+

BddCorrect/config/config.php

@@ -11,6 +11,10 @@ $vues['vueSupression']='vues/VueSupression.php';
 $vues['vueNbQuestions']='vues/VueNbQuestions.php';
 $vues['vueDemonstration']='vues/VueDemonstration.php';
 $vues['vueQCM']='vues/VueQCM.php';
+$vues['vueAccueil']='vues/VueAccueil.php';
+$vues['vueAdmin']='vues/VueAdmin.php';
+
+
 $vues['vueBoo']='css/bootstrap.min.css';
 $css['vuePrincipale']='css/VuePrincipale.php';
 $css['bootstrap']='css/bootstrap.min.css';

BddCorrect/controleur/Controleur.php

@@ -14,8 +14,20 @@ class Controleur {
           
             case NULL :
                     //require ($rep.$vues['vueLogin']);
-                $this->afficherQuestions(); 
+                //$this->afficherQuestions(); 
+                require ($rep.$vues['vueAccueil']);
+                break;
+            
+            case 'Retour au menu principal' :
+                    //require ($rep.$vues['vueLogin']);
+                //$this->afficherQuestions(); 
+                require ($rep.$vues['vueAccueil']);
+                break;
+            
+            case 'Ajouter une question' : 
+                require ($rep.$vues['vueAdmin']);
                 break;
+            
             case 'Afficher les questions':
                     //require ($rep.$vues['vueLogin']);
                 $this->afficherQuestions(); 
@@ -47,6 +59,10 @@ class Controleur {
                 $this->resetDemonstrations();
                 break;
             
+            case 'Réintiliser les questions' :
+                $this->resetQuestions();
+                break;
+            
             case 'Afficher les QCM' :                
                 $this->afficherQCM();
                 break;
@@ -68,6 +84,13 @@ class Controleur {
         //$this->afficherQuestions();
     }    
     
+    
+    
+    function resetQuestions(){
+        $db = new SqliteDb();
+        $db->createTable();
+        $this->afficherQuestions();
+    }
     function resetRandomBdd(){
         require_once('BDD/OracleDb.php');
         $oraDb = new OracleDb();

BddCorrect/css/.bash_history

@@ -0,0 +1,13 @@
+cd /var/www/html/
+cd oracle/
+cd correction-bd-mehdi/
+cd BddCorrect/
+ls
+cd ..
+ls
+ls -l
+chmod -R 777 BddCorrect/
+cd BddCorrect/
+ls -l
+cd Traitement/
+ls -l

BddCorrect/css/VueAccueil.css

@@ -0,0 +1,40 @@
+.bouton {
+    background: #0082b5;
+    color: #fff;
+    border: 1px solid #eee;
+    border-radius: 20px;
+    box-shadow: 5px 5px 5px #eee;
+    text-shadow:none;   
+    width: 100%;
+    height: 100px;    
+    margin: 20px;    
+}
+
+.bouton:hover {
+    background: #016ABC;
+    color: #fff;
+    border: 1px solid #eee;
+    border-radius: 20px;
+    box-shadow: 5px 5px 5px #eee;
+    text-shadow:none;
+}
+
+body {
+    text-align: center;
+}
+
+form {
+    margin-top: 100px;
+    display: inline-block;
+    width: 50%;
+}
+
+footer{
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  background-color: red;
+  color: white;
+  text-align: center;
+}

BddCorrect/css/VueDemonstration.css

@@ -0,0 +1,34 @@
+#frm-reset{
+   position:absolute;  
+    right: 0;  
+    
+    
+}
+
+
+#frm-reset input{
+    background: #0082b5;
+    color: #fff;
+    border: 1px solid #eee;
+    border-radius: 20px;
+    box-shadow: 5px 5px 5px #eee;
+    text-shadow:none;           
+    width: 500px; 
+   
+    display: block;
+    height: 30%;
+}
+
+#content{
+    min-height:88vh;
+}
+footer{
+    position: relative;
+    bottom: 0;
+    width: 100%;
+    background-color: red;
+    color: white;
+    text-align: center;
+    min-height: 12vh;
+    border : double;
+}

BddCorrect/css/VuePrincipale.css

@@ -9,6 +9,79 @@ and open the template in the editor.
 */
 
 .frm{
-    text-align: right;
+        
-    margin: 10px;
+    position:absolute;  
+    right: 0;       
+}
+
+.inp-reset{
+    background: #0082b5;
+    color: #fff;
+    border: 1px solid #eee;
+    border-radius: 20px;
+    box-shadow: 5px 5px 5px #eee;
+    text-shadow:none;           
+    width: 500px; 
+    margin-bottom: 5px;
+    display: block;
+    height: 30%;
+
+}
+
+.inp-reset:hover {
+    background: #d9534f;
+    color: #fff;
+    border: 1px solid #eee;footer{
+    position: relative;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    background-color: red;
+    color: white;
+    text-align: center;
+}
+    border-radius: 20px;
+    box-shadow: 5px 5px 5px #eee;
+    text-shadow:none;
+}
+
+footer{
+    position: relative;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    background-color: red;
+    color: white;
+    text-align: center;
+}
+
+
+li {
+    cursor: pointer;
+}
+
+#btn-ajout, #inp-ret {
+    background: #0082b5;
+    border: 1px solid #eee;
+    color: #fff;
+    border-radius:20px;
+    box-shadow: 5px 5px 5px #eee;
+    margin-bottom: 10px;
+    width: 400px;          
+}
+
+#btn-ajout:hover, #inp-ret:hover {
+    background: #016ABC;
+    color: #fff;
+    border: 1px solid #eee;
+    border-radius: 20px;
+    box-shadow: 5px 5px 5px #eee;
+    text-shadow:none;          
+}
+
+#a-ajout{
+position: absolute;
+    left: 0;
+
+    text-shadow:none;           
 }

BddCorrect/modeles/Modele.php

@@ -7,7 +7,6 @@ class Modele {
         $db = new SqliteDb();
         //$db->createTable();
         $qg = new QuestionsGateway($db);   
-                die("test");    
 
         $tabQuestions = $qg->afficherQuestions();
         return $tabQuestions;

BddCorrect/nbproject/private/private.properties

@@ -1,6 +1,7 @@
 auxiliary.org-netbeans-modules-php-editor.fluent_2e_setter_2e_project_2e_property=false
 auxiliary.org-netbeans-modules-php-editor.getter_2e_setter_2e_method_2e_name_2e_generation=AS_JAVA
 auxiliary.org-netbeans-modules-php-editor.public_2e_modifier_2e_project_2e_property=false
+browser.id=SL[/Browsers/MicrosoftEdgeBrowser
 copy.src.files=false
 copy.src.on.open=false
 copy.src.target=C:\\xampp\\htdocs\\PhpProject1

BddCorrect/nbproject/private/private.xml

@@ -3,14 +3,10 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/xampp/htdocs/BddCorrect/vues/VueAdmin.php</file>
+            <file>file:/C:/xampp/htdocs/BddCorrect/css/VueAccueil.css</file>
-            <file>file:/C:/xampp/htdocs/BddCorrect/Traitement/AjoutQuestion.php</file>
+            <file>file:/C:/xampp/htdocs/BddCorrect/vues/VueAccueil.php</file>
-            <file>file:/C:/xampp/htdocs/BddCorrect/BDD/SqliteDb.php</file>
+            <file>file:/C:/xampp/htdocs/BddCorrect/css/VuePrincipale.css</file>
-            <file>file:/C:/xampp/htdocs/BddCorrect/Traitement/Suppression.php</file>
+            <file>file:/C:/xampp/htdocs/BddCorrect/vues/VuePrincipale.php</file>
-            <file>file:/C:/xampp/htdocs/BddCorrect/Traitement/Ordre.php</file>
-            <file>file:/C:/xampp/htdocs/BddCorrect/Traitement/Modification.php</file>
-            <file>file:/C:/xampp/htdocs/BddCorrect/BDD/OracleDb.php</file>
-            <file>file:/C:/xampp/htdocs/BddCorrect/Traitement/Correcteur.php</file>
         </group>
     </open-files>
 </project-private>

BddCorrect/vues/VueAccueil.php

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <meta charset="UTF-8"><style><?php global $rep,$vues,$css; include $rep.$css['bootstrap']; ?></style>
+        <title></title>
+        <script src="css/jquery-3.5.1.js"></script>
+        
+        <link rel="stylesheet" href="css/VueAccueil.css">
+    </head>
+    <body id="vuep">       
+        <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top" id="mainNav">
+           <div class="container">
+             <a class="navbar-brand js-scroll-trigger" href="#page-top">Base De Données</a>
+             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+               <span class="navbar-toggler-icon"></span>
+             </button>             
+           </div>
+         </nav>
+        <header class="bg-primary text-white">
+          <div class="container text-center">
+            <h1>test</h1>
+            <p class="lead">TEST</p>
+          </div>
+        </header>
+        <div id='allp'>
+            <div style="font-weight: bold" id="Temps-Restant"></div>
+
+
+            <form method="get" role="form">
+                <input class="bouton" type="submit" name="action" value="Afficher les demonstrations" ><br/>
+                <input class="bouton" type="submit" name="action" value="Afficher les QCM" ><br/>
+                <input class="bouton" type="submit" name="action" value="Afficher les questions"><br/>
+            </form>
+
+           
+
+        </div>      
+
+        <!-- Footer -->
+        <footer class="py-5 bg-dark">
+          <div class="container">
+            <p class="m-0 text-center text-white">IUT Clermont-Ferrand 2020</p>
+          </div>
+          <!-- /.container -->
+        </footer>
+
+        <!-- Bootstrap core JavaScript -->
+        <script src="vendor/jquery/jquery.min.js"></script>
+        <script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
+
+        <!-- Plugin JavaScript -->
+        <script src="vendor/jquery-easing/jquery.easing.min.js"></script>
+
+        <!-- Custom JavaScript for this theme -->
+        <script src="js/scrolling-nav.js"></script>
+         
+    </body>
+</html>

BddCorrect/vues/VueAdmin.php

@@ -3,9 +3,9 @@
     <head>
         <meta charset="UTF-8">
         <title></title>
-        <script src="../css/jquery-3.5.1.js"></script>
+        <script src="css/jquery-3.5.1.js"></script>
-        <link rel="stylesheet" href="css/bootstrap.min.css">
+        <link rel="stylesheet" href="css/VueAdmin.css">
-        <link rel="stylesheet" href="../css/VueAdmin.css">
+        
     </head>
 
     <body>
@@ -59,6 +59,10 @@
         <div id="erreur">
             
         </div>
+        
+        <form method="get">
+            <input id="inp-questions" class="bouton" type="submit" name="action" value="Afficher les questions" hidden> 
+        </form>
     </body>    
        
     <script>
@@ -76,7 +80,8 @@
         });
         function SubmitAjoutQuestion() {
                     //document.write($('#demo'+numQuestion).val());
-
+                    $('#erreur').empty();
+                    wait(1500);
 
                     var tp = $('#tp').val() ; 
                     var num = $('#num').val() ; 
@@ -88,13 +93,27 @@
                     var bdd = $("input[name='bdd']:checked").val();
                     var fonction = $('#fonction').val() ;                 
 
-                   $.get("../Traitement/AjoutQuestion.php", { tp: tp,num: num,points: points,consigne: consigne,reponse: reponse,type: type,aleatoire: aleatoire,bdd: bdd, fonction : fonction},
+                   $.get("Traitement/AjoutQuestion.php", { tp: tp,num: num,points: points,consigne: consigne,reponse: reponse,type: type,aleatoire: aleatoire,bdd: bdd, fonction : fonction},
                     function(data) {
                          $('#erreur').html(data);                        
+                         if (data.includes("AJOUT") == true){                                                        
+                            //alert("La question a été ajoutée");
+                            var result = confirm("La question a été ajoutée. Afficher les Questions ?");
+                            if(result)  $('#inp-questions').trigger("click");                            
+                         }
+                         //else alert("Erreur");
                          //$('#demoForm')[0].reset();
                       });
         }
         
+        function wait(ms){
+            var start = new Date().getTime();
+            var end = start;
+            while(end < start + ms) {
+              end = new Date().getTime();
+       }
+     }
+
 
 
     </script>

BddCorrect/vues/VueDemonstration.php

@@ -1,14 +1,17 @@
 <!DOCTYPE html>
 
 <html>
+
     <head>
         <meta charset="UTF-8">
         <title></title>
         <script src="css/jquery-3.5.1.js"></script>
         <link rel="stylesheet" href="css/bootstrap.min.css">
-        <link rel="stylesheet" href="css/VuePrincipale.css">
+        <link rel="stylesheet" href="css/VueDemonstration.css">
     </head>
+    
     <body>
+        <div id="content">
             <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top" id="mainNav">
                <div class="container">
                  <a class="navbar-brand js-scroll-trigger" href="#page-top">TP de Base De Données</a>
@@ -33,12 +36,12 @@
                  </div>
                </div>
              </nav>
-        <header class="bg-primary text-white">
+            <!--<header class="bg-primary text-white">
               <div class="container text-center">
                 <h1>Demonstrations</h1>
                 <p class="lead">TEST</p>
               </div>
-        </header>
+            </header>-->
 
             <div style="font-weight: bold" id="Temps-Restant"></div>
 
@@ -70,15 +73,14 @@
                 </div>
               </div>
             </section>
-        <form method="get" >
+            <form method="get" id="frm-reset">
                 <input type="submit" name="action" id="regenererDemo" value="Reintiliser les demonstrations"  /><br/>
             </form>
+
             <a href="vues/VueAjoutDemo.php"><button>Ajouter Une Démonstration</button></a>
             <a href="vues/VueLibre.php"><button>Creation table</button></a>
 
             <form method="get" role="form">
-            <input type="submit" name="action" value="Afficher les questions" /><br/>
-            <input type="submit" name="action" value="Afficher les QCM" ><br/>
                 <input type="submit" name="action" id="afficher-demo" value="Afficher les demonstrations" style='display:none'>
             </form>
     <div id="erreur">
@@ -110,23 +112,12 @@
                     }
                 }
             </script>
+        </div>
         <!-- Footer -->
         <footer class="py-5 bg-dark">
           <div class="container">
             <p class="m-0 text-center text-white">IUT Clermont-Ferrand 2020</p>
           </div>           
-          <!-- /.container -->
         </footer>       
-
-        <!-- Bootstrap core JavaScript -->
-        <script src="vendor/jquery/jquery.min.js"></script>
-        <script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
-
-        <!-- Plugin JavaScript -->
-        <script src="vendor/jquery-easing/jquery.easing.min.js"></script>
-
-        <!-- Custom JavaScript for this theme -->
-        <script src="js/scrolling-nav.js"></script>
-         
     </body>
 </html>

BddCorrect/vues/VuePrincipale.php

@@ -8,6 +8,11 @@
         <link rel="stylesheet" href="css/VuePrincipale.css">
         
     </head>
+    <?php 
+      $tp_str = implode(",", array_keys($dVueQuestions));
+      //die($tp_str);
+   
+    ?>
     <body id="vuep">       
         <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top" id="mainNav">
            <div class="container">
@@ -17,17 +22,13 @@
              </button>
              <div class="collapse navbar-collapse" id="navbarResponsive">
                <ul class="navbar-nav ml-auto">
+                   <?php                    foreach ($dVueQuestions as $tp => $question){   ?>
                  <li class="nav-item">
-                   <a class="nav-link js-scroll-trigger" href="#TP2">TP2</a>
+                     <a style = "text-transform:uppercase;" class="nav-link js-scroll-trigger" id="<?php echo $tp; ?>" onclick="changerSection('<?php echo $tp;?>','<?php echo $tp_str ;?>')" ><?php echo $tp; ?></a>
-                 </li>
-                 <li class="nav-item">
-                   <a class="nav-link js-scroll-trigger" href="#TP3">TP3</a>
                  </li>                
-                 <li class="nav-item">
+                   <?php }?>
-                   <a class="nav-link js-scroll-trigger" href="#TP4">TP4</a>
+                 <li>
-                 </li>
+                     <a class="nav-link js-scroll-trigger">Se connecter</a>
-                 <li class="nav-item">
-                   <a class="nav-link js-scroll-trigger" href="#TP5">TP5</a>
                  </li>
                </ul>
              </div>
@@ -42,19 +43,20 @@
 <div id='allp'>
         <div style="font-weight: bold" id="Temps-Restant"></div>
 
-        <section id="TP2">
+        <?php         foreach ($dVueQuestions as $tp => $questions){ //die(print_r($questions));?>
+        <section id="<?php echo 'o'.$tp; ?>">
           <div class="container">
             <div class="row">
               <div class="col-lg-8 mx-auto">
-                <h2>TP 2</h2>
+                <h2 style = "text-transform:uppercase;"><?php echo $tp; ?></h2>
                 
-                <form  id="questionsForm" method="get" name="Exam">
+                <form  id="questionsForm<?php echo $tp ?>" method="get" name="Exam">
                         <?php $i=0; //shuffle($dVueQuestions); 
-                        foreach ($dVueQuestions as $q) {
+                        foreach ($questions as $q) {
                             /*if($nbQ > $_SESSION['nbQuestions']) 
                                 break; */ ?>
                         <p><?php  $i++;  echo $q->getNumQuestion() .'.'.$q->getQuestion();  $_SESSION['num']=array();  $_SESSION['num'][$i] =$q->getNumQuestion();  ?> <br/>
-                            <textarea name="question<?php echo $q->getNumQuestion(); ?>" id="question<?php echo $q->getNumQuestion(); ?>"  rows="5" cols="70">
+                            <textarea name="question<?php echo $q->getNumQuestion(); ?>" id="question<?php echo $q->getNumQuestion().$q->getNumTp(); ?>"  rows="5" cols="70">
                                 <?php  echo (isset($_SESSION['fi'][$i]) ? $_SESSION['fi'][$i] : '') ?>
                             </textarea>
                             <p><input class="submitQuestionData" type="button" value="Valider" onclick="SubmitQuestionData(<?php echo $q->getNumQuestion(); ?>,<?php echo $q->getNumTp(); ?>);" >
@@ -62,7 +64,7 @@
                             <input class="modifierQuestion" type="button" value="Modifier" onclick="ModifierQuestion(<?php echo $q->getNumQuestion(); ?>,<?php echo $q->getNumTp(); ?>)" >
                             <input class="monterQuestion" type="button" value="Monter" onclick="MonterQuestion(<?php echo $q->getNumQuestion(); ?>,<?php echo $q->getNumTp(); ?>)" ></p>
                         </p>
-                        <div id="resultatsQuestions<?php echo $q->getNumQuestion(); ?>">
+                        <div id="resultatsQuestions<?php echo $q->getNumQuestion().$q->getNumTp(); ?>">
                             <!-- les résultats s'affichent içi -->
                         </div><br/>
                         <?php $i++; } //fin foreach ?>
@@ -70,32 +72,28 @@
               </div>
             </div>
           </div>
-        </section>
+        </section><?php } ?>
         
     
         <form method="get" class="frm">
-            <input type="submit" name="action" id="test" value="Générer Base de données aléatoire" />
+            <input class="inp-reset" type="submit" name="action"  value="Générer Base de données aléatoire" />
-            <input type="submit" name="regenerer" id="test" value="Réintiliser les questions" /><br/>
+            <input class="inp-reset" type="submit" name="action"  value="Réintiliser les questions" />
         </form>
-        <a href="vues/VueAdmin.php"><button>Ajouter Une Question</button></a>
-        <a href="vues/VueLibre.php"><button>Creation table</button></a>
         
-        <form method="get" role="form">
+        <form method="get" >
-            <input type="submit" name="action" value="Afficher les demonstrations" >
+            <input id="btn-ajout" type="submit" name="action"  value="Ajouter une question" />
-            <input type="submit" name="action" value="Afficher les QCM" ><br/>
         </form>
-
+        <!--<a href="vues/VueAdmin.php" class="a-ajout"><button id="btn-ajout">Ajouter Une Question</button></a>
-        <?php
+        <!--<a href="vues/VueLibre.php" class="a-ajout"><button>Creation table</button></a>-->
         
         
-       if(array_key_exists('regenerer',$_GET)){
         
-           $db = new SqliteDb();
+        <form method="get" role="form">
-           $db->createTable();
+            <input id="inp-questions" class="bouton" type="submit" name="action" value="Afficher les questions" hidden>
-           $URL="index.php";
+            <input id="inp-ret" type="submit" name="action" value="Retour au menu principal" >
-           echo '<META HTTP-EQUIV="refresh" content="0;URL=' . $URL . '">';
+        </form>
-        }
 
+        <?php
         
         ?>
         <div id="resultats">
@@ -127,14 +125,24 @@
             }
             init();
        
+            function changerSection(tp,keys){
+                                
+                tpk = keys.split(",");
+                tpk.forEach(function(entry) {
+                    $("#o"+entry).hide();
+                    console.log(entry);
+                });               
+                $("#o"+tp).show();
+   
+            }
             
             function SubmitQuestionData(numQuestion, numTp) {
                 //document.write($('#demo'+numQuestion).val());
-                var txt = $('#question'+numQuestion).val() ; 
+                var txt = $('#question'+numQuestion+numTp).val() ; 
 
                 $.get("Traitement/Correcteur.php", { textbox : txt, numQuestion : numQuestion, numTp : numTp},
                 function(data) {
-                     $('#resultatsQuestions'+numQuestion).html(data);
+                     $('#resultatsQuestions'+numQuestion+numTp).html(data);
                      //$('#questionsForm')[0].reset();
                   });
                   
@@ -143,9 +151,9 @@
              function SupprimerQuestion(numQuestion,numTp) {
                 $.get("Traitement/Suppression.php", {  numQuestion : numQuestion, numTp : numTp},
                 function(data) {
-                     $('#resultatsQuestions'+numQuestion).html(data);
+                     //$('#resultatsQuestions'+numQuestion).html(data);
                      //$('#questionsForm')[0].reset();
-                     location.reload();
+                        $('#inp-questions').trigger("click");
                   });
                   
             } 
@@ -168,8 +176,8 @@
                     function(data) {
 
                          //$('#questionsForm')[0].reset();
-                        
+                        $('#inp-questions').trigger("click");
-                         window.location.replace("index.php");
+                         //window.location.replace("index.php");
                       });
                 }
             }