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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Robert 2020-10-22 08:41:49 +02:00
commit 0ccbbabee0
25 changed files with 506 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.gitignore vendored Normal file
View File

@ -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

5
admin/survey/SurveyAdminAjax.php
View File

@ -318,7 +318,9 @@ class SurveyAdminAjax {
if (isset ($_POST['state']))
$state = $_POST['state'];
if (isset ($_POST['return_finished']))
$return_finished = $_POST['return_finished'];
$return_finished = $_POST['return_finished'];
if (isset ($_POST['subsequent_answers']))
$subsequent_answers = $_POST['subsequent_answers'];
if (isset ($_POST['cookie_continue']))
$cookie_continue = $_POST['cookie_continue'];
if (isset ($_POST['block_ip']))
@ -1084,6 +1086,7 @@ class SurveyAdminAjax {
'cookie',
'cookie_return',
'return_finished',
'subsequent_answers',
'cookie_continue',
'user_from_cms',
'user_base',

6
admin/survey/SurveyAdminSettings.php
View File

@ -494,6 +494,12 @@ class SurveyAdminSettings {
echo '<div class="no-cookie no-cookie-return"><span class="nastavitveSpan3 bold" ><label>' . $lang['srv_return_finished'] . Help :: display('srv_return_finished') . ':</label></span>';
echo ' <label for="return_finished_1"><input type="radio" name="return_finished" value="1" id="return_finished_1"' . ($row['return_finished'] == 1 ? ' checked="checked"' : '') . ' />' . $lang['srv_return_finished_yes'] . '</label>' . "\n\r";
echo ' <label for="return_finished_0"><input type="radio" name="return_finished" value="0" id="return_finished_0"' . ($row['return_finished'] == 0 ? ' checked="checked"' : '') . ' />' . $lang['srv_return_finished_no'] . '</label></div>' . "\n\r";
echo '<br/>';
// Nikoli ne more popravljati svojih odgovorov (tudi ce se npr. vrne na prejsnjo stran)
echo '<div class="no-subsequent-answers"><span class="nastavitveSpan3 bold" ><label>' . $lang['srv_subsequent_answers'] . Help :: display('srv_subsequent_answers') . ':</label></span>';
echo ' <label for="subsequent_answers_1"><input type="radio" name="subsequent_answers" value="1" id="subsequent_answers_1"' . ($row['subsequent_answers'] == 1 ? ' checked="checked"' : '') . ' />' . $lang['srv_subsequent_answers_yes'] . '</label>' . "\n\r";
echo ' <label for="subsequent_answers_0"><input type="radio" name="subsequent_answers" value="0" id="subsequent_answers_0"' . ($row['subsequent_answers'] == 0 ? ' checked="checked"' : '') . ' />' . $lang['srv_subsequent_answers_no'] . '</label></div>' . "\n\r";
echo '<br/>';
// Ce ni sprejel piskotka lahko/ne more nadaljevati

16
admin/survey/export/latexclasses/Vprasanja/BesediloLatex.php
View File

@ -19,6 +19,7 @@ class BesediloLatex extends LatexSurveyElement
protected $texBigSkip = '\bigskip';
protected $export_subtype;
protected $path2SignatureImages;
protected $texGapBeforeTable = '\vspace*{-\baselineskip}';
public function __construct()
{
@ -183,7 +184,7 @@ class BesediloLatex extends LatexSurveyElement
$izpisanoBesediloPoStarem = 0;
}elseif($export_data_type==1){ //ce je izpis razsirjen
$okvir = 1; //rabimo okvir
//$okvir = 0; //rabimo okvir
//$okvir = 0; //ne rabimo okvir
}
}else{ //ce je prazen vprasalnik
$okvir = 1; //rabimo okvir
@ -194,11 +195,17 @@ class BesediloLatex extends LatexSurveyElement
/* echo "postavitev besedila: ".$postavitev." ".$spremenljivke['id']."</br>";
echo "položaj besedila: ".$polozajBesedila."</br>"; */
if($okvir == 1){
if(($postavitev!=0)){ //ce ni vodoravno ob vprasanju, uporabi za izpis tabelo
if($steviloOken>1){ //ce je stevilo oken vec kot 1, zacni novo tabelo
//Ureditev dodajanja manjsega razmika med besedilom vprasanja in tabelo
$tex .= $this->texGapBeforeTable;
//Ureditev dodajanja manjsega razmika med besedilom vprasanja in tabelo - konec
#ZACETEK TABELE
//zacetek tabele
$tex .= $this->StartLatexTable($export_format, $parameterTabular, 'tabularx', 'tabular', 1, 1);
//zacetek tabele
$tex .= $this->StartLatexTable($export_format, $parameterTabular, 'tabularx', 'tabular', 1, 1);
}
//echo "ni vodoravno ob vprašanju </br>";
@ -274,8 +281,7 @@ class BesediloLatex extends LatexSurveyElement
//priprava latex kode za text box dolocene sirine in visine glede na export format z ustreznim besedilom odgovora
if($okvir == 1){ //ce rabimo okvir, izpisi
if($podatekVBazi && $export_format == 'pdf' && $steviloOken==1){ //ce je podatek v bazi in je pdf oz. se izpisuje odgovore respondenta
//$dataTextBox = $this->LatexTextBox($export_format, $textboxHeight, $textboxWidth, $besedilo, $textboxAllignment, 1);
if($podatekVBazi && $export_format == 'pdf'){ //ce je podatek v bazi in je pdf oz. se izpisuje odgovore respondenta
$dataTextBox = $besedilo; //izpis besedila brez okvirja
}else{
//echo "Pos: ".$postavitev."</br>";

63
admin/survey/export/latexclasses/Vprasanja/DatumLatex.php
View File

@ -77,9 +77,35 @@ 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
@ -95,44 +121,15 @@ 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 .= $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
$tex .= $texNewLine;
}
//IZRIS - KONEC

6
admin/survey/export/latexclasses/Vprasanja/RadioCheckboxSelectLatex.php
View File

@ -252,14 +252,14 @@ 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>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."</br>";
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;

11
admin/survey/export/latexclasses/class.LatexSurvey.php
View File

@ -267,7 +267,8 @@ class LatexSurvey{
$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 "."</br>";
while ($rowSpremenljivke = mysqli_fetch_assoc($sqlSpremenljivke))
{ // sprehodimo se skozi spremenljivke grupe
@ -306,10 +307,6 @@ class LatexSurvey{
$this->pdf->SetTextColor(0,0,255);
/* $this->pdf->SetTextColor(0,0,0);
$this->pdf->SetDrawColor(0,0,0); */
// Izpis vprasalnika z rezultati
// Ce imamo kombinirano tabelo pogledamo ce prikazujemo katero od podtabel
@ -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)
@ -1154,6 +1148,7 @@ class LatexSurvey{
//$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."</br>";
$sqlTest = sisplet_query($sqlTestString);
$rowTest = mysqli_fetch_array($sqlTest);

25
admin/survey/export/latexclasses/class.LatexSurveyElement.php
View File

@ -206,7 +206,7 @@ class LatexSurveyElement{
//echo "naslov: ".$text."</br>";
//$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
@ -983,6 +982,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." </br>";
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);

27
admin/survey/modules/Evalvacija/class.GC.php
View File

@ -136,8 +136,8 @@ class GC{
$fakultete[$row['id']] = $row;
}
/*
* AG 3000043 Akademija za glasbo
* AGRFT 3000044 Akademija za gledališče, radio, film in televizijo - NIMA GC-JA
* AG 3000043 Akademija za glasbo (posebni upload)
*
* ALUO 3000042 Akademija za likovno umetnost in oblikovanje
* BF 3000071 Biotehniska fakulteta
* FA 3000025 Fakulteta za arhitekturo
@ -145,13 +145,11 @@ class GC{
* FF 3000018 Filozofska fakulteta
* FFA 3000031 Fakulteta za farmacijo
* FGG 3000026 Fakulteta za gradbeništvo in geodezijo
* FKKT 3000030 Fakulteta za kemijo in kemijsko tehnologijo
* FMF 3000027 Fakulteta za matematiko in fiziko
* FPP 3000009 Fakulteta za pomorstvo in promet
* FS 3000023 Fakulteta za strojništvo
* FSD 3000006 Fakulteta za socialno delo
* FSP 3000022 Fakulteta za šport
* FU 3000004 Fakulteta za upravo - NIMA GC-JA
* MF 3000041 Medicinska fakulteta
* NTF 3000029 Naravoslovnotehniška fakulteta
* PEF 3000001 Pedagoska fakulteta
@ -160,6 +158,9 @@ class GC{
* VF 3000037 Veterinarska fakulteta
* ZF 3000011 Zdravstvena fakulteta
*
* FKKT 3000030 Fakulteta za kemijo in kemijsko tehnologijo
* AGRFT 3000044 Akademija za gledališče, radio, film in televizijo - NIMA GC-JA
* FU 3000004 Fakulteta za upravo - NIMA GC-JA
* EF 3000019 Ekonomska fakulteta
* FRI 3000063 Fakulteta za računalništvo in informatiko
* FE 3000064 Fakulteta za elektrotehniko
@ -182,15 +183,15 @@ class GC{
'4_1' => 'predmeti'
);
$reports_id = '09072020';
$report_type = '1_1';
$fak_id = '3000001';
$reports_id = '19102020';
$report_type = '4_1';
$fak_id = '3000011';
$zip_name = '';
// Nastavimo pot do pdf-jev
$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/';
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/';
//$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/';
echo '<span class="bold">Parametri:</span>';
echo '<ul><li>ID: <span class="bold">'.$reports_id.'</span></li>';
@ -205,16 +206,16 @@ class GC{
//$this->executeManualUpload($zip_name, $fak_id, $report_type, $reports_id, $unzip=false);
// BRANJE POROCIL - IZVAJALEC
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_93', $fakultete[$fak_id]['kratica']);
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_190', $fakultete[$fak_id]['kratica']);
// BRANJE POROCIL - FAKULTETA
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2018_2019', $fakultete[$fak_id]['kratica']);
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2019_2020', $fakultete[$fak_id]['kratica']);
// BRANJE POROCIL - PREDMETI
//$response = $this->readFolder($zadeva_id='RezultatiAnket_predmeti_'.$fak_id.'_2018_2019', $fakultete[$fak_id]['kratica']);
//$response = $this->readFolder($zadeva_id='RezultatiAnket_predmeti_'.$fak_id.'_2019_2020', $fakultete[$fak_id]['kratica']);
// BRANJE POROCIL - HABILITACIJA
//$response = $this->readFolder($zadeva_id='RezultatiAnket_habilitacija_'.$fak_id.'_2018_2019', $fakultete[$fak_id]['kratica']);
//$response = $this->readFolder($zadeva_id='RezultatiAnket_habilitacija_'.$fak_id.'_2019_2020', $fakultete[$fak_id]['kratica']);
echo '<pre>';

21
admin/survey/modules/mod_EVOLI/class.EvoliForm.php
View File

@ -25,11 +25,11 @@ class EvoliForm {
// Naložimo jezikovno datoteko
if($this->language == 'slo')
include('../../../../lang/1.php');
include('../../../../../lang/1.php');
elseif($this->language == 'den')
include('../../../../lang/29.php');
include('../../../../../lang/29.php');
else
include('../../../../lang/2.php');
include('../../../../../lang/2.php');
if ($this->anketa == 0 && $ank_id != 0)
$this->anketa = $ank_id;
@ -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) {
@ -119,7 +119,7 @@ class EvoliForm {
public function displayForm(){
global $lang;
echo '<form method="post" action="'.$this->type.'.php">';
echo '<form method="post" action="'.$this->type.'_form.php">';
// Hidden ank_id in email
echo '<input type="hidden" name="pass" value="'.$this->pass.'">';
@ -155,8 +155,8 @@ class EvoliForm {
echo $lang['srv_evoli_form_td'].':';
echo '<p class="department_p" id="department_p_1">';
echo '<input type="text" id="department_1" class="department" name="department[]" value="">';
echo '<a href="#" title="'.$lang['srv_evoli_form_dep_add'].'" onClick="addDepartment(); return false;" id="add_department_1" class="add_department"><img src="css/add.png" /></a>';
echo '<a href="#" title="'.$lang['srv_evoli_form_dep_remove'].'" onClick="deleteDepartment(); return false;" id="delete_department_1" class="delete_department"><img src="css/delete.png" /></a>';
echo '<a href="#" title="'.$lang['srv_evoli_form_dep_add'].'" onClick="addDepartment(); return false;" id="add_department_1" class="add_department"><img src="../css/add.png" /></a>';
echo '<a href="#" title="'.$lang['srv_evoli_form_dep_remove'].'" onClick="deleteDepartment(); return false;" id="delete_department_1" class="delete_department"><img src="../css/delete.png" /></a>';
echo '</p>';
echo '</div>';
@ -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{

7
admin/survey/modules/mod_EVOLI/class.SurveyTeamMeter.php
View File

@ -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_form.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_form.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_form.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_form.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&amp;email=CLIENT_EMAIL&amp;departments=1&amp;language=slo&amp;pass=GENERATED_PASSWORD
$url = $site_url.'admin/survey/modules/mod_EVOLI/team_meter.php?';
$url = $site_url.'admin/survey/modules/mod_EVOLI/forms/'.$this->submodule_form.'?';
$url .= 'ank_id='.$this->anketa;
$url .= '&language='.$language;
$url .= '&email='.$row['email'];

27
admin/survey/modules/mod_EVOLI/organizational_employeeship_meter.php → admin/survey/modules/mod_EVOLI/forms/organizational_employeeship_meter_form.php
View File

@ -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 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
@ -23,18 +23,13 @@
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
//echo '<script type="text/javascript" src="admin/survey/script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
echo '<script type="text/javascript" src="../../script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
//echo '<script type="text/javascript" src="admin/survey/script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
echo '<script type="text/javascript" src="../../script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
//echo '<script type="text/javascript" src="admin/survey/modules/mod_EVOLI/script/script.js"></script>';
echo '<script type="text/javascript" src="script/script.js"></script>';
echo '<script type="text/javascript" src="../../../script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
echo '<script type="text/javascript" src="../../../script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
echo '<script type="text/javascript" src="../script/script.js"></script>';
echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,700italic,400,600,700&subset=latin,latin-ext" rel="stylesheet">';
//echo '<link type="text/css" href="admin/survey/modules/mod_EVOLI/css/style.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="css/style.css" media="screen" rel="stylesheet" />';
//echo '<link type="text/css" href="admin/survey/script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../../script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../css/style.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../../../script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<script type="text/javascript">
$(document).ready(function () {
@ -76,16 +71,18 @@
$evoli = new EvoliForm();
$evoli->setReportType($type='organizational_employeeship_meter');
$language = $evoli->getLanguage();
// Glava
echo '<div id="tm_header"><a href="https://www.evoli.si/" title="Evoli">';
echo ' <img src="css/logo.png" />';
echo ' <img src="../css/logo.png" />';
echo ' <div class="title_text">';
if($_GET['language'] == 'slo' || $_POST['language'] == 'slo')
if($language == 'slo')
echo 'Organizacijski Employeeship merilec';
elseif($_GET['language'] == 'den' || $_POST['language'] == 'den')
elseif($language == 'den')
echo 'Virksomhedens Employeeship måler';
else
echo 'Organisational Employeeship Meter';

27
admin/survey/modules/mod_EVOLI/quality_climate.php → admin/survey/modules/mod_EVOLI/forms/quality_climate_form.php
View File

@ -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 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
@ -23,18 +23,13 @@
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
//echo '<script type="text/javascript" src="admin/survey/script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
echo '<script type="text/javascript" src="../../script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
//echo '<script type="text/javascript" src="admin/survey/script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
echo '<script type="text/javascript" src="../../script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
//echo '<script type="text/javascript" src="admin/survey/modules/mod_EVOLI/script/script.js"></script>';
echo '<script type="text/javascript" src="script/script.js"></script>';
echo '<script type="text/javascript" src="../../../script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
echo '<script type="text/javascript" src="../../../script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
echo '<script type="text/javascript" src="../script/script.js"></script>';
echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,700italic,400,600,700&subset=latin,latin-ext" rel="stylesheet">';
//echo '<link type="text/css" href="admin/survey/modules/mod_EVOLI/css/style.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="css/style.css" media="screen" rel="stylesheet" />';
//echo '<link type="text/css" href="admin/survey/script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../../script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../css/style.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../../../script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<script type="text/javascript">
$(document).ready(function () {
@ -76,16 +71,18 @@
$evoli = new EvoliForm();
$evoli->setReportType($type='quality_climate');
$language = $evoli->getLanguage();
// Glava
echo '<div id="tm_header"><a href="https://www.evoli.si/" title="Evoli">';
echo ' <img src="css/logo.png" />';
echo ' <img src="../css/logo.png" />';
echo ' <div class="title_text">';
if($_GET['language'] == 'slo' || $_POST['language'] == 'slo')
if($language == 'slo')
echo 'Klima Kakovosti';
elseif($_GET['language'] == 'den' || $_POST['language'] == 'den')
elseif($language == 'den')
echo 'Kvalitetsklima';
else
echo 'Quality Climate';

130
admin/survey/modules/mod_EVOLI/forms/team_meter_form.php Normal file
View File

@ -0,0 +1,130 @@
<?php
/**
*
* forma za vnos Evoli TM
*
*/
ob_start();
header('Cache-Control: no-cache');
header('Pragma: no-cache');
include_once('../../../../../function.php');
include_once('../../../../../vendor/autoload.php');
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 '<script type="text/javascript" src="../../../script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
echo '<script type="text/javascript" src="../../../script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
echo '<script type="text/javascript" src="../script/script.js"></script>';
echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,700italic,400,600,700&subset=latin,latin-ext" rel="stylesheet">';
echo '<link type="text/css" href="../css/style.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../../../script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<script type="text/javascript">
$(document).ready(function () {
$("#date_from").datepicker({
showOtherMonths: true,
selectOtherMonths: true,
changeMonth: true,
changeYear: true,
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});
$("#date_to").datepicker({
showOtherMonths: true,
selectOtherMonths: true,
changeMonth: true,
changeYear: true,
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});
})
</script>';
echo '</head>';
echo '<body>';
$evoli = new EvoliForm();
$evoli->setReportType($type='team_meter');
$language = $evoli->getLanguage();
// Glava
echo '<div id="tm_header"><a href="https://www.evoli.si/" title="Evoli">';
echo ' <img src="../css/logo.png" />';
echo ' <div class="title_text">';
if($language == 'slo')
echo 'Team Energy Meter';
elseif($language == 'den')
echo 'Team Energy Meter';
else
echo 'Team Energy Meter';
echo ' </div>';
echo '</a></div>';
// Srednji del
echo '<div id="tm_body">';
echo ' <div id="tm_holder">';
// 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 ' </div>';
echo '</div>';
// Footer
echo '<div id="tm_footer">';
$evoli->displayFooter();
echo '</div>';
echo '</body>';
echo '</html>';
?>

27
admin/survey/modules/mod_EVOLI/teamship_meter.php → admin/survey/modules/mod_EVOLI/forms/teamship_meter_form.php
View File

@ -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 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
@ -23,18 +23,13 @@
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
//echo '<script type="text/javascript" src="admin/survey/script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
echo '<script type="text/javascript" src="../../script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
//echo '<script type="text/javascript" src="admin/survey/script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
echo '<script type="text/javascript" src="../../script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
//echo '<script type="text/javascript" src="admin/survey/modules/mod_EVOLI/script/script.js"></script>';
echo '<script type="text/javascript" src="script/script.js"></script>';
echo '<script type="text/javascript" src="../../../script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
echo '<script type="text/javascript" src="../../../script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
echo '<script type="text/javascript" src="../script/script.js"></script>';
echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,700italic,400,600,700&subset=latin,latin-ext" rel="stylesheet">';
//echo '<link type="text/css" href="admin/survey/modules/mod_EVOLI/css/style.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="css/style.css" media="screen" rel="stylesheet" />';
//echo '<link type="text/css" href="admin/survey/script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../../script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../css/style.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../../../script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<script type="text/javascript">
$(document).ready(function () {
@ -76,16 +71,18 @@
$evoli = new EvoliForm();
$evoli->setReportType($type='teamteamship_meter');
$language = $evoli->getLanguage();
// Glava
echo '<div id="tm_header"><a href="https://www.evoli.si/" title="Evoli">';
echo ' <img src="css/logo.png" />';
echo ' <img src="../css/logo.png" />';
echo ' <div class="title_text">';
if($_GET['language'] == 'slo' || $_POST['language'] == 'slo')
if($language == 'slo')
echo 'Teamship merilec';
elseif($_GET['language'] == 'den' || $_POST['language'] == 'den')
elseif($language == 'den')
echo 'Teamshipmåler';
else
echo 'Teamship Meter';

8
admin/survey/modules/mod_EVOLI/script/script.js
View File

@ -14,8 +14,8 @@ function addDepartment(val){
cnt ++;
$("#department_holder").append("<p id=\"department_p_"+cnt+"\" class=\"department_p\">"+
"<input type=\"text\" id=\"department_"+cnt+"\" class=\"department\" name=\"department[]\" value=\"\">"+
"<a href=\"#\" title=\"Add department\" onClick=\"addDepartment(); return false;\" class=\"add_department\" id=\"add_department_"+cnt+"\"><img src=\"css/add.png\" /></a>"+
"<a href=\"#\" title=\"Remove department\" onClick=\"deleteDepartment(); return false;\" class=\"delete_department\" id=\"delete_department_"+cnt+"\"><img src=\"css/delete.png\" /></a>"+
"<a href=\"#\" title=\"Add department\" onClick=\"addDepartment(); return false;\" class=\"add_department\" id=\"add_department_"+cnt+"\"><img src=\"../css/add.png\" /></a>"+
"<a href=\"#\" title=\"Remove department\" onClick=\"deleteDepartment(); return false;\" class=\"delete_department\" id=\"delete_department_"+cnt+"\"><img src=\"../css/delete.png\" /></a>"+
"</p>");
}
@ -34,7 +34,7 @@ function deleteDepartment(){
cnt = cnt-1;
// Dodamo plus in minus novemu zadnjemu
$("#department_"+cnt).after("<a href=\"#\" title=\"Add department\" onClick=\"addDepartment(); return false;\" class=\"add_department\" id=\"add_department_"+cnt+"\"><img src=\"css/add.png\" /></a>"+
"<a href=\"#\" title=\"Remove department\" onClick=\"deleteDepartment(); return false;\" class=\"delete_department\" id=\"delete_department_"+cnt+"\"><img src=\"css/delete.png\" /></a>");
$("#department_"+cnt).after("<a href=\"#\" title=\"Add department\" onClick=\"addDepartment(); return false;\" class=\"add_department\" id=\"add_department_"+cnt+"\"><img src=\"../css/add.png\" /></a>"+
"<a href=\"#\" title=\"Remove department\" onClick=\"deleteDepartment(); return false;\" class=\"delete_department\" id=\"delete_department_"+cnt+"\"><img src=\"../css/delete.png\" /></a>");
}
}

145
admin/survey/modules/mod_EVOLI/team_meter.php
View File

@ -1,133 +1,54 @@
<?php
/**
*
* forma za vnos Evoli TM
*
* redirect na ustrezno formo, ko pride kupec iz trgovine
* redirect se izvede na podlagi id-ja ankete in vklopljenega modula
*/
ob_start();
header('Cache-Control: no-cache');
header('Pragma: no-cache');
include_once '../../../../function.php';
include_once('../../../../function.php');
include_once('../../../../vendor/autoload.php');
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 '<script type="text/javascript" src="admin/survey/script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
echo '<script type="text/javascript" src="../../script/jquery/ui-1.8.18/js/jquery-1.7.1.min.js"></script>';
//echo '<script type="text/javascript" src="admin/survey/script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
echo '<script type="text/javascript" src="../../script/jquery/ui-1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>';
//echo '<script type="text/javascript" src="admin/survey/modules/mod_EVOLI/script/script.js"></script>';
echo '<script type="text/javascript" src="script/script.js"></script>';
echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,700italic,400,600,700&subset=latin,latin-ext" rel="stylesheet">';
//echo '<link type="text/css" href="admin/survey/modules/mod_EVOLI/css/style.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="css/style.css" media="screen" rel="stylesheet" />';
//echo '<link type="text/css" href="admin/survey/script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="../../script/jquery/ui-1.8.18/js/jquery-ui.css" media="screen" rel="stylesheet" />';
echo '<script type="text/javascript">
$(document).ready(function () {
$("#date_from").datepicker({
showOtherMonths: true,
selectOtherMonths: true,
changeMonth: true,
changeYear: true,
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});
$("#date_to").datepicker({
showOtherMonths: true,
selectOtherMonths: true,
changeMonth: true,
changeYear: true,
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
buttonImage: "../../script/calendar/calendar.gif",
buttonImageOnly: true,
buttonText: ""
});
})
</script>';
echo '</head>';
echo '<body>';
global $lang;
global $site_url;
// Dekodiramo parametre in dobimo id ankete
$evoli = new EvoliForm();
$evoli->setReportType($type='team_meter');
$ank_id = $evoli->getAnkId();
if($ank_id == 0){
echo $lang['srv_evoli_form_error'].'!';
die();
}
// Glava
echo '<div id="tm_header"><a href="https://www.evoli.si/" title="Evoli">';
// 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%'");
echo ' <img src="css/logo.png" />';
if(mysqli_num_rows($sql) == 0){
echo $lang['srv_evoli_form_error_module'].'!';
die();
}
echo ' <div class="title_text">';
if($_GET['language'] == 'slo' || $_POST['language'] == 'slo')
echo 'Team Energy Meter';
elseif($_GET['language'] == 'den' || $_POST['language'] == 'den')
echo 'Team Energy Meter';
else
echo 'Team Energy Meter';
echo ' </div>';
$row = mysqli_fetch_assoc($sql);
echo '</a></div>';
if($row['modul'] == 'evoli_quality_climate'){
$script_name = 'quality_climate_form.php';
}
elseif($row['modul'] == 'evoli_teamship_meter'){
$script_name = 'teamship_meter_form.php';
}
elseif($row['modul'] == 'evoli_organizational_employeeship_meter'){
$script_name = 'organizational_employeeship_meter_form.php';
}
else{
$script_name = 'team_meter_form.php';
}
// Srednji del
echo '<div id="tm_body">';
echo ' <div id="tm_holder">';
// Redirect na ustrezno skripto
header("Location: ".$site_url."/admin/survey/modules/mod_EVOLI/forms/".$script_name.'?'.$_SERVER['QUERY_STRING']);
// 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 ' </div>';
echo '</div>';
// Footer
echo '<div id="tm_footer">';
$evoli->displayFooter();
echo '</div>';
echo '</body>';
echo '</html>';
?>

4
lang/1.php
View File

@ -2358,6 +2358,9 @@ $lang = array (
"srv_return_finished" => "Uporabnik, ki je zaklju&#269;il anketo",
"srv_return_finished_yes" => "Lahko kasneje ureja svoje odgovore",
"srv_return_finished_no" => "Ne more ve&#269; urejati svojih odgovorov",
"srv_subsequent_answers" => "Uporabnik med izpolnjevanjem",
"srv_subsequent_answers_no" => "Ne more naknadno urejati svojih odgovorov",
"srv_subsequent_answers_yes" => "Lahko naknadno ureja svoje odgovore",
"srv_cookie_continue" => "Uporabnik, ki ne sprejme piškotka",
"srv_cookie_continue_yes" => "Lahko vseeno nadaljuje z izpolnjevanjem",
"srv_cookie_continue_no" => "Ne more odgovarjati na anketo",
@ -7958,6 +7961,7 @@ $lang = array (
'srv_evoli_form_footer' => "Kontaktirajte pomoč na naslovu <a href=\"mailto:info@evoli.si\">info@evoli.si</a>",
'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! 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.<br />Dodajte ali izbrišite time s pomočjo gumbov + ali –.",
'srv_evoli_form_help3' => "Vpišite začetni in končni datum izpolnjevanja ankete.",

6
lang/2.php
View File

@ -2339,6 +2339,9 @@ $lang = array (
"srv_return_finished" => "User, that finished his survey",
"srv_return_finished_yes" => "Can later edit their answers",
"srv_return_finished_no" => "Cannot edit their answers",
"srv_subsequent_answers" => "User during answering",
"srv_subsequent_answers_no" => "Cannot subseqently edit their answers",
"srv_subsequent_answers_yes" => "Can subseqently edit their answers",
"srv_cookie_continue" => "User does not accept cookies",
"srv_cookie_continue_yes" => "Can still answer survey questions",
"srv_cookie_continue_no" => "Cannot respond to survey",
@ -7848,7 +7851,8 @@ GDPR introduction preview",
'srv_evoli_form_err_parameter2' => "Missing parameters tm_id or departments",
'srv_evoli_form_footer' => "Contact our help on <a href=\"mailto:info@evoli.si\">info@evoli.si</a>",
'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.<br />Add more or delete teams with + and - buttons",
'srv_evoli_form_help3' => "Enter the start and end dates for your test to take place.",

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

@ -7,6 +7,7 @@
namespace App\Controllers;
use App\Controllers\CheckController as Check;
use App\Controllers\DisplayController as Display;
use App\Controllers\FindController as Find;
use App\Controllers\HeaderController as Header;
@ -1758,6 +1759,8 @@ class BodyController extends Controller
* @desc prikaze trenutno grupo
*/
public function displayGrupa(){
global $admin_type;
// Ce imamo vklopljene napredne parapodatke zabelezimo id-strani
if(SurveyAdvancedParadataLog::getInstance()->paradataEnabled()){
@ -1873,6 +1876,14 @@ class BodyController extends Controller
Js::getInstance()->generateBranchingJS();
// 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())
Js::getInstance()->disableSubsequentAnswers();
}
// nov zgornji link pri uporabnosti
$link = SurveySetting::getInstance()->getSurveyMiscSetting('uporabnost_link_' . get('grupa'));
if ($link != '' && strlen($link) > 7)

33
main/survey/app/Controllers/CheckController.php
View File

@ -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();
}
}
}
}
@ -725,4 +730,18 @@ class CheckController extends Controller
}
return $missing;
}
// Preverimo, ce je uporabnik ze bil na strani
public function check_subsequent_visit(){
$sql = 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')."' AND g.id='".get('grupa')."'
");
if(mysqli_num_rows($sql) > 0)
return true;
else
return false;
}
}

38
main/survey/app/Controllers/JsController.php
View File

@ -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");
@ -2781,4 +2803,20 @@ class JsController extends Controller
return '(' . $expression . ')';
}
// Disable odgovorov, ce je ze izpolnjeval to stran in ima vklopljeno nastavitev, da ni dovoljeno naknadno vnasanje odogovorov
public static function disableSubsequentAnswers(){
echo '<script>';
echo ' $(":radio").prop("disabled", true);';
echo ' $(":checkbox").prop("disabled", true);';
echo ' $(":text").prop("disabled", true);';
echo ' $(":password").prop("disabled", true);';
echo ' $(":button").prop("disabled", true);';
echo ' $(":image").prop("disabled", true);';
echo ' $(":file").prop("disabled", true);';
echo '</script>';
}
}

36
main/survey/app/Controllers/Vprasanja/VprasanjaController.php
View File

@ -164,19 +164,33 @@ 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 ' <div class="spremenljivka lang_pick">' . "\n";
echo ' <div id="spremenljivka_evoli_tm_department" class="spremenljivka lang_pick">' . "\n";
// Izbira oddelka z dropdown menijem
if(isset($_GET['language']) && $_GET['language'] == '1')
echo ' <p><div class="naslov">Prosimo izberite vašo ekipo, oddelek ali delovno skupino v vaši organizaciji:</div>';
else
echo ' <p><div class="naslov">Please indicate your team, department or working group in your organisation:</div>';
echo ' <div class="variable_holder clr"><div class="variabla"><select name="evoli_tm_department" id="evoli_tm_department">';
while($rowTM = mysqli_fetch_array($sqlTM)){
echo '<option value="' . $rowTM['id'] . '">' . $rowTM['department'] . '</option>';
}
echo ' </select></div></div>';
echo '</p>' . "\n";
if(isset($_GET['language']) && $_GET['language'] == '1'){
echo ' <p><div class="naslov"><span class="reminder">*</span>Prosimo izberite vašo ekipo, oddelek ali delovno skupino v vaši organizaciji:</div>';
echo ' <div class="variable_holder clr"><div class="variabla"><select name="evoli_tm_department" id="evoli_tm_department">';
echo '<option value="0">Izberite s seznama</option>';
while($rowTM = mysqli_fetch_array($sqlTM)){
echo '<option value="' . $rowTM['id'] . '">' . $rowTM['department'] . '</option>';
}
echo ' </select></div></div>';
echo '</p>' . "\n";
}
else{
echo ' <p><div class="naslov"><span class="reminder">*</span>Please indicate your team, department or working group in your organisation:</div>';
echo ' <div class="variable_holder clr"><div class="variabla"><select name="evoli_tm_department" id="evoli_tm_department">';
echo '<option value="0">Select from dropdown</option>';
while($rowTM = mysqli_fetch_array($sqlTM)){
echo '<option value="' . $rowTM['id'] . '">' . $rowTM['department'] . '</option>';
}
echo ' </select></div></div>';
echo '</p>' . "\n";
}
echo ' </div>' . "\n";
}

11
main/survey/app/Models/SaveSurvey.php
View File

@ -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

4
sql/update2.sql
View File

@ -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";