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

Modul za skavte - V TESTIRANJU

Browse Source
This commit is contained in:
pero1203 2020-12-07 09:42:55 +01:00
parent 1fea0b9f5b
commit 2050c10f47
1 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -503,22 +503,16 @@ class DisplayController extends Controller
$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
AND (s.variable LIKE 'P%' OR s.variable LIKE 'G%') AND s.variable LIKE 'R%'
"); ");
if (!$sqlS) echo mysqli_error($GLOBALS['connect_db']); if (!$sqlS) echo mysqli_error($GLOBALS['connect_db']);
while($rowS = mysqli_fetch_array($sqlS)){ while($rowS = mysqli_fetch_array($sqlS)){
$vprasanja[$rowS['spr_id']] = $rowS; $vprasanje_number = substr($rowS['spr_variable'], 1);
$vprasanja[$rowS['spr_id']] = $vprasanje_number;
// ID-ji vprasanj za query // ID-ji vprasanj za query
$spr_ids .= $rowS['spr_id'].','; $spr_ids .= $rowS['spr_id'].',';
// Pohvala
if(substr($rowS['spr_variable'], 0, 1) == 'P')
$vprasanja[$rowS['spr_id']]['tip'] = 'pohvala';
// Graja
else
$vprasanja[$rowS['spr_id']]['tip'] = 'graja';
} }
$spr_ids = substr($spr_ids, 0, -1); $spr_ids = substr($spr_ids, 0, -1);
@ -534,20 +528,44 @@ class DisplayController extends Controller
"); ");
while($rowAnswers = mysqli_fetch_array($sqlAnswers)){ while($rowAnswers = mysqli_fetch_array($sqlAnswers)){
// Graja
if((int)$rowAnswers['variable'] > 199){
$graje[(int)$rowAnswers['variable']] = $rowAnswers;
}
// Pohvala // Pohvala
else{ if((int)$rowAnswers['variable'] >= 1 && (int)$rowAnswers['variable'] <= 199){
$pohvale[(int)$rowAnswers['variable']] = $rowAnswers; $pohvale[(int)$rowAnswers['variable']] = $rowAnswers;
}
// Graja
elseif((int)$rowAnswers['variable'] >= 201 && (int)$rowAnswers['variable'] <= 399){
$graje[(int)$rowAnswers['variable']] = $rowAnswers;
} }
} }
// Sortiramo po velikosti // Sortiramo po velikosti
ksort($pohvale, SORT_NUMERIC); ksort($pohvale, SORT_NUMERIC);
ksort($graje, SORT_NUMERIC); ksort($graje, SORT_NUMERIC);
// Loop cez komentarje v nagovorih
$pohvale_besedilo = array();
$graje_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
AND (s.variable LIKE 'P%' OR s.variable LIKE 'G%')
");
if (!$sqlS) echo mysqli_error($GLOBALS['connect_db']);
while($rowS = mysqli_fetch_array($sqlS)){
$tip = substr($rowS['spr_variable'], 0, 1);
$vprasanje_number = substr($rowS['spr_variable'], 1);
// Pohvala
if($tip == 'P'){
$pohvale_besedilo[$vprasanje_number] = $naslov;
}
// Graja
elseif($tip == 'G'){
$graje_besedilo[$vprasanje_number] = $naslov;
}
}
// Izrisemo seznam vprasanj s pohvalami // Izrisemo seznam vprasanj s pohvalami
@ -559,13 +577,17 @@ class DisplayController extends Controller
if($i > $max_odgovorov) if($i > $max_odgovorov)
break; break;
$spr_id = $vrednost['spr_id'];
$vprasanje_number = $vprasanja[$spr_id];
echo '<div class="spremenljivka">'; echo '<div class="spremenljivka">';
echo ' <div class="naslov">'.$vprasanja[$vrednost['spr_id']]['spr_naslov'].'</div>'; echo ' <div class="naslov">'.$pohvale_besedilo[$vprasanje_number].'</div>';
/*echo ' <div class="naslov">'.$vprasanja[$vrednost['spr_id']]['spr_naslov'].'</div>';
echo ' <div class="variable_holder">'; echo ' <div class="variable_holder">';
echo $vrednost['naslov'] . '('.$pohvala_vrednost.')'; echo $vrednost['naslov'] . '('.$pohvala_vrednost.')';
echo ' </div>'; echo ' </div>';*/
echo '</div>'; echo '</div>';
@ -581,13 +603,17 @@ class DisplayController extends Controller
if($i > $max_odgovorov) if($i > $max_odgovorov)
break; break;
$spr_id = $vrednost['spr_id'];
$vprasanje_number = $vprasanja[$spr_id];
echo '<div class="spremenljivka">'; echo '<div class="spremenljivka">';
echo ' <div class="naslov">'.$vprasanja[$vrednost['spr_id']]['spr_naslov'].'</div>'; echo ' <div class="naslov">'.$graje_besedilo[$vprasanje_number].'</div>';
/*echo ' <div class="naslov">'.$vprasanja[$vrednost['spr_id']]['spr_naslov'].'</div>';
echo ' <div class="variable_holder">'; echo ' <div class="variable_holder">';
echo $vrednost['naslov'] . '('.$graja_vrednost.')'; echo $vrednost['naslov'] . '('.$graja_vrednost.')';
echo ' </div>'; echo ' </div>';*/
echo '</div>'; echo '</div>';