From 06cb69c3ba0ee0c65e5b912e99f34732157b001b Mon Sep 17 00:00:00 2001 From: patrik2020 Date: Tue, 6 Oct 2020 10:12:11 +0200 Subject: [PATCH 01/23] =?UTF-8?q?Latex=20za=20izvoze:=20IZVOZ-44:=20Obliko?= =?UTF-8?q?vanje=20ankete=20=E2=80=93=20ne=20dela=20izvoz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../latexclasses/class.LatexSurveyElement.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/admin/survey/export/latexclasses/class.LatexSurveyElement.php b/admin/survey/export/latexclasses/class.LatexSurveyElement.php index ad8a55c5f..7e741403b 100644 --- a/admin/survey/export/latexclasses/class.LatexSurveyElement.php +++ b/admin/survey/export/latexclasses/class.LatexSurveyElement.php @@ -983,6 +983,24 @@ class LatexSurveyElement{ } //RESEVANJE BESEDILA V CIRILICI - konec + + + //RESEVANJE odstranitve dodatnih style tag-ov po ul, ipd. ####################################################### + $findStyleTag = 'style="'; + $findStyleTagEnd = '">'; + $numOfStyleTags = substr_count($text, $findStyleTag); //stevilo 'style=" ' v tekstu + //echo "stevilo style: ".$numOfStyleTags."
"; + + for($s=0; $s<$numOfStyleTags; $s++){ //za vsako najdeno 'style=" ' besedilo, uredi njeno odstranitev + //$posImg = strpos($text, $findImg); + $posStyleTag = strpos($text, $findStyleTag); + $posStyleTagEnd = strpos($text, $findStyleTagEnd); + $dolzinaOff = $posStyleTagEnd - $posStyleTag + 2; + $text = substr_replace($text, "", $posStyleTag, $dolzinaOff); + + } + //RESEVANJE odstranitve dodatnih style tag-ov po ul, ipd. - konec ################################################# + if($pos === false && $posImg === false) { //v tekstu ni br in img $text = preg_replace("/(\R){2,}/", "$1", $text); From dec0d9c568e20ed6276076f3e347275b0477e1d7 Mon Sep 17 00:00:00 2001 From: patrik2020 Date: Tue, 6 Oct 2020 11:18:51 +0200 Subject: [PATCH 02/23] Latex za izvoze: IZVOZ-57: Slike v anketi: ureditev odvecnih prelomov --- .../latexclasses/Vprasanja/DatumLatex.php | 67 +++++++++---------- .../latexclasses/class.LatexSurveyElement.php | 7 +- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php b/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php index e659044e6..f252f7fc2 100644 --- a/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php @@ -77,10 +77,36 @@ class DatumLatex extends LatexSurveyElement $besedilo .= '}'; //ureditev besedila odgovora respondenta v doloceno barvo - konec - //$answerTextBox = $this->LatexTextBox($export_format, $textboxHeight, $textboxWidth, $userAnswer['text'], $textboxAllignment, $noBorders); - $answerTextBox = $this->LatexTextBox($export_format, $textboxHeight, $textboxWidth, $besedilo, $textboxAllignment, $noBorders); - - + if($userAnswer['text']==''){ //ce ni izpisa odgovorov respondentov, priprava izpis s tabelo + $answerTextBox = $this->LatexTextBox($export_format, $textboxHeight, $textboxWidth, $besedilo, $textboxAllignment, $noBorders); + + //parametri tabele + //$parameterTabular = 'l'; + if($export_format == 'pdf'){ //ce je pdf + $parameterTabular = 'X'; + }else{ //ce je rtf + $parameterTabular = 'l'; + } + + //IZRIS + #ZACETEK TABELE + //zacetek tabele + $tex .= $this->StartLatexTable($export_format, $parameterTabular, 'tabularx', 'tabular', 1, 1); + + $tex .= $answerTextBox; //izris znotraj tabele + + //zakljucek tabele + $tex .= $this->EndLatexTable($export_format, 'tabularx', 'tabular'); + #KONEC TABELE + $tex .= $this->texBigSkip; + }else{ //ce je izpis odgovorov respondentov + $tex .= $this->texNewLine; + $tex .= $besedilo; + //$tex .= " \ "; //da ni tezave z "there is no line here to end" + $tex .= $texNewLine; + $tex .= $texNewLine; + } + //priprava missing-ov //pregled vseh moznih vrednosti (kategorij) po $sqlVrednosti while ($rowVrednost = mysqli_fetch_assoc($sqlVrednosti)){ @@ -95,46 +121,17 @@ class DatumLatex extends LatexSurveyElement $symbol = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], 0, 0); //poberi simbol checkbox za other in missing moznosti odgovora //priprava missing-ov - konec - //parametri tabele - //$parameterTabular = 'l'; - if($export_format == 'pdf'){ //ce je pdf - $parameterTabular = 'X'; - }else{ //ce je rtf - $parameterTabular = 'l'; - } - - //IZRIS - #ZACETEK TABELE - //zacetek tabele - $tex .= $this->StartLatexTable($export_format, $parameterTabular, 'tabularx', 'tabular', 1, 1); - - $tex .= $answerTextBox; //izris znotraj tabele - - //zakljucek tabele - $tex .= $this->EndLatexTable($export_format, 'tabularx', 'tabular'); - #KONEC TABELE - - $tex .= ' \vspace{0.3cm} '; //prostor med okvirjem in missing - // Izris polj drugo - ne vem... if (count($array_others) > 0) { + $tex .= ' \vspace{0.3cm} '; //prostor med okvirjem in missing $tex .= $texNewLine; foreach ($array_others AS $oKey => $other) { $tex .= $symbol.' '.$other['naslov'].' '; $tex .= $texNewLine; } + $tex .= $texNewLine; } -/* $tex .= $texNewLine; - $tex .= $texNewLine; */ - $tex .= $this->texBigSkip; - - if($export_format == 'pdf'){ //ce je pdf - $tex .= '\\end{absolutelynopagebreak}'; //zakljucimo environment, da med vprasanji ne bo prelomov strani - }else{ //ce je rtf - - } - //IZRIS - KONEC return $tex; diff --git a/admin/survey/export/latexclasses/class.LatexSurveyElement.php b/admin/survey/export/latexclasses/class.LatexSurveyElement.php index 7e741403b..224375aad 100644 --- a/admin/survey/export/latexclasses/class.LatexSurveyElement.php +++ b/admin/survey/export/latexclasses/class.LatexSurveyElement.php @@ -206,7 +206,7 @@ class LatexSurveyElement{ //echo "naslov: ".$text."
"; //$tex = $text." ".$texNewLine; - if( !in_array($spremenljivke['tip'], array(1, 2, 3, 4, 7, 6, 16, 19, 20, 21, 17, 18, 24, 26, 27)) ){ //ce ni radio, check, roleta, stevilo, multigrid radio, checkbox, besedilo, stevilo, razvrscanje, vsota ali kombinirana tabela, lokacija, ali heatmap + if( !in_array($spremenljivke['tip'], array(1, 2, 3, 4, 7, 8, 6, 16, 19, 20, 21, 17, 18, 24, 26, 27)) ){ //ce ni radio, check, roleta, stevilo, datum, multigrid radio, checkbox, besedilo, stevilo, razvrscanje, vsota ali kombinirana tabela, lokacija, ali heatmap $tex .= ($this->export_format == 'pdf' ? '\\begin{absolutelynopagebreak} \\noindent ' : ' '); //ce je pdf uredimo, da med vprasanji ne bo prelomov strani } @@ -283,9 +283,8 @@ class LatexSurveyElement{ if($spremenljivke['info'] != ''){ $tex .= $this->texNewLine; $tex .= '\vspace{2 mm}'; - //$tex .= ' {\indent \\footnotesize '.$this->encodeText($spremenljivke['info']).'}'; //$tex .= ' {\noindent \\footnotesize '.$this->encodeText($spremenljivke['info']).'}'; - $tex .= ' \noindent \\footnotesize '.$this->encodeText($spremenljivke['info']).' '; + $tex .= ' \noindent \\footnotesize '.$this->encodeText($spremenljivke['info']).' \\normalsize '; } if( !in_array($spremenljivke['tip'], array(4, 6, 16, 19, 20, 21, 7, 8, 18)) ){ //ce ni multigrid radio, checkbox, besedilo, stevilo, datum ali vsota ki ne potrebujejo prazne vrstice zaradi uporabe tabele @@ -346,7 +345,7 @@ class LatexSurveyElement{ $tex .= $this->texNewLine; $tex .= '\vspace{2 mm}'; //$tex .= ' {\indent \\footnotesize '.$this->encodeText($spremenljivke['info']).'} '; - $tex .= ' {\noindent \\footnotesize '.$this->encodeText($spremenljivke['info']).'} '; + $tex .= ' {\noindent \\footnotesize '.$this->encodeText($spremenljivke['info']).' \\normalsize } '; } if($export_subtype=='q_data'||$export_subtype=='q_data_all'){ //ce je izpis odgovorov From d01e0856b712abdbe04651677914d840e28c2baf Mon Sep 17 00:00:00 2001 From: patrik2020 Date: Tue, 6 Oct 2020 12:40:30 +0200 Subject: [PATCH 03/23] Latex za izvoze: IZVOZ-57: Slike v anketi: ureditev pomanjkljivega sql stavka --- .../export/latexclasses/class.LatexSurvey.php | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/admin/survey/export/latexclasses/class.LatexSurvey.php b/admin/survey/export/latexclasses/class.LatexSurvey.php index f78008649..52b7d89eb 100644 --- a/admin/survey/export/latexclasses/class.LatexSurvey.php +++ b/admin/survey/export/latexclasses/class.LatexSurvey.php @@ -265,20 +265,21 @@ class LatexSurvey{ // Izrisemo naslov loopa $tex .= $this->dataPiping($loop_title); - + //TODO: TUdi tu se celotna spremenljivka prenaša naprej - $sqlSpremenljivke = sisplet_query("SELECT id, tip, visible, sistem, variable, naslov, info, orientation FROM srv_spremenljivka WHERE gru_id='".$this->grupa."' AND visible='1' ORDER BY vrstni_red ASC"); - + $sqlSpremenljivke = sisplet_query("SELECT id, tip, visible, sistem, variable, naslov, info, orientation, dostop FROM srv_spremenljivka WHERE gru_id='".$this->grupa."' AND visible='1' ORDER BY vrstni_red ASC"); + //echo "SELECT id, tip, visible, sistem, variable, naslov, info, orientation FROM srv_spremenljivka WHERE gru_id='".$this->grupa."' AND visible='1' ORDER BY vrstni_red ASC "."
"; + while ($rowSpremenljivke = mysqli_fetch_assoc($sqlSpremenljivke)) { // sprehodimo se skozi spremenljivke grupe $spremenljivka = $rowSpremenljivke['id']; - + if ($rowSpremenljivke['visible'] == 0 || !( ($this->admin_type <= $rowSpremenljivke['dostop'] && $this->admin_type>=0) || ($this->admin_type==-1 && $rowSpremenljivke['dostop']==4) ) ) { //echo "ni admin za sprem: ".$rowSpremenljivke['id']."
"; continue; } - + if($export_subtype=='q_data'||$export_subtype=='q_data_all'){ //ce je vprasalnik s podatki za enega ali vse respondente $preveriSpremenljivko = $this->checkSpremenljivkaData($spremenljivka, $this->loop_id); }else{ //ce je prazen vprasalnik ali vprasalnik s komentarji @@ -304,10 +305,6 @@ class LatexSurvey{ } else if ($rowSpremenljivke['sistem'] == 1) $this->pdf->SetTextColor(0,0,255); - - -/* $this->pdf->SetTextColor(0,0,0); - $this->pdf->SetDrawColor(0,0,0); */ // Izpis vprasalnika z rezultati @@ -401,9 +398,6 @@ class LatexSurvey{ $stevilcenje = ( SurveyInfo::getInstance()->getSurveyCountType() ) ? ( ( SurveyInfo::getInstance()->getSurveyCountType() == 2 ) ? $rowSpremenljivke['variable'].") " : $zaporedna.") " ) : null; - //$this->pdf->SetTextColor(0,0,0); - //$this->pdf->SetDrawColor(0,0,0); - $this->currentHeight = 0; // izpis skrcenega vprasalnika (samo pri izpisu iz urejanja) @@ -1151,9 +1145,10 @@ class LatexSurvey{ //Stari query srv_vrednost se ni nikjer uporabljal //$sql = sisplet_query("SELECT l.* FROM srv_loop_data l, srv_vrednost v WHERE l.if_id='$if_id' AND l.id > '$loop_id' AND l.vre_id IN ($vre_id) AND l.vre_id=v.id ORDER BY l.id ASC"); //Problematicni sql, ker ocitno tale zadeva z obj ne dela najbolje - //$sql = sisplet_query("SELECT id FROM srv_loop_data WHERE if_id='$if_id' AND id > '$loop_id' AND vre_id IN ($vre_id) ORDER BY id ASC", "obj"); - + //$sql = sisplet_query("SELECT id FROM srv_loop_data WHERE if_id='$if_id' AND id > '$loop_id' AND vre_id IN ($vre_id) ORDER BY id ASC", "obj"); + $sqlTestString = "SELECT id FROM srv_loop_data WHERE if_id='$if_id' AND id > '$loop_id' AND vre_id IN ($vre_id) ORDER BY id ASC"; + //echo "sqlString: ".$sqlTestString."
"; $sqlTest = sisplet_query($sqlTestString); $rowTest = mysqli_fetch_array($sqlTest); From 5cea500539bf2af17de3b25df977d0a76e857a65 Mon Sep 17 00:00:00 2001 From: Peter Hrvatin Date: Tue, 6 Oct 2020 14:23:53 +0200 Subject: [PATCH 04/23] Dodan gitignore --- .gitignore | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..3f7a4162f --- /dev/null +++ b/.gitignore @@ -0,0 +1,51 @@ +# Vendor folder +/vendor/ + +# DEV tools +.vscode/ +.idea/ + +# SVN +.svn/ + +# Docker database +/utils/Docker/sql/database +docker + +# Cache files +/admin/survey/SurveyData/*.html + +# Log files +*.log + +# dat 1ka files +*.dat + +# CSV files +*.csv + +# Map files (sass) +*.map + +# Applications +*.app +*.exe +*.war + +# Large media files +*.mp4 +*.tiff +*.avi +*.flv +*.mov +*.wmv + + +# Settings, htaccess... +/settings.php +/settings_optional.php +/.htaccess +/composer.bat +/composer.phar +/composer.lock +/.favorites.json \ No newline at end of file From 7e45725637f2fffb0dc5a9cf1c389c811ed171e1 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 7 Oct 2020 10:26:53 +0200 Subject: [PATCH 05/23] Popravek nadaljevanja na strani kjer je respondent ostal, ce so vklopljena vabila (preskok uvoda) --- .../app/Controllers/CheckController.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/main/survey/app/Controllers/CheckController.php b/main/survey/app/Controllers/CheckController.php index 5036f590b..f6b84ff94 100644 --- a/main/survey/app/Controllers/CheckController.php +++ b/main/survey/app/Controllers/CheckController.php @@ -629,15 +629,20 @@ class CheckController extends Controller $sql1 = sisplet_query("SELECT g.id FROM srv_user_grupa" . get('db_table') . " u, srv_grupa g WHERE u.gru_id=g.id AND u.usr_id='" . get('usr_id') . "' ORDER BY g.vrstni_red DESC LIMIT 1"); if (!$sql1) echo mysqli_error($GLOBALS['connect_db']); - $row1 = mysqli_fetch_array($sql1); - save('grupa', $row1['id']); - $grupa = Find::getInstance()->findNextGrupa(); + if(mysqli_num_rows($sql1) > 0){ - if ($grupa > 0) { - setcookie('ref', get('anketa')); // cookie z referalom (da se ne sprozi redirect zaradi referala pri ?code= ) - return header("Location: " . \SurveyInfo::getSurveyLink() . "&grupa=$grupa" . (isset($_GET['language']) ? '&language=' . $_GET['language'] : '') . (isset($_GET['skupina']) ? '&skupina=' . $_GET['skupina'] : '') . get('cookie_url') . "&c"); - die(); + $row1 = mysqli_fetch_array($sql1); + + save('grupa', $row1['id']); + + $grupa = Find::getInstance()->findNextGrupa(); + + if ($grupa > 0) { + setcookie('ref', get('anketa')); // cookie z referalom (da se ne sprozi redirect zaradi referala pri ?code= ) + return header("Location: " . \SurveyInfo::getSurveyLink() . "&grupa=$grupa" . (isset($_GET['language']) ? '&language=' . $_GET['language'] : '') . (isset($_GET['skupina']) ? '&skupina=' . $_GET['skupina'] : '') . get('cookie_url') . "&c"); + die(); + } } } } From 00087401b699a24daa77c76aff398c516d14cde6 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 7 Oct 2020 10:52:28 +0200 Subject: [PATCH 06/23] Evoli - naknadno posiljanje vabil (povecanje kvote, popravek url-ja) --- admin/survey/modules/mod_EVOLI/class.EvoliForm.php | 7 ++++++- admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php index 1d8d751d9..d660cc028 100644 --- a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php +++ b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php @@ -361,7 +361,12 @@ class EvoliForm { $sql = sisplet_query("SELECT id FROM srv_evoli_teammeter WHERE ank_id='".$this->anketa."' AND skupina_id='".$this->group_id."'"); $row = mysqli_fetch_array($sql); - $tm_group['tm_id'] = $row['id']; + $tm_group['tm_id'] = $row['id']; + + // Se povecamo max kvoto + if(count($email_list) > 0){ + $sqlI = sisplet_query("UPDATE srv_evoli_teammeter SET kvota_max=kvota_max+".count($email_list)." WHERE ank_id='".$this->anketa."' AND skupina_id='".$this->group_id."'"); + } } // Drugace dodamo novo skupino/podjetje else{ diff --git a/admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php b/admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php index 125d959d6..c0d5f4c2a 100644 --- a/admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php +++ b/admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php @@ -16,6 +16,7 @@ class SurveyTeamMeter{ var $submodule = ''; // Ista funkcionalnost za evoli module evoli_teammeter, evoli_quality_climate, evoli_teamship_meter in evoli_organizational_employeeship_meter var $submodule_name = ''; + var $submodule_form = ''; var $execute_params = array(); var $debug = false; @@ -52,6 +53,7 @@ class SurveyTeamMeter{ if(isset($modules['evoli_quality_climate'])){ $this->submodule = 'evoli_quality_climate'; $this->submodule_name = 'Quality climate'; + $this->submodule_form = 'quality_climate.php'; $this->execute_params['csv_name'] = 'quality_climate.csv'; @@ -75,6 +77,7 @@ class SurveyTeamMeter{ elseif(isset($modules['evoli_teamship_meter'])){ $this->submodule = 'evoli_teamship_meter'; $this->submodule_name = 'Teamship meter'; + $this->submodule_form = 'teamship_meter.php'; $this->execute_params['csv_name'] = 'evoli_teamship.csv'; @@ -98,6 +101,7 @@ class SurveyTeamMeter{ elseif(isset($modules['evoli_organizational_employeeship_meter'])){ $this->submodule = 'evoli_organizational_employeeship_meter'; $this->submodule_name = 'Organizational employeeship meter'; + $this->submodule_form = 'organizational_employeeship_meter.php'; $this->execute_params['csv_name'] = 'evoli_team.csv'; @@ -121,6 +125,7 @@ class SurveyTeamMeter{ else{ $this->submodule = 'evoli_teammeter'; $this->submodule_name = 'Team meter'; + $this->submodule_form = 'team_meter.php'; $this->execute_params['csv_name'] = 'evoli_team.csv'; @@ -322,7 +327,7 @@ class SurveyTeamMeter{ // Naknadno posiljanje vabil // https://tools.evoli.si/admin/survey/modules/mod_EVOLI/team_meter.php?ank_id=SURVEY_ID&email=CLIENT_EMAIL&departments=1&language=slo&pass=GENERATED_PASSWORD - $url = $site_url.'admin/survey/modules/mod_EVOLI/team_meter.php?'; + $url = $site_url.'admin/survey/modules/mod_EVOLI/'.$this->submodule_form.'?'; $url .= 'ank_id='.$this->anketa; $url .= '&language='.$language; $url .= '&email='.$row['email']; From 6512ca3009a44ed6e2ecda56804b5368676e14cf Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 9 Oct 2020 14:15:20 +0200 Subject: [PATCH 07/23] Evoli - dodana skripta za redirect, dodano polje za izbor dropdowna pri oddelkih --- .../modules/mod_EVOLI/class.EvoliForm.php | 2 +- admin/survey/modules/mod_EVOLI/form.php | 53 +++++++++++++++++++ .../Vprasanja/VprasanjaController.php | 30 ++++++++--- 3 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 admin/survey/modules/mod_EVOLI/form.php diff --git a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php index d660cc028..15da2eb3f 100644 --- a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php +++ b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php @@ -47,7 +47,7 @@ class EvoliForm { // Pridobimo parametre (ank_id in email) - private function getParameters(){ + public function getParameters(){ // Ce imamo kodirane parametre jih najprej odkodiramo if (!isset($_GET['ank_id']) && isset($_GET['dc']) && $_GET['dc'] != null) { diff --git a/admin/survey/modules/mod_EVOLI/form.php b/admin/survey/modules/mod_EVOLI/form.php new file mode 100644 index 000000000..c01565792 --- /dev/null +++ b/admin/survey/modules/mod_EVOLI/form.php @@ -0,0 +1,53 @@ +getAnkId(); + + if($ank_id == 0){ + echo $lang['srv_evoli_form_error'].'!'; + die(); + } + + + // V bazi pogledamo kateri modul ima anketa vklopljen + $sql = sisplet_query("SELECT * srv_anketa_module WHERE ank_id='".$ank_id."'"); + + if(mysqli_num_row($sql) == 0){ + echo $lang['srv_evoli_form_error'].'!'; + die(); + } + + $row = mysqli_fetch_assoc($sql); + + if($row['modul'] == 'evoli_quality_climate'){ + $script_name = 'quality_climate.php'; + } + elseif($row['modul'] == 'teamship_meter'){ + $script_name = 'evoli_teamship_meter.php'; + } + elseif($row['modul'] == 'evoli_organizational_employeeship_meter'){ + $script_name = 'organizational_employeeship_meter.php'; + } + else{ + $script_name = 'team_meter.php'; + } + + + // Redirect na ustrezno skripto + header("Location: index.php?modules/mod_EVOLI/".$script_name); + + +?> diff --git a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php index 404dfcc3b..c54fe10ad 100644 --- a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php +++ b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php @@ -167,16 +167,30 @@ class VprasanjaController extends Controller echo '
' . "\n"; // Izbira oddelka z dropdown menijem - if(isset($_GET['language']) && $_GET['language'] == '1') + if(isset($_GET['language']) && $_GET['language'] == '1'){ echo '

Prosimo izberite vašo ekipo, oddelek ali delovno skupino v vaši organizaciji:
'; - else + echo '
'; + echo '

' . "\n"; + } + else{ echo '

Please indicate your team, department or working group in your organisation:
'; - echo '
'; - echo '

' . "\n"; + echo '
'; + echo '

' . "\n"; + } echo '
' . "\n"; } From edf37f8f20d978a2148e3c188d480acc440fc8b9 Mon Sep 17 00:00:00 2001 From: patrik2020 Date: Mon, 12 Oct 2020 10:31:43 +0200 Subject: [PATCH 08/23] Latex za izvoze: razsirjen izvoz odgovorov respondentov za en in vec odgovorov: ni prisotnih odgovorov ob simbolu --- .../latexclasses/Vprasanja/RadioCheckboxSelectLatex.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php b/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php index 98708757d..1dcd50c62 100644 --- a/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php @@ -252,13 +252,13 @@ class RadioCheckboxSelectLatex extends LatexSurveyElement while ($rowVrednost = mysqli_fetch_assoc($sqlVrednosti)){ $prop['full'] = ( isset($userAnswer[$rowVrednost['id']]) ); - if($this->language!=''){ //ce je prevod ankete + //if($this->language!=''){ //ce je prevod ankete + if($this->language>0){ //ce je prevod ankete $rowl = $this->srv_language_vrednost($rowVrednost['id']); //pridobi prevod naslova v ustreznem jeziku $stringTitle = ((( $rowl['naslov'] ) ? $rowl['naslov'] : ( ( $rowl['naslov2'] ) ? $rowl['naslov2'] : $rowl['variable'] ) )); //prevod naslova v ustreznem jeziku }else{ $stringTitle = ((( $rowVrednost['naslov'] ) ? $rowVrednost['naslov'] : ( ( $rowVrednost['naslov2'] ) ? $rowVrednost['naslov2'] : $rowVrednost['variable'] ) )); } - if ( $spremenljivke['tip'] == 1 || $spremenljivke['tip'] == 3 ){ $symbol = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], 0, $this->userAnswer[$rowVrednost['id']], $spremenljivke['orientation'], $indeksZaWhile, $vizualnaSkalaNumber); From 511e1d9ff2869774f02fdb5066dde6279aa4ed64 Mon Sep 17 00:00:00 2001 From: patrik2020 Date: Mon, 12 Oct 2020 12:43:25 +0200 Subject: [PATCH 09/23] Latex za izvoze: razsirjen izvoz odgovorov respondentov za en in vec odgovorov: ni prisotnih odgovorov ob simbolu --- .../latexclasses/Vprasanja/RadioCheckboxSelectLatex.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php b/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php index 1dcd50c62..3dbe1f965 100644 --- a/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php @@ -253,13 +253,13 @@ class RadioCheckboxSelectLatex extends LatexSurveyElement $prop['full'] = ( isset($userAnswer[$rowVrednost['id']]) ); //if($this->language!=''){ //ce je prevod ankete - if($this->language>0){ //ce je prevod ankete + if($this->language>1){ //ce je prevod ankete $rowl = $this->srv_language_vrednost($rowVrednost['id']); //pridobi prevod naslova v ustreznem jeziku $stringTitle = ((( $rowl['naslov'] ) ? $rowl['naslov'] : ( ( $rowl['naslov2'] ) ? $rowl['naslov2'] : $rowl['variable'] ) )); //prevod naslova v ustreznem jeziku }else{ $stringTitle = ((( $rowVrednost['naslov'] ) ? $rowVrednost['naslov'] : ( ( $rowVrednost['naslov2'] ) ? $rowVrednost['naslov2'] : $rowVrednost['variable'] ) )); } - + //echo "jezik: ".$this->language."
"; if ( $spremenljivke['tip'] == 1 || $spremenljivke['tip'] == 3 ){ $symbol = $this->getAnswerSymbol($export_format, $fillablePdf, $spremenljivke['tip'], $spremenljivke['grids'], 0, $this->userAnswer[$rowVrednost['id']], $spremenljivke['orientation'], $indeksZaWhile, $vizualnaSkalaNumber); //$tex .= '{\ChoiceMenu[radio,radiosymbol=\ding{108},name=myGroupOfRadiobuttons]{}{='.$stringTitle.'}}'.$stringTitle.' '.$this->texNewLine; From 142c6aaa0c283e4d711c3155dc1d70e264d87075 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Mon, 12 Oct 2020 15:32:14 +0200 Subject: [PATCH 10/23] Evoli - sprejemna skripta, ki preusmeri na ustrezno formo glede na id ankete in vklopljen modul, vprasanje za oddelke je obvezno --- admin/survey/modules/mod_EVOLI/form.php | 11 +++++----- lang/1.php | 1 + lang/2.php | 3 ++- main/survey/app/Controllers/JsController.php | 22 +++++++++++++++++++ .../Vprasanja/VprasanjaController.php | 6 ++--- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/admin/survey/modules/mod_EVOLI/form.php b/admin/survey/modules/mod_EVOLI/form.php index c01565792..0fb972994 100644 --- a/admin/survey/modules/mod_EVOLI/form.php +++ b/admin/survey/modules/mod_EVOLI/form.php @@ -10,6 +10,7 @@ global $lang; + global $site_url; // Dekodiramo parametre in dobimo id ankete @@ -23,15 +24,15 @@ // V bazi pogledamo kateri modul ima anketa vklopljen - $sql = sisplet_query("SELECT * srv_anketa_module WHERE ank_id='".$ank_id."'"); + $sql = sisplet_query("SELECT * FROM srv_anketa_module WHERE ank_id='".$ank_id."' AND modul LIKE '%evoli%'"); - if(mysqli_num_row($sql) == 0){ - echo $lang['srv_evoli_form_error'].'!'; + if(mysqli_num_rows($sql) == 0){ + echo $lang['srv_evoli_form_error_module'].'!'; die(); } $row = mysqli_fetch_assoc($sql); - + if($row['modul'] == 'evoli_quality_climate'){ $script_name = 'quality_climate.php'; } @@ -47,7 +48,7 @@ // Redirect na ustrezno skripto - header("Location: index.php?modules/mod_EVOLI/".$script_name); + header("Location: ".$site_url."/admin/survey/modules/mod_EVOLI/".$script_name.'?'.$_SERVER['QUERY_STRING']); ?> diff --git a/lang/1.php b/lang/1.php index 394cccae8..292c883e9 100644 --- a/lang/1.php +++ b/lang/1.php @@ -7958,6 +7958,7 @@ $lang = array ( 'srv_evoli_form_footer' => "Kontaktirajte pomoč na naslovu info@evoli.si", 'srv_evoli_form_error' => "Napaka! Manjka email naslov ali id ankete", 'srv_evoli_form_error_access' => "Napaka! Nimate dostopa do vnosne forme", + 'srv_evoli_form_error_module' => "Napaka! Anekta nima vklopljenega ustreznega modula", 'srv_evoli_form_help1' => "Vpišite ime podjetja, ki bo viden na poročilu Energy Meter.", 'srv_evoli_form_help2' => "Vnesite imena timov ali oddelkov, katerim pripadajo zaposleni.
Dodajte ali izbrišite time s pomočjo gumbov + ali –.", 'srv_evoli_form_help3' => "Vpišite začetni in končni datum izpolnjevanja ankete.", diff --git a/lang/2.php b/lang/2.php index bb0653857..3ae9a315f 100644 --- a/lang/2.php +++ b/lang/2.php @@ -7848,7 +7848,8 @@ GDPR introduction preview", 'srv_evoli_form_err_parameter2' => "Missing parameters tm_id or departments", 'srv_evoli_form_footer' => "Contact our help on info@evoli.si", 'srv_evoli_form_error' => "Error! Missing email or survey ID!", - 'srv_evoli_form_error_access' => "Error! You don't have access to input form", + 'srv_evoli_form_error_access' => "Error! You don't have access to input form", + 'srv_evoli_form_error_module' => "Error! Evoli module is not turned on.", 'srv_evoli_form_help1' => "Enter your organisation's title, which will be visible identifier on your final report.", 'srv_evoli_form_help2' => "Fill in teams' or departments' names, which you would like your members to be affiliated to.
Add more or delete teams with + and - buttons", 'srv_evoli_form_help3' => "Enter the start and end dates for your test to take place.", diff --git a/main/survey/app/Controllers/JsController.php b/main/survey/app/Controllers/JsController.php index 4b3c55028..7b68473be 100644 --- a/main/survey/app/Controllers/JsController.php +++ b/main/survey/app/Controllers/JsController.php @@ -972,6 +972,28 @@ class JsController extends Controller } + + // Alert za EVOLI departmente + if(SurveyInfo::getInstance()->checkSurveyModule('evoli_teammeter') + || SurveyInfo::getInstance()->checkSurveyModule('evoli_quality_climate') + || SurveyInfo::getInstance()->checkSurveyModule('evoli_teamship_meter') + || SurveyInfo::getInstance()->checkSurveyModule('evoli_organizational_employeeship_meter') + ) + $evoli_teammeter = true; + else + $evoli_teammeter = false; + + if($evoli_teammeter){ + echo ' var obj = document.forms[\'vnos\'].elements[\'evoli_tm_department\']; ' . "\n"; + echo ' if (obj.value == 0) { ' . "\n"; + echo ' hard = false; ' . "\n"; + echo ' submitAlert(\'#spremenljivka_evoli_tm_department\', \'add\', \'require\', \'hard\', validation, false, false, false, false); ' . "\n"; + echo ' } else { ' . "\n"; + echo ' submitAlert(\'#spremenljivka_evoli_tm_department\', \'remove\', \'require\', \'hard\', validation, false, false, false, false); ' . "\n"; + echo ' } ' . "\n"; + } + + // posebno testiranje za vsoto in num ce smo presegli limit //$sql = sisplet_query("SELECT * FROM srv_spremenljivka WHERE gru_id='".get('grupa')."' AND vsota_reminder > 0 ORDER BY vrstni_red ASC"); $sql = sisplet_query("SELECT * FROM srv_spremenljivka WHERE gru_id='" . get('grupa') . "' AND gru_id != '0' AND (tip='18' OR tip='7' OR tip='20' OR tip='21') ORDER BY vrstni_red ASC"); diff --git a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php index c54fe10ad..192ae1b79 100644 --- a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php +++ b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php @@ -164,11 +164,11 @@ class VprasanjaController extends Controller $sqlTM = sisplet_query("SELECT d.* FROM srv_evoli_teammeter_department d, srv_evoli_teammeter tm WHERE d.tm_id=tm.id AND tm.skupina_id='".$rowGroupTM['vre_id']."'"); if(mysqli_num_rows($sqlTM) > 0){ - echo '
' . "\n"; + echo '
' . "\n"; // Izbira oddelka z dropdown menijem if(isset($_GET['language']) && $_GET['language'] == '1'){ - echo '

Prosimo izberite vašo ekipo, oddelek ali delovno skupino v vaši organizaciji:
'; + echo '

*Prosimo izberite vašo ekipo, oddelek ali delovno skupino v vaši organizaciji:
'; echo '
'; echo ''; From 20650da9f2c3828c22cc913f269f2e2e20b44af4 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 13 Oct 2020 09:43:59 +0200 Subject: [PATCH 11/23] Evoli - popravki preusmeritev na forme --- .../mod_EVOLI/class.SurveyTeamMeter.php | 10 +- admin/survey/modules/mod_EVOLI/form.php | 54 ------ ...rganizational_employeeship_meter_form.php} | 0 .../quality_climate_form.php} | 0 .../mod_EVOLI/forms/team_meter_form.php | 133 +++++++++++++++ .../teamship_meter_form.php} | 0 admin/survey/modules/mod_EVOLI/team_meter.php | 157 +++++------------- lang/1.php | 2 +- 8 files changed, 178 insertions(+), 178 deletions(-) delete mode 100644 admin/survey/modules/mod_EVOLI/form.php rename admin/survey/modules/mod_EVOLI/{organizational_employeeship_meter.php => forms/organizational_employeeship_meter_form.php} (100%) rename admin/survey/modules/mod_EVOLI/{quality_climate.php => forms/quality_climate_form.php} (100%) create mode 100644 admin/survey/modules/mod_EVOLI/forms/team_meter_form.php rename admin/survey/modules/mod_EVOLI/{teamship_meter.php => forms/teamship_meter_form.php} (100%) diff --git a/admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php b/admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php index c0d5f4c2a..87bbb5035 100644 --- a/admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php +++ b/admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php @@ -53,7 +53,7 @@ class SurveyTeamMeter{ if(isset($modules['evoli_quality_climate'])){ $this->submodule = 'evoli_quality_climate'; $this->submodule_name = 'Quality climate'; - $this->submodule_form = 'quality_climate.php'; + $this->submodule_form = 'quality_climate_form.php'; $this->execute_params['csv_name'] = 'quality_climate.csv'; @@ -77,7 +77,7 @@ class SurveyTeamMeter{ elseif(isset($modules['evoli_teamship_meter'])){ $this->submodule = 'evoli_teamship_meter'; $this->submodule_name = 'Teamship meter'; - $this->submodule_form = 'teamship_meter.php'; + $this->submodule_form = 'teamship_meter_form.php'; $this->execute_params['csv_name'] = 'evoli_teamship.csv'; @@ -101,7 +101,7 @@ class SurveyTeamMeter{ elseif(isset($modules['evoli_organizational_employeeship_meter'])){ $this->submodule = 'evoli_organizational_employeeship_meter'; $this->submodule_name = 'Organizational employeeship meter'; - $this->submodule_form = 'organizational_employeeship_meter.php'; + $this->submodule_form = 'organizational_employeeship_meter_form.php'; $this->execute_params['csv_name'] = 'evoli_team.csv'; @@ -125,7 +125,7 @@ class SurveyTeamMeter{ else{ $this->submodule = 'evoli_teammeter'; $this->submodule_name = 'Team meter'; - $this->submodule_form = 'team_meter.php'; + $this->submodule_form = 'team_meter_form.php'; $this->execute_params['csv_name'] = 'evoli_team.csv'; @@ -327,7 +327,7 @@ class SurveyTeamMeter{ // Naknadno posiljanje vabil // https://tools.evoli.si/admin/survey/modules/mod_EVOLI/team_meter.php?ank_id=SURVEY_ID&email=CLIENT_EMAIL&departments=1&language=slo&pass=GENERATED_PASSWORD - $url = $site_url.'admin/survey/modules/mod_EVOLI/'.$this->submodule_form.'?'; + $url = $site_url.'admin/survey/modules/mod_EVOLI/forms/'.$this->submodule_form.'?'; $url .= 'ank_id='.$this->anketa; $url .= '&language='.$language; $url .= '&email='.$row['email']; diff --git a/admin/survey/modules/mod_EVOLI/form.php b/admin/survey/modules/mod_EVOLI/form.php deleted file mode 100644 index 0fb972994..000000000 --- a/admin/survey/modules/mod_EVOLI/form.php +++ /dev/null @@ -1,54 +0,0 @@ -getAnkId(); - - if($ank_id == 0){ - echo $lang['srv_evoli_form_error'].'!'; - die(); - } - - - // V bazi pogledamo kateri modul ima anketa vklopljen - $sql = sisplet_query("SELECT * FROM srv_anketa_module WHERE ank_id='".$ank_id."' AND modul LIKE '%evoli%'"); - - if(mysqli_num_rows($sql) == 0){ - echo $lang['srv_evoli_form_error_module'].'!'; - die(); - } - - $row = mysqli_fetch_assoc($sql); - - if($row['modul'] == 'evoli_quality_climate'){ - $script_name = 'quality_climate.php'; - } - elseif($row['modul'] == 'teamship_meter'){ - $script_name = 'evoli_teamship_meter.php'; - } - elseif($row['modul'] == 'evoli_organizational_employeeship_meter'){ - $script_name = 'organizational_employeeship_meter.php'; - } - else{ - $script_name = 'team_meter.php'; - } - - - // Redirect na ustrezno skripto - header("Location: ".$site_url."/admin/survey/modules/mod_EVOLI/".$script_name.'?'.$_SERVER['QUERY_STRING']); - - -?> diff --git a/admin/survey/modules/mod_EVOLI/organizational_employeeship_meter.php b/admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php similarity index 100% rename from admin/survey/modules/mod_EVOLI/organizational_employeeship_meter.php rename to admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php diff --git a/admin/survey/modules/mod_EVOLI/quality_climate.php b/admin/survey/modules/mod_EVOLI/forms/quality_climate_form.php similarity index 100% rename from admin/survey/modules/mod_EVOLI/quality_climate.php rename to admin/survey/modules/mod_EVOLI/forms/quality_climate_form.php diff --git a/admin/survey/modules/mod_EVOLI/forms/team_meter_form.php b/admin/survey/modules/mod_EVOLI/forms/team_meter_form.php new file mode 100644 index 000000000..3b3a7b0e4 --- /dev/null +++ b/admin/survey/modules/mod_EVOLI/forms/team_meter_form.php @@ -0,0 +1,133 @@ +'; + echo ''; + + + echo ''; + + echo ''; + + //echo ''; + echo ''; + //echo ''; + echo ''; + //echo ''; + echo ''; + + echo ''; + //echo ''; + echo ''; + //echo ''; + echo ''; + + echo ''; + + echo ''; + + + echo ''; + + + $evoli = new EvoliForm(); + $evoli->setReportType($type='team_meter'); + + + // Glava + echo ''; + + + // Srednji del + echo '
'; + echo '
'; + + + // Submit obrazca + if ($_SERVER["REQUEST_METHOD"] == "POST") { + $evoli->submitForm(); + } + // Izris obrazca + else{ + if($evoli->getAnkId() > 0 && $evoli->getEmail() != ''){ + // Preverimo ce ima user dostop do obrazca (parameter pass v get-u) + if($evoli->checkAccess()) + $evoli->displayForm(); + else + $evoli->displayErrorAccess(); + } + else{ + $evoli->displayError(); + } + } + + echo '
'; + echo '
'; + + // Footer + echo ''; + + echo ''; + + + echo ''; + +?> diff --git a/admin/survey/modules/mod_EVOLI/teamship_meter.php b/admin/survey/modules/mod_EVOLI/forms/teamship_meter_form.php similarity index 100% rename from admin/survey/modules/mod_EVOLI/teamship_meter.php rename to admin/survey/modules/mod_EVOLI/forms/teamship_meter_form.php diff --git a/admin/survey/modules/mod_EVOLI/team_meter.php b/admin/survey/modules/mod_EVOLI/team_meter.php index 3b3a7b0e4..89102c121 100644 --- a/admin/survey/modules/mod_EVOLI/team_meter.php +++ b/admin/survey/modules/mod_EVOLI/team_meter.php @@ -1,133 +1,54 @@ '; - echo ''; - - - echo ''; - - echo ''; - - //echo ''; - echo ''; - //echo ''; - echo ''; - //echo ''; - echo ''; + global $lang; + global $site_url; - echo ''; - //echo ''; - echo ''; - //echo ''; - echo ''; - - echo ''; - - echo ''; - - - echo ''; - - + + // Dekodiramo parametre in dobimo id ankete $evoli = new EvoliForm(); - $evoli->setReportType($type='team_meter'); - - - // Glava - echo ''; - - // Srednji del - echo '
'; - echo '
'; - - - // Submit obrazca - if ($_SERVER["REQUEST_METHOD"] == "POST") { - $evoli->submitForm(); - } - // Izris obrazca - else{ - if($evoli->getAnkId() > 0 && $evoli->getEmail() != ''){ - // Preverimo ce ima user dostop do obrazca (parameter pass v get-u) - if($evoli->checkAccess()) - $evoli->displayForm(); - else - $evoli->displayErrorAccess(); - } - else{ - $evoli->displayError(); - } - } - - echo '
'; - echo '
'; - - // Footer - echo ''; - - echo ''; - - - echo ''; - ?> diff --git a/lang/1.php b/lang/1.php index 292c883e9..3af2c5beb 100644 --- a/lang/1.php +++ b/lang/1.php @@ -7958,7 +7958,7 @@ $lang = array ( 'srv_evoli_form_footer' => "Kontaktirajte pomoč na naslovu info@evoli.si", 'srv_evoli_form_error' => "Napaka! Manjka email naslov ali id ankete", 'srv_evoli_form_error_access' => "Napaka! Nimate dostopa do vnosne forme", - 'srv_evoli_form_error_module' => "Napaka! Anekta nima vklopljenega ustreznega modula", + 'srv_evoli_form_error_module' => "Napaka! Anketa nima vklopljenega ustreznega modula", 'srv_evoli_form_help1' => "Vpišite ime podjetja, ki bo viden na poročilu Energy Meter.", 'srv_evoli_form_help2' => "Vnesite imena timov ali oddelkov, katerim pripadajo zaposleni.
Dodajte ali izbrišite time s pomočjo gumbov + ali –.", 'srv_evoli_form_help3' => "Vpišite začetni in končni datum izpolnjevanja ankete.", From 8d87c85078c7d358b1a990cc5e76b0d259757078 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 13 Oct 2020 09:53:33 +0200 Subject: [PATCH 12/23] Evoli - popravki form --- .../organizational_employeeship_meter_form.php | 17 ++++++----------- .../mod_EVOLI/forms/quality_climate_form.php | 17 ++++++----------- .../modules/mod_EVOLI/forms/team_meter_form.php | 17 ++++++----------- .../mod_EVOLI/forms/teamship_meter_form.php | 17 ++++++----------- 4 files changed, 24 insertions(+), 44 deletions(-) diff --git a/admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php b/admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php index 2c79b7ea9..810ca441e 100644 --- a/admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php +++ b/admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php @@ -11,8 +11,8 @@ header('Cache-Control: no-cache'); header('Pragma: no-cache'); - include_once '../../../../function.php'; - include_once('../../../../vendor/autoload.php'); + include_once('../../../../../function.php'); + include_once('../../../../../vendor/autoload.php'); echo ''; @@ -23,18 +23,13 @@ echo ''; - //echo ''; - echo ''; - //echo ''; - echo ''; - //echo ''; + echo ''; + echo ''; echo ''; echo ''; - //echo ''; echo ''; - //echo ''; - echo ''; + echo ''; echo ''; - echo ''; - //echo ''; - echo ''; - //echo ''; + echo ''; + echo ''; echo ''; echo ''; - //echo ''; echo ''; - //echo ''; - echo ''; + echo ''; echo ''; - echo ''; - //echo ''; - echo ''; - //echo ''; + echo ''; + echo ''; echo ''; echo ''; - //echo ''; echo ''; - //echo ''; - echo ''; + echo ''; echo ''; - echo ''; - //echo ''; - echo ''; - //echo ''; + echo ''; + echo ''; echo ''; echo ''; - //echo ''; echo ''; - //echo ''; - echo ''; + echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; - echo ''; + echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; + } + } \ No newline at end of file diff --git a/main/survey/app/Models/SaveSurvey.php b/main/survey/app/Models/SaveSurvey.php index c475653be..9d5ba9472 100644 --- a/main/survey/app/Models/SaveSurvey.php +++ b/main/survey/app/Models/SaveSurvey.php @@ -67,6 +67,7 @@ class SaveSurvey extends Model global $lang; global $admin_type; + // Modul panel - status - shranimo v cookie, ker drugace se vcasih ne ohrani do konca ce so strani preskocene if(isset($_POST['panel_status']) && $_POST['panel_status'] != ''){ setcookie('panel_status', $_POST['panel_status'], 0, '/'); @@ -111,6 +112,16 @@ class SaveSurvey extends Model SurveySetting::getInstance()->Init(get('anketa')); $question_resp_comment = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment'); + + // Disable odgovorov, ce je ze izpolnjeval to stran in ima vklopljeno nastavitev, da ni dovoljeno naknadno vnasanje odogovorov + if($rowa['subsequent_answers'] == '0' && $admin_type != '0'){ + + // Preverimo, ce je uporabnik ze bil na strani + if(Check::getInstance()->check_subsequent_visit()) + return; + } + + /** * Tele spremenljivke so za vse INSERTe, ki se vnasajo v tabele (z imenom spremenljivke) * Namen je ta, da se vnosi kesirajo in naenkrat vnesejo v bazo, kar pohitri celotno zadevo diff --git a/sql/update2.sql b/sql/update2.sql index e95ba5aac..d3dcf97af 100644 --- a/sql/update2.sql +++ b/sql/update2.sql @@ -9327,3 +9327,7 @@ CREATE TABLE srv_clicks ( UPDATE misc SET value='20.09.21' WHERE what="version"; +ALTER TABLE srv_anketa ADD subsequent_answers ENUM('0', '1') NOT NULL DEFAULT '1' AFTER return_finished; +INSERT INTO srv_help (help, what) VALUES ('Uporabnik ne more nikoli naknadno urejati svojih odgovorov (npr. s klikom nazaj)', 'srv_subsequent_answers'); + +UPDATE misc SET value='20.10.20' WHERE what="version";