Skip to content

MineQuest
MineQuest
Commit 4a0668e3 authored by khalilbt's avatar khalilbt
Browse files
Options

modify Question in Questionnaire

parent a538efdc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 378 additions and 52 deletions
controller/EnseignantController.class.php
View file @ 4a0668e3
......@@ -77,8 +77,60 @@
}
public function modifyQCMQuestion(){
$question = Question::findQuestion($_POST["ID_QUESTION"]);
$options=$question->findAllOptions();
$nbrObtions=count($options);
$view = new EnseignantView($this,'modificationQuestionQCM');
$view -> setUser($this->user);
$view->render();
}
public function modifyTextQuestion(){
$view = new EnseignantView($this,'modificationQuestionTexte');
$view -> setUser($this->user);
$view->render();
}
public function validateModificationQCMQuestion(){
$question = Question::findQuestion($this->request->read("ID_QUESTION"));
$DUREE = $this->request->read("DUREE");
$ENONCER = $this->request->read("ENONCER");
$question->modifyTextQuestion($DUREE,$ENONCER,"NULL");
for($i=0;$i<count($question->findAllOptions());$i++){
$question->deleteAllOption();
}
$nbrOption = (($this->request->nbrArg())- 3)/2;
$c=0;$i=1;
while($c<$nbrOption){
if($this->request->read("Option".$i)!=null){
$TEXTE = $this->request->read("Option".$i);
$COLONNE="0";
$valeur=$this->request->read("checkbox".$i);
$choix=Choix::create($question->ID_QUESTION(),$TEXTE,$COLONNE,$valeur);
$c++;
}
$i++;
}
$this->loadViewCreationQuestionnaire();
}
public function validateModificationTextQuestion(){
$question = Question::findQuestion($this->request->read("ID_QUESTION"));
$DUREE = $this->request->read("DUREE");
$ENONCER = $this->request->read("ENONCER");
$CORRECTION = $this->request->read("CORRECTION");
$question->modifyTextQuestion($DUREE,$ENONCER,$CORRECTION);
$this->loadViewCreationQuestionnaire();
}
// actions linked to questionnaires
public function prepareQuestionnaire(){
......@@ -170,11 +222,60 @@
}
public function modifierQuestionnaire(){
$view = new EnseignantView($this,'modificationQuestionnaire');
$TITRE = $this->request->read("TITRE");
$DESCRIPTION = $this->request->read("DESCRIPTION");
$TYPE = $this->request->read("TYPE");
$MATIERE = $this->request->read("MATIERE");
$DATE_OUVERTURE=$this->request->read("DATE_OUVERTURE");
$DATE_FIN=$this->request->read("DATE_FIN");
if($DATE_OUVERTURE != NULL){
$DATE_OUVERTURE=DateTime::createFromFormat('m/d/Y h:i A', $DATE_OUVERTURE);
if(is_bool($DATE_OUVERTURE)){$DATE_OUVERTURE=$this->request->read("DATE_OUVERTURE");}else{
$DATE_OUVERTURE=$DATE_OUVERTURE->format('Y-m-d H:i:s');}
}
if($DATE_FIN != NULL){
$DATE_FIN=DateTime::createFromFormat('m/d/Y h:i A', $DATE_FIN);
if(is_bool($DATE_FIN)){$DATE_FIN=$this->request->read("DATE_FIN");}else{
$DATE_FIN=$DATE_FIN->format('Y-m-d H:i:s');}
}
$questionnaire = Questionnaire::CurrentQuestionnaire();
$questionnaire ->modifierQuestionnaire($TITRE,$DESCRIPTION,$DATE_OUVERTURE,$DATE_FIN,$MATIERE,$TYPE);
$this-> loadViewCreationQuestionnaire();
}
public function openQuestionnaire(){
$_SESSION["ID_QUESTIONNAIRE"]=$this->request->read("ID_QUESTIONNAIRE");
$this->loadViewCreationQuestionnaire();
}
public function deleteQuestion(){
$Questionnaire=Questionnaire::CurrentQuestionnaire();
$Questionnaire->deleteQuestion($this->request->read("ID_QUESTION"));
$this->loadViewCreationQuestionnaire();
}
public function generateAllQuestionnaireCard(){
$view = new EnseignantView($this,'allQuestionnaire');
$view -> setUser($this->user);
$view->render();
}
// actions linked to enseignant
public function disconnect() {
......
img/modify.svg 0 → 100644
View file @ 4a0668e3
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" height="512" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512 512m-395.3 0a395.3 395.3 0 1 0 790.6 0 395.3 395.3 0 1 0-790.6 0Z" fill="#29B6D6" /><path d="M318.3 677l76.2-11.1c1.8-0.3 2.5-2.4 1.2-3.7l-74.9-74.9c-1.3-1.3-3.4-0.5-3.7 1.2L306 664.7c-1 7.2 5.2 13.3 12.3 12.3zM639.7 416.7l-73.4-73.4c-2.1-2.1-5.5-2.1-7.7 0l-39.2 39.2-186.2 186.4c-2.1 2.1-2.1 5.5 0 7.7l73.4 73.4c2.1 2.1 5.5 2.1 7.7 0l186.3-186.3 39.2-39.2c2-2.3 2-5.7-0.1-7.8zM680.7 383.4c17.6-17.6 17.6-46.3 0-63.9l-17.2-17.2c-17.6-17.6-46.3-17.6-63.9 0L578 324c-2.1 2.1-2.1 5.5 0 7.7l73.4 73.4c2.1 2.1 5.5 2.1 7.7 0l21.6-21.7z" fill="#FFFFFF" /><path d="M676.5 680.6H480.7c-5 0-9.1-4.1-9.1-9.1s4.1-9.1 9.1-9.1h195.7c5 0 9.1 4.1 9.1 9.1s-4 9.1-9 9.1z" fill="#FFFFFF" /></svg>
\ No newline at end of file
model/Question.class.php
View file @ 4a0668e3
......@@ -49,8 +49,17 @@
return $m;
}
public function modifyTextQuestion($DUREE,$ENONCER,$CORRECTION){
static::db()->exec("UPDATE question SET DUREE = '$DUREE', ENONCER = '$ENONCER',CORRECTION='$CORRECTION' WHERE ID_QUESTION = '$this->ID_QUESTION'");
}
public function deleteAllOption(){
$options = $this->findAllOptions();
for($i=0;$i<count($options);$i++){
static::db()->exec("DELETE FROM choix WHERE choix.ID_CHOIX =".$options[$i][0]);
}
}
public function ID_QUESTION(){
return $this ->ID_QUESTION ;
......
model/Questionnaire.class.php
View file @ 4a0668e3
......@@ -67,6 +67,30 @@
static::db()->exec("INSERT INTO posseder_question (ID_QUESTIONNAIRE,ID_QUESTION) VALUES('$this->ID_QUESTIONNAIRE','$ID_QUESTION')");
}
public function deleteQuestion($idQuestion){
static::db()->exec("DELETE FROM posseder_question WHERE ID_QUESTIONNAIRE=".$this->ID_QUESTIONNAIRE()." AND ID_QUESTION=".$idQuestion);
}
public function modifierQuestionnaire($TITRE,$DESCRIPTION,$DATE_OUVERTURE,$DATE_FIN,$MATIERE,$TYPE){
$idMATIERE = static::findMatiere($MATIERE);
if ($DATE_OUVERTURE != null && $DATE_FIN != null){
static::db()->exec("UPDATE questionnaire SET DESCRIPTION = '$DESCRIPTION', TYPE = '$TYPE',TITRE='$TITRE',DATE_OUVERTURE='$DATE_OUVERTURE', DATE_FIN='$DATE_FIN',idMATIERE='$idMATIERE' WHERE ID_QUESTIONNAIRE = '$this->ID_QUESTIONNAIRE'");
}else {
static::db()->exec("UPDATE questionnaire SET DESCRIPTION = '$DESCRIPTION', TYPE = '$TYPE',TITRE='$TITRE',DATE_OUVERTURE=NULL, DATE_FIN=NULL,idMATIERE='$idMATIERE' WHERE questionnaire.ID_QUESTIONNAIRE = '$this->ID_QUESTIONNAIRE'");
}
}
public function generateQuestionnaireCard(){
$templateFileName =__ROOT_DIR . '/templates/'. 'QuestionnaireCard.php';
require($templateFileName);
}
public function ID_QUESTIONNAIRE(){
return $this ->ID_QUESTIONNAIRE ;
......@@ -107,5 +131,7 @@
return $this ->idMATIERE ;
}
}
?>
\ No newline at end of file
model/User.class.php
View file @ 4a0668e3
......@@ -52,6 +52,13 @@
}
public function findEnseigantQuestionnaires(){
$sql = "select ID_QUESTIONNAIRE FROM questionnaire WHERE idCreateur=".$this->id();
$st = static::db()->query($sql);
$m= $st->fetchAll();
return($m);
}
public function login(){
return $this ->login;
......
templates/QCMcard.php
View file @ 4a0668e3
......@@ -4,12 +4,27 @@
<div class="card-header bg-light h-50" >
<div class="row align-items-center ">
<div class="col-10">
<div class="col-7">
<h6><?php echo $this->ENONCER()?></h6>
</div>
<div class="col">
<span class="badge badge-secondary"><?php echo $this->DUREE()?> Secondes</span>
</div>
<div class="col">
<form action=<?php echo(__BASE_URL ."/index.php?controller=enseignant&action=modifyQCMQuestion") ?> method="post">
<input type="text" name="ID_QUESTION" value= '<?php echo $this->ID_QUESTION()?>'hidden>
<button type="submit" style="padding: 0;border: none;background: none;"><img src="img/modifier.png" width="45" height="45"></button>
</form>
</div>
<div class="col">
<form action=<?php echo(__BASE_URL ."/index.php?controller=enseignant&action=deleteQuestion") ?> method="post">
<input type="text" name="ID_QUESTION" value= '<?php echo $this->ID_QUESTION()?>'hidden>
<button type="submit" style="padding: 0;border: none;background: none;"><img src="img/delete.png"></button>
</form>
</div>
</div>
</div>
......
templates/QuestionnaireCard.php 0 → 100644
View file @ 4a0668e3
<div class="row m-2 ">
<div class="card w-100">
<div class="card-header bg-light h-50" >
<div class="row align-items-center ">
<div class="col-11">
<h6><?php echo $this->TITRE()?></h6>
</div>
<div class="col">
<form action=<?php echo(__BASE_URL ."/index.php?controller=enseignant&action=openQuestionnaire") ?> method="post">
<input type="text" name="ID_QUESTIONNAIRE" value= '<?php echo $this->ID_QUESTIONNAIRE()?>'hidden>
<button type="submit" style="padding: 0;border: none;background: none;"><img src="img/modify.png"></button>
</form>
</div>
</div>
</div>
<div class="card-body">
<div class="row">
<div class="col">
Description: <?php echo $this->DESCRIPTION() ?>
</div>
</div>
<div class="row">
<div class="col">
Matiere: <?php echo Questionnaire::Matiere($this->idMATIERE()) ?>
</div>
<div class="col">
(insert request here) élèves ont passé ce questionnaire.
</div>
</div>
<div class="row">
<div class="col">
Crée le: <?php echo $this->DATE_CREATION() ?>
</div>
</div>
</div>
</div>
</div>
templates/TextCard.php
View file @ 4a0668e3
......@@ -4,12 +4,29 @@
<div class="card-header bg-light h-50" >
<div class="row align-items-center ">
<div class="col-10">
<div class="col-7">
<h6><?php echo $this->ENONCER()?></h6>
</div>
<div class="col">
<span class="badge badge-secondary"><?php echo $this->DUREE()?> Secondes</span>
</div>
<div class="col">
<form action=<?php echo(__BASE_URL ."/index.php?controller=enseignant&action=modifyTextQuestion") ?> method="post">
<input type="text" name="ID_QUESTION" value= '<?php echo $this->ID_QUESTION()?>'hidden>
<button type="submit" style="padding: 0;border: none;background: none;"><img src="img/modifier.png" width="45" height="45"></button>
</form>
</div>
<div class="col">
<form action=<?php echo(__BASE_URL ."/index.php?controller=enseignant&action=deleteQuestion") ?> method="post">
<input type="text" name="ID_QUESTION" value= '<?php echo $this->ID_QUESTION()?>'hidden>
<button type="submit" style="padding: 0;border: none;background: none;"><img src="img/delete.png"></button>
</form>
</div>
</div>
</div>
......
templates/allQuestionnaireTemplate.php 0 → 100644
View file @ 4a0668e3
<?php
$m=$this->user->findEnseigantQuestionnaires();
for($i=0;$i<count($m);$i++){
$questionnaire= Questionnaire::findQuestionnaire($m[$i][0]);
$questionnaire->generateQuestionnaireCard();
}
?>
\ No newline at end of file
templates/createQuestionnaireTemplate.php
View file @ 4a0668e3
This diff is collapsed.
templates/creationQuestionQCMTemplate.php
View file @ 4a0668e3
......@@ -6,7 +6,7 @@
}
function addLinkIn($elem){
var ch = "'option"+optionId+"'";
var x = '<div class="row align-items-center mt-4 " id="option'+optionId+'"> <div class="col-10" ><div class="custom-control custom-checkbox"><input type="hidden" name="checkbox'+optionId+'" value="0" /><input type="checkbox" value="1" class="custom-control-input" id="checkbox'+optionId+'" name="checkbox'+optionId+'" ><label class="custom-control-label " for="checkbox'+optionId+'" style="width:100%;"><input type="text" name="Option'+optionId+'" class="form-control " placeholder="Option '+optionId+'" ></label></div></div> <div class="col"><button id="remove" onclick="removeElement('+ch+')"><img src="img/trash.svg"></button></div></div>';
var x = '<div class="row align-items-center mt-4 " id="option'+optionId+'"> <div class="col-10" ><div class="custom-control custom-checkbox"><input type="hidden" name="checkbox'+optionId+'" value="0" /><input type="checkbox" value="1" class="custom-control-input" id="checkbox'+optionId+'" name="checkbox'+optionId+'" ><label class="custom-control-label " for="checkbox'+optionId+'" style="width:100%;"><input id="Option'+optionId+'" type="text" name="Option'+optionId+'" class="form-control " placeholder="Option '+optionId+'" ></label></div></div> <div class="col"><button id="remove" onclick="removeElement('+ch+')"><img src="img/trash.svg"></button></div></div>';
$elem.append($(x));
}
......@@ -19,18 +19,15 @@
});
function removeElement(elementId) {
// Removes an element from the document
var element = document.getElementById(elementId);
element.parentNode.removeChild(element);
optionId=optionId-1;
}
var element = document.getElementById(elementId);
element.parentNode.removeChild(element);
optionId=optionId-1;
}
</script>
<form action= <?php echo(__BASE_URL ."/index.php?controller=enseignant&action=validateCreationQcmQuestion") ?> method="post" >
<form id="form" action= <?php echo(__BASE_URL ."/index.php?controller=enseignant&action=validateCreationQcmQuestion") ?> method="post" >
<div class=" container " style="margin-top:50px;" >
<script type="text/javascript">
document.write(optionId)
</script>
<div class="row">
<div class="col-8 offset-2">
<div class="card">
......@@ -58,15 +55,16 @@
</div>
<div class="card-body " id="card-body">
<input type="text" name="ENONCER" class="form-control mb-5" placeholder="Ecrivez votre question ici">
<input type="text" id="ENONCER" name="ENONCER" class="form-control mb-5" placeholder="Ecrivez votre question ici">
<input type="text" name="ID_QUESTION" id="ID_QUESTION" hidden>
<div class="row align-items-center mt-4 " id="option1">
<div class="col-10" >
<div class="custom-control custom-checkbox">
<input type="hidden" name="checkbox1" value="0" />
<input type="checkbox" value="1" class="custom-control-input" id="checkbox1" name="checkbox1" >
<label class="custom-control-label " for="checkbox1" style="width:100%;">
<input type="text" name="Option1" class="form-control " placeholder="Option 1" >
<input type="text" name="Option1" id="Option1" class="form-control " placeholder="Option 1" >
</label>
</div>
</div>
......@@ -78,7 +76,7 @@
<input type="hidden" name="checkbox2" value="0" />
<input type="checkbox" value="1" class="custom-control-input" id="checkbox2" name="checkbox2" >
<label class="custom-control-label " for="checkbox2" style="width:100%;">
<input type="text" name="Option2" class="form-control " placeholder="Option 2" >
<input type="text" name="Option2" id="Option2" class="form-control " placeholder="Option 2" >
</label>
</div>
</div>
......@@ -90,7 +88,7 @@
<input type="hidden" name="checkbox3" value="0" />
<input type="checkbox" value="1" class="custom-control-input" id="checkbox3" name="checkbox3" >
<label class="custom-control-label " for="checkbox3" style="width:100%;">
<input type="text" name="Option3" class="form-control " placeholder="Option 3" >
<input type="text" name="Option3" id="Option3" class="form-control " placeholder="Option 3" >
</label>
</div>
</div>
......@@ -106,7 +104,7 @@
<input type="hidden" name="checkbox4" value="0" />
<input type="checkbox" value="1" class="custom-control-input" id="checkbox4" name="checkbox4" >
<label class="custom-control-label " for="checkbox4" style="width:100%;">
<input type="text" name="Option4" class="form-control " placeholder="Option 4" >
<input type="text" name="Option4" id="Option4" class="form-control " placeholder="Option 4" >
</label>
</div>
</div>
......@@ -127,15 +125,14 @@
<div class="row align-items-stretch" >
<div class="col-3">
<button class="btn btn-primary btn-block" type="button" onclick="history.back()">Précédent</button>
</div>
<div class="col-2 offset-7 ">
<button class="btn btn-primary btn-block" type="submit">Créer</button>
</div>
<div class="row align-items-stretch" >
<div class="col-3">
<button class="btn btn-primary btn-block" type="button" onclick="history.back()">Précédent</button>
</div>
<div class="col-2 offset-7 ">
<button class="btn btn-primary btn-block" type="submit" id="createButton" >Créer</button>
<button class="btn btn-primary btn-block" type="submit" id="modifyButton" >Modify</button>
</div>
</div>
......@@ -147,3 +144,4 @@
</div>
</div>
</form>
s
\ No newline at end of file
templates/creationQuestionTexteTemplate.php
View file @ 4a0668e3
......@@ -9,7 +9,7 @@
</div>
<div class="col-3 offset-5 ">
<form action= <?php echo(__BASE_URL ."/index.php?controller=enseignant&action=validateCreationTextQuestion") ?> method="post" >
<form id="form" action= <?php echo(__BASE_URL ."/index.php?controller=enseignant&action=validateCreationTextQuestion") ?> method="post" >
<select class="browser-default custom-select" name="DUREE">
<option value="" disabled >Choisissez la durée</option>
......@@ -26,10 +26,10 @@
</div>
<div class="card-body ">
<input type="text" name="ENONCER" class="form-control mb-5" placeholder="Ecrivez votre question ici">
<input type="text" id="ENONCER" name="ENONCER" class="form-control mb-5" placeholder="Ecrivez votre question ici">
<input type="text" name="CORRECTION" class="form-control mb-4 ml-3 " placeholder="Ecrivez la bonne réponse" style="width:80%;">
<input type="text" id="CORRECTION" name="CORRECTION" class="form-control mb-4 ml-3 " placeholder="Ecrivez la bonne réponse" style="width:80%;">
<input type="text" name="ID_QUESTION" id="ID_QUESTION" hidden>
</div>
<div class="card-footer text-muted" >
......@@ -44,10 +44,14 @@
</div>
<div class="col-2 offset-7 ">
<button class="btn btn-primary btn-block" type="submit">Créer</button>
<button class="btn btn-primary btn-block" type="submit" id="createButton" >Créer</button>
<button class="btn btn-primary btn-block" type="submit" id="modifyButton" >Modify</button>
</form>
</div>
</div>
</form>
......
templates/enseignantNavBarTemplate.php
View file @ 4a0668e3
......@@ -14,7 +14,7 @@
</li>
<li class="nav-item">
<a class="nav-link" href="#">Questionnaires</a>
<a class="nav-link" href="<?php echo(__BASE_URL."/index.php?controller=enseignant&action=generateAllQuestionnaireCard")?>">Questionnaires</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Qestions</a>
......
templates/modificationQuestionQCMTemplate.php 0 → 100644
View file @ 4a0668e3
<?php
// this part of code is very messy
$question = Question::findQuestion($_POST["ID_QUESTION"]);
$options=$question->findAllOptions();
$nbrObtions=count($options);
$templateFileName =__ROOT_DIR . '/templates/'. 'creationQuestionQCMTemplate.php';
require($templateFileName);
for($i=0;$i<($nbrObtions-4);$i++){
echo "<script> addLinkIn($('#card-body'));optionId=optionId+1;</script>";
}
$text = array();
$values = array();
for($i=0;$i<$nbrObtions;$i++){
$option = Choix::findChoix($options[$i][0])->TEXTE();
$value = Choix::findChoix($options[$i][0])->valeur();
array_push($text,$option );
array_push($values,$value );
}
?>
<script>
document.getElementById("ENONCER").value = "<?php echo (Question::findQuestion($_POST["ID_QUESTION"])->ENONCER()); ?>";
document.getElementById("form").action='<?php echo(__BASE_URL ."/index.php?controller=enseignant&action=validateModificationQCMQuestion") ?>' ;
document.getElementById("ID_QUESTION").value = "<?php echo $_POST["ID_QUESTION"]; ?>";
document.getElementById("createButton").hidden=true;
document.getElementById("modifyButton").hidden=false;
var i;
text = <?php echo JSON_encode($text);?>;
values =<?php echo JSON_encode($values);?>;
for (i = 1; i <= <?php echo $nbrObtions ?>; i++) {
document.getElementById("Option"+i).value = text[i-1];
if (values[i-1]=="1") {
document.getElementById("checkbox"+i).checked =true;
}
}
</script>
templates/modificationQuestionTexteTemplate.php 0 → 100644
View file @ 4a0668e3
<?php
$templateFileName =__ROOT_DIR . '/templates/'. 'creationQuestionTexteTemplate.php';
require($templateFileName);
?>
<script>
document.getElementById("ENONCER").value = "<?php echo (Question::findQuestion($_POST["ID_QUESTION"])->ENONCER()); ?>";
document.getElementById("CORRECTION").value = "<?php echo (Question::findQuestion($_POST["ID_QUESTION"])->CORRECTION()); ?>";
document.getElementById("form").action='<?php echo(__BASE_URL ."/index.php?controller=enseignant&action=validateModificationTextQuestion") ?>' ;
document.getElementById("ID_QUESTION").value = "<?php echo $_POST["ID_QUESTION"]; ?>";
document.getElementById("createButton").hidden=true;
document.getElementById("modifyButton").hidden=false;
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment