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

Popravki za skavte

Browse Source
This commit is contained in:
pero1203 2021-02-09 10:09:38 +01:00
parent 687ba09f8d
commit 53593ddab3
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
main/survey/app/Controllers/DisplayController.php
View File

@ -493,7 +493,7 @@ class DisplayController extends Controller
// SKAVTI - prikaze povzetek in graf za njihovo anketo // SKAVTI - prikaze povzetek in graf za njihovo anketo
public function displaySkavtiAnswers(){ 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; $max_odgovorov = 3;
$vprasanja = array(); $vprasanja = array();
@ -520,7 +520,7 @@ class DisplayController extends Controller
// Loop cez vse response za vprasanja // Loop cez vse response za vprasanja
$pohvale = array(); $pohvale = array();
$graje = array(); $izzivi = array();
$sqlAnswers = sisplet_query("SELECT vd.*, v.naslov, v.variable $sqlAnswers = sisplet_query("SELECT vd.*, v.naslov, v.variable
FROM srv_data_vrednost_active vd, srv_vrednost v FROM srv_data_vrednost_active vd, srv_vrednost v
WHERE vd.usr_id='".get('usr_id')."' AND vd.spr_id IN (".$spr_ids.") 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){ if((int)$rowAnswers['variable'] >= 1 && (int)$rowAnswers['variable'] <= 199){
$pohvale[(int)$rowAnswers['variable']] = $rowAnswers; $pohvale[(int)$rowAnswers['variable']] = $rowAnswers;
} }
// Graja // Izziv
elseif((int)$rowAnswers['variable'] >= 201 && (int)$rowAnswers['variable'] <= 399){ elseif((int)$rowAnswers['variable'] >= 201 && (int)$rowAnswers['variable'] <= 399){
$graje[(int)$rowAnswers['variable']] = $rowAnswers; $izzivi[(int)$rowAnswers['variable']] = $rowAnswers;
} }
} }
// Sortiramo po velikosti // Sortiramo po velikosti
ksort($pohvale, SORT_NUMERIC); ksort($pohvale, SORT_NUMERIC);
ksort($graje, SORT_NUMERIC); ksort($izzivi, SORT_NUMERIC);
// Loop cez komentarje v nagovorih // Loop cez komentarje v nagovorih
$pohvale_besedilo = array(); $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 $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 FROM srv_spremenljivka s, srv_grupa g
WHERE g.ank_id='".get('anketa')."' AND s.gru_id=g.id WHERE g.ank_id='".get('anketa')."' AND s.gru_id=g.id
@ -562,9 +562,9 @@ class DisplayController extends Controller
if($tip == 'P'){ if($tip == 'P'){
$pohvale_besedilo[$vprasanje_number] = $naslov; $pohvale_besedilo[$vprasanje_number] = $naslov;
} }
// Graja // Izziv
elseif($tip == 'G'){ elseif($tip == 'G'){
$graje_besedilo[$vprasanje_number] = $naslov; $izzivi_besedilo[$vprasanje_number] = $naslov;
} }
} }
@ -588,11 +588,11 @@ class DisplayController extends Controller
$i++; $i++;
} }
// Izrisemo seznam vprasanj z grajami // Izrisemo seznam vprasanj z izzivi
echo '<br><h2 style="padding-left: 20px;">GRAJE</h2>'; echo '<br><h2 style="padding-left: 20px;">IZZIVI</h2>';
$i = 1; $i = 1;
foreach($graje as $graja_vrednost => $vrednost){ foreach($izzivi as $izziv_vrednost => $vrednost){
if($i > $max_odgovorov) if($i > $max_odgovorov)
break; break;
@ -601,7 +601,7 @@ class DisplayController extends Controller
$vprasanje_number = $vprasanja[$spr_id]; $vprasanje_number = $vprasanja[$spr_id];
echo '<div class="spremenljivka">'; echo '<div class="spremenljivka">';
echo ' <div class="naslov">'.$graje_besedilo[$vprasanje_number].'</div>'; echo ' <div class="naslov">'.$izzivi_besedilo[$vprasanje_number].'</div>';
echo '</div>'; echo '</div>';
$i++; $i++;
@ -627,6 +627,10 @@ class DisplayController extends Controller
"); ");
if (!$sqlB) echo mysqli_error($GLOBALS['connect_db']); if (!$sqlB) echo mysqli_error($GLOBALS['connect_db']);
// Za graf rabimo vsaj 3 ogljisca
if(mysqli_num_rows($sqlB) < 3)
return;
// Loop cez bloke (stranica radarja) // Loop cez bloke (stranica radarja)
while($rowB = mysqli_fetch_array($sqlB)){ while($rowB = mysqli_fetch_array($sqlB)){
@ -642,24 +646,24 @@ class DisplayController extends Controller
// Loop cez vprasanja in odgovore v bloku // Loop cez vprasanja in odgovore v bloku
$count_answers_pohvale = 0; $count_answers_pohvale = 0;
$count_answers_graje = 0; $count_answers_izzivi = 0;
while($rowQ = mysqli_fetch_array($sqlQ)){ while($rowQ = mysqli_fetch_array($sqlQ)){
// Pohvala // Pohvala
if((int)$rowQ['variable'] >= 1 && (int)$rowQ['variable'] <= 199){ if((int)$rowQ['variable'] >= 1 && (int)$rowQ['variable'] <= 200){
$count_answers_pohvale++; $count_answers_pohvale++;
} }
// Graja // Izziv
elseif((int)$rowQ['variable'] >= 201 && (int)$rowQ['variable'] <= 399){ elseif((int)$rowQ['variable'] >= 201 && (int)$rowQ['variable'] <= 400){
$count_answers_graje++; $count_answers_izzivi++;
} }
} }
$count_answers_all = (int)$count_answers_pohvale + (int)$count_answers_graje; $count_answers_all = (int)$count_answers_pohvale + (int)$count_answers_izzivi;
if($count_answers_all > 0){ if($count_answers_all > 0){
$radar_data[$rowB['label']]['all'] = $count_answers_all; $radar_data[$rowB['label']]['all'] = $count_answers_all;
$radar_data[$rowB['label']]['pohvale'] = $count_answers_pohvale; $radar_data[$rowB['label']]['pohvale'] = $count_answers_pohvale;
$radar_data[$rowB['label']]['graje'] = $count_answers_graje; $radar_data[$rowB['label']]['izzivi'] = $count_answers_izzivi;
} }
} }
//echo '<pre>' . var_export($radar_data, true) . '</pre>'; //echo '<pre>' . var_export($radar_data, true) . '</pre>';
@ -670,15 +674,15 @@ class DisplayController extends Controller
foreach($radar_data as $radar_label => $radar_values){ foreach($radar_data as $radar_label => $radar_values){
$labels[$i] = $radar_label; $labels[$i] = $radar_label;
$pohvale[$i] = round($radar_values['pohvale'] / $radar_values['all'] * 10); $pohvale[$i] = $radar_values['pohvale'] / $radar_values['all'] * 10;
$graje[$i] = round($radar_values['graje'] / $radar_values['all'] * 10); $izzivi[$i] = $radar_values['izzivi'] / $radar_values['all'] * 10;
$i++; $i++;
} }
$json_labels = json_encode($labels); $json_labels = json_encode($labels);
$json_pohvale = json_encode($pohvale); $json_pohvale = json_encode($pohvale);
$json_graje = json_encode($graje); $json_izzivi = json_encode($izzivi);
echo '<br><h2 style="padding-left: 20px;">Pajkova mreža</h2>'; echo '<br><h2 style="padding-left: 20px;">Pajkova mreža</h2>';
@ -686,7 +690,7 @@ class DisplayController extends Controller
echo '<div class="spremenljivka radar_chart" id="skavti_radar_chart_holder">'; echo '<div class="spremenljivka radar_chart" id="skavti_radar_chart_holder">';
echo '<canvas id="skavti_radar_chart" class="chart"></canvas>'; echo '<canvas id="skavti_radar_chart" class="chart"></canvas>';
echo '<script>$(document).ready(function(){ init_skavti_radar('.$json_labels.', '.$json_pohvale.', '.$json_graje.'); })</script>'; echo '<script>$(document).ready(function(){ init_skavti_radar('.$json_labels.', '.$json_pohvale.', '.$json_izzivi.'); })</script>';
echo '</div>'; echo '</div>';
} }

6
main/survey/js/ChartJS/chart_init.js
View File

@ -216,7 +216,7 @@ function init_excell_matrix(x_axis, y_axis, rad){
} }
// Funkcija za poseben modul radar chart - skavti // Funkcija za poseben modul radar chart - skavti
function init_skavti_radar(labels, pohvale, graje){ function init_skavti_radar(labels, pohvale, izzivi){
// Inicializiramo graf // Inicializiramo graf
var ctx = document.getElementById("skavti_radar_chart"); var ctx = document.getElementById("skavti_radar_chart");
@ -230,8 +230,8 @@ function init_skavti_radar(labels, pohvale, graje){
backgroundColor: "rgba(30,136,229,0.6)" backgroundColor: "rgba(30,136,229,0.6)"
}, },
{ {
data: graje, data: izzivi,
label: "Graje", label: "Izzivi",
backgroundColor: "rgba(200,0,0,0.5)" backgroundColor: "rgba(200,0,0,0.5)"
}] }]
}; };