diff options
Diffstat (limited to 'mayor-orig/mayor-naplo/www/include')
| -rw-r--r-- | mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php index 602f26e1..60ddb4fa 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php @@ -24,16 +24,20 @@ tankorNev, feladatTipusId, munkaido, - hazifeladatId, hazifeladatLeiras + hazifeladatId, + hazifeladatLeiras, + cimkeId, cimkeLeiras FROM `%s`.ora LEFT JOIN `%s`.oraHazifeladat USING (oraId) + LEFT JOIN `%s`.oraCimke USING (oraId) + LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t1 ON ki=t1.tanarId LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t2 ON kit=t2.tanarId LEFT JOIN ".__INTEZMENYDBNEV.".feladatTipus USING (feladatTipusId) LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId) WHERE oraId=%u AND (tanev=%u OR feladatTipusId IS NOT NULL)"; - $v = array(tanevDbNev(__INTEZMENY, $tanev),tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev); + $v = array(tanevDbNev(__INTEZMENY, $tanev),tanevDbNev(__INTEZMENY, $tanev), tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev); return db_query($q, array('fv' => 'getOraAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v), $olr); } else { @@ -349,6 +353,8 @@ } else { $q = "SELECT * FROM ora LEFT JOIN oraHazifeladat USING (oraId) +LEFT JOIN oraCimke USING (oraId) +LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora"; array_unshift($v, $tolDt, $igDt, $tanarId, $tanarId); if ($SET['result']=='assoc') @@ -389,13 +395,19 @@ WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora"; $RE = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v)); } else { if ($SET['elmaradokNelkul']) - $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora + $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime, cimkeId, cimkeLeiras +FROM ora LEFT JOIN oraHazifeladat USING (oraId) +LEFT JOIN oraCimke USING (oraId) +LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).") AND tipus NOT IN ('elmarad','elmarad máskor')"; else - $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora + $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime, cimkeId, cimkeLeiras +FROM ora LEFT JOIN oraHazifeladat USING (oraId) +LEFT JOIN oraCimke USING (oraId) +LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).")"; $R = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v)); $RE['tankorok']=array(); |