diff --git a/classes/expressions/LimeExpressionManager.php b/classes/expressions/LimeExpressionManager.php index b049794..cc8ec14 100644 --- a/classes/expressions/LimeExpressionManager.php +++ b/classes/expressions/LimeExpressionManager.php @@ -3227,6 +3227,12 @@ if (!isset($this->subQrelInfo[$questionNum])) { $this->subQrelInfo[$questionNum] = array(); } + // Set the hide mode according to the reason why it's hidden. TODO add attribute in each question with sub question. + if(strpos($type,'exclude_all_others')!==false){ + $hideMode='input'; + }else{ + $hideMode=''; + } $this->subQrelInfo[$questionNum][$rowdivid] = array( 'qid' => $questionNum, 'eqn' => $eqn, @@ -3240,6 +3246,7 @@ 'qtype'=>$qtype, 'sgqa'=>$sgqa, 'hasErrors'=>$hasErrors, + 'hideMode'=>$hideMode, ); } return $result; @@ -5508,11 +5515,11 @@ $rowdividList[$sq['rowdivid']] = $sq['result']; // $relParts[] = " // Apply " . $sq['type'] . ": " . $sq['eqn'] ."\n"; $relParts[] = " if ( " . $sq['relevancejs'] . " ) {\n"; - $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "').show();\n"; + $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "').lsemShow('{$sq['hideMode']}');\n"; $relParts[] = " if ($('#relevance" . $sq['rowdivid'] . "').val()!='1') { relChange" . $arg['qid'] . "=true; }\n"; $relParts[] = " $('#relevance" . $sq['rowdivid'] . "').val('1');\n"; $relParts[] = " }\n else {\n"; - $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "').hide();\n"; + $relParts[] = " $('#javatbd" . $sq['rowdivid'] . "').lsemHide('{$sq['hideMode']}');\n"; $relParts[] = " if ($('#relevance" . $sq['rowdivid'] . "').val()=='1') { relChange" . $arg['qid'] . "=true; }\n"; $relParts[] = " $('#relevance" . $sq['rowdivid'] . "').val('');\n"; switch ($sq['qtype']) @@ -5687,14 +5694,14 @@ if ($arg['hidden']) { $relParts[] = " // This question should always be hidden\n"; - $relParts[] = " $('#question" . $arg['qid'] . "').hide();\n"; + $relParts[] = " $('#question" . $arg['qid'] . "').lsemHide();\n"; $relParts[] = " $('#display" . $arg['qid'] . "').val('');\n"; } else { if (!($relevance == '' || $relevance == '1')) { // In such cases, PHP will make the question visible by default. By not forcing a re-show(), template.js can hide questions with impunity - $relParts[] = " $('#question" . $arg['qid'] . "').show();\n"; + $relParts[] = " $('#question" . $arg['qid'] . "').lsemShow();\n"; if ($arg['type'] == 'S') { $relParts[] = " if($('#question" . $arg['qid'] . " div[id^=\"gmap_canvas\"]').length > 0)\n"; @@ -5722,7 +5729,7 @@ if (!($relevance == '' || $relevance == '1')) { $relParts[] = "else {\n"; - $relParts[] = " $('#question" . $arg['qid'] . "').hide();\n"; + $relParts[] = " $('#question" . $arg['qid'] . "').lsemHide();\n"; $relParts[] = " if ($('#relevance" . $arg['qid'] . "').val()=='1') { relChange" . $arg['qid'] . "=true; }\n"; // only propagate changes if changing from relevant to irrelevant $relParts[] = " $('#relevance" . $arg['qid'] . "').val('0');\n"; $relParts[] = "}\n"; diff --git a/config.php b/config.php index bfcc6be..82b10b1 100644 --- a/config.php +++ b/config.php @@ -10,7 +10,7 @@ * free or open source software licenses. * See COPYRIGHT.php for copyright notices and details. * - * $Id$ + * $Id: config.php 9651 2010-12-16 14:25:20Z c_schmitz $ */ /* IMPORTANT NOTICE @@ -24,9 +24,9 @@ // Basic Setup -$databasetype = 'mysql'; // ADOdb database driver - valid values are mysql, mysqli, odbc_mssql, mssql_n, odbtp or postgres +$databasetype = 'mysqli'; // ADOdb database driver - valid values are mysql, mysqli, odbc_mssql, mssql_n, odbtp or postgres // mysql: Recommended driver for mysql - // mysqli: Slightly faster driver for mysql - not on all server systems available + // mysqli: Slightly faster driver for mysql - not on all server systems available // odbc_mssql: MSSQL driver using ODBC with MS SQL Server // mssqlnative: Native SQL Server driver for SQL Server 2005+ // mssql_n: Experimental driver for MS SQL Server which handles UTF-8 charsets @@ -34,28 +34,34 @@ $databasetype = 'mysql'; // ADOdb database driver - valid values a // postgres: Standard postgres driver $databaselocation = 'localhost'; // Network location of your Database - for odbc_mssql or mssqlnative use the mssql servername, not localhost or IP -$databasename = 'limesurvey'; // The name of the database that we will create -$databaseuser = 'root'; // The name of a user with rights to create db (or if db already exists, then rights within that db) -$databasepass = ''; // Password of db user +$databasename = 'sondagespro_lssvn'; // The name of the database that we will create +$databaseuser = 'sondagespro'; // The name of a user with rights to create db (or if db already exists, then rights within that db) +$databasepass = 'u3BWRZdczah4GZ6m'; // Password of db user $dbprefix = 'lime_'; // A global prefix that can be added to all LimeSurvey tables. Use this if you are sharing -// a database with other applications. Suggested prefix is 'lime_' + // a database with other applications. Suggested prefix is 'lime_' // File Locations -$rooturl = "http://{$_SERVER['HTTP_HOST']}/limesurvey"; // The root web url for your limesurvey installation (without a trailing slash). +// File Locations +$rooturl = "http://{$_SERVER['HTTP_HOST']}"; // The root web url for your limesurvey installation (without a trailing slash). // The double quotes (") are important. -$rootdir = dirname(__FILE__); // This is the physical disk location for your limesurvey installation. Normally you don't have to touch this -// setting. If you use IIS then you MUST enter the complete rootdir e.g. : $rootDir='C:\Inetpub\wwwroot\limesurvey'! -// Some IIS and OS/2 installations also require to use forward slashes -// instead of backslashes, e.g. $rootDir='C:/Inetpub/wwwroot/limesurvey'! +$rootdir = dirname(__FILE__); // This is the physical disk location for your limesurvey installation. Normally you don't have to touch this + // setting. If you use IIS then you MUST enter the complete rootdir e.g. : $rootDir='C:\Inetpub\wwwroot\limesurvey'! + // Some IIS and OS/2 installations also require to use forward slashes + // instead of backslashes, e.g. $rootDir='C:/Inetpub/wwwroot/limesurvey'! // Installation Setup -$defaultuser = 'admin'; // This is the username when LimeSurvey is installed and the administration user is created on installation -$defaultpass = 'password'; // This is the password for the administration user when LimeSurvey is installed +$defaultuser = 'shnoulle'; // This is the username when LimeSurvey is installed and the administration user is created on installation +$defaultpass = 'motdepasse'; // This is the password for the administration user when LimeSurvey is installed + // Debug Settings -$debug = 0; // Set this to 1 if you are looking for errors. If you still get no errors after enabling this +$debug = 3; // Set this to 1 if you are looking for errors. If you still get no errors after enabling this // then please check your error-logs - either in your hosting provider admin panel or in some /logs dir // on your webspace. // LimeSurvey developers: Set this to 3 to circumvent the restriction to remove the installation directory and full access to standard templates // or to change the password. If you set it to 3 then PHP STRICT warnings will be shown additionally. + +$demoModeOnly = false; +$modrewrite = 1; + diff --git a/scripts/em_javascript.js b/scripts/em_javascript.js index 98004b9..7d96588 100644 --- a/scripts/em_javascript.js +++ b/scripts/em_javascript.js @@ -2495,4 +2495,21 @@ function time () { // * example 1: timeStamp = time(); // * results 1: timeStamp > 1000000000 && timeStamp < 2000000000 return Math.floor(new Date().getTime() / 1000); -} \ No newline at end of file +} + +// replace hide function by lsemHide +jQuery.fn.lsemHide = function(hideMode) { + if(hideMode=='input'){ + $(this).find('input').css('visibility','hidden'); + }else{ + $(this).hide(); + } +}; +jQuery.fn.lsemShow = function(hideMode) { + if(hideMode=='input'){ + $(this).show(); + $(this).find('input').css('visibility',''); + }else{ + $(this).show(); + } +}; diff --git a/scripts/survey_runtime.js b/scripts/survey_runtime.js index 807133e..84f25d1 100644 --- a/scripts/survey_runtime.js +++ b/scripts/survey_runtime.js @@ -1001,3 +1001,4 @@ function textLimit(field, maxlen) { document.getElementById(field).value = document.getElementById(field).value.substring(0, maxlen); } } +