Merge branch 'master' of https://git.1ka.si:/git/1ka
This commit is contained in:
tejagerjovic
commit
3dfc3fe348
@ -4519,6 +4519,8 @@ class SurveyAdminSettings {
|
||||
|
||||
$sdf = SurveyDataFile::get_instance();
|
||||
$sdf->init($this->anketa);
|
||||
$sdf->prepareFiles();
|
||||
|
||||
$headFileName = $sdf->getHeaderFileName();
|
||||
$dataFileName = $sdf->getDataFileName();
|
||||
$dataFileStatus = $sdf->getStatus();
|
||||
|
||||
@ -1548,15 +1548,20 @@ class Dostop {
|
||||
}
|
||||
|
||||
// kopirano iz user_to_be v users
|
||||
$result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM WHERE id='" . $uid . "'");
|
||||
$result = sisplet_query("SELECT type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang FROM users_to_be WHERE id='" . $uid . "'");
|
||||
|
||||
if (mysqli_num_rows($result) > 0) {
|
||||
$r = mysqli_fetch_assoc($result);
|
||||
$g = base64_encode((hash('SHA256', base64_decode($r['pass']) . $pass_salt)));
|
||||
|
||||
sisplet_query("INSERT INTO users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved)
|
||||
$sqlCopy = sisplet_query("INSERT INTO users (type, email, name, surname, pass, status, gdpr_agree, when_reg, came_from, lang, manuallyApproved)
|
||||
VALUES ('" . $r['type'] . "', '" . $r['email'] . "', '" . $r['name'] . "', '" . $r['surname'] . "', '" . $g . "','" . $r['status'] . "', '" . $r['gdpr_agree'] . "','" . $r['when_reg'] . "', '" . $r['came_from'] . "', '" . $r['lang'] . "', 'Y')");
|
||||
sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'");
|
||||
if (!$sqlCopy) {
|
||||
echo mysqli_error($GLOBALS['connect_db']);
|
||||
return;
|
||||
}
|
||||
|
||||
sisplet_query("DELETE FROM users_to_be WHERE id='" . $uid . "' OR email='" . $r['email'] . "'");
|
||||
|
||||
|
||||
// Uporabniku posljemo email da je bil njegov racun aktiviran
|
||||
|
||||
@ -778,16 +778,17 @@ class Library {
|
||||
global $global_user_id;
|
||||
global $lang;
|
||||
global $site_url;
|
||||
|
||||
$anketa = $_POST['anketa']; // nasa anketa (jo povozimo)
|
||||
$ank_id = $_POST['ank_id']; // anketa, ki jo uporabimo za predlogo
|
||||
|
||||
$hierarhija = (empty($_POST['hierarhija']) ? false : true);
|
||||
|
||||
if($hierarhija && $ank_id == 'privzeta'){
|
||||
|
||||
$ank_id = AppSettings::getInstance()->getSetting('hierarhija-default_id');
|
||||
}
|
||||
|
||||
|
||||
if ($anketa > 0) {
|
||||
|
||||
// preberemo osnovne podatke obstojece ankete (naslov.....)
|
||||
@ -797,11 +798,11 @@ class Library {
|
||||
$sql2 = sisplet_query("SELECT naslov FROM srv_anketa WHERE id = '$ank_id'");
|
||||
$row2 = mysqli_fetch_array($sql2);
|
||||
|
||||
$sqls = sisplet_query("SELECT ank_id, uid FROM srv_dostop WHERE ank_id='$anketa'");
|
||||
$sqls = sisplet_query("SELECT ank_id, uid FROM srv_dostop WHERE ank_id='$anketa'");
|
||||
|
||||
$this->SurveyAdmin->anketa_delete($anketa);
|
||||
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
|
||||
$sql = sisplet_query("SELECT naslov, dostop FROM srv_anketa WHERE id = '$ank_id'");
|
||||
$row = mysqli_fetch_array($sql);
|
||||
@ -812,14 +813,13 @@ class Library {
|
||||
$naslov = " naslov='".(isset($_POST['naslov']) ? $_POST['naslov'] : $row['naslov'])."',";
|
||||
$intro_opomba = " intro_opomba='".(addslashes($lang['srv_library_copy_of_note'].'<a href="'.$site_url.'admin/survey/index.php?anketa='.$ank_id.'">'.$row2['naslov'].'</a>'))."',";
|
||||
|
||||
|
||||
//$new_id = $this->SurveyAdmin->anketa_copy($ank_id);
|
||||
$sas = new SurveyAdminSettings();
|
||||
$new_id = $sas->anketa_copy($ank_id);
|
||||
|
||||
// popravimo naslov, opombo, dostop, in novega avtorja
|
||||
sisplet_query("UPDATE srv_anketa SET $naslov $intro_opomba dostop='$row[dostop]', insert_uid='$global_user_id', edit_uid='$global_user_id' WHERE id='$new_id'");
|
||||
// vsilimo refresh podatkov
|
||||
|
||||
// vsilimo refresh podatkov
|
||||
SurveyInfo :: getInstance()->resetSurveyData();
|
||||
|
||||
// dostop uporabimo od stare ankete in ne od skopirane (trnutno ne kopira pravic od prej, če ustvarjamo novo anketo)
|
||||
@ -840,7 +840,8 @@ class Library {
|
||||
(new \Hierarhija\Hierarhija($new_id))->izrisisSistemskoVprsanjeVloga();
|
||||
|
||||
echo $new_id;
|
||||
}else{
|
||||
}
|
||||
else{
|
||||
echo 'index.php?anketa='.$new_id.'&a=branching';
|
||||
}
|
||||
}
|
||||
|
||||
@ -381,12 +381,6 @@ class SurveyList {
|
||||
echo $lang['srv_testiranje_predvidenicas'].'</a>';
|
||||
echo '</li>';
|
||||
|
||||
# Zavihek mape
|
||||
echo '<li class="'.($tab=='collectData' ? ' active' : '').'">';
|
||||
echo '<a href="index.php?a=nastavitve&m=collectData" title="'.$lang['srv_collectData'].'">';
|
||||
echo $lang['srv_collectData'].'</a>';
|
||||
echo '</li>';
|
||||
|
||||
# Zavihek lep url
|
||||
echo '<li class="'.($tab=='nice_links' ? ' active' : '').'">';
|
||||
echo '<a href="index.php?a=nastavitve&m=nice_links" title="'.$lang['srv_nice_url'].'">';
|
||||
|
||||
@ -231,10 +231,6 @@ class SurveyPostProcess {
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
//echo '<input type="submit" value="'.$lang['srv_coding_filter'].'" onclick="$(this).prop(\'disabled\', true); coding_filter($(\'#mass_coding_spr_id\').val()); return false;"> ('.$lang['srv_coding_spr2'].')</p>';
|
||||
if ( count($variables)>0 )
|
||||
echo '<p class="bottom16">('.$lang['srv_coding_spr2'].')</p>';
|
||||
|
||||
|
||||
SurveyDataDisplay::displayVnosiHTML();
|
||||
|
||||
@ -33,6 +33,8 @@ class VariableView {
|
||||
#inicializiramo class za datoteke
|
||||
self::$SDF = SurveyDataFile::get_instance();
|
||||
self::$SDF->init($sid);
|
||||
|
||||
self::$SDF->prepareFiles($show_loading);
|
||||
|
||||
self::$headFileName = self::$SDF->getHeaderFileName();
|
||||
self::$dataFileName = self::$SDF->getDataFileName();
|
||||
|
||||
@ -71,11 +71,11 @@ class SurveyAnalysisHelper {
|
||||
|
||||
echo '<div id="bottom_data_legend_missing" class="legend_box">';
|
||||
|
||||
echo '<div class="legend_title" onclick="$(\'#bottom_data_legend_detail_missing\').toggleClass(\'displayNone\');">';
|
||||
echo '<span class="faicon fa-plus link-right"></span>'.$lang['srv_bottom_data_legend_note'];
|
||||
echo '<div class="legend_title" onclick="$(\'#bottom_data_legend_detail_missing\').toggle(\'fast\');">';
|
||||
echo '<span class="faicon arrow2_r"></span>'.$lang['srv_bottom_data_legend_note'];
|
||||
echo '</div>';
|
||||
|
||||
echo '<div id="bottom_data_legend_detail_missing" class="legend_details displayNone">';
|
||||
echo '<div id="bottom_data_legend_detail_missing" class="legend_details">';
|
||||
echo ' <ul>';
|
||||
echo ' <li>'.$lang['srv_bottom_data_legend_note_li1'].'</li>';
|
||||
echo ' <li>'.$lang['srv_bottom_data_legend_note_li2'].'</li>';
|
||||
|
||||
@ -1337,6 +1337,8 @@ class SurveyCrosstabs {
|
||||
echo '</div>';
|
||||
|
||||
|
||||
$this->displayExport();
|
||||
|
||||
// Izrisemo legendo
|
||||
$this->displayCrosstabCheckboxes();
|
||||
|
||||
@ -1359,6 +1361,46 @@ class SurveyCrosstabs {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @desc prikaze izvoz za PDF/RTF
|
||||
*/
|
||||
function displayExport () {
|
||||
|
||||
# z javascriptom prikažemo ikonce za arhiviranje, emaijlanje arhivov, pdf, rtf, excel...
|
||||
if ($this->isSelectedBothVariables()) {
|
||||
$data1 = '';
|
||||
$data2 = '';
|
||||
|
||||
foreach($this->variabla1 as $var1){
|
||||
$data1 .= implode(',', array_values($var1)).',';
|
||||
}
|
||||
$data1 = substr($data1, 0, -1);
|
||||
|
||||
foreach($this->variabla2 as $var2){
|
||||
$data2 .= implode(',', array_values($var2)).',';
|
||||
}
|
||||
$data2 = substr($data2, 0, -1);
|
||||
|
||||
$href_print = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2);
|
||||
$href_pdf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2);
|
||||
$href_rtf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis_rtf&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2);
|
||||
$href_xls = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis_xls&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2);
|
||||
|
||||
echo '<script>';
|
||||
|
||||
# nastavimopravilne linke
|
||||
echo '$("#secondNavigation_links a#crosstabDoPdf").attr("href", "'.$href_pdf.'");';
|
||||
echo '$("#secondNavigation_links a#crosstabDoRtf").attr("href", "'.$href_rtf.'");';
|
||||
echo '$("#secondNavigation_links a#crosstabDoXls").attr("href", "'.$href_xls.'");';
|
||||
|
||||
# prikažemo linke
|
||||
echo '$("#hover_export_icon").removeClass("hidden");';
|
||||
echo '$("#secondNavigation_links a").removeClass("hidden");';
|
||||
|
||||
echo '</script>';
|
||||
}
|
||||
}
|
||||
|
||||
/** kadar kličemo iz Break, ali pri radio grupi dodamo še povprečje po stolpcih
|
||||
*
|
||||
* @param unknown_type $showBottomAverage
|
||||
|
||||
@ -1559,10 +1559,12 @@ class SurveyMultiCrosstabs {
|
||||
$href_xls = makeEncodedIzvozUrlString('izvoz.php?b=export&m=multicrosstabs_izpis_xls&anketa='.$this->ank_id);
|
||||
|
||||
echo '<script>';
|
||||
|
||||
# nastavimopravilne linke
|
||||
echo '$("#secondNavigation_links a#multicrosstabDoPdf").attr("href", "'.$href_pdf.'");';
|
||||
echo '$("#secondNavigation_links a#multicrosstabDoRtf").attr("href", "'.$href_rtf.'");';
|
||||
echo '$("#secondNavigation_links a#multicrosstabDoXls").attr("href", "'.$href_xls.'");';
|
||||
|
||||
# prikažemo linke
|
||||
echo '$("#hover_export_icon a").removeClass("hidden");';
|
||||
echo '$("#secondNavigation_links a").removeClass("hidden");';
|
||||
|
||||
@ -2184,7 +2184,7 @@ class SurveyTableChart {
|
||||
global $lang;
|
||||
|
||||
// Ikone izvoza na vrhu posameznih nastavitev
|
||||
//$this->displayExportIcons($chartID);
|
||||
$this->displayExportIcons($chartID);
|
||||
|
||||
|
||||
echo '<div class="chart_settings_content">';
|
||||
@ -2254,13 +2254,7 @@ class SurveyTableChart {
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// Link na urejanje barv
|
||||
echo '<span class="edit" onclick="tableChartAdvancedSettings(\''.$chartID.'\', \''.$this->podstran.'\')">'.$lang['srv_chart_advancedLink_colors'].'</span>';
|
||||
// Vprasajcek za pomoc
|
||||
echo Help :: display('displaychart_settings_colors');
|
||||
|
||||
}
|
||||
|
||||
echo '</div>';
|
||||
|
||||
@ -2275,16 +2269,9 @@ class SurveyTableChart {
|
||||
// linki
|
||||
echo '<div class="chart_setting_exportLinks">';
|
||||
|
||||
// Ikona za print
|
||||
echo '<a href="#" onclick="showAnalizaSingleChartPopup(\''.$chartID.'\',\''.M_ANALYSIS_CHARTS.'\'); return false;">';
|
||||
echo '<span class="faicon print_small icon-grey_dark_link" title="' . $lang['PRN_Izpis'] . '"></span>';
|
||||
echo '</a>';
|
||||
// Gumb za nastavitve
|
||||
echo '<button class="small white-blue" onClick="tableChartAdvancedSettings(\''.$chartID.'\', \''.$this->podstran.'\');"><span class="faicon wheel_32"></span>'.$lang['settings'].'</button>';
|
||||
|
||||
// Izvoz posameznega grafa v PDF/RTF/PPT
|
||||
echo ' <a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts&anketa='.$this->anketa.'&sprID='.$chartID).'" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf"></span> </a>';
|
||||
echo ' <a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_rtf&anketa='.$this->anketa.'&sprID='.$chartID).'" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf"></span> </a>';
|
||||
echo ' <a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_ppt&anketa='.$this->anketa.'&sprID='.$chartID).'" target="_blank" title="'.$lang['PPT_Izpis'].'"><span class="faicon ppt"></span> </a>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
@ -2329,7 +2316,7 @@ class SurveyTableChart {
|
||||
|
||||
// tip izpisa vrednosti
|
||||
echo '<div class="chart_setting">';
|
||||
echo $lang['srv_chart_valtype'].': <select id="tablechart_value_type_'.$chartID.'" name="tablechart_value_type" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'value_type\');">';
|
||||
echo $lang['srv_chart_valtype'].': <select id="tablechart_value_type_'.$chartID.'" name="tablechart_value_type" class="dropdown small" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'value_type\');">';
|
||||
|
||||
echo ' <option value="0" '.($settings['value_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_percent'].'</option>';
|
||||
echo ' <option value="1" '.($settings['value_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_freq'].'</option>';
|
||||
|
||||
@ -234,7 +234,7 @@ class SurveyDataDisplay{
|
||||
// Ce imamo urlhash gre za javno povezavo in nikoli ne prikazemo loading okna
|
||||
$show_loading = (isset($_GET['urlhash'])) ? false : true;
|
||||
|
||||
self::$SDF->prepareFiles($show_loading);
|
||||
self::$SDF->prepareFiles();
|
||||
|
||||
self::$headFileName = self::$SDF->getHeaderFileName();
|
||||
self::$dataFileName = self::$SDF->getDataFileName();
|
||||
@ -860,7 +860,7 @@ class SurveyDataDisplay{
|
||||
// Opcija "vsi" - ni na voljo ce je vec kot 1000 responsov (drugace lahko vse zasteka)
|
||||
if(self::$_RECORD_COUNT <= 1000){
|
||||
$_select_records .= '<option '.(self::$_VARS[VAR_REC_ON_PAGE] == 'all' ? ' selected="selected"' : '').' value="all">';
|
||||
$_select_records .= $lang['srv_vsi'];
|
||||
$_select_records .= $lang['all2'];
|
||||
$_select_records .= '</option>';
|
||||
}
|
||||
|
||||
@ -923,7 +923,7 @@ class SurveyDataDisplay{
|
||||
// Opcija "vsi" - ni na voljo ce je vec kot 50 vprasanj (drugace lahko vse zasteka)
|
||||
if(self::$_ALL_QUESTION_COUNT <= 50){
|
||||
$_spr_on_page .= '<option '.(self::$_VARS[VAR_SPR_LIMIT] == 'all' ? ' selected="selected"' : '').' value="all">';
|
||||
$_spr_on_page .= $lang['hour_all2'];
|
||||
$_spr_on_page .= $lang['srv_block_random_all'];
|
||||
$_spr_on_page .= '</option>';
|
||||
}
|
||||
|
||||
@ -1168,11 +1168,7 @@ class SurveyDataDisplay{
|
||||
|
||||
echo '<div class="setting_line">';
|
||||
echo ' <input type="checkbox" id="dataIcons_edit" onchange="changeDataIcons(); return false;"'.(self::$displayEditIcons['dataIcons_edit'] == true ? ' checked="checekd"' : '').'/>';
|
||||
echo ' <label for="dataIcons_edit">'.$lang['srv_dataIcons_edit'];
|
||||
if (self::$displayEditIcons['dataIcons_edit'] == true) {
|
||||
echo ' '.Help::display('srv_podatki_urejanje_inline');
|
||||
}
|
||||
echo ' </label>';
|
||||
echo ' <label for="dataIcons_edit">'.$lang['srv_dataIcons_edit'].'</label>';
|
||||
echo '</div>';
|
||||
|
||||
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
|
||||
|
||||
@ -126,6 +126,8 @@ lang('srv_novavrednost_drugo');
|
||||
lang('srv_unlock_alert');
|
||||
lang('srv_custom_report_first');
|
||||
lang('srv_ask_delete');
|
||||
lang('srv_ask_delete_data');
|
||||
lang('srv_ask_delete_multiple_data');
|
||||
lang('srv_brisivrednostconfirm');
|
||||
lang('srv_brisivrednost');
|
||||
lang('srv_incremental_hs1');
|
||||
@ -200,6 +202,8 @@ lang('srv_comment_comment');
|
||||
lang('edit1338');
|
||||
lang('for');
|
||||
lang('alternative_email_delete');
|
||||
lang('srv_anketa_deleted_restore_confirm');
|
||||
lang('srv_data_deleted_restore_confirm');
|
||||
|
||||
|
||||
//LOKACIJA
|
||||
|
||||
@ -124,14 +124,9 @@ function add_to_my_library () {
|
||||
|
||||
}
|
||||
|
||||
function anketa_copy (ank_id, text) {
|
||||
var lib_prva = $("input#lib_prva").val();
|
||||
if (lib_prva == 1 ) {
|
||||
var naslov = $("#novaanketa_naslov").val();
|
||||
$.redirect('ajax.php?t=library&a=anketa_copy_new', {ank_id: ank_id, naslov: naslov});
|
||||
} else {
|
||||
$.redirect('ajax.php?t=library&a=anketa_copy', {anketa:srv_meta_anketa_id, ank_id: ank_id});
|
||||
}
|
||||
function anketa_copy (ank_id) {
|
||||
var naslov = $("#novaanketa_naslov").val();
|
||||
$.redirect('ajax.php?t=library&a=anketa_copy_new', {ank_id: ank_id, naslov: naslov});
|
||||
}
|
||||
|
||||
function anketa_copy_top (ank_id, hierarhija) {
|
||||
|
||||
@ -4359,30 +4359,20 @@ function changeDoCMSUserFilterCheckbox() {
|
||||
|
||||
function anketa_restore(anketa) {
|
||||
|
||||
if ( confirm('?') ) {
|
||||
|
||||
if ( confirm(lang['srv_anketa_deleted_restore_confirm']) ) {
|
||||
$.post('ajax.php?a=anketa_restore', {id: anketa}, function () {
|
||||
|
||||
window.location.href = 'index.php?anketa='+anketa;
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function data_restore(anketa) {
|
||||
|
||||
if ( confirm('?') ) {
|
||||
|
||||
if ( confirm(lang['srv_data_deleted_restore_confirm']) ) {
|
||||
$.post('ajax.php?a=data_restore', {id: anketa}, function () {
|
||||
|
||||
window.location.href = 'index.php?anketa='+anketa;
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function deleteSurveyDataFile(note) {
|
||||
|
||||
@ -41,13 +41,13 @@ function analiza_init () {
|
||||
});
|
||||
|
||||
// brisanje vnosa
|
||||
$('#dataTable td .delete_circle').live('click', function(event) {
|
||||
$('#dataTable td .delete').live('click', function(event) {
|
||||
|
||||
// polovimo user id
|
||||
var usr_id = $(this).parent().parent().find('.data_uid').html();
|
||||
var row = $(this).parent().parent();
|
||||
|
||||
var note = 'srv_ask_delete';
|
||||
var note = 'srv_ask_delete_data';
|
||||
|
||||
// Preverimo ce je med njimi tudi kaksno vabilo - dodatno opozorilo
|
||||
if($(this).parent().parent().find('.invitation_cell').length == 1){
|
||||
@ -1010,7 +1010,7 @@ function deleteMultipleData(){
|
||||
|
||||
var userArray = new Array;
|
||||
|
||||
var note = 'srv_ask_delete';
|
||||
var note = 'srv_ask_delete_multiple_data';
|
||||
|
||||
// Napolnimo array z checkanimi userji
|
||||
$('#div_vnosi_data input:checked').each(function() {
|
||||
|
||||
@ -225,7 +225,7 @@ $lang = array (
|
||||
"show" => "Prikazan povsod",
|
||||
"only_show_index" => "Samo na prvi strani",
|
||||
"not_show" => "Ni prikazan",
|
||||
"ask_delete_link" => "Ali ste prepričani, da zelite izbrisati podstran",
|
||||
"ask_delete_link" => "Ali ste prepričani, da želite izbrisati podstran",
|
||||
"ask2_delete_link" => "Unicili boste tudi vse podnavigacije! Ce hocete uniciti zgolj to navigacijo, ne pa tudi tistih pod njo, jo najprej spremenite v nizji nivo. Res zelite uniciti tudi vse podnavigacije in njihove vsebine?",
|
||||
"ask_delete_news" => "Ali ste prepričani, da zelite izbrisati novico?",
|
||||
"archive_restored" => "Arhiv nalozen.",
|
||||
@ -2343,6 +2343,8 @@ $lang = array (
|
||||
"srv_arhivi" => "Arhivi",
|
||||
"srv_progressbar" => "Prikaži vrstico napredka (progress bar)",
|
||||
"srv_ask_delete" => "Ali ste prepricani, da želite trajno izbrisati?",
|
||||
"srv_ask_delete_multiple_data" => "Ali ste prepricani, da želite trajno izbrisati izbrane enote?",
|
||||
"srv_ask_delete_data" => "Ali ste prepricani, da želite trajno izbrisati enoto?",
|
||||
"srv_ask_delete_inv" => "Ali ste prepricani, da želite trajno izbrisati?\n\nPobrisali boste tudi odgovore, ki so vezani na vabila! To lahko povzroči napake pri obravnavanju odgovorov poslanih preko vabil.",
|
||||
"srv_crosstabs" => "Tabele",
|
||||
"srv_multicrosstabs" => "Multitabele",
|
||||
@ -5927,10 +5929,12 @@ $lang = array (
|
||||
"srv_anketa_deleted" => 'Izbrisane ankete',
|
||||
"srv_anketa_deleted_note" => 'V spodnji tabeli je seznam vseh izbrisanih anket in možnost obnovitve teh anket.',
|
||||
"srv_anketa_deleted_restore" => 'Obnovi anketo',
|
||||
"srv_anketa_deleted_restore_confirm" => 'Ste prepričani, da želite obnoviti anketo?',
|
||||
"srv_data_deleted" => 'Izbrisani podatki',
|
||||
"srv_data_deleted_surveyname" => 'Ime ankete',
|
||||
"srv_data_deleted_user" => 'E-mail uporabnika',
|
||||
"srv_data_deleted_restore" => 'Obnovi podatke',
|
||||
"srv_data_deleted_restore_confirm" => 'Ste prepričani, da želite obnoviti podatke?',
|
||||
"srv_data_deleted_note" => 'V spodnji tabeli je seznam vseh anket, kjer so bili izbrisani podatki, in možnost obnovitve izbrisanih podatkov.',
|
||||
"srv_restore" => 'Obnovi',
|
||||
"srv_all_types" => 'Vsi tipi',
|
||||
@ -5970,7 +5974,7 @@ $lang = array (
|
||||
"srv_data_emailstatus_1" => "Da",
|
||||
"srv_data_emailstatus_2" => "Napaka",
|
||||
"srv_bottom_data_legend_note" => 'Legenda manjkajočih (negativnih) vrednosti',
|
||||
"srv_bottom_data_legend_note_li0" => '<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/statusi-enot-ustreznost-veljavnost-manjkajoce-vrednosti?from1ka=1" target="_blank">Več>></a>',
|
||||
"srv_bottom_data_legend_note_li0" => '<a href="https://www.1ka.si/d/sl/pomoc/prirocniki/statusi-enot-ustreznost-veljavnost-manjkajoce-vrednosti?from1ka=1" target="_blank" class="read-more">Preberi več<span class="faicon arrow2_r"></span></a>',
|
||||
"srv_bottom_data_legend_note_li1" => "'-1' neodgovorjeno vprašanje,",
|
||||
"srv_bottom_data_legend_note_li2" => "'-2' preskok zaradi pogoja (IF),",
|
||||
"srv_bottom_data_legend_note_li3" => "'-3' prekinitev izpolnjevanja,",
|
||||
|
||||
@ -2328,6 +2328,8 @@ $lang = array (
|
||||
"srv_arhivi" => "Archives",
|
||||
"srv_progressbar" => "Show progress indicator",
|
||||
"srv_ask_delete" => "Do you want to permanently delete?",
|
||||
"srv_ask_delete_multiple_data" => "Do you want to permanently delete selected units?",
|
||||
"srv_ask_delete_data" => "Do you want to permanently delete selected unit?",
|
||||
"srv_ask_delete_inv" => "Do you want to permanently delete?\n\nYou will delete also answers from invitations! This can cause invitations errors.",
|
||||
"srv_crosstabs" => "Crosstabs",
|
||||
"srv_multicrosstabs" => "Multitables",
|
||||
@ -5822,10 +5824,12 @@ $lang = array (
|
||||
"srv_anketa_deleted" => 'Deleted surveys',
|
||||
"srv_anketa_deleted_note" => 'The table below lists all deleted surveys and the possibility to restore them.',
|
||||
"srv_anketa_deleted_restore" => 'Restore survey',
|
||||
"srv_anketa_deleted_restore_confirm" => 'Are you sure you want to restore this survey?',
|
||||
"srv_data_deleted" => 'Deleted data',
|
||||
"srv_data_deleted_surveyname" => 'Survey name',
|
||||
"srv_data_deleted_user" => 'User E-mail',
|
||||
"srv_data_deleted_restore" => 'Restore data',
|
||||
"srv_data_deleted_restore_confirm" => 'Are you sure you want to restore this data?',
|
||||
"srv_data_deleted_note" => 'The table below lists all the surveys where data have been deleted and the possibility to restore deleted data.',
|
||||
"srv_restore" => 'Restore',
|
||||
"srv_all_types" => 'All types',
|
||||
@ -5865,7 +5869,7 @@ $lang = array (
|
||||
"srv_data_emailstatus_1" => "Yes",
|
||||
"srv_data_emailstatus_2" => "Error",
|
||||
"srv_bottom_data_legend_note" => 'Missing values legend',
|
||||
"srv_bottom_data_legend_note_li0" => '<a href="https://www.1ka.si/d/en/help/manuals/status-of-units-relevance-validity-and-missing-values" target="_blank">More>></a>',
|
||||
"srv_bottom_data_legend_note_li0" => '<a href="https://www.1ka.si/d/en/help/manuals/status-of-units-relevance-validity-and-missing-values" target="_blank" class="read-more">Read more<span class="faicon arrow2_r"></span></a>',
|
||||
"srv_bottom_data_legend_note_li1" => "'-1' unanswered question,",
|
||||
"srv_bottom_data_legend_note_li2" => "'-2' skipped question (IF logic),",
|
||||
"srv_bottom_data_legend_note_li3" => "'-3' survey dropout,",
|
||||
|
||||
@ -668,15 +668,15 @@ class HeaderController extends Controller
|
||||
break;
|
||||
|
||||
case '3':
|
||||
echo '.variable_holder, .variable_holder .variabla label';
|
||||
echo '.variable_holder .variabla';
|
||||
break;
|
||||
|
||||
case '4':
|
||||
echo 'table.grid_table tbody tr:nth-child(2n+1)';
|
||||
echo 'table.grid_table tbody tr:nth-child(2n+1), .variable_holder .variabla';
|
||||
break;
|
||||
|
||||
case '5':
|
||||
echo '.spremenljivka';
|
||||
echo 'div.spremenljivka';
|
||||
break;
|
||||
|
||||
case '7':
|
||||
@ -721,12 +721,12 @@ class HeaderController extends Controller
|
||||
|
||||
case '5':
|
||||
if ($rowt['value'] == '0') {
|
||||
echo 'border: 0;';
|
||||
echo 'border: 0 !important;';
|
||||
} elseif ($rowt['value'] == '2') {
|
||||
echo 'border: 1px #B9C5D9 solid;';
|
||||
echo 'border: 1px #B9C5D9 solid !important;';
|
||||
} else {
|
||||
echo 'border: 0;';
|
||||
echo 'border-top: 1px #B9C5D9 solid;';
|
||||
echo 'border-top: 1px #B9C5D9 solid !important;';
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -18,10 +18,10 @@ span.faicon.pdf::before{
|
||||
color: #ed1c24;
|
||||
}
|
||||
span.faicon.pdf.black{
|
||||
color: $gray !important;
|
||||
&:hover{
|
||||
color: #ed1c24 !important;
|
||||
}
|
||||
color: $blue !important;
|
||||
&:hover{
|
||||
color: #ed1c24 !important;
|
||||
}
|
||||
}
|
||||
a:hover span.faicon.pdf.black{
|
||||
color: #ed1c24 !important;
|
||||
@ -40,7 +40,7 @@ span.faicon.xls::before{
|
||||
color: #008000;
|
||||
}
|
||||
span.faicon.xls.black{
|
||||
color: $gray !important;
|
||||
color: $blue !important;
|
||||
&:hover{
|
||||
color: #008000 !important;
|
||||
}
|
||||
@ -62,7 +62,7 @@ span.faicon.rtf::before{
|
||||
color: #0f3ea8;
|
||||
}
|
||||
span.faicon.rtf.black{
|
||||
color: $gray !important;
|
||||
color: $blue !important;
|
||||
&:hover{
|
||||
color: #0f3ea8 !important;
|
||||
}
|
||||
@ -84,7 +84,7 @@ span.faicon.ppt::before{
|
||||
color: #fa4913;
|
||||
}
|
||||
span.faicon.ppt.black{
|
||||
color: $gray !important;
|
||||
color: $blue !important;
|
||||
&:hover{
|
||||
color: #fa4913 !important;
|
||||
}
|
||||
@ -106,7 +106,7 @@ span.faicon.xml::before{
|
||||
color: #00a000;
|
||||
}
|
||||
span.faicon.xml.black{
|
||||
color: $gray !important;
|
||||
color: $blue !important;
|
||||
&:hover{
|
||||
color: #00a000 !important;
|
||||
}
|
||||
|
||||
@ -19,4 +19,14 @@ a {
|
||||
text-decoration: none;
|
||||
font-weight: $extra-bold;
|
||||
}
|
||||
|
||||
&.read-more{
|
||||
text-decoration: none;
|
||||
|
||||
.faicon:before{
|
||||
padding-left: 8px;
|
||||
font-size: 8px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -4,7 +4,8 @@
|
||||
|
||||
|
||||
// Posamezen element grafa
|
||||
.chart_holder {
|
||||
.chart_holder,
|
||||
.tableChart {
|
||||
width: 1060px;
|
||||
margin: 0 auto;
|
||||
padding-top: 36px;
|
||||
@ -313,7 +314,17 @@
|
||||
}
|
||||
}
|
||||
|
||||
.tableChart{
|
||||
position: relative;
|
||||
|
||||
.custom_report_include{
|
||||
display: none;
|
||||
}
|
||||
|
||||
.chart_setting_exportLinks{
|
||||
justify-content: flex-end;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*editing chart labels in popup*/
|
||||
@ -376,109 +387,6 @@ ul.vrednost_sort {
|
||||
}
|
||||
}
|
||||
}
|
||||
/*chart of analisys*/
|
||||
.tableChart {
|
||||
margin: 30px auto 30px auto;
|
||||
width: 1000px;
|
||||
overflow: auto;
|
||||
text-align: center;
|
||||
|
||||
.chart_title {
|
||||
width: 800px;
|
||||
margin: 5px 0px;
|
||||
padding-left: 5px;
|
||||
min-height: 15px;
|
||||
|
||||
font-weight: 600;
|
||||
font-size: 14px;
|
||||
}
|
||||
.chart_img {
|
||||
float: left;
|
||||
img {
|
||||
width: 800px;
|
||||
}
|
||||
}
|
||||
.chart_settings {
|
||||
float: right;
|
||||
position: relative;
|
||||
margin-top: 5px;
|
||||
opacity: 0;
|
||||
filter: alpha(opacity=0);
|
||||
float: right;
|
||||
position: relative;
|
||||
opacity: 0;
|
||||
filter: alpha(opacity=0);
|
||||
margin-top: -25px;
|
||||
background-color: $gray;
|
||||
.switch_left {
|
||||
z-index: 99999;
|
||||
position: relative;
|
||||
width: 90px;
|
||||
height: 17px;
|
||||
padding: 5px 0 8px 0 !important;
|
||||
color: $blue;
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
background-color: $gray;
|
||||
float: left;
|
||||
}
|
||||
.switch_right {
|
||||
z-index: 99999;
|
||||
position: relative;
|
||||
width: 90px;
|
||||
height: 17px;
|
||||
padding: 5px 0 8px 0 !important;
|
||||
color: $blue;
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
background-color: $gray;
|
||||
float: right;
|
||||
}
|
||||
.non-active {
|
||||
cursor: pointer;
|
||||
background-color: $gray;
|
||||
}
|
||||
.chart_settings_inner {
|
||||
position: relative;
|
||||
clear: both;
|
||||
margin-top: -3px;
|
||||
padding: 10px;
|
||||
width: 160px;
|
||||
height: auto;
|
||||
font-size: 10px;
|
||||
line-height: 15px;
|
||||
font-weight: normal;
|
||||
text-align: left;
|
||||
background-color: $gray;
|
||||
}
|
||||
span.title {
|
||||
color: $blue;
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
}
|
||||
span.edit {
|
||||
cursor: pointer;
|
||||
display: block;
|
||||
margin: 10px;
|
||||
font-weight: bold;
|
||||
text-align: left;
|
||||
color: $blue;
|
||||
&:hover {
|
||||
color: $blue;
|
||||
}
|
||||
}
|
||||
.chart_setting_exportLinks {
|
||||
text-align: right;
|
||||
padding: 7px;
|
||||
span {
|
||||
margin: 0 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.chart_setting {
|
||||
margin: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.chart_other_text {
|
||||
.chart_title {
|
||||
|
||||
@ -59,7 +59,6 @@ div.subpage_coding {
|
||||
|
||||
div#analiza_data {
|
||||
max-width: 932px;
|
||||
overflow-x: scroll;
|
||||
|
||||
div.dataFullscreen{
|
||||
display: none;
|
||||
|
||||
@ -92,6 +92,10 @@ button.buttons-columnVisibility {
|
||||
padding-top: 0 !important;
|
||||
}
|
||||
|
||||
.select-info{
|
||||
display: none;
|
||||
}
|
||||
|
||||
table.usersTable {
|
||||
margin-left: 14px;
|
||||
margin-right: 14px;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user