may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redesign - popravki napak - odstranjeni nastavitvi za prikaz datuma in recnuma v podatkih

Browse Source
This commit is contained in:
pero1203 2022-05-25 09:58:28 +02:00
parent f33f2bf9e5
commit 872d1a476c
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdminAjax.php
View File

@ -1131,8 +1131,6 @@ class SurveyAdminAjax {
'continue_later',
'js_tracking',
'defValidProfile',
'showItime',
'showLineNumber',
'parapodatki'
);

4
admin/survey/SurveyAdminSettings.php
View File

@ -652,7 +652,7 @@ class SurveyAdminSettings {
echo '</div>';
// Pri volitvah ne moremo prikazati datuma respondenta
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
/*if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
echo '<div class="setting_holder">';
echo '<span class="setting_title" >'.$lang['srv_prikaz_showItime'].'</span>';
@ -681,7 +681,7 @@ class SurveyAdminSettings {
echo '<label for="showLineNumber1">'.$lang['yes'].'</label>';
echo '</div>';
echo '</div>';
echo '</div>';*/
echo '</fieldset>';

6
admin/survey/classes/surveyData/class.SurveyDataDisplay.php
View File

@ -178,8 +178,7 @@ class SurveyDataDisplay{
}
# ali prikazujemo datum na začetku ankete (Če smo v identifikatorjih ne smemo zaradi povezovanja)
if ( (self::$_VARS[VAR_SHOW_DATE] == true || (int)SurveyInfo :: getInstance()->getSurveyColumn('showItime') == 1) && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
//if (self::$_VARS[VAR_SHOW_DATE] == true && self::$_VARS[VAR_SHOW_SYSTEM] == false) {
if ( self::$_VARS[VAR_SHOW_DATE] == true && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
self::$showItime = true;
}
else {
@ -187,8 +186,7 @@ class SurveyDataDisplay{
}
# ali prikazujemo zaporedno številko. (Če smo v identifikatorjih ne smemo zaradi povezovanja)
if ( (self::$_VARS[VAR_SHOW_NO] == true || (int)SurveyInfo :: getInstance()->getSurveyColumn('showLineNumber') == 1) && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
//if (self::$_VARS[VAR_SHOW_NO] == true) {
if ( self::$_VARS[VAR_SHOW_NO] == true && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
self::$showLineNumber = true;
}
else {