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

Redesign - popravki napak - hitri seznam v podatkih

Browse Source
This commit is contained in:
pero1203 2022-05-30 11:03:03 +02:00
parent 9fd7b2819c
commit 743a71e131
4 changed files with 62 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3305,20 +3305,26 @@ class SurveyDataDisplay{
$lang_admin = $row['value'];
}
$sqlVersion = sisplet_query("SELECT value FROM misc WHERE what = 'version'");
$rowVersion = mysqli_fetch_assoc($sqlVersion);
#izpišemo HTML
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
echo '<head>';
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
echo '<head>';
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />';
echo '<script type="text/javascript" src="'.$site_url.'admin/survey/script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>';
echo '<script type="text/javascript" src="'.$site_url.'admin/survey/script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>';
echo '<script type="text/javascript" src="'.$site_url.'admin/survey/minify/g=jsnew"></script>';
echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<!--[if lt IE 7]>';
echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css?v='.$rowVersion['value'].'" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint?v='.$rowVersion['value'].'" media="print" rel="stylesheet" />';
echo '<!--[if lt IE 7]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
echo '<![endif]-->';
echo '<!--[if IE 7]>';
@ -3327,9 +3333,7 @@ class SurveyDataDisplay{
echo '<!--[if IE 8]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />';
echo '<![endif]-->';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<script>';
echo 'function chkstate(){';
echo ' if(document.readyState=="complete"){';
@ -3347,12 +3351,17 @@ class SurveyDataDisplay{
echo ' window.close();';
echo '}';
echo '</script>';
echo '</head>';
echo '<body style="margin:5px; padding:5px;" onBlur="window.close();">';
echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />';
#echo '<div id="div_analiza_single_var" class="container">';
echo '<body class="quick_list_data" onBlur="window.close();">';
echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />';
echo '<div id="analiza_data">';
//Izvoz v PDF / RTF / XLS
$_url1 = $site_url.'admin/survey/izvoz.php?dc='.base64_encode(
serialize(
@ -3369,14 +3378,18 @@ class SurveyDataDisplay{
array( 'b'=>'export',
'a'=>'list_xls',
'anketa'=>$anketa)));
echo '<div class=" printHide" style="margin-top:6px;">';
echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
echo '<div class="printHide">';
/*echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';*/
echo '<br class="clr"/>';
echo $lang['srv_data_print_preview'];
echo '</div>';
self::$printPreview = true;
self::$_VARS[VAR_DATA] = 1;
@ -3391,27 +3404,23 @@ class SurveyDataDisplay{
unset(self::$_SVP_PV['invitation']);
}
# ponastavimo nastavitve- filter
# ponastavimo nastavitve- filter
self::setUpFilter();
self::DisplayDataTable();
echo '</div>';
echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="close_win(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span class="faicon print_small icon-grey_dark_link"></span> '.$lang['hour_print2'].'</a></div></span>';
echo '<span class="spaceRight floatRight printHide" style="margin-top:6px;">';
echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
echo '<div class="button_holder below float-right">';
echo ' <button class="medium white-blue" onclick="window.print(); return false;">'.$lang['hour_print2'].'</button>';
echo ' <button class="medium blue" onclick="close_win(); return false;">'.$lang['srv_zapri'].'</button>';
echo '</span>';
echo '<br class="clr" />';
echo '</div>';
echo '</body>';
echo '</html>';
}

10
public/css/admin_new.css
View File

@ -25560,6 +25560,16 @@ ul#merge li {
opacity: 0.5;
}
.quick_list_data {
padding: 16px;
}
.quick_list_data #dataTableScroller {
display: none;
}
.quick_list_data #dataTable {
margin-top: 16px;
}
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates

11
resources/sass/admin_new/pages/survey_data/quick_list_data.scss Normal file
View File

@ -0,0 +1,11 @@
.quick_list_data{
padding: 16px;
#dataTableScroller{
display: none;
}
#dataTable{
margin-top: 16px;
}
}

1
resources/sass/admin_new/pages/survey_data/survey_data.scss
View File

@ -7,5 +7,6 @@
@import "calculations";
@import "append_merge";
@import "quick_edit";
@import "quick_list_data";
@import "popups/popups";