From a6185f7270c04c7469ea1a785e5cb35d2c3fdea6 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Tue, 21 Sep 2021 13:20:05 +0200
Subject: Rev: 4814

---
 .../www/policy/public/naplo/intezmeny/tanarok-pre.php         | 11 ++++++-----
 .../mayor-naplo/www/policy/public/naplo/intezmeny/tanarok.php |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'mayor-orig/mayor-naplo/www/policy/public')

diff --git a/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok-pre.php b/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok-pre.php
index 010a7189..18f17ec6 100644
--- a/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok-pre.php
@@ -36,12 +36,13 @@
     $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus,statusz,besorolas,email,YEAR(beDt) AS belepesEve,IFNULL("",YEAR(kiDt)) AS kilepesEve, elerhetoseg'));
     $ADAT['targyak'] = getTargyak(array('arraymap'=>array('targyId')));
     $lr = db_connect('naplo_intezmeny');
+
     for($i=0; $i<count($ADAT['tanarok']); $i++) {
-	$_tanarId = $ADAT['tanarok'][$i]['tanarId'];
-	$ADAT[$_tanarId]['osztalyfonok'] = getOsztalyIdsByTanarId($_tanarId, array('tanev'=>__TANEV,'csakId'=>true),$lr);
-	$ADAT[$_tanarId]['mkVez'] = getVezetettMunkakozossegByTanarId($_tanarId,array('result'=>'assoc'),$lr);
-	$ADAT[$_tanarId]['munkakozosseg'] = getMunkakozossegByTanarId($_tanarId,array('result'=>'assoc'),$lr);
-	$ADAT[$_tanarId]['kepesites'] = getTanarKepesites($_tanarId);
+        $_tanarId = $ADAT['tanarok'][$i]['tanarId'];
+        $ADAT['tanarOsztaly'][$_tanarId] = getOsztalyIdsByTanarId($_tanarId, array('tanev'=>__TANEV,'csakId'=>true),$lr);
+        $ADAT['tanarMunkakozosseg'][$_tanarId] = getVezetettMunkakozossegByTanarId($_tanarId,array('result'=>'assoc'),$lr);
+        $ADAT['tanarok'][$i]['kepesites'] = getTanarKepesites($_tanarId);
+//      $ADAT['tanarok'][$i]['kepesitesNev'] = $ADAT['kepesitesek'];
     }
     $ADAT['osztalyok'] = getOsztalyok(__TANEV,array('result'=>'assoc'),$lr);
     db_close($lr);
diff --git a/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok.php b/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok.php
index 3d15f4de..d028bd19 100644
--- a/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok.php
+++ b/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok.php
@@ -2,6 +2,7 @@
 
     if (_RIGHTS_OK !== true) die();
     global $ADAT;
-    putTanarLista($ADAT);
+
+    putTanarLista_large($ADAT);
 
 ?>
-- 
cgit v1.2.3