diff options
| author | M.Gergo | 2020-09-10 13:20:03 +0200 |
|---|---|---|
| committer | M.Gergo | 2020-09-10 13:20:03 +0200 |
| commit | 847eb4a21606966ac5573c6ed6df878eff93841a (patch) | |
| tree | e2f5a86ee00ec0335b696c0446dee11ae6f59534 /mayor-orig/mayor-naplo | |
| parent | 05cd10ac470512a35ac392856baabe8b0619add5 (diff) | |
| download | mayor-847eb4a21606966ac5573c6ed6df878eff93841a.tar.gz mayor-847eb4a21606966ac5573c6ed6df878eff93841a.zip | |
Rev: 4680rev4680
Diffstat (limited to 'mayor-orig/mayor-naplo')
4 files changed, 40 insertions, 3 deletions
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4678 +4680 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')); diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml index b476482c..44af95fb 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml @@ -423,5 +423,26 @@ function putOsztalyJellegek($ADAT,$osztalyJellegId) { } +function putOidEllenor($ADAT) { + + formBegin(array('class'=>'osztalyForm')); + echo '<input type="hidden" name="action" value="oidEllenor" />'; + echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />'; + echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />'; + + echo '<h1>'._OIDELLENOR.'</h1>'; + + var_dump($ADAT['oidCheck']); + + echo '<textarea name="oidtxt" rows="10">'; + echo $ADAT['oidtxt']; + echo '</textarea>'; + + echo '<br/><input type="submit" value="'._OK.'" />'; + + formEnd(); + +} + ?>
\ No newline at end of file |