Skip to content

Commit

Permalink
Dev Most question types working again
Browse files Browse the repository at this point in the history 
git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev_cs@8262 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed Jan 16, 2010
1 parent e792345 commit 08a17ed
Show file tree
Hide file tree
Showing 8 changed files with 165 additions and 158 deletions.
51 changes: 31 additions & 20 deletions admin/activate.php
View file
Expand Up @@ -18,6 +18,8 @@
include_once("login_check.php"); //Login Check dies also if the script is started directly
$postsid=returnglobal('sid');
$activateoutput='';
$qtypes=getqtypelist('','array');

if (!isset($_POST['ok']) || !$_POST['ok'])
{
if (isset($_GET['fixnumbering']) && $_GET['fixnumbering'])
Expand Down Expand Up @@ -85,19 +87,30 @@
// # ";" -> Array Multi Flexi Text
// # "1" -> MULTI SCALE



$chkquery = "SELECT qid, question, gid FROM {$dbprefix}questions WHERE sid={$_GET['sid']} AND type IN ('L', 'O', 'M', 'P', 'A', 'B', 'C', 'E', 'F', 'R', 'J', '!', '^', ':', '1')";
$chkquery = "SELECT qid, question, gid, type FROM {$dbprefix}questions WHERE sid={$surveyid}";
$chkresult = db_execute_assoc($chkquery) or safe_die ("Couldn't get list of questions<br />$chkquery<br />".$connect->ErrorMsg());
while ($chkrow = $chkresult->FetchRow())
{
$chaquery = "SELECT * FROM {$dbprefix}answers WHERE qid = {$chkrow['qid']} ORDER BY sortorder, answer";
$charesult=$connect->Execute($chaquery);
$chacount=$charesult->RecordCount();
if (!$chacount > 0)
{
$failedcheck[]=array($chkrow['qid'], $chkrow['question'], ": ".$clang->gT("This question is a multiple answer type question but has no answers."), $chkrow['gid']);
}
if ($qtypes[$chkrow['type']]['subquestions']>0)
{
$chaquery = "SELECT * FROM {$dbprefix}questions WHERE parent_qid = {$chkrow['qid']} ORDER BY question_order, question";
$charesult=$connect->Execute($chaquery);
$chacount=$charesult->RecordCount();
if ($chacount == 0)
{
$failedcheck[]=array($chkrow['qid'], $chkrow['question'], ": ".$clang->gT("This question is a sub-question type question but has no configured sub-questions."), $chkrow['gid']);
}
}
if ($qtypes[$chkrow['type']]['answerscales']>0)
{
$chaquery = "SELECT * FROM {$dbprefix}answers WHERE qid = {$chkrow['qid']} ORDER BY sortorder, answer";
$charesult=$connect->Execute($chaquery);
$chacount=$charesult->RecordCount();
if ($chacount == 0)
{
$failedcheck[]=array($chkrow['qid'], $chkrow['question'], ": ".$clang->gT("This question is a multiple answer type question but has no answers."), $chkrow['gid']);
}
}
}

//NOW CHECK THAT ALL QUESTIONS HAVE A 'QUESTION TYPE' FIELD
Expand Down Expand Up @@ -167,7 +180,7 @@
{
$qidorder[]=array($c, $qrow['qid']);
$c++;
}
}
$qordercount="";
//1: Get each condition's question id
$conquery= "SELECT {$dbprefix}conditions.qid, cqid, {$dbprefix}questions.question, "
Expand Down Expand Up @@ -366,24 +379,22 @@
break;
}
}
elseif ($arow['type'] == "M" || $arow['type'] == "A" || $arow['type'] == "B" ||
$arow['type'] == "C" || $arow['type'] == "E" || $arow['type'] == "F" ||
$arow['type'] == "H" || $arow['type'] == "P" || $arow['type'] == "^")
elseif ($qtypes[$arow['type']]['subquestions']>0 && $arow['type'] != ":" && $arow['type'] != ";")
{
//MULTI ENTRY
$abquery = "SELECT a.*, q.other FROM {$dbprefix}answers as a, {$dbprefix}questions as q"
." WHERE a.qid=q.qid AND sid={$postsid} AND q.qid={$arow['qid']} "
." AND a.language='".GetbaseLanguageFromSurveyid($postsid). "' "
$abquery = "SELECT sq.*, q.other FROM {$dbprefix}questions as sq, {$dbprefix}questions as q"
." WHERE sq.parent_qid=q.qid AND q.sid={$postsid} AND q.qid={$arow['qid']} "
." AND sq.language='".GetbaseLanguageFromSurveyid($postsid). "' "
." AND q.language='".GetbaseLanguageFromSurveyid($postsid). "' "
." ORDER BY a.sortorder, a.answer";
." ORDER BY sq.question_order, sq.question";
$abresult=db_execute_assoc($abquery) or safe_die ("Couldn't get perform answers query<br />$abquery<br />".$connect->ErrorMsg());
while ($abrow=$abresult->FetchRow())
{
$createsurvey .= " `{$arow['sid']}X{$arow['gid']}X{$arow['qid']}{$abrow['code']}` C(5),\n";
$createsurvey .= " `{$arow['sid']}X{$arow['gid']}X{$arow['qid']}{$abrow['title']}` C(5),\n";
if ($abrow['other']=="Y") {$alsoother="Y";}
if ($arow['type'] == "P")
{
$createsurvey .= " `{$arow['sid']}X{$arow['gid']}X{$arow['qid']}{$abrow['code']}comment` X,\n";
$createsurvey .= " `{$arow['sid']}X{$arow['gid']}X{$arow['qid']}{$abrow['title']}comment` X,\n";
}
}
if ((isset($alsoother) && $alsoother=="Y") && ($arow['type']=="M" || $arow['type']=="P" || $arow['type']=="1")) //Sc: check!
Expand Down
6 changes: 3 additions & 3 deletions admin/browse.php
View file
Expand Up @@ -704,9 +704,9 @@
."".$clang->gT("Records Displayed:")."<input type='text' size='4' value='$dtcount2' name='limit' id='limit' />\n"
."&nbsp;&nbsp; ".$clang->gT("Starting From:")."<input type='text' size='4' value='$start' name='start' id='start' />\n"
."&nbsp;&nbsp; ".$clang->gT("Display:")."<select name='filterinc' onchange='javascript:document.getElementById(\"limit\").value=\"\";submit();'>\n"
."\t<option value='filter' $selecthide>".$clang->gT("Completed Records Only")."</option>\n"
."\t<option value='show' $selectshow>".$clang->gT("All Records")."</option>\n"
."\t<option value='incomplete' $selectinc>".$clang->gT("Incomplete Records Only")."</option>\n"
."\t<option value='filter' $selecthide>".$clang->gT("Completed responses only")."</option>\n"
."\t<option value='show' $selectshow>".$clang->gT("All responses")."</option>\n"
."\t<option value='incomplete' $selectinc>".$clang->gT("Incomplete responses only")."</option>\n"
."</select>\n"
."&nbsp;&nbsp;&nbsp;&nbsp;<input type='submit' value='".$clang->gT("Show")."' />\n"
."</font>\n"
Expand Down
6 changes: 3 additions & 3 deletions admin/export_data_spss.php
View file
Expand Up @@ -117,9 +117,9 @@

$exportspssoutput .= "<form action='$scriptname' id='exportspss' method='get'><ul>\n"
."<li><label for='filterinc'>".$clang->gT("Data selection:")."</label><select id='filterinc' name='filterinc' onchange='this.form.submit();'>\n"
."\t<option value='filter' $selecthide>".$clang->gT("Completed records only")."</option>\n"
."\t<option value='show' $selectshow>".$clang->gT("All records")."</option>\n"
."\t<option value='incomplete' $selectinc>".$clang->gT("Incomplete records only")."</option>\n"
."\t<option value='filter' $selecthide>".$clang->gT("Completed responses only")."</option>\n"
."\t<option value='show' $selectshow>".$clang->gT("All responses")."</option>\n"
."\t<option value='incomplete' $selectinc>".$clang->gT("Incomplete responses only")."</option>\n"
."</select></li>\n";

$exportspssoutput .= "<li><label for='spssver'>".$clang->gT("SPSS version:")."</label><select id='spssver' name='spssver' onchange='this.form.submit();'>\n";
Expand Down
6 changes: 3 additions & 3 deletions admin/exportresults.php
View file
Expand Up @@ -191,9 +191,9 @@
$exportoutput .= " ".$clang->gT("to")." <input type='text' name='export_to' size='8' value='$max_datasets' /></li>"

."<li><br /><label for='filterinc'>".$clang->gT("Completion state")."</label> <select id='filterinc' name='filterinc'>\n"
."<option value='filter' $selecthide>".$clang->gT("Completed records only")."</option>\n"
."<option value='show' $selectshow>".$clang->gT("All Records")."</option>\n"
."<option value='incomplete' $selectinc>".$clang->gT("Incomplete records only")."</option>\n"
."<option value='filter' $selecthide>".$clang->gT("Completed responses only")."</option>\n"
."<option value='show' $selectshow>".$clang->gT("All responses")."</option>\n"
."<option value='incomplete' $selectinc>".$clang->gT("Incomplete responses only")."</option>\n"
."\t</select>\n"
."</li></ul></fieldset>"

Expand Down
6 changes: 3 additions & 3 deletions admin/statistics.php
View file
Expand Up @@ -264,9 +264,9 @@
}
$statisticsoutput .="<fieldset style='clear:both;'><legend>".$clang->gT("Data selection")."</legend><ul>";
$statisticsoutput .="<li><label for='filterinc'>".$clang->gT("Include:")."</label><select name='filterinc' id='filterinc'>\n"
."<option value='show' $selectshow>".$clang->gT("All records")."</option>\n"
."<option value='filter' $selecthide>".$clang->gT("Completed records only")."</option>\n"
."<option value='incomplete' $selectinc>".$clang->gT("Incomplete records only")."</option>\n"
."<option value='show' $selectshow>".$clang->gT("All responses")."</option>\n"
."<option value='filter' $selecthide>".$clang->gT("Completed responses only")."</option>\n"
."<option value='incomplete' $selectinc>".$clang->gT("Incomplete responses only")."</option>\n"
."</select></li>\n"

."<li><label for='viewsummaryall'>".$clang->gT("View summary of all available fields")."</label>
Expand Down
6 changes: 3 additions & 3 deletions admin/vvexport.php
View file
Expand Up @@ -60,9 +60,9 @@
."<li>\n"
." <label for='filterinc'>".$clang->gT("Export").":</label>"
." <select name='filterinc' id='filterinc'>\n"
." <option value='filter' $selecthide>".$clang->gT("Completed Records Only")."</option>\n"
." <option value='show' $selectshow>".$clang->gT("All Records")."</option>\n"
." <option value='incomplete' $selectinc>".$clang->gT("Incomplete Records Only")."</option>\n"
." <option value='filter' $selecthide>".$clang->gT("Completed responses only")."</option>\n"
." <option value='show' $selectshow>".$clang->gT("All responses")."</option>\n"
." <option value='incomplete' $selectinc>".$clang->gT("Incomplete responses only")."</option>\n"
." </select>\n"
."</li>\n"
."<li>\n"
Expand Down

0 comments on commit 08a17ed

Please sign in to comment.