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

Merge branch 'master' of https://git.1ka.si:/git/1ka

Browse Source
This commit is contained in:
tejagerjovic 2021-07-21 11:55:10 +02:00
commit a8942c95ce
10 changed files with 113 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
admin/survey/SurveyAdminAjax.php
View File

@ -3152,40 +3152,11 @@ class SurveyAdminAjax {
Common::updateEditStamp(); Common::updateEditStamp();
sisplet_query("DELETE FROM srv_user WHERE id = '$usr_id'"); sisplet_query("DELETE FROM srv_user WHERE id = '$usr_id'");
/* Ker imamo FK bi moralo avtomatsko pobrisati vse ostale vnose ( upam da res :) )
sisplet_query("DELETE FROM srv_data_grid".$this->db_table." WHERE usr_id = '$usr_id'");
sisplet_query("DELETE FROM srv_data_text".$this->db_table." WHERE usr_id = '$usr_id'");
sisplet_query("DELETE FROM srv_data_vrednost".$this->db_table." WHERE usr_id = '$usr_id'");
sisplet_query("DELETE FROM srv_data_checkgrid".$this->db_table." WHERE usr_id = '$usr_id'");
sisplet_query("DELETE FROM srv_data_imena WHERE usr_id = '$usr_id'");
sisplet_query("DELETE FROM srv_data_number WHERE usr_id = '$usr_id'");
sisplet_query("DELETE FROM srv_data_rating WHERE usr_id = '$usr_id'");
sisplet_query("DELETE FROM srv_data_textgrid".$this->db_table." WHERE usr_id = '$usr_id'");
sisplet_query("DELETE FROM srv_user_grupa_active WHERE usr_id = '$usr_id'");
sisplet_query("DELETE FROM srv_user_grupa WHERE usr_id = '$usr_id'");
*/
} }
elseif ($_GET['a'] == 'delete_all') { elseif ($_GET['a'] == 'delete_all') {
Common::updateEditStamp(); Common::updateEditStamp();
$sql = sisplet_query("DELETE FROM srv_user WHERE ank_id = '$this->anketa'"); $sql = sisplet_query("DELETE FROM srv_user WHERE ank_id = '$this->anketa'");
//$sql = sisplet_query("SELECT * FROM srv_user WHERE ank_id = '$this->anketa'");
//while ($row = mysqli_fetch_array($sql)) {
//sisplet_query("DELETE FROM srv_user WHERE id = '$row[id]'");
/* Ker imamo FK bi moralo avtomatsko pobrisati vse ostale vnose ( upam da res :) )
sisplet_query("DELETE FROM srv_data_grid".$this->db_table." WHERE usr_id = '$row[id]'");
sisplet_query("DELETE FROM srv_data_text".$this->db_table." WHERE usr_id = '$row[id]'");
sisplet_query("DELETE FROM srv_data_vrednost".$this->db_table." WHERE usr_id = '$row[id]'");
sisplet_query("DELETE FROM srv_data_checkgrid".$this->db_table." WHERE usr_id = '$row[id]'");
sisplet_query("DELETE FROM srv_data_imena WHERE usr_id = '$row[id]'");
sisplet_query("DELETE FROM srv_data_number WHERE usr_id = '$row[id]'");
sisplet_query("DELETE FROM srv_data_rating WHERE usr_id = '$row[id]'");
sisplet_query("DELETE FROM srv_data_textgrid".$this->db_table." WHERE usr_id = '$row[id]'");
sisplet_query("DELETE FROM srv_user_grupa_active WHERE usr_id = '$row[id]'");
sisplet_query("DELETE FROM srv_user_grupa WHERE usr_id = '$row[id]'");
*/
//}
# pobrišemo še DATA datoteke in HTML -dashboard če obstajajo # pobrišemo še DATA datoteke in HTML -dashboard če obstajajo
global $site_path; global $site_path;

29
admin/survey/classes/surveyData/class.SurveyDataCollect.php
View File

@ -1321,16 +1321,24 @@ class SurveyDataCollect{
$page = 1; $page = 1;
foreach ($this->_array_groups as $gid => $grupa) { foreach ($this->_array_groups as $gid => $grupa) {
$_HEADER['meta']['grids'][$_g_cnt] = Array('naslov'=>$lang['page'].' '.$page); // Uvod
if($gid == '0'){
$_HEADER['meta']['grids'][$_g_cnt] = Array('naslov'=>$lang['intro']);
# date on page # date on page
$_HEADER['meta']['grids'][$_g_cnt]['variables'][0] = Array ('variable'=>'date_'.$page,'naslov'=>'datum_'.$page,'spss'=>'DATETIMEw','sortType'=>'date','sequence'=>$sequence); $_HEADER['meta']['grids'][$_g_cnt]['variables'][0] = Array ('variable'=>'date_0','naslov'=>'datum_0','spss'=>'DATETIMEw','sortType'=>'date','sequence'=>$sequence);
$sequence++; }
else{
$_HEADER['meta']['grids'][$_g_cnt] = Array('naslov'=>$lang['page'].' '.$page);
# date on page
$_HEADER['meta']['grids'][$_g_cnt]['variables'][0] = Array ('variable'=>'date_'.$page,'naslov'=>'datum_'.$page,'spss'=>'DATETIMEw','sortType'=>'date','sequence'=>$sequence);
$page++;
}
$_HEADER['meta']['grids'][$_g_cnt]['cnt_vars'] = 1; $_HEADER['meta']['grids'][$_g_cnt]['cnt_vars'] = 1;
$sequence++; $_g_cnt++;
$page++;
$_g_cnt++;
} }
// IP // IP
@ -2765,6 +2773,13 @@ class SurveyDataCollect{
$cnt = 0; $cnt = 0;
if ($this->_cnt_groups > 0) { if ($this->_cnt_groups > 0) {
$this->_array_groups = array(); $this->_array_groups = array();
// Uvod - ce je prikazan v anketi
if($this->survey['show_intro'] == '1'){
$this->_array_groups['0'] = '0';
$str .= '0,';
}
$prefix =''; $prefix ='';
while ($row = mysqli_fetch_assoc($qry_groups)) { while ($row = mysqli_fetch_assoc($qry_groups)) {

181
admin/survey/modules/Evalvacija/class.Evalvacija.php
View File

@ -30,7 +30,8 @@ class Evalvacija{
'anketa_po' =>-1, 'anketa_po' =>-1,
'anketa_splosna' =>-1, 'anketa_splosna' =>-1,
'anketa_podipl' =>-1, 'anketa_podipl' =>-1,
'anketa_podipl2' =>-1 'anketa_podipl2' =>-1,
'anketa_podipl3' =>-1
); );
private $_dataFileName = null; # ime obstoječe datoteke na FS. private $_dataFileName = null; # ime obstoječe datoteke na FS.
@ -456,6 +457,9 @@ class Evalvacija{
// SEDMI CSV - reseni podatki v anketi podiplomska 2 // SEDMI CSV - reseni podatki v anketi podiplomska 2
$this->prepareCSVData($this->exportSettings['anketa_podipl2'], 4); $this->prepareCSVData($this->exportSettings['anketa_podipl2'], 4);
// OSMI CSV - reseni podatki v anketi podiplomska 3
$this->prepareCSVData($this->exportSettings['anketa_podipl3'], 5);
} }
// Pripravimo CSV s sifranti - profesorji s predmeti // Pripravimo CSV s sifranti - profesorji s predmeti
@ -590,7 +594,7 @@ class Evalvacija{
fclose($file); fclose($file);
} }
// Pripravimo CSV s podatki resene ankete ($type: 0->anketa_pred, 1->anketa_po, 2->splosna, 3->podipl, 4->podipl2) // Pripravimo CSV s podatki resene ankete ($type: 0->anketa_pred, 1->anketa_po, 2->splosna, 3->podipl, 4->podipl2, 5->podipl3)
private function prepareCSVData($anketa, $type=0){ private function prepareCSVData($anketa, $type=0){
global $site_path; global $site_path;
@ -639,6 +643,8 @@ class Evalvacija{
$name = 'anketa_podipl'; $name = 'anketa_podipl';
elseif($type == 4) elseif($type == 4)
$name = 'anketa_podipl2'; $name = 'anketa_podipl2';
elseif($type == 5)
$name = 'anketa_podipl3';
$fd2 = fopen($temp_folder.'/'.$name.'_'.$this->fakultete[$this->exportSettings['fakulteta']]['kratica'].'.csv', "w"); $fd2 = fopen($temp_folder.'/'.$name.'_'.$this->fakultete[$this->exportSettings['fakulteta']]['kratica'].'.csv', "w");
@ -844,6 +850,9 @@ class Evalvacija{
$csv = 'anketa_podipl2_'.$fakulteta.'.csv'; $csv = 'anketa_podipl2_'.$fakulteta.'.csv';
$zip->addFile($temp_folder.$csv, $csv); $zip->addFile($temp_folder.$csv, $csv);
$csv = 'anketa_podipl3_'.$fakulteta.'.csv';
$zip->addFile($temp_folder.$csv, $csv);
$csv = 'programi_'.$fakulteta.'.csv'; $csv = 'programi_'.$fakulteta.'.csv';
$zip->addFile($temp_folder.$csv, $csv); $zip->addFile($temp_folder.$csv, $csv);
@ -1630,6 +1639,22 @@ class Evalvacija{
echo '</tr>'; echo '</tr>';
} }
} }
elseif($_GET['ank_type'] == 'anketa_podipl3'){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Študent</td>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">ID ankete</td>';
echo '</tr>';
$sql = sisplet_query("SELECT * FROM eval_data_podipl3 WHERE ank_id='".$ank_id."' ORDER BY student ASC");
while($row = mysqli_fetch_array($sql)){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">'.$row['student'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">'.$row['ank_id'].'</td>';
echo '</tr>';
}
}
echo '</table>'; echo '</table>';
} }
@ -1656,6 +1681,7 @@ class Evalvacija{
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Splošna anketa</td>'; echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Splošna anketa</td>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Podiplomska anketa</td>'; echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Podiplomska anketa</td>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Podiplomska anketa 2</td>'; echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Podiplomska anketa 2</td>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Podiplomska anketa 3</td>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Aktivna</td>'; echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Aktivna</td>';
echo '</tr>'; echo '</tr>';
@ -1689,6 +1715,10 @@ class Evalvacija{
echo ' <a href="'.$site_url.'admin/survey/index.php?anketa='.$rowF['anketa_podipl2'].'">'.$rowF['anketa_podipl2'].'</a> (<a href="'.$site_url.'admin/survey/index.php?a=ul_evalvation&t=test&ank_type=anketa_podipl2&ank_id='.$rowF['anketa_podipl2'].'">podatki</a>)'; echo ' <a href="'.$site_url.'admin/survey/index.php?anketa='.$rowF['anketa_podipl2'].'">'.$rowF['anketa_podipl2'].'</a> (<a href="'.$site_url.'admin/survey/index.php?a=ul_evalvation&t=test&ank_type=anketa_podipl2&ank_id='.$rowF['anketa_podipl2'].'">podatki</a>)';
echo '</td>'; echo '</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">';
echo ' <a href="'.$site_url.'admin/survey/index.php?anketa='.$rowF['anketa_podipl3'].'">'.$rowF['anketa_podipl3'].'</a> (<a href="'.$site_url.'admin/survey/index.php?a=ul_evalvation&t=test&ank_type=anketa_podipl3&ank_id='.$rowF['anketa_podipl3'].'">podatki</a>)';
echo '</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$rowF['active'].'</td>'; echo '<td style="border:1px solid black; padding:2px 5px;">'.$rowF['active'].'</td>';
echo '</tr>'; echo '</tr>';
@ -1697,142 +1727,6 @@ class Evalvacija{
echo '</table>'; echo '</table>';
} }
// Tabela z anketami - STARO
// Najprej napolnimo array
/*$surveysArray = array();
$sqlA = sisplet_query("SELECT id, naslov FROM srv_anketa WHERE id!='0' AND id!='-1'");
while($rowA = mysqli_fetch_array($sqlA)){
$sqlStudent = sisplet_query("SELECT * FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='".$rowA['id']."' AND s.gru_id=g.id AND s.sistem='1' AND s.variable='sifstud'");
$sqlPredmet = sisplet_query("SELECT * FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='".$rowA['id']."' AND s.gru_id=g.id AND s.sistem='1' AND s.variable='sifpredm'");
$sqlFaks = sisplet_query("SELECT * FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='".$rowA['id']."' AND s.gru_id=g.id AND s.sistem='1' AND s.variable='siffaks'");
$sqlIzvajalec = sisplet_query("SELECT * FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='".$rowA['id']."' AND s.gru_id=g.id AND s.sistem='1' AND s.variable='sifizv1'");
$sqlPodipl = sisplet_query("SELECT * FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='".$rowA['id']."' AND s.gru_id=g.id AND s.sistem='1' AND s.variable='podipl'");
// Ce ni sifre studenta je napaka - mora biti vedno
if(mysqli_num_rows($sqlStudent) == 0)
$surveysArray['none'][] = array('id'=>$rowA['id'], 'naslov'=>$rowA['naslov']);
else{
// je siffaks - obravnava se kot druga fakulteta
if(mysqli_num_rows($sqlFaks) > 0){
if(mysqli_num_rows($sqlPredmet) > 0){
if(mysqli_num_rows($sqlIzvajalec) > 0)
$surveysArray['druga']['pred'][] = array('id'=>$rowA['id'], 'naslov'=>$rowA['naslov']);
else
$surveysArray['druga']['po'][] = array('id'=>$rowA['id'], 'naslov'=>$rowA['naslov']);
}
else{
if(mysqli_num_rows($sqlPodipl) > 0)
$surveysArray['druga']['podiplomska'][] = array('id'=>$rowA['id'], 'naslov'=>$rowA['naslov']);
else
$surveysArray['druga']['splosna'][] = array('id'=>$rowA['id'], 'naslov'=>$rowA['naslov']);
}
}
// ni siffaks - FDV
else{
if(mysqli_num_rows($sqlPredmet) > 0){
if(mysqli_num_rows($sqlIzvajalec) > 0)
$surveysArray['fdv']['pred'][] = array('id'=>$rowA['id'], 'naslov'=>$rowA['naslov']);
else
$surveysArray['fdv']['po'][] = array('id'=>$rowA['id'], 'naslov'=>$rowA['naslov']);
}
else{
if(mysqli_num_rows($sqlPodipl) > 0)
$surveysArray['fdv']['podiplomska'][] = array('id'=>$rowA['id'], 'naslov'=>$rowA['naslov']);
else
$surveysArray['fdv']['splosna'][] = array('id'=>$rowA['id'], 'naslov'=>$rowA['naslov']);
}
}
}
}
// Izrisemo tabelo
echo '<table style="float:left; border-spacing:0px; border:2px black solid; table-layout:fixed; border-collapse:collapse; margin:10px 20px;">';
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">ID</td>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Naslov</td>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Fakulteta</td>';
echo '<td style="border:1px solid black; padding:2px 5px; font-weight:bold;">Tip študentske ankete</td>';
echo '</tr>';
foreach($surveysArray['fdv']['pred'] as $anketa){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['id'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['naslov'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">FDV</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Anketa PRED</td>';
echo '</tr>';
}
foreach($surveysArray['fdv']['po'] as $anketa){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['id'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['naslov'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">FDV</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Anketa PO</td>';
echo '</tr>';
}
foreach($surveysArray['fdv']['splosna'] as $anketa){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['id'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['naslov'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">FDV</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Splošna anketa</td>';
echo '</tr>';
}
foreach($surveysArray['fdv']['podiplomska'] as $anketa){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['id'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['naslov'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">FDV</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Podiplomska anketa</td>';
echo '</tr>';
}
foreach($surveysArray['druga']['pred'] as $anketa){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['id'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['naslov'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Druga</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Anketa PRED</td>';
echo '</tr>';
}
foreach($surveysArray['druga']['po'] as $anketa){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['id'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['naslov'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Druga</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Anketa PO</td>';
echo '</tr>';
}
foreach($surveysArray['druga']['splosna'] as $anketa){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['id'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['naslov'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Druga</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Splošna anketa</td>';
echo '</tr>';
}
foreach($surveysArray['druga']['podiplomska'] as $anketa){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['id'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['naslov'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Druga</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">Podiplomska anketa</td>';
echo '</tr>';
}
foreach($surveysArray['none'] as $anketa){
echo '<tr>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['id'].'</td>';
echo '<td style="border:1px solid black; padding:2px 5px;">'.$anketa['naslov'].'</td>';
echo '<td colspan="2" style="border:1px solid black; padding:2px 5px;">NI SPREMENLJIVKE "sifstud"!</td>';
echo '</tr>';
}
echo '</table>'; */
echo '</fieldset>'; echo '</fieldset>';
} }
@ -2726,7 +2620,15 @@ class Evalvacija{
// Pridobimo id fakultete glede na id ankete // Pridobimo id fakultete glede na id ankete
function getFakultetaId($ank_id){ function getFakultetaId($ank_id){
$sql = sisplet_query("SELECT * FROM eval_fakulteta WHERE anketa_pred='".$ank_id."' OR anketa_po='".$ank_id."' OR anketa_splosna='".$ank_id."' OR anketa_podipl='".$ank_id."' OR anketa_podipl2='".$ank_id."'"); $sql = sisplet_query("SELECT *
FROM eval_fakulteta
WHERE anketa_pred='".$ank_id."'
OR anketa_po='".$ank_id."'
OR anketa_splosna='".$ank_id."'
OR anketa_podipl='".$ank_id."'
OR anketa_podipl2='".$ank_id."'
OR anketa_podipl3='".$ank_id."'
");
if(mysqli_num_rows($sql) == 0){ if(mysqli_num_rows($sql) == 0){
echo 'Anketa ne pripada nobeni članici!'; echo 'Anketa ne pripada nobeni članici!';
@ -2768,6 +2670,7 @@ class Evalvacija{
$this->exportSettings['anketa_splosna'] = isset($this->fakultete[$this->exportSettings['fakulteta']]['anketa_splosna']) ? $this->fakultete[$this->exportSettings['fakulteta']]['anketa_splosna'] : -1; $this->exportSettings['anketa_splosna'] = isset($this->fakultete[$this->exportSettings['fakulteta']]['anketa_splosna']) ? $this->fakultete[$this->exportSettings['fakulteta']]['anketa_splosna'] : -1;
$this->exportSettings['anketa_podipl'] = isset($this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl']) ? $this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl'] : -1; $this->exportSettings['anketa_podipl'] = isset($this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl']) ? $this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl'] : -1;
$this->exportSettings['anketa_podipl2'] = isset($this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl2']) ? $this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl2'] : -1; $this->exportSettings['anketa_podipl2'] = isset($this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl2']) ? $this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl2'] : -1;
$this->exportSettings['anketa_podipl3'] = isset($this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl3']) ? $this->fakultete[$this->exportSettings['fakulteta']]['anketa_podipl3'] : -1;
$this->testExport(); $this->testExport();
} }

9
admin/survey/modules/Evalvacija/sql.sql
View File

@ -422,3 +422,12 @@ CREATE TABLE eval_data_podipl2 (
ank_id INT(11) NOT NULL, ank_id INT(11) NOT NULL,
PRIMARY KEY (student) PRIMARY KEY (student)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
# 21.7.2021
ALTER TABLE eval_fakulteta ADD anketa_podipl3 INT(11) NOT NULL DEFAULT '0' AFTER anketa_podipl2;
CREATE TABLE eval_data_podipl3 (
student VARCHAR(50) NOT NULL,
ank_id INT(11) NOT NULL,
PRIMARY KEY (student)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

5
lang/1.php
View File

@ -911,6 +911,7 @@ $lang = array (
"forum_lastposts" => "ve&#269;", //V originalu "Zandnje teme" "forum_lastposts" => "ve&#269;", //V originalu "Zandnje teme"
"forum_lastposts2" => "Zadnje teme", "forum_lastposts2" => "Zadnje teme",
"page" => "Stran", "page" => "Stran",
"intro" => "Uvod",
"thread_alert_on" => "Naro&#269;eni ste na nova sporo&#269;ila v tej temi", "thread_alert_on" => "Naro&#269;eni ste na nova sporo&#269;ila v tej temi",
"thread_alert_off" => "Niste naro&#269;eni na nova sporo&#269;ila v tej temi", "thread_alert_off" => "Niste naro&#269;eni na nova sporo&#269;ila v tej temi",
"forum_alert_on" => "Naro&#269;eni ste na nova sporo&#269;ila v tem forumu", "forum_alert_on" => "Naro&#269;eni ste na nova sporo&#269;ila v tem forumu",
@ -6666,8 +6667,8 @@ $lang = array (
'srv_public_link_created' => 'Ustvaril', 'srv_public_link_created' => 'Ustvaril',
'srv_public_link_refresh' => 'Osveži vsakih 15s', 'srv_public_link_refresh' => 'Osveži vsakih 15s',
'srv_public_link_deleteLink' => 'Odstrani zunanjo povezavo', 'srv_public_link_deleteLink' => 'Odstrani zunanjo povezavo',
'date_insert' => 'vnosa', 'date_insert' => 'začetek',
'date_edit' => 'popravljanja', 'date_edit' => 'konec',
'srv_invitation_server_warning' => 'Pred pošiljanjem je potrebno nastaviti strežnik', 'srv_invitation_server_warning' => 'Pred pošiljanjem je potrebno nastaviti strežnik',
'srv_excel_upload_note' => 'Pozor, sistem bo uporabil zavihek, ki je bil nazadnje uporabljen!', 'srv_excel_upload_note' => 'Pozor, sistem bo uporabil zavihek, ki je bil nazadnje uporabljen!',
'srv_library_filter_folder' => 'Direktorij', 'srv_library_filter_folder' => 'Direktorij',

5
lang/2.php
View File

@ -895,6 +895,7 @@ $lang = array (
"forum_lastposts" => "last threads", "forum_lastposts" => "last threads",
"forum_lastposts2" => "last threads", "forum_lastposts2" => "last threads",
"page" => "Page", "page" => "Page",
"intro" => "Intro",
"thread_alert_on" => "You are subscribed to new posts in this thread", "thread_alert_on" => "You are subscribed to new posts in this thread",
"thread_alert_off" => "You are not subscribed to new posts in this thread", "thread_alert_off" => "You are not subscribed to new posts in this thread",
"forum_alert_on" => "You are subscribed to new posts in this forum", "forum_alert_on" => "You are subscribed to new posts in this forum",
@ -6551,8 +6552,8 @@ $lang = array (
'srv_public_link_created' => 'Created', 'srv_public_link_created' => 'Created',
'srv_public_link_refresh' => 'Refresh every 15s', 'srv_public_link_refresh' => 'Refresh every 15s',
'srv_public_link_deleteLink' => 'Delete link', 'srv_public_link_deleteLink' => 'Delete link',
'date_insert' => 'insert', 'date_insert' => 'begin',
'date_edit' => 'edit', 'date_edit' => 'end',
'srv_invitation_server_warning' => 'You must configure server settings before sending emails', 'srv_invitation_server_warning' => 'You must configure server settings before sending emails',
'srv_excel_upload_note' => 'Warning, system will use the last opened tab!', 'srv_excel_upload_note' => 'Warning, system will use the last opened tab!',
'srv_library_filter_folder' => 'Folder', 'srv_library_filter_folder' => 'Folder',

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

@ -676,6 +676,7 @@ class BodyController extends Controller
$sql4 = sisplet_query("SELECT d.* FROM srv_spremenljivka s, srv_grupa g, srv_data_text" . get('db_table') . " d WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='sifizv1' AND d.spr_id=s.id AND d.usr_id='" . get('usr_id') . "'"); $sql4 = sisplet_query("SELECT d.* FROM srv_spremenljivka s, srv_grupa g, srv_data_text" . get('db_table') . " d WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='sifizv1' AND d.spr_id=s.id AND d.usr_id='" . get('usr_id') . "'");
$sql5 = sisplet_query("SELECT s.* FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='podipl'"); $sql5 = sisplet_query("SELECT s.* FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='podipl'");
$sql6 = sisplet_query("SELECT s.* FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='podipl2'"); $sql6 = sisplet_query("SELECT s.* FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='podipl2'");
$sql7 = sisplet_query("SELECT s.* FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='podipl3'");
// Ce imamo sifro predmeta gre za anketo za ocenjevanje predmetov // Ce imamo sifro predmeta gre za anketo za ocenjevanje predmetov
if (mysqli_num_rows($sql2) > 0) { if (mysqli_num_rows($sql2) > 0) {
@ -714,6 +715,16 @@ class BodyController extends Controller
// Pobrisemo md5 (id studenta) iz zacasne tabele eval_data_user zaradi anonimnosti // Pobrisemo md5 (id studenta) iz zacasne tabele eval_data_user zaradi anonimnosti
sisplet_query("DELETE FROM eval_data_user WHERE usr_id='".get('usr_id')."' AND ank_id='".get('anketa')."'"); sisplet_query("DELETE FROM eval_data_user WHERE usr_id='".get('usr_id')."' AND ank_id='".get('anketa')."'");
} }
// splosna PODIPLOMSKA anketa 3 (ena na studenta, brez predmetov)
elseif (mysqli_num_rows($sql7) > 0) {
$row1 = mysqli_fetch_array($sql1);
// student je v celoti odgovoril na anketo
sisplet_query("INSERT INTO eval_data_podipl3 (student, ank_id) VALUES ('$row1[student]', '" . get('anketa') . "')");
// Pobrisemo md5 (id studenta) iz zacasne tabele eval_data_user zaradi anonimnosti
sisplet_query("DELETE FROM eval_data_user WHERE usr_id='".get('usr_id')."' AND ank_id='".get('anketa')."'");
}
// SPLOSNA anketa (ena na studenta, brez predmetov) // SPLOSNA anketa (ena na studenta, brez predmetov)
elseif (mysqli_num_rows($sql1) > 0) { elseif (mysqli_num_rows($sql1) > 0) {
$row1 = mysqli_fetch_array($sql1); $row1 = mysqli_fetch_array($sql1);

22
main/survey/class.EvalvacijaMain.php
View File

@ -239,6 +239,17 @@ class EvalvacijaMain {
$return['prijava'] = false; $return['prijava'] = false;
} }
} }
// Podiplomska anketa 3
elseif($rowStudent['letnik'] == '3'){
// Preverimo ce je podiplomski student ze odgovarjal na splosno podiplomsko anketo 3
$sql2 = sisplet_query("SELECT * FROM eval_data_podipl3 WHERE student='$student'");
if (mysqli_num_rows($sql2) == 0){
$return['msg'] = 'Pred vnosom vpisnega lista morate izpolniti še podiplomsko anketo 3.';
$return['prijava'] = false;
}
}
} }
} }
} }
@ -304,7 +315,7 @@ class EvalvacijaMain {
if($ank_type == 'anketa_pred' || $ank_type == 'anketa_po' || $ank_type == 'anketa_splosna') if($ank_type == 'anketa_pred' || $ank_type == 'anketa_po' || $ank_type == 'anketa_splosna')
$sqlStudent = sisplet_query("SELECT * FROM eval_student WHERE id_student='$student'"); $sqlStudent = sisplet_query("SELECT * FROM eval_student WHERE id_student='$student'");
else else
$sqlStudent = sisplet_query("SELECT * FROM eval_student_podipl WHERE id_student='$student' AND (letnik='1' OR letnik='2')"); $sqlStudent = sisplet_query("SELECT * FROM eval_student_podipl WHERE id_student='$student' AND (letnik='1' OR letnik='2' OR letnik='3')");
if(mysqli_num_rows($sqlStudent) > 0){ if(mysqli_num_rows($sqlStudent) > 0){
$rowStudent = mysqli_fetch_array($sqlStudent); $rowStudent = mysqli_fetch_array($sqlStudent);
@ -322,6 +333,11 @@ class EvalvacijaMain {
$ank_type = 'anketa_podipl2'; $ank_type = 'anketa_podipl2';
} }
// Pogledamo ce imamo slucajno podiplomsko anketo 3
if($ank_type == 'anketa_podipl' && $rowStudent['letnik'] == '3'){
$ank_type = 'anketa_podipl3';
}
// Dobimo id ustrezne ankete // Dobimo id ustrezne ankete
$ank_id = self::getFaksData($fakulteta, $ank_type); $ank_id = self::getFaksData($fakulteta, $ank_type);
@ -336,6 +352,8 @@ class EvalvacijaMain {
$sql = sisplet_query("SELECT * FROM eval_data_podipl WHERE student='$student' AND ank_id='$ank_id'"); $sql = sisplet_query("SELECT * FROM eval_data_podipl WHERE student='$student' AND ank_id='$ank_id'");
elseif($ank_type == 'anketa_podipl2') elseif($ank_type == 'anketa_podipl2')
$sql = sisplet_query("SELECT * FROM eval_data_podipl2 WHERE student='$student' AND ank_id='$ank_id'"); $sql = sisplet_query("SELECT * FROM eval_data_podipl2 WHERE student='$student' AND ank_id='$ank_id'");
elseif($ank_type == 'anketa_podipl3')
$sql = sisplet_query("SELECT * FROM eval_data_podipl3 WHERE student='$student' AND ank_id='$ank_id'");
// Ce ze imamo odgovor studenta v bazi ga ne spustimo naprej // Ce ze imamo odgovor studenta v bazi ga ne spustimo naprej
if(mysqli_num_rows($sql) > 0) if(mysqli_num_rows($sql) > 0)
@ -434,7 +452,7 @@ class EvalvacijaMain {
$request .= '&nacinstud='.$rowStudent['nacin_studija']; $request .= '&nacinstud='.$rowStudent['nacin_studija'];
} }
// Parametri za SPLOSNO anketo in za PODIPLOMSKO SPLOSNO anketo // Parametri za SPLOSNO anketo in za PODIPLOMSKO SPLOSNO anketo
elseif($ank_type == 'anketa_splosna' || $ank_type == 'anketa_podipl' || $ank_type == 'anketa_podipl2'){ elseif($ank_type == 'anketa_splosna' || $ank_type == 'anketa_podipl' || $ank_type == 'anketa_podipl2' || $ank_type == 'anketa_podipl3'){
$request .= '&sifstud='.$student; $request .= '&sifstud='.$student;
$request .= '&siffaks='.$fakulteta; $request .= '&siffaks='.$fakulteta;

1
main/survey/podiplomska_anketa_uni.php
View File

@ -5,6 +5,7 @@
* File za redirekt na podiplomsko studentsko anketo - vsak student izpolni eno anketo * File za redirekt na podiplomsko studentsko anketo - vsak student izpolni eno anketo
* PODIPLOMSKA SPLOSNA ANKETA * PODIPLOMSKA SPLOSNA ANKETA
* PODIPLOMSKA SPLOSNA ANKETA 2 * PODIPLOMSKA SPLOSNA ANKETA 2
* PODIPLOMSKA SPLOSNA ANKETA 3
*/ */
include_once('../../function.php'); include_once('../../function.php');

2
main/survey/studentska_prijava_podipl_uni.php
View File

@ -2,7 +2,7 @@
/** /**
* *
* file za preverjat ali se student lahko prijavi na izpite/visji letnik - ce je izpolnil PODIPLOMSKO ANKETO oz. PODIPLOMSKO ANKETO 2 * file za preverjat ali se student lahko prijavi na izpite/visji letnik - ce je izpolnil PODIPLOMSKO ANKETO oz. PODIPLOMSKO ANKETO 2 oz. PODIPLOMSKO ANKETO 3
* *
*/ */