diff --git a/BddCorrect/BDD/SqliteDb.php b/BddCorrect/BDD/SqliteDb.php index 66d9dc6..0fcbca0 100644 --- a/BddCorrect/BDD/SqliteDb.php +++ b/BddCorrect/BDD/SqliteDb.php @@ -192,9 +192,7 @@ class SqliteDb extends SQLite3 $this->exec("INSERT INTO dateTp VALUES(2,'20200101','20200814')"); } - - - + function joueurEtDateRandom(&$nomRandom, &$dateRandom){ $listeJoueurQuery = oci_parse($this->conn, 'SELECT prenomnoms,datematch FROM STATS INTERSECT SELECT prenomnoms,datematch FROM randomstats '); diff --git a/BddCorrect/DAL/QuestionsGateway.php b/BddCorrect/DAL/QuestionsGateway.php index 1d8eea6..5a2ee34 100644 --- a/BddCorrect/DAL/QuestionsGateway.php +++ b/BddCorrect/DAL/QuestionsGateway.php @@ -18,13 +18,13 @@ class QuestionsGateway { //$nbTpRow = $result->fetchArray(SQLITE3_NUM); $i = 0; 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 = 'SELECT numTp,numquestion,question,reponse,points FROM Correct WHERE numTp = ? UNION SELECT numTp,numquestion,question,reponse,points 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']); + $tabQuestions[] = new QuestionNote($q['numTp'],$q['numquestion'],$q['question'],$q['reponse'],$q['points']); } $tabTp['tp'.$tp[0]] = $tabQuestions ; unset($tabQuestions); diff --git a/BddCorrect/Traitement/DateTp.php b/BddCorrect/Traitement/DateTp.php index c93a65e..6a2bd18 100644 --- a/BddCorrect/Traitement/DateTp.php +++ b/BddCorrect/Traitement/DateTp.php @@ -21,4 +21,6 @@ $prp->bindParam(1, $fin); $prp->bindParam(2,$_GET['tp'] ); $result = $prp->execute(); +echo ' Les dates ont été modifiées '; + diff --git a/BddCorrect/Traitement/VueGestionTp.php b/BddCorrect/Traitement/VueGestionTp.php new file mode 100644 index 0000000..ff8e7d8 --- /dev/null +++ b/BddCorrect/Traitement/VueGestionTp.php @@ -0,0 +1,83 @@ + + + + + + + + + + +
+
+ + +

Modifier les dates de tp

+
+ + prepare('SELECT dateDebut,dateFin FROM dateTp WHERE numTp=?'); + $reponseQuery->bindParam(1,$_GET['tp']); + $reponseResult = $reponseQuery->execute(); + $reponseRow = $reponseResult->fetchArray(); + + $anneeDebut = substr($reponseRow['dateDebut'],0,4) ; + $moisDebut=substr($reponseRow['dateDebut'],4,2); + $jourDebut=substr($reponseRow['dateDebut'],6,2); + $dateDebut= $anneeDebut.'-'.$moisDebut.'-'.$jourDebut; + + $anneeFin=substr($reponseRow['dateFin'],0,4); + $moisFin=substr($reponseRow['dateFin'],4,2); + $jourFin=substr($reponseRow['dateFin'],6,2); + $dateFin= $anneeFin.'-'.$moisFin.'-'.$jourFin; + + ?> + + +


+ + +

+ + +


+ +
+ +
+
+
+
+ +
+ +
+ +
+ + + + diff --git a/BddCorrect/Traitement/test2.db b/BddCorrect/Traitement/test2.db index 1b39289..cc94894 100644 Binary files a/BddCorrect/Traitement/test2.db and b/BddCorrect/Traitement/test2.db differ diff --git a/BddCorrect/controleur/Controleur.php b/BddCorrect/controleur/Controleur.php index 15b6dae..6c0c60f 100644 --- a/BddCorrect/controleur/Controleur.php +++ b/BddCorrect/controleur/Controleur.php @@ -7,6 +7,7 @@ class Controleur { session_start(); $dVueEreur = array (); + $_SESSION['typeSession'] = 'LJLf1'; try{ $action=$_REQUEST['action']; // echo $action; diff --git a/BddCorrect/css/VueAccueil.css b/BddCorrect/css/VueAccueil.css index 0e08ad0..8fe7ae2 100644 --- a/BddCorrect/css/VueAccueil.css +++ b/BddCorrect/css/VueAccueil.css @@ -19,6 +19,15 @@ text-shadow:none; } +.adm:hover{ + background: #d9534f; + color: #fff; + border: 1px solid #eee; + border-radius: 20px; + box-shadow: 5px 5px 5px #eee; + text-shadow:none; +} + body { text-align: center; } diff --git a/BddCorrect/css/VueDemonstration.css b/BddCorrect/css/VueDemonstration.css index faafc2b..6220e41 100644 --- a/BddCorrect/css/VueDemonstration.css +++ b/BddCorrect/css/VueDemonstration.css @@ -6,6 +6,9 @@ } +.adm{ + display: none; +} #frm-reset input{ background: #0082b5; diff --git a/BddCorrect/css/VuePrincipale.css b/BddCorrect/css/VuePrincipale.css index 41b703a..edbd47a 100644 --- a/BddCorrect/css/VuePrincipale.css +++ b/BddCorrect/css/VuePrincipale.css @@ -8,6 +8,10 @@ and open the template in the editor. Author : Mehdi */ +.adm{ + display: none; +} + #inp-gauche{ margin-left: 50px; } diff --git a/BddCorrect/index.php b/BddCorrect/index.php index 9d0f22e..dc5451b 100644 --- a/BddCorrect/index.php +++ b/BddCorrect/index.php @@ -37,6 +37,7 @@ and open the template in the editor. } }*/ + require_once(__DIR__.'/config/config.php'); //chargement autoloader pour autochargement des classes diff --git a/BddCorrect/metier/QuestionNote.php b/BddCorrect/metier/QuestionNote.php new file mode 100644 index 0000000..fd90619 --- /dev/null +++ b/BddCorrect/metier/QuestionNote.php @@ -0,0 +1,25 @@ +bareme = $bareme; + } + + public function getBareme(){ + return $this->bareme; + } +} diff --git a/BddCorrect/nbproject/private/private.xml b/BddCorrect/nbproject/private/private.xml index e34b4ac..9441c65 100644 --- a/BddCorrect/nbproject/private/private.xml +++ b/BddCorrect/nbproject/private/private.xml @@ -3,10 +3,7 @@ - file:/C:/xampp/htdocs/BddCorrect/vues/VueQCM.php - file:/C:/xampp/htdocs/BddCorrect/BDD/SqliteDb.php - file:/C:/xampp/htdocs/BddCorrect/Traitement/AjoutQCM.php - file:/C:/xampp/htdocs/BddCorrect/vues/vueAjoutQCM.php + file:/C:/xampp/htdocs/BddCorrect/BDD/OracleDb.php diff --git a/BddCorrect/vues/VueAccueil.php b/BddCorrect/vues/VueAccueil.php index 8080943..dc44124 100644 --- a/BddCorrect/vues/VueAccueil.php +++ b/BddCorrect/vues/VueAccueil.php @@ -29,13 +29,12 @@


-
-
-
+
+
- + -
+
@@ -84,12 +84,20 @@ -
+
+
diff --git a/BddCorrect/vues/VueQCM.php b/BddCorrect/vues/VueQCM.php index de2636c..9f96605 100644 --- a/BddCorrect/vues/VueQCM.php +++ b/BddCorrect/vues/VueQCM.php @@ -48,10 +48,10 @@ ?>

- - - - + + + +

@@ -63,8 +63,9 @@
- -
+ + +
@@ -138,6 +139,20 @@ }); } + $( document ).ready(function() { + var ad = $('#verif-ad').val(); + + if(ad == 'LJLf1') + $( ".adm").show(); + else $( ".adm").remove(); + + + + if(ad == 'test'){ + $('#vuep').empty(); + } + + }); window.addEventListener('scroll',function() { localStorage.setItem('scrollPosition',window.scrollY);