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

Latex za izvoze: IZVOZ-57: Slike v anketi: ureditev pomanjkljivega sql stavka

Browse Source
This commit is contained in:
patrik2020 2020-10-06 12:40:30 +02:00
parent dec0d9c568
commit d01e0856b7
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
admin/survey/export/latexclasses/class.LatexSurvey.php
View File

@ -265,20 +265,21 @@ class LatexSurvey{
// Izrisemo naslov loopa // Izrisemo naslov loopa
$tex .= $this->dataPiping($loop_title); $tex .= $this->dataPiping($loop_title);
//TODO: TUdi tu se celotna spremenljivka prenaša naprej //TODO: TUdi tu se celotna spremenljivka prenaša naprej
$sqlSpremenljivke = sisplet_query("SELECT id, tip, visible, sistem, variable, naslov, info, orientation FROM srv_spremenljivka WHERE gru_id='".$this->grupa."' AND visible='1' ORDER BY vrstni_red ASC"); $sqlSpremenljivke = sisplet_query("SELECT id, tip, visible, sistem, variable, naslov, info, orientation, dostop FROM srv_spremenljivka WHERE gru_id='".$this->grupa."' AND visible='1' ORDER BY vrstni_red ASC");
//echo "SELECT id, tip, visible, sistem, variable, naslov, info, orientation FROM srv_spremenljivka WHERE gru_id='".$this->grupa."' AND visible='1' ORDER BY vrstni_red ASC "."</br>";
while ($rowSpremenljivke = mysqli_fetch_assoc($sqlSpremenljivke)) while ($rowSpremenljivke = mysqli_fetch_assoc($sqlSpremenljivke))
{ // sprehodimo se skozi spremenljivke grupe { // sprehodimo se skozi spremenljivke grupe
$spremenljivka = $rowSpremenljivke['id']; $spremenljivka = $rowSpremenljivke['id'];
if ($rowSpremenljivke['visible'] == 0 || !( ($this->admin_type <= $rowSpremenljivke['dostop'] && $this->admin_type>=0) || ($this->admin_type==-1 && $rowSpremenljivke['dostop']==4) ) ) { if ($rowSpremenljivke['visible'] == 0 || !( ($this->admin_type <= $rowSpremenljivke['dostop'] && $this->admin_type>=0) || ($this->admin_type==-1 && $rowSpremenljivke['dostop']==4) ) ) {
//echo "ni admin za sprem: ".$rowSpremenljivke['id']."</br>"; //echo "ni admin za sprem: ".$rowSpremenljivke['id']."</br>";
continue; continue;
} }
if($export_subtype=='q_data'||$export_subtype=='q_data_all'){ //ce je vprasalnik s podatki za enega ali vse respondente if($export_subtype=='q_data'||$export_subtype=='q_data_all'){ //ce je vprasalnik s podatki za enega ali vse respondente
$preveriSpremenljivko = $this->checkSpremenljivkaData($spremenljivka, $this->loop_id); $preveriSpremenljivko = $this->checkSpremenljivkaData($spremenljivka, $this->loop_id);
}else{ //ce je prazen vprasalnik ali vprasalnik s komentarji }else{ //ce je prazen vprasalnik ali vprasalnik s komentarji
@ -304,10 +305,6 @@ class LatexSurvey{
} }
else if ($rowSpremenljivke['sistem'] == 1) else if ($rowSpremenljivke['sistem'] == 1)
$this->pdf->SetTextColor(0,0,255); $this->pdf->SetTextColor(0,0,255);
/* $this->pdf->SetTextColor(0,0,0);
$this->pdf->SetDrawColor(0,0,0); */
// Izpis vprasalnika z rezultati // Izpis vprasalnika z rezultati
@ -401,9 +398,6 @@ class LatexSurvey{
$stevilcenje = ( SurveyInfo::getInstance()->getSurveyCountType() ) ? $stevilcenje = ( SurveyInfo::getInstance()->getSurveyCountType() ) ?
( ( SurveyInfo::getInstance()->getSurveyCountType() == 2 ) ? $rowSpremenljivke['variable'].") " : $zaporedna.") " ) : null; ( ( SurveyInfo::getInstance()->getSurveyCountType() == 2 ) ? $rowSpremenljivke['variable'].") " : $zaporedna.") " ) : null;
//$this->pdf->SetTextColor(0,0,0);
//$this->pdf->SetDrawColor(0,0,0);
$this->currentHeight = 0; $this->currentHeight = 0;
// izpis skrcenega vprasalnika (samo pri izpisu iz urejanja) // izpis skrcenega vprasalnika (samo pri izpisu iz urejanja)
@ -1151,9 +1145,10 @@ class LatexSurvey{
//Stari query srv_vrednost se ni nikjer uporabljal //Stari query srv_vrednost se ni nikjer uporabljal
//$sql = sisplet_query("SELECT l.* FROM srv_loop_data l, srv_vrednost v WHERE l.if_id='$if_id' AND l.id > '$loop_id' AND l.vre_id IN ($vre_id) AND l.vre_id=v.id ORDER BY l.id ASC"); //$sql = sisplet_query("SELECT l.* FROM srv_loop_data l, srv_vrednost v WHERE l.if_id='$if_id' AND l.id > '$loop_id' AND l.vre_id IN ($vre_id) AND l.vre_id=v.id ORDER BY l.id ASC");
//Problematicni sql, ker ocitno tale zadeva z obj ne dela najbolje //Problematicni sql, ker ocitno tale zadeva z obj ne dela najbolje
//$sql = sisplet_query("SELECT id FROM srv_loop_data WHERE if_id='$if_id' AND id > '$loop_id' AND vre_id IN ($vre_id) ORDER BY id ASC", "obj"); //$sql = sisplet_query("SELECT id FROM srv_loop_data WHERE if_id='$if_id' AND id > '$loop_id' AND vre_id IN ($vre_id) ORDER BY id ASC", "obj");
$sqlTestString = "SELECT id FROM srv_loop_data WHERE if_id='$if_id' AND id > '$loop_id' AND vre_id IN ($vre_id) ORDER BY id ASC"; $sqlTestString = "SELECT id FROM srv_loop_data WHERE if_id='$if_id' AND id > '$loop_id' AND vre_id IN ($vre_id) ORDER BY id ASC";
//echo "sqlString: ".$sqlTestString."</br>";
$sqlTest = sisplet_query($sqlTestString); $sqlTest = sisplet_query($sqlTestString);
$rowTest = mysqli_fetch_array($sqlTest); $rowTest = mysqli_fetch_array($sqlTest);