Skip to content

Commit

Permalink
Fixed issue #15980: No results shown for selected date questions at s…
Browse files Browse the repository at this point in the history 
…tatistics
  • Loading branch information
@olleharstedt
olleharstedt committed Aug 25, 2020
2 parents ef553a4 + 90810b8 commit 460a012
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 12 deletions.
73 changes: 62 additions & 11 deletions application/helpers/admin/statistics_helper.php
View file
Expand Up @@ -444,6 +444,7 @@ function buildSelects($allfields, $surveyid, $language)

//T - Long Free Text
//Q - Multiple Short Text
//Equations are also included here (firstletter = T)
elseif (($firstletter == "T" || $firstletter == "Q") && $_POST[$pv] != "") {
$selectSubs = array();
//We intepret and * and % as wildcard matches, and use ' OR ' and , as the separators
Expand Down Expand Up @@ -1122,17 +1123,32 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql,

} //end else-if -> multiple numerical types

//is there some "id", "datestamp" or "D" within the type?
elseif (substr($rt, 0, 2) == "id" || substr($rt, 0, 9) == "datestamp" || ($firstletter == "D")) {
//is there some "id" or "datestamp" within the type?
elseif (substr($rt, 0, 2) == "id" || substr($rt, 0, 9) == "datestamp") {
/*
* DON'T show anything for date questions
* because there aren't any statistics implemented yet!
*
* See bug report #2539 and
* feature request #2620
* DON'T show anything
*/
}

//D - Date/Time
elseif ($firstletter == "D") {
//search for key
$fld = substr($rt, 1, strlen($rt));
$fielddata = $fieldmap[$fld];

//get question data
$nresult = Question::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$fielddata['qid']));
$qtitle = $nresult->title;
$qtype = $nresult->type;
$qquestion = flattenText($nresult->question);

$mfield = substr($rt, 1, strlen($rt));

//Date/time questions are handled the same way as text questions.
$alist[] = array("Answer", gT("Answer"), $mfield);
$alist[] = array("NoAnswer", gT("No answer"), $mfield);
}

// NICE SIMPLE SINGLE OPTION ANSWERS
/*
TO DEBUG QUESTION TYPES FIRSTLETTER, UNCOMMENT THOSE LINES
Expand Down Expand Up @@ -2261,11 +2277,46 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( ";
$query .= ($sDatabaseType == "mysql") ? Yii::app()->db->quoteColumnName($al[2])." = '')" : " (".Yii::app()->db->quoteColumnName($al[2])." LIKE ''))";
}
}
/*
* Date/Time question
*/
elseif ($outputs['qtype'] == "D") {
$sDatabaseType = Yii::app()->db->getDriverName();

// Date answers
if ($al[0] == "Answer") {
$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ";
$query .= Yii::app()->db->quoteColumnName($al[2])." IS NOT NULL";
}
//"no answer" handling
elseif ($al[0] == "NoAnswer") {
$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ";
$query .= Yii::app()->db->quoteColumnName($al[2])." IS NULL";
}
} elseif ($outputs['qtype'] == "O") {
$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( ";
$query .= ($sDatabaseType == "mysql") ? Yii::app()->db->quoteColumnName($al[2])." <> '')" : " (".Yii::app()->db->quoteColumnName($al[2])." NOT LIKE ''))";
// all other question types
} else {
}
/*
* Equation
*/
elseif ($outputs['qtype'] == "*") {
$sDatabaseType = Yii::app()->db->getDriverName();

// Equation with non empty result
if ($al[0] == "Answer") {
$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ";
$query .= ($sDatabaseType == "mysql") ? Yii::app()->db->quoteColumnName($al[2])." != ''" : "NOT (".Yii::app()->db->quoteColumnName($al[2])." LIKE '')";
}
//"no answer" handling
elseif ($al[0] == "NoAnswer") {
$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ( ";
$query .= ($sDatabaseType == "mysql") ? Yii::app()->db->quoteColumnName($al[2])." = '')" : " (".Yii::app()->db->quoteColumnName($al[2])." LIKE ''))";
}
}
// all other question types
else {

$query = "SELECT count(*) FROM {{survey_$surveyid}} WHERE ".Yii::app()->db->quoteColumnName($al[2])." =";

Expand Down Expand Up @@ -4241,10 +4292,10 @@ protected function getQuartile($quartile, $fieldname, $surveyid, $sql, $excludez
*/
function _listcolumn($surveyid, $column, $sortby = "", $sortmethod = "", $sorttype = "")
{
$search['condition'] = Yii::app()->db->quoteColumnName($column)." != ''";
$search['condition'] = "COALESCE(CAST(".Yii::app()->db->quoteColumnName($column)." as char), '') != ''";
$sDBDriverName = Yii::app()->db->getDriverName();
if ($sDBDriverName == 'sqlsrv' || $sDBDriverName == 'mssql' || $sDBDriverName == 'dblib') {
$search['condition'] = "CAST(".Yii::app()->db->quoteColumnName($column)." as varchar) != ''";
$search['condition'] = "COALESCE(CAST(".Yii::app()->db->quoteColumnName($column)." as varchar), '') != ''";
}

//filter incomplete answers if set
Expand Down
3 changes: 2 additions & 1 deletion application/views/admin/export/statistics_subviews/_question.php
View file
Expand Up @@ -135,9 +135,11 @@

/*
* all "free text" types (T, U, S) get the same prefix ("T")
* Equations are treated the same way
*/
case "T": // Long free text
case "U": // Huge free text
case '*': // Equation
echo '<div class="statistics-responses-label-group ls-space padding bottom-5 top-15 ls-flex-item">';
$myfield2="T$myfield";
echo "\t<input type='checkbox' name='summary[]' value='$myfield2'";
Expand Down Expand Up @@ -906,7 +908,6 @@

//Boilerplate questions are only used to put some text between other questions -> no analysis needed
case "X": //This is a boilerplate question and it has no business in this script
case '*': // EQUATION
echo '<h4 class="question-selector-title">'.$oStatisticsHelper::_showSpeaker($niceqtext).'</h4><br/>';
eT("This question type can't be selected.");
break;
Expand Down

0 comments on commit 460a012

Please sign in to comment.