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

Evoli - sprejemna skripta, ki preusmeri na ustrezno formo glede na id ankete in vklopljen modul, vprasanje za oddelke je obvezno

Browse Source
This commit is contained in:
pero1203 2020-10-12 15:32:14 +02:00
parent 511e1d9ff2
commit 142c6aaa0c
5 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/survey/modules/mod_EVOLI/form.php
View File

@ -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']);
?>

1
lang/1.php
View File

@ -7958,6 +7958,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! 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.<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.",

3
lang/2.php
View File

@ -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 <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.",

22
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");

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

@ -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 ' <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>';
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>';
@ -180,7 +180,7 @@ class VprasanjaController extends Controller
echo '</p>' . "\n";
}
else{
echo ' <p><div class="naslov">Please indicate your team, department or working group in your organisation:</div>';
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>';