Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Updated limesurvey to revision 11019

Browse Source
This commit is contained in:
azammitdcarf
2011-09-20 23:28:02 +00:00
parent f018ac95c9
commit 4abd0c59ac
20 changed files with 12661 additions and 13136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/limesurvey/admin/import_functions.php
View File

@@ -1422,12 +1422,12 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
{
if (isset($aQIDReplacements[$insertdata['cqid']]))
{
$oldcqid = $insertdata['cqid']; //Save for cfield transformation
$insertdata['cqid']=$aQIDReplacements[$insertdata['cqid']]; // remap the qid
}
else continue; // a problem with this answer record -> don't consider
list($oldcsid, $oldcgid, $oldqidanscode) = explode("X",$insertdata["cfieldname"],3);
// replace the gid for the new one in the cfieldname(if there is no new gid in the $aGIDReplacements array it means that this condition is orphan -> error, skip this record)
if (!isset($aGIDReplacements[$oldcgid]))
continue;
@@ -1440,11 +1440,11 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
{
if (preg_match("/^\+/",$oldcsid))
{
$newcfieldname = '+'.$newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldqid));
$newcfieldname = '+'.$newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldcqid));
}
else
{
$newcfieldname = $newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldqid));
$newcfieldname = $newsid . "X" . $aGIDReplacements[$oldcgid] . "X" . $insertdata["cqid"] .substr($oldqidanscode,strlen($oldcqid));
}
}
else

8
include/limesurvey/admin/printablesurvey.php
View File

@@ -136,7 +136,7 @@ if(isset($showsgqacode) && $showsgqacode == true)
}
else
{
$surveyname = "";
$surveyname = $surveyname;
}
$survey_output = array(
@@ -442,7 +442,7 @@ while ($degrow = $degresult->FetchRow())
FROM ".db_table_name("conditions")."
WHERE ".db_table_name("conditions").".qid={$deqrow['qid']}
AND ".db_table_name("conditions").".scenario={$scenariorow['scenario']}
group by cqid, method, cfieldname, value
group by cqid, method
ORDER BY cqid";
$distinctresult=db_execute_assoc($distinctquery);
//Loop through each condition for a particular scenario.
@@ -493,7 +493,7 @@ while ($degrow = $degresult->FetchRow())
{
$explanation .= $clang->gT("Answer was")." ";
}
$explanation .= " ".$distinctrow['value'];
$explanation .= " `".$distinctrow['value']."`";
}
if(!$distinctrow['cqid']) { // cqid == 0 ==> token attribute match
$tokenData = GetTokenFieldsAndNames($surveyid);
@@ -531,7 +531,7 @@ while ($degrow = $degresult->FetchRow())
{
$explanation .= $clang->gT("is")." ";
}
$answer_section = $distinctrow['value'];
$explanation .= " `".$distinctrow['value']."`";
}
$conquery="SELECT cid, cqid, q.title,\n"

4
include/limesurvey/admin/scripts/admin_core.js
View File

@@ -47,9 +47,7 @@ $(document).ready(function(){
target: 'bottomRight'}
},
show: {effect: { length:50}},
hide: { when: 'mouseout' },
api: { onRender: function() {$(this.options.hide.when.target).bind('click', this.hide);}}
hide: { when: 'mouseout' }
});
}
});

2
include/limesurvey/admin/statistics_function.php
View File

@@ -79,7 +79,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
//$allfields ="";
global $connect, $dbprefix, $clang,
$rooturl, $rootdir, $homedir, $homeurl, $tempdir, $tempurl, $scriptname, $imagedir,
$chartfontfile, $chartfontsize, $admintheme, $pdfdefaultfont, $pdffontsize;
$chartfontfile, $chartfontsize, $admintheme, $pdfdefaultfont, $pdffontsize, $showaggregateddata;
$fieldmap=createFieldMap($surveyid, "full");