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

Glasovanje - popravek predogleda zakljucka

Browse Source
This commit is contained in:
pero1203 2021-11-10 13:21:18 +01:00
parent 7b73075096
commit 80f9d5dbb2
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
main/survey/app/Controllers/BodyController.php
View File

@ -1290,7 +1290,7 @@ class BodyController extends Controller
echo '<script>var srv_meta_anketa_id = ' . get('anketa') . ';</script>'; echo '<script>var srv_meta_anketa_id = ' . get('anketa') . ';</script>';
//izpis zakljucka // izpis zakljucka
if (isset($_GET['glas_end']) && $_GET['glas_end'] == 1) { if (isset($_GET['glas_end']) && $_GET['glas_end'] == 1) {
if (!get('printPreview')) { if (!get('printPreview')) {
@ -1327,11 +1327,19 @@ class BodyController extends Controller
} }
} }
SurveySetting::getInstance()->Init(get('anketa'));
$hide_mobile_img = SurveySetting::getInstance()->getSurveyMiscSetting('hide_mobile_img');
$class = ($hide_mobile_img == '1') ? 'hide_mobile_img' : '';
if (isset($_GET['mobile']) && $_GET['mobile'] == 1)
$class .= ' mobile_preview';
elseif (isset($_GET['mobile']) && $_GET['mobile'] == 2)
$class .= ' tablet_preview';
echo '<div class="outercontainer_holder concl_glasovanje">';
echo '<div class="outercontainer_holder '.$class.' concl_glasovanje">';
echo '<div class="outercontainer_holder_top"></div>'; echo '<div class="outercontainer_holder_top"></div>';
echo '<div id="outercontainer concl_glasovanje">' . "\n"; echo '<div id="outercontainer" class="'.$class.'">' . "\n";
echo '<div class="outercontainer_header"></div>'; echo '<div class="outercontainer_header"></div>';
echo '<div id="container">' . "\n"; echo '<div id="container">' . "\n";
@ -1351,7 +1359,7 @@ class BodyController extends Controller
} else { } else {
$concl = $row['conclusion']; $concl = $row['conclusion'];
} }
echo ' <h3><p>' . $concl . '</p></h3>' . "\n"; echo ' <div class="naslov"><p>' . $concl . '</p></div>' . "\n";
echo ' </div>' . "\n"; echo ' </div>' . "\n";
@ -1420,14 +1428,29 @@ class BodyController extends Controller
//ce statistike ne prikazujemo skocimo na zakljucek (ce imammo izklopljeno ali nastavleno na samo urednike in ni urednik) //ce statistike ne prikazujemo skocimo na zakljucek (ce imammo izklopljeno ali nastavleno na samo urednike in ni urednik)
if ($rows['stat'] == 0 || ($rows['stat'] == 2 && self::$admin_type != 0 && self::$admin_type != 1)) { if ($rows['stat'] == 0 || ($rows['stat'] == 2 && self::$admin_type != 0 && self::$admin_type != 1)) {
header('Location: ' . SurveyInfo::getSurveyLink() . '&grupa=' . get('grupa') . (isset($_GET['language']) ? '&language=' . $_GET['language'] : '') . '&glas_end=1' . get('cookie_url') . ''); header('Location: ' . SurveyInfo::getSurveyLink()
. '&grupa=' . get('grupa')
. (isset($_GET['language']) ? '&language=' . $_GET['language'] : '')
. '&glas_end=1'
. (isset($_GET['preview']) ? '&preview=' . $_GET['preview'] : '')
. (isset($_GET['mobile']) ? '&mobile=' . $_GET['mobile'] : '')
. get('cookie_url') . '');
} }
else { else {
echo '<div class="outercontainer_holder concl_statistika">'; SurveySetting::getInstance()->Init(get('anketa'));
$hide_mobile_img = SurveySetting::getInstance()->getSurveyMiscSetting('hide_mobile_img');
$class = ($hide_mobile_img == '1') ? 'hide_mobile_img' : '';
if (isset($_GET['mobile']) && $_GET['mobile'] == 1)
$class .= ' mobile_preview';
elseif (isset($_GET['mobile']) && $_GET['mobile'] == 2)
$class .= ' tablet_preview';
echo '<div class="outercontainer_holder '.$class.' concl_statistika">';
echo '<div class="outercontainer_holder_top"></div>'; echo '<div class="outercontainer_holder_top"></div>';
echo '<div id="outercontainer concl_statistika">' . "\n"; echo '<div id="outercontainer" class="concl_statistika '.$class.'">' . "\n";
echo '<div class="outercontainer_header"></div>'; echo '<div class="outercontainer_header"></div>';
echo '<div id="container">' . "\n"; echo '<div id="container">' . "\n";
@ -1444,7 +1467,7 @@ class BodyController extends Controller
echo '<div class="buttons">'; echo '<div class="buttons">';
$url_stat = '' . SurveyInfo::getSurveyLink() . '&grupa=' . get('grupa') . (isset($_GET['language']) ? '&language=' . $_GET['language'] : '') . '&glas_end=1' . get('cookie_url'); $url_stat = '' . SurveyInfo::getSurveyLink() . '&grupa=' . get('grupa') . (isset($_GET['language']) ? '&language=' . $_GET['language'] : '') . '&glas_end=1' . (isset($_GET['preview']) ? '&preview=' . $_GET['preview'] : '').(isset($_GET['mobile']) ? '&mobile=' . $_GET['mobile'] : '').get('cookie_url');
$js = 'document.location.href=\'' . $url_stat . '\';'; $js = 'document.location.href=\'' . $url_stat . '\';';
// Gumb nazaj // Gumb nazaj
@ -2197,6 +2220,9 @@ class BodyController extends Controller
if (isset($_GET['code'])) if (isset($_GET['code']))
echo '<input type="hidden" name="code" value="' . $_GET['code'] . '">'; echo '<input type="hidden" name="code" value="' . $_GET['code'] . '">';
if (isset($_GET['glas_end']))
echo '<input type="hidden" name="glas_end" value="' . $_GET['glas_end'] . '">';
echo '<p><label for="disableif"><input type="checkbox" value="1" ' . ($_GET['disableif'] == '1' ? ' checked' : '') . ' name="disableif" id="disableif" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>'; echo '<p><label for="disableif"><input type="checkbox" value="1" ' . ($_GET['disableif'] == '1' ? ' checked' : '') . ' name="disableif" id="disableif" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
echo ' ' . self::$lang['srv_disableif'] . '</label></p>'; echo ' ' . self::$lang['srv_disableif'] . '</label></p>';