diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 96e6420aa..7def03141 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -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(); diff --git a/admin/survey/classes/class.Dostop.php b/admin/survey/classes/class.Dostop.php index 523d0992e..89ccca1d0 100644 --- a/admin/survey/classes/class.Dostop.php +++ b/admin/survey/classes/class.Dostop.php @@ -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 diff --git a/admin/survey/classes/class.Library.php b/admin/survey/classes/class.Library.php index c552e6e6c..6f08e7c2b 100644 --- a/admin/survey/classes/class.Library.php +++ b/admin/survey/classes/class.Library.php @@ -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'].''.$row2['naslov'].''))."',"; - - //$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'; } } diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index 3b2a5e475..de0167104 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -381,12 +381,6 @@ class SurveyList { echo $lang['srv_testiranje_predvidenicas'].''; echo ''; - # Zavihek mape - echo '
  • '; - echo ''; - echo $lang['srv_collectData'].''; - echo '
  • '; - # Zavihek lep url echo '
  • '; echo ''; diff --git a/admin/survey/classes/class.SurveyPostProcess.php b/admin/survey/classes/class.SurveyPostProcess.php index 4b04b16b6..b448258fa 100644 --- a/admin/survey/classes/class.SurveyPostProcess.php +++ b/admin/survey/classes/class.SurveyPostProcess.php @@ -231,10 +231,6 @@ class SurveyPostProcess { echo ''; echo ''; - - //echo ' ('.$lang['srv_coding_spr2'].')

    '; - if ( count($variables)>0 ) - echo '

    ('.$lang['srv_coding_spr2'].')

    '; SurveyDataDisplay::displayVnosiHTML(); diff --git a/admin/survey/classes/class.SurveyVariableView.php b/admin/survey/classes/class.SurveyVariableView.php index 74342fd1c..18ef6b940 100644 --- a/admin/survey/classes/class.SurveyVariableView.php +++ b/admin/survey/classes/class.SurveyVariableView.php @@ -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(); diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php index 66d183692..73280f5c5 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php @@ -71,11 +71,11 @@ class SurveyAnalysisHelper { echo '
    '; - echo '
    '; - echo ''.$lang['srv_bottom_data_legend_note']; + echo '
    '; + echo ''.$lang['srv_bottom_data_legend_note']; echo '
    '; - echo '
    '; + echo '
    '; echo '
      '; echo '
    • '.$lang['srv_bottom_data_legend_note_li1'].'
    • '; echo '
    • '.$lang['srv_bottom_data_legend_note_li2'].'
    • '; diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php index 53e54a1e1..6b41fe0e3 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php @@ -1337,6 +1337,8 @@ class SurveyCrosstabs { echo '
    '; + $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 ''; + } + } + /** kadar kličemo iz Break, ali pri radio grupi dodamo še povprečje po stolpcih * * @param unknown_type $showBottomAverage diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php index e4b8924ec..c9a0e0979 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php @@ -1559,10 +1559,12 @@ class SurveyMultiCrosstabs { $href_xls = makeEncodedIzvozUrlString('izvoz.php?b=export&m=multicrosstabs_izpis_xls&anketa='.$this->ank_id); echo '