diff options
Diffstat (limited to 'admin/survey/classes/surveyData/class.SurveySNDataFile.php')
| -rw-r--r-- | admin/survey/classes/surveyData/class.SurveySNDataFile.php | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/admin/survey/classes/surveyData/class.SurveySNDataFile.php b/admin/survey/classes/surveyData/class.SurveySNDataFile.php index aba152b..57796b9 100644 --- a/admin/survey/classes/surveyData/class.SurveySNDataFile.php +++ b/admin/survey/classes/surveyData/class.SurveySNDataFile.php @@ -17,9 +17,11 @@ * zato je na začetek dodana funkcija ki prešteje loope
*/
+
#KONSTANTE
-define(EXPORT_FOLDER, "admin/survey/SurveyData");
-DEFINE (STR_DLMT, "|");
+if(!defined(EXPORT_FOLDER)) define(EXPORT_FOLDER, "admin/survey/SurveyData");
+if(!defined(STR_DLMT)) define(STR_DLMT, "|");
+
class SurveySNDataFile {
@@ -56,7 +58,8 @@ class SurveySNDataFile { session_start();
- $this->snCreateFullTable = $_SESSION['sid_'.$sid]['snCreateFullTable'];
+ $this->snCreateFullTable = isset($_SESSION['sid_'.$sid]['snCreateFullTable']) ? $_SESSION['sid_'.$sid]['snCreateFullTable'] : $this->snCreateFullTable;
+
if ( $this->dataFileStatus == FILE_STATUS_NO_DATA
|| $this->dataFileStatus == FILE_STATUS_SRV_DELETED) {
Common::noDataAlert();
@@ -338,8 +341,10 @@ class SurveySNDataFile { function displayFullTableCheckbox() {
global $lang;
+
session_start();
- echo '<label><input id="snCreateFullTable" name="snCreateFullTable" onclick="setSnDisplayFullTableCheckbox();" type="checkbox"'.($this->snCreateFullTable==true?' checked="checked"':'').'>Prikaži razširjeno tabelo</label>';
+
+ echo '<input id="snCreateFullTable" name="snCreateFullTable" onclick="setSnDisplayFullTableCheckbox();" type="checkbox"'.($this->snCreateFullTable==true?' checked="checked"':'').'><label for="snCreateFullTable">Prikaži razširjeno tabelo</label>';
}
@@ -387,7 +392,7 @@ class SurveySNDataFile { $SN_HEADER = unserialize(file_get_contents($_SN_head_file_name));
echo '<div id="tableContainer" class="tableContainer">';
- echo '<h3>'.$lang['srv_loop_for_variable'].' <b>['. $this->sn_loop_data[$lpid]['variable']. '] - '. $this->sn_loop_data[$lpid]['naslov']. '</b> ('.$lang['srv_loop_antonucci_circle'].' '.$this->sn_loop_data[$lpid]['antonucci'].')</h3>';
+ echo '<h3 class="sn_title">'.$lang['srv_loop_for_variable'].' <span class="semi-bold">['. $this->sn_loop_data[$lpid]['variable']. '] - '. $this->sn_loop_data[$lpid]['naslov']. '</span> ('.$lang['srv_loop_antonucci_circle'].' '.$this->sn_loop_data[$lpid]['antonucci'].')</h3>';
// TABELA
@@ -603,6 +608,11 @@ class SurveySNDataFile { $add_data = true;
}
break;
+ case 'status':
+ if ($this->_VARS[VAR_STATUS] && $this->canDisplayStatus) {
+ $add_data = true;
+ }
+ break;
case 'invitation':
if ($this->_VARS[VAR_EMAIL]) {
$add_data = true;
|