diff --git a/main/survey/app/Controllers/DisplayController.php b/main/survey/app/Controllers/DisplayController.php
index 5d264a077..a3fcb8ed0 100644
--- a/main/survey/app/Controllers/DisplayController.php
+++ b/main/survey/app/Controllers/DisplayController.php
@@ -493,7 +493,7 @@ class DisplayController extends Controller
// SKAVTI - prikaze povzetek in graf za njihovo anketo
public function displaySkavtiAnswers(){
- // Stevilo top pohval in graj, ki jih izpisemo v zakljucku
+ // Stevilo top pohval in izziv, ki jih izpisemo v zakljucku
$max_odgovorov = 3;
$vprasanja = array();
@@ -520,7 +520,7 @@ class DisplayController extends Controller
// Loop cez vse response za vprasanja
$pohvale = array();
- $graje = array();
+ $izzivi = array();
$sqlAnswers = sisplet_query("SELECT vd.*, v.naslov, v.variable
FROM srv_data_vrednost_active vd, srv_vrednost v
WHERE vd.usr_id='".get('usr_id')."' AND vd.spr_id IN (".$spr_ids.")
@@ -532,20 +532,20 @@ class DisplayController extends Controller
if((int)$rowAnswers['variable'] >= 1 && (int)$rowAnswers['variable'] <= 199){
$pohvale[(int)$rowAnswers['variable']] = $rowAnswers;
}
- // Graja
+ // Izziv
elseif((int)$rowAnswers['variable'] >= 201 && (int)$rowAnswers['variable'] <= 399){
- $graje[(int)$rowAnswers['variable']] = $rowAnswers;
+ $izzivi[(int)$rowAnswers['variable']] = $rowAnswers;
}
}
// Sortiramo po velikosti
ksort($pohvale, SORT_NUMERIC);
- ksort($graje, SORT_NUMERIC);
+ ksort($izzivi, SORT_NUMERIC);
// Loop cez komentarje v nagovorih
$pohvale_besedilo = array();
- $graje_besedilo = array();
+ $izzivi_besedilo = array();
$sqlS = sisplet_query("SELECT s.id AS spr_id, s.naslov AS spr_naslov, s.variable AS spr_variable
FROM srv_spremenljivka s, srv_grupa g
WHERE g.ank_id='".get('anketa')."' AND s.gru_id=g.id
@@ -562,9 +562,9 @@ class DisplayController extends Controller
if($tip == 'P'){
$pohvale_besedilo[$vprasanje_number] = $naslov;
}
- // Graja
+ // Izziv
elseif($tip == 'G'){
- $graje_besedilo[$vprasanje_number] = $naslov;
+ $izzivi_besedilo[$vprasanje_number] = $naslov;
}
}
@@ -588,11 +588,11 @@ class DisplayController extends Controller
$i++;
}
- // Izrisemo seznam vprasanj z grajami
- echo '
' . var_export($radar_data, true) . ''; @@ -670,15 +674,15 @@ class DisplayController extends Controller foreach($radar_data as $radar_label => $radar_values){ $labels[$i] = $radar_label; - $pohvale[$i] = round($radar_values['pohvale'] / $radar_values['all'] * 10); - $graje[$i] = round($radar_values['graje'] / $radar_values['all'] * 10); + $pohvale[$i] = $radar_values['pohvale'] / $radar_values['all'] * 10; + $izzivi[$i] = $radar_values['izzivi'] / $radar_values['all'] * 10; $i++; } $json_labels = json_encode($labels); $json_pohvale = json_encode($pohvale); - $json_graje = json_encode($graje); + $json_izzivi = json_encode($izzivi); echo '