X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsurvey%2Fsurvey.inc.php;h=0daa07af4b78150595c547bb6c879186a7f236bc;hb=0dc8c5a4cc2a816f3d67ffe85163e9e77b06f90c;hp=02ccef64108d5fbb256640881c7b771b117cfc82;hpb=797d27dbbcdaec6e021fa33f785a55e4b9346de1;p=platal.git diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php index 02ccef6..0daa07a 100644 --- a/modules/survey/survey.inc.php +++ b/modules/survey/survey.inc.php @@ -1,6 +1,6 @@ "sondage ouvert à tout le monde, anonyme", + private static $longModes = array(self::MODE_ALL => "sondage ouvert à tout le monde, anonyme", self::MODE_XANON => "sondage restreint aux polytechniciens, anonyme", self::MODE_XIDENT => "sondage restreint aux polytechniciens, non anonyme"); private static $shortModes = array(self::MODE_ALL => "tout le monde, anonyme", @@ -37,11 +37,13 @@ class Survey return ($long)? self::$longModes : self::$shortModes; } - private static $types = array('text' => 'Texte court', - 'textarea' => 'Texte long', - 'num' => 'Numérique', - 'radio' => 'Choix multiples (une réponse)', - 'checkbox' => 'Choix multiples (plusieurs réponses)'); + private static $types = array('text' => 'Texte court', + 'textarea' => 'Texte long', + 'num' => 'Numérique', + 'radio' => 'Choix multiples (une réponse)', + 'checkbox' => 'Choix multiples (plusieurs réponses)', + 'radiotable' => 'Questions multiples à choix multiples (une réponse)', + 'checkboxtable' => 'Questions multiples à choix mutliples (plusieurs réponses)'); public static function getTypes() { @@ -81,6 +83,7 @@ class Survey if ($this->mode == self::MODE_ALL) { $args['promos'] = ''; } + $args['promos'] = str_replace(' ', '', $args['promos']); $this->promos = ($args['promos'] == '' || preg_match('#^(\d{4}-?|(\d{4})?-\d{4})(,(\d{4}-?|(\d{4})?-\d{4}))*$#', $args['promos']))? $args['promos'] : '#'; } // }}} @@ -158,10 +161,7 @@ class Survey $q = $this->questions[$k]->toArray(); $q['id'] = $k; if ($this->isEnded()) { // if the survey is ended, then adds here the results of this question - $sql = $this->questions[$k]->buildResultRequest(); - if ($sql != '') { - $q['result'] = XDB::iterator($sql, $this->id, $k); - } + $q['result'] = $this->questions[$k]->getResultArray($this->id, $k); } $qArr[$k] = $q; } @@ -182,9 +182,12 @@ class Survey $csv_output = ''; $csv = fopen('var://csv_output', 'w'); $line = ($this->isMode(self::MODE_XIDENT))? array('id', 'Nom', 'Prenom', 'Promo') : array('id'); + $qids = array(); for ($qid = 0; $qid < $nbq; $qid++) { - $line[] = $this->questions[$qid]->getCSVColumn(); // the fist line contains the questions + $qids[$qid] = count($line); // stores the first id of a question (in case of questions with subquestions) + array_splice($line, count($line), 0, $this->questions[$qid]->getCSVColumns()); // the first line contains the questions } + $nbf = count($line); $users = array(); if ($this->isMode(self::MODE_XIDENT)) { // if the mode is non anonymous $sql = 'SELECT v.id AS vid, a.nom, a.prenom, a.promo @@ -198,22 +201,21 @@ class Survey $users[$u['vid']] = array('nom' => $u['nom'], 'prenom' => $u['prenom'], 'promo' => $u['promo']); } } - $sql = 'SELECT v.id AS vid, a.question_id AS qid, a.answer + $sql = 'SELECT v.id AS vid, a.question_id AS qid, a.answer AS answer FROM survey_votes AS v LEFT JOIN survey_answers AS a ON a.vote_id=v.id WHERE v.survey_id={?} - ORDER BY vid ASC, qid ASC;'; + ORDER BY vid ASC, qid ASC, answer ASC;'; $res = XDB::iterator($sql, $this->id); // retrieves all answers from database $cur = $res->next(); $vid = -1; $vid_ = 0; - $first = ($this->isMode(self::MODE_XIDENT))? 4 : 1; while ($cur != null) { if ($vid != $cur['vid']) { // if the vote id changes, then starts a new line fputcsv($csv, $line, $sep, $enc); // stores the former line into $csv_output $vid = $cur['vid']; - $line = array_fill(0, $first + $nbq, ''); // creates an array full of empty string + $line = array_fill(0, $nbf, ''); // creates an array full of empty string $line[0] = $vid_; // the first field is a 'clean' vote id (not the one stored in database) if ($this->isMode(self::MODE_XIDENT)) { // if the mode is non anonymous if (array_key_exists($vid, $users) && is_array($users[$vid])) { // and if the user data can be found @@ -224,11 +226,20 @@ class Survey } $vid_++; } - $fid = $first + $cur['qid']; // computes the field id - if ($line[$fid] != '') { // if this field already contains something - $line[$fid] .= $asep; // then adds a separator before adding the new answer + $ans = $this->questions[$cur['qid']]->formatAnswer($cur['answer']); // formats the current answer + if (!is_null($ans)) { + if (is_array($ans)) { + $fid = $qids[$cur['qid']] + $ans['id']; // computes the field id + $a = $ans['answer']; + } else { + $fid = $qids[$cur['qid']]; + $a = $ans; + } + if ($line[$fid] != '') { // if this field already contains something + $line[$fid] .= $asep; // then adds a separator before adding the new answer + } + $line[$fid] .= $a; // adds the current answer to the correct field } - $line[$fid] .= $cur['answer']; // adds the current answer to the correct field $cur = $res->next(); // gets next answer } fputcsv($csv, $line, $sep, $enc); // stores the last line into $csv_output @@ -250,8 +261,10 @@ class Survey return new SurveyRadio($args); case 'checkbox': return new SurveyCheckbox($args); - case 'personal': - return new SurveyPersonal($args); + case 'radiotable': + return new SurveyRadioTable($args); + case 'checkboxtable': + return new SurveyCheckboxTable($args); default: return null; } @@ -299,8 +312,8 @@ class Survey // {{{ function checkSyntax() : checks syntax of the questions (currently the root only) before storing the survey in database private static $errorMessages = array( - "datepassed" => "la date de fin de sondage est déjà dépassée : vous devez préciser une date future", - "promoformat" => "les restrictions à certaines promotions sont mal formattées" + "datepassed" => "la date de fin de sondage est déjà dépassée : vous devez préciser une date future", + "promoformat" => "les restrictions à certaines promotions sont mal formattées" ); public function checkSyntax() @@ -336,7 +349,8 @@ class Survey } $sql = 'SELECT id, title, end, mode FROM survey_surveys - WHERE '.$where.';'; + WHERE '.$where.' + ORDER BY end DESC;'; if ($tpl) { return XDB::iterator($sql); } else { @@ -394,7 +408,7 @@ class Survey public function proposeSurvey() { require_once 'validations.inc.php'; - $surveyreq = new SurveyReq($this->title, $this->description, $this->end, $this->mode, $this->promos, $this->questions, S::v('uid')); + $surveyreq = new SurveyReq($this->title, $this->description, $this->end, $this->mode, $this->promos, $this->questions, S::user()); return $surveyreq->submit(); } // }}} @@ -516,7 +530,7 @@ abstract class SurveyQuestion } // }}} - // {{{ function checkAnswer : returns a correctly formatted answer (or nothing empty string if error) + // {{{ function checkAnswer : returns a correct answer (or a null value if error) public function checkAnswer($ans) { return null; @@ -524,12 +538,14 @@ abstract class SurveyQuestion // }}} // {{{ functions regarding the results of a survey - public function buildResultRequest() + abstract public function getResultArray($sid, $qid); + + public function formatAnswer($ans) { - return ''; + return $ans; } - public function getCSVColumn() + public function getCSVColumns() { return $this->question; } @@ -546,7 +562,7 @@ abstract class SurveySimple extends SurveyQuestion return array($ans); } - public function buildResultRequest() + public function getResultArray($sid, $qid) { $sql = 'SELECT answer FROM survey_answers @@ -554,7 +570,8 @@ abstract class SurveySimple extends SurveyQuestion AND question_id={?} ORDER BY RAND() LIMIT 5;'; - return $sql; + $res = XDB::query($sql, $sid, $qid); + return $res->fetchAllAssoc(); } } // }}} @@ -605,8 +622,8 @@ abstract class SurveyList extends SurveyQuestion { parent::update($args); $this->choices = array(); - foreach ($args['options'] as $val) { - if (trim($val)) { + foreach ($args['choices'] as $val) { + if (trim($val) || trim($val) == '0') { $this->choices[] = $val; } } @@ -619,28 +636,24 @@ abstract class SurveyList extends SurveyQuestion return $rArr; } - public function buildResultRequest() + public function getResultArray($sid, $qid) { $sql = 'SELECT answer, COUNT(id) AS count FROM survey_answers WHERE vote_id IN (SELECT id FROM survey_votes WHERE survey_id={?}) AND question_id={?} GROUP BY answer ASC'; - return $sql; + $res = XDB::query($sql, $sid, $qid); + return $res->fetchAllAssoc(); } - public function getCSVColumn() + public function formatAnswer($ans) { - $r = parent::getCSVColumn(); - if (empty($this->choices)) { - return $r; - } - $r .= ' [0 => '.$this->choices[0]; - for ($k = 1; $k < count($this->choices); $k++) { - $r .= ', '.$k.' => '.$this->choices[$k]; + if (array_key_exists($ans, $this->choices)) { + return $this->choices[$ans]; + } else { + return null; } - $r .= ']'; - return $r; } } // }}} @@ -650,7 +663,8 @@ class SurveyRadio extends SurveyList { public function checkAnswer($ans) { - return (array_key_exists($ans, $this->choices))? array($ans) : null; + $a = intval($ans); + return (array_key_exists($a, $this->choices))? array($a) : null; } protected function getQuestionType() @@ -683,5 +697,128 @@ class SurveyCheckbox extends SurveyList // }}} // }}} -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// {{{ abstract class SurveyTable and its derived classes : table question, each column represents a choice, each line represents a question +// {{{ abstract class SurveyTable extends SurveyList +abstract class SurveyTable extends SurveyList +{ + protected $subquestions; + + public function update($args) + { + parent::update($args); + $this->subquestions = array(); + foreach ($args['subquestions'] as $val) { + if (trim($val) || trim($val) == '0') { + $this->subquestions[] = $val; + } + } + } + + public function toArray() + { + $rArr = parent::toArray(); + $rArr['subquestions'] = $this->subquestions; + return $rArr; + } + + public function getResultArray($sid, $qid) + { + $sql = 'SELECT answer, COUNT(id) AS count + FROM survey_answers + WHERE vote_id IN (SELECT id FROM survey_votes WHERE survey_id={?}) + AND question_id={?} + GROUP BY answer ASC'; + $res = XDB::iterator($sql, $sid, $qid); + $result = array(); + for ($i = 0; $i < count($this->subquestions); $i++) { + $result[$i] = array_fill(0, count($this->choices), 0); + } + while ($r = $res->next()) { + list($i, $j) = explode(':', $r['answer']); + $result[$i][$j] = $r['count']; + } + return $result; + } + + public function formatAnswer($ans) + { + list($q, $c) = explode(':', $ans); + if (array_key_exists($q, $this->subquestions) && array_key_exists($c, $this->choices)) { + return array('id' => $q, 'answer' => $this->choices[$c]); + } else { + return null; + } + } + + public function getCSVColumns() + { + $q = parent::getCSVColumns(); + if (empty($this->subquestions)) { + return $q; + } + $a = array(); + for ($k = 0; $k < count($this->subquestions); $k++) { + $a[$k] = $q.' : '.$this->subquestions[$k]; + } + return $a; + } +} +// }}} + +// {{{ class SurveyRadioTable extends SurveyTable : SurveyTable with radio type choices +class SurveyRadioTable extends SurveyTable +{ + public function checkAnswer($ans) + { + $rep = array(); + foreach ($ans as $k => $a) { + if (!array_key_exists($k, $this->subquestions)) { + continue; + } + $a = intval($a); + if (array_key_exists($a, $this->choices)) { + $rep[] = $k . ':' . $a; + } + } + return (count($rep) == 0)? null : $rep; + } + + protected function getQuestionType() + { + return "radiotable"; + } + +} +// }}} + +// {{{ class SurveyCheckboxTable extends SurveyTable : SurveyTable with checkbox type choices +class SurveyCheckboxTable extends SurveyTable +{ + public function checkAnswer($ans) + { + $rep = array(); + foreach ($ans as $k => $aa) { + if (!array_key_exists($k, $this->subquestions)) { + continue; + } + foreach ($aa as $a) { + $a = intval($a); + if (array_key_exists($a, $this->choices)) { + $rep[] = $k . ':' . $a; + } + } + } + return (count($rep) == 0)? null : $rep; + } + + protected function getQuestionType() + { + return "checkboxtable"; + } + +} +// }}} +// }}} + +// vim:set et sw=4 sts=4 ts=4 foldmethod=marker enc=utf-8: ?>