diff options
Diffstat (limited to 'mayor-orig/mayor-naplo/www/policy')
| -rw-r--r-- | mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php | 15 | ||||
| -rw-r--r-- | mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php | 5 |
2 files changed, 18 insertions, 2 deletions
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php index 9222a0c8..62d0f384 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php @@ -19,6 +19,7 @@ require_once('include/modules/naplo/share/tankorDiakModifier.php'); require_once('include/modules/naplo/share/hianyzasModifier.php'); require_once('include/modules/naplo/share/jegyModifier.php'); require_once('include/modules/naplo/share/jegy.php'); +require_once('include/modules/naplo/share/kereso.php'); require_once('include/share/net/upload.php'); define('FILE_UPLOAD_DIR',_DOWNLOADDIR.'/private/naplo/upload/'); @@ -116,7 +117,19 @@ if (isset($osztalyId)) { $ADAT['diakok'] = getDiakok(array('tanev' => $tanev)); } -if ($action == 'osztalyAdatModositas' && __NAPLOADMIN) { + +if ($action == 'oidEllenor' && __NAPLOADMIN===true) { + + // --TODO + $_re = str_replace(' ',"\n",str_replace('\r','\n',$_POST['oidtxt'])); + $oidxp = explode("\n",str_replace(' ',"\n",str_replace('\r','\n',$_POST['oidtxt']))); + $ADAT['oidtxt'] = $_re; + for($i=0; $i<count($oidxp); $i++) { + $_oid = $oidxp[$i]; + $ADAT['oidCheck'][$_oid] = getDiakokByPattern($_oid); + } + +} elseif ($action == 'osztalyAdatModositas' && __NAPLOADMIN) { $leiras = readVariable($_POST['leiras'], 'string'); $ofoTanarId = readVariable($_POST['ofoTanarId'], 'id'); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php index 20ca97a5..a1c51b8c 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php @@ -12,7 +12,8 @@ // Osztályhoz rendelés if (isset($ADAT['osztalyId']) && ($ADAT['osztalyAdat']["kezdoTanev"]<=$ADAT['tanev'] && $ADAT['osztalyAdat']["vegzoTanev"]>=$ADAT['tanev'])) { - + + putOsztalyAdatokForm($ADAT); if ($ADAT['osztalyJellegek'][ $ADAT['osztalyAdat']['osztalyJellegId'] ]['kovOsztalyJellegId'] != 0) { // NyEK évfolyam @@ -24,6 +25,8 @@ } putUjTagForm($ADAT); + if (__NAPLOADMIN ===true) putOidEllenor($ADAT); + if (__NAPLOADMIN) { if ($fileName == '') { putFileSelectForm('naplo_intezmeny:diak',array('osztalyId','tanev')); |