From 9f8ebef887d2a1fa3c4ca138e28d6f732071176b Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Fri, 6 Jul 2018 11:35:38 +0200
Subject: 2018-07-03 állapot

---
 mayor-orig/www/policy/private/naplo/intezmeny/osztaly-pre.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/mayor-orig/www/policy/private/naplo/intezmeny/osztaly-pre.php b/mayor-orig/www/policy/private/naplo/intezmeny/osztaly-pre.php
index ddc17765..0bff88bf 100644
--- a/mayor-orig/www/policy/private/naplo/intezmeny/osztaly-pre.php
+++ b/mayor-orig/www/policy/private/naplo/intezmeny/osztaly-pre.php
@@ -86,7 +86,7 @@ if (isset($osztalyId)) {
 	$diakIds = $ADAT['osztalyAdat']['kepzesIds'] = array();
 	if (is_array($ADAT['osztalyAdat']['kepzes'])) 
 	    for ($i = 0; $i < count($ADAT['osztalyAdat']['kepzes']); $i++) $ADAT['osztalyAdat']['kepzesIds'][] = $ADAT['osztalyAdat']['kepzes'][$i]['kepzesId'];
-	$OsztalyNevsor = getDiakokByOsztaly($osztalyId, array('tanev' => $tanev));
+	$OsztalyNevsor = getDiakokByOsztaly($osztalyId, array('tanev' => $tanev,'felveteltNyertEkkel'=>true));
 
 	foreach ($OsztalyNevsor as $key => $value) if (is_numeric($key)) {
 	    $diakIds[] = $key;
@@ -254,7 +254,7 @@ if ($action == 'osztalyAdatModositas' && __NAPLOADMIN) {
 	$kiDt = readVariable($_POST['kiDt'], 'date');
 	if (isset($diakId)  && isset($beDt)) {
 	    if (ujTag($osztalyId, $diakId, $beDt, $kiDt)) {
-		$OsztalyNevsor = getDiakokByOsztaly($osztalyId, array('tanev' => $tanev));
+		$OsztalyNevsor = getDiakokByOsztaly($osztalyId, array('tanev' => $tanev,'felveteltNyertEkkel'=>true));
 		foreach ($OsztalyNevsor as $key => $value) if (is_numeric($key)) {
 		    $ADAT['osztalyNevsor'][$key] = $value;
 		}
@@ -271,7 +271,7 @@ if ($action == 'osztalyAdatModositas' && __NAPLOADMIN) {
     $PARAM['zaradekkal'] = false;
     if (isset($PARAM['osztalyId']) && isset($PARAM['diakId']) && isset($PARAM['tolDt'])) {
 	if (osztalyDiakTorol($PARAM)) {
-	    $OsztalyNevsor = getDiakokByOsztaly($osztalyId, array('tanev' => $tanev));
+	    $OsztalyNevsor = getDiakokByOsztaly($osztalyId, array('tanev' => $tanev,'felveteltNyertEkkel'=>true));
 	    foreach ($OsztalyNevsor as $key => $value) if (is_numeric($key)) {
 		$ADAT['osztalyNevsor'][$key] = $value;
 	    }
@@ -293,11 +293,12 @@ if (isset($osztalyId)) {
 	$diakIds = $ADAT['osztalyAdat']['kepzesIds'] = array();
 	if (is_array($ADAT['osztalyAdat']['kepzes'])) 
 	    for ($i = 0; $i < count($ADAT['osztalyAdat']['kepzes']); $i++) $ADAT['osztalyAdat']['kepzesIds'][] = $ADAT['osztalyAdat']['kepzes'][$i]['kepzesId'];
-	$OsztalyNevsor = getDiakokByOsztaly($osztalyId, array('tanev' => $tanev));
+	$OsztalyNevsor = getDiakokByOsztaly($osztalyId, array('tanev' => $tanev,'felveteltNyertEkkel'=>true));
         $ADAT['osztalyNevsor'] = array();
 	foreach ($OsztalyNevsor as $key => $value) if (is_numeric($key)) {
 	    $diakIds[] = $key;
 	    $ADAT['osztalyNevsor'][$key] = $value;
+	    $ADAT['osztalyNevsor'][$key]['diakNaploSorszam'] = getDiakNaploSorszam($key,$tanev,$osztalyId);
 	}
 	$ADAT['diakKepzes'] = getKepzesByDiakId($diakIds, array('result' => 'assoc'));
 	$ADAT['diakok'] = getDiakok(array('tanev' => $tanev));
-- 
cgit v1.2.3