From f51c9ed2abe5c68211bb3736be5f70b1fe2c9ec0 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Fri, 8 Mar 2019 21:20:34 +0100 Subject: további rendrakás --- .../policy/private/naplo/sni/diakAllapot-pre.php | 127 --------------------- .../www/policy/private/naplo/sni/diakAllapot.php | 8 -- .../private/naplo/sni/fejlesztesiTerv-pre.php | 110 ------------------ .../policy/private/naplo/sni/fejlesztesiTerv.php | 9 -- .../www/policy/private/naplo/sni/sni-pre.php | 5 - mayor-orig/www/policy/private/naplo/sni/sni.php | 0 .../naplo/sni/tantargyiFeljegyzesek-pre.php | 113 ------------------ .../private/naplo/sni/tantargyiFeljegyzesek.php | 10 -- 8 files changed, 382 deletions(-) delete mode 100644 mayor-orig/www/policy/private/naplo/sni/diakAllapot-pre.php delete mode 100644 mayor-orig/www/policy/private/naplo/sni/diakAllapot.php delete mode 100644 mayor-orig/www/policy/private/naplo/sni/fejlesztesiTerv-pre.php delete mode 100644 mayor-orig/www/policy/private/naplo/sni/fejlesztesiTerv.php delete mode 100644 mayor-orig/www/policy/private/naplo/sni/sni-pre.php delete mode 100644 mayor-orig/www/policy/private/naplo/sni/sni.php delete mode 100644 mayor-orig/www/policy/private/naplo/sni/tantargyiFeljegyzesek-pre.php delete mode 100644 mayor-orig/www/policy/private/naplo/sni/tantargyiFeljegyzesek.php (limited to 'mayor-orig/www/policy/private/naplo/sni') diff --git a/mayor-orig/www/policy/private/naplo/sni/diakAllapot-pre.php b/mayor-orig/www/policy/private/naplo/sni/diakAllapot-pre.php deleted file mode 100644 index 81926458..00000000 --- a/mayor-orig/www/policy/private/naplo/sni/diakAllapot-pre.php +++ /dev/null @@ -1,127 +0,0 @@ - $osztalyId, 'result' => 'idonly','override' => false)); - if (is_array($ADAT['diakIds']) && count($ADAT['diakIds']) > 0) { - $ADAT['diakAdat'] = getDiakAdatById($ADAT['diakIds'], array('result' => 'assoc', 'keyfield' => 'diakId')); - $ADAT['sniDiakIds'] = $Diakok = array(); - foreach ($ADAT['diakAdat'] as $_diakId => $dAdat) { - if ($dAdat['fogyatekossag'] != '') { - $ADAT['sniDiakIds'][] = $_diakId; - $dAdat['aktualisStatusz'] = $dAdat['statusz']; - $Diakok[] = $dAdat; - } - } - } - $diakId = $ADAT['diakId'] = readVariable($_POST['diakId'], 'id', null, $ADAT['sniDiakIds']); - if (isset($diakId)) { - - $ADAT['fields']['olvasas'] = getEnumField('naplo','sniDiakAllapot','olvasas'); - $ADAT['fields']['olvasasTempoja'] = getEnumField('naplo','sniDiakAllapot','olvasasTempoja'); - $ADAT['fields']['olvasasHibak'] = getSetField('naplo','sniDiakAllapot','olvasasHibak'); - $ADAT['fields']['iras'] = getEnumField('naplo','sniDiakAllapot','iras'); - $ADAT['fields']['iraskepe'] = getEnumField('naplo','sniDiakAllapot','iraskepe'); - $ADAT['fields']['irasHibak'] = getSetField('naplo','sniDiakAllapot','irasHibak'); - $ADAT['fields']['szovegertes'] = getEnumField('naplo','sniDiakAllapot','szovegertes'); - $ADAT['fields']['matematika'] = getSetField('naplo','sniDiakAllapot','matematika'); - $ADAT['fogyatekossag'] = getSetField('naplo_intezmeny','diak', 'fogyatekossag'); - - // Mentor/Ofő lekérdezése, konstans beállítása - $ADAT['sniDiakAdat'] = getSniDiakAdat($diakId); - define('__MENTOR', - __TANAR - && ( - (__OSZTALYFONOK && in_array($osztalyId, $_OSZTALYA)) - || __USERTANARID == $ADAT['sniDiakAdat']['mentorTanarId'] - ) - ); - // Action - if ( - $_TANEV['statusz'] == 'aktív' - && (__NAPLOADMIN || __VEZETOSEG || __MENTOR) - ) { // ? egyéb feltételek - határidő??? - if ($action == 'allapotRogzites') { - $Fields = getTableFields('sniDiakAllapot','naplo'); - foreach ($Fields as $attr => $attrNev) { - if (is_array($ADAT['fields'][$attr])) { - $Param['diakAllapot'][$attr] = readVariable($_POST[$attr], 'enum', null, $ADAT['fields'][$attr]); - if (is_array($Param['diakAllapot'][$attr])) $Param['diakAllapot'][$attr] = implode(',',$Param['diakAllapot'][$attr]); - } elseif (in_array($attr, array('diakId','szemeszter','vizsgalatTanarId','priorizalas'))) { - $Param['diakAllapot'][$attr] = readVariable($_POST[$attr], 'id'); - } elseif ($attr == 'vizsgalatDt') { - $Param['diakAllapot'][$attr] = readVariable($_POST[$attr], 'date'); - } else { - $Param['diakAllapot'][$attr] = readVariable($_POST[$attr], 'string'); - } - } - foreach (array('gyengeseg','erosseg') as $val) { - $Param['gyengesegekErossegek'][$val.'Leiras'] = readVariable($_POST[$val.'Leiras'], 'string'); - $Param['gyengesegekErossegek'][$val.'Prioritas'] = readVariable($_POST[$val.'Prioritas'], 'numeric unsigned'); - } - if ($diakId != $ADAT['diakId']) { - $_SESSION['alert'][] = 'message:wrong_data:allapotRogzites:diakId='.$diakId.'?'.$Param['diakId']; - } else { - sniDiakAllapotRogzites($Param); - } - } elseif ($action == 'sniDiakAdatRogzites') { - $Param['diakId'] = $diakId; - $Param['kulsoInfo'] = readVariable($_POST['kulsoInfo'], 'string'); - $Param['mentorTanarId'] = readVariable($_POST['mentorTanarId'], 'id'); - $Param['fogyatekossag'] = readVariable($_POST['fogyatekossag'], 'enum', null, $ADAT['fogyatekossag']); - sniDiakAdatRogzites($Param); - } - } - $ADAT['diakAdat'][$diakId] = getDiakAdatById($diakId); - $ADAT['diakAllapot'] = getDiakAllapot($diakId); - $ADAT['sniDiakAdat'] = getSniDiakAdat($diakId); - // Osztály tanárai - $Tankorok = getTankorByOsztalyId($osztalyId, __TANEV, array('tanarral' => true)); - $ADAT['tanarIds'] = array(); - for ($i = 0; $i < count($Tankorok); $i++) { - for ($j = 0; $j < count($Tankorok[$i]['tanarok']); $j++) { - if (!in_array($Tankorok[$i]['tanarok'][$j]['tanarId'], $ADAT['tanarIds'])) - $ADAT['tanarIds'][] = $Tankorok[$i]['tanarok'][$j]['tanarId']; - } - } - // Összes tanár névsorban - $ADAT['tanarok'] = getTanarok(); - } - - } - // Tool - $TOOL['osztalySelect'] = array('tipus'=>'cella','paramName' => 'osztalyId', 'post' => array()); - if (isset($osztalyId)) { - $TOOL['diakSelect'] = array( - 'diakok' => $Diakok, - 'tipus'=>'cella','paramName' => 'diakId', - 'osztalyId'=> $osztalyId,'post' => array('osztalyId'), - 'statusz' => array('jogviszonyban van','magántanuló','jogviszonya felfüggesztve','jogviszonya lezárva') - ); - } - $TOOL['oldalFlipper'] = array('tipus' => 'cella', - 'url' => array('index.php?page=naplo&sub=sni&f=diakAllapot','index.php?page=naplo&sub=sni&f=fejlesztesiTerv','index.php?page=naplo&sub=sni&f=tantargyiFeljegyzesek'), - 'titleConst' => array('_DIAK_ALLAPOT','_HAVI_OSSZEGZES','_TANTARGYI_FELJEGYZESEK'), - 'post' => array('osztalyId','diakId','dt'), - 'paramName'=>'diakId'); - getToolParameters(); - - } - -?> diff --git a/mayor-orig/www/policy/private/naplo/sni/diakAllapot.php b/mayor-orig/www/policy/private/naplo/sni/diakAllapot.php deleted file mode 100644 index 8eb88c0e..00000000 --- a/mayor-orig/www/policy/private/naplo/sni/diakAllapot.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/mayor-orig/www/policy/private/naplo/sni/fejlesztesiTerv-pre.php b/mayor-orig/www/policy/private/naplo/sni/fejlesztesiTerv-pre.php deleted file mode 100644 index 46dfeab1..00000000 --- a/mayor-orig/www/policy/private/naplo/sni/fejlesztesiTerv-pre.php +++ /dev/null @@ -1,110 +0,0 @@ - $osztalyId, 'result' => 'idonly','override' => false)); - if (is_array($ADAT['diakIds']) && count($ADAT['diakIds']) > 0) { - $ADAT['diakAdat'] = getDiakAdatById($ADAT['diakIds'], array('result' => 'assoc', 'keyfield' => 'diakId')); - $ADAT['sniDiakIds'] = $Diakok = array(); - foreach ($ADAT['diakAdat'] as $_diakId => $dAdat) { - if ($dAdat['fogyatekossag'] != '') { - $ADAT['sniDiakIds'][] = $_diakId; - $dAdat['aktualisStatusz'] = $dAdat['statusz']; - $Diakok[] = $dAdat; - } - } - } - $diakId = $ADAT['diakId'] = readVariable($_POST['diakId'], 'id', null, $ADAT['sniDiakIds']); - if (isset($diakId) && isset($dt)) { - - // Mentor/Ofő lekérdezése, konstans beállítása - $ADAT['sniDiakAdat'] = getSniDiakAdat($diakId); - define('__MENTOR', - __TANAR - && ( - (__OSZTALYFONOK && in_array($osztalyId, $_OSZTALYA)) - || __USERTANARID == $ADAT['sniDiakAdat']['mentorTanarId'] - ) - ); - // Action - if ( - $_TANEV['statusz'] == 'aktív' - && (__NAPLOADMIN || __VEZETOSEG || __MENTOR) - ) { // ? egyéb feltételek - határidő??? - if ($action == 'haviOsszegzesRogzitese') { - $Fields = getTableFields('sniHaviOsszegzes', 'naplo'); - foreach ($Fields as $attr => $attrNev) { - if (in_array($attr, array('diakId','valtozas'))) - $Param[$attr] = readVariable($_POST[$attr], 'id'); - elseif ($attr == 'dt') - $Param[$attr] = readVariable($_POST[$attr], 'date'); - else - $Param[$attr] = readVariable($_POST[$attr], 'string'); - } - $Param['felelos'] = readVariable($_POST['felelos'], 'id'); - sniHaviOsszegzesRogzites($Param); - } - } - - $ADAT['sniHaviOsszegzes'] = getHaviOsszegzes($diakId, $dt); - $Tankorok = getTankorByOsztalyId($osztalyId, __TANEV, array('tanarral' => true)); - $ADAT['tanarIds'] = array(); - for ($i = 0; $i < count($Tankorok); $i++) { - for ($j = 0; $j < count($Tankorok[$i]['tanarok']); $j++) { - if (!in_array($Tankorok[$i]['tanarok'][$j]['tanarId'], $ADAT['tanarIds'])) - $ADAT['tanarIds'][] = $Tankorok[$i]['tanarok'][$j]['tanarId']; - } - } - $ADAT['tanarok'] = getTanarok(); - } - - - } - // Tool - $TOOL['osztalySelect'] = array('tipus'=>'cella','paramName' => 'osztalyId', 'post' => array('dt')); - $TOOL['diakSelect'] = array( - 'diakok' => $Diakok, - 'tipus'=>'cella','paramName' => 'diakId', - 'osztalyId'=> $osztalyId,'post' => array('osztalyId'), - 'statusz' => array('jogviszonyban van','magántanuló','jogviszonya felfüggesztve','jogviszonya lezárva'), - 'post' => array('osztalyId','dt') - ); - $TOOL['datumSelect'] = array( - 'tipus' => 'sor', 'ParamName' => 'dt', 'tanev' => __TANEV, 'tolDt' => $_TANEV['kezdesDt'], 'igDt' => $_TANEV['zarasDt'], - 'hanyNaponta' => 'havonta', 'post' => array('diakId', 'osztalyId') - ); - $TOOL['oldalFlipper'] = array('tipus' => 'cella', - 'url' => array('index.php?page=naplo&sub=sni&f=diakAllapot','index.php?page=naplo&sub=sni&f=fejlesztesiTerv','index.php?page=naplo&sub=sni&f=tantargyiFeljegyzesek'), - 'titleConst' => array('_DIAK_ALLAPOT','_HAVI_OSSZEGZES','_TANTARGYI_FELJEGYZESEK'), - 'post' => array('osztalyId','diakId','dt'), - 'paramName'=>'diakId'); - if (isset($osztalyId)) $TOOL['nyomtatasGomb'] = array('titleConst' => '_NYOMTATAS','tipus'=>'cella', 'url'=>'index.php?page=naplo&sub=nyomtatas&f=sniHaviJegyzokonyv','post' => array('osztalyId')); - getToolParameters(); - } - -?> diff --git a/mayor-orig/www/policy/private/naplo/sni/fejlesztesiTerv.php b/mayor-orig/www/policy/private/naplo/sni/fejlesztesiTerv.php deleted file mode 100644 index 78fd73f2..00000000 --- a/mayor-orig/www/policy/private/naplo/sni/fejlesztesiTerv.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/mayor-orig/www/policy/private/naplo/sni/sni-pre.php b/mayor-orig/www/policy/private/naplo/sni/sni-pre.php deleted file mode 100644 index 94ab4312..00000000 --- a/mayor-orig/www/policy/private/naplo/sni/sni-pre.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/mayor-orig/www/policy/private/naplo/sni/sni.php b/mayor-orig/www/policy/private/naplo/sni/sni.php deleted file mode 100644 index e69de29b..00000000 diff --git a/mayor-orig/www/policy/private/naplo/sni/tantargyiFeljegyzesek-pre.php b/mayor-orig/www/policy/private/naplo/sni/tantargyiFeljegyzesek-pre.php deleted file mode 100644 index f2af35f3..00000000 --- a/mayor-orig/www/policy/private/naplo/sni/tantargyiFeljegyzesek-pre.php +++ /dev/null @@ -1,113 +0,0 @@ - $osztalyId, 'result' => 'idonly','override' => false)); - if (is_array($ADAT['diakIds']) && count($ADAT['diakIds']) > 0) { - $ADAT['diakAdat'] = getDiakAdatById($ADAT['diakIds'], array('result' => 'assoc', 'keyfield' => 'diakId')); - $ADAT['sniDiakIds'] = $Diakok = array(); - foreach ($ADAT['diakAdat'] as $_diakId => $dAdat) { - if ($dAdat['fogyatekossag'] != '') { - $ADAT['sniDiakIds'][] = $_diakId; - $dAdat['aktualisStatusz'] = $dAdat['statusz']; - $Diakok[] = $dAdat; - } - } - } - $diakId = $ADAT['diakId'] = readVariable($_POST['diakId'], 'id', null, $ADAT['sniDiakIds']); - - if (isset($diakId) && isset($dt)) { - - // Az osztály tanárai - $ADAT['tankorIds'] = getTankorByDiakId($diakId, __TANEV, array('result' => 'idonly')); - $ADAT['tankorTanar'] = getTankorTanaraiByInterval($ADAT['tankorIds'], array('tanev' => __TANEV, 'tolDt' => '', 'igDt' => '', 'result' => 'assoc', 'datumKenyszeritessel' => false)); - $ADAT['tankorAdat'] = getTankorAdatByIds($ADAT['tankorIds'], array('tanev' => __TANEV, 'dt' => $dt)); - foreach ($ADAT['tankorTanar'] as $_tankorId => $Tanarok) { - $ADAT['tankorTanaraE'][$_tankorId] = false; - for ($i = 0; $i < count($Tanarok); $i++) - if ($Tanarok[$i]['tanarId'] == __USERTANARID) { $ADAT['tankorTanaraE'][$_tankorId] = true; break; } - } - - $ADAT['tankorId'] = $tankorId = readVariable($_POST['tankorId'], 'id', null, $ADAT['tankorIds']); - if (isset($tankorId)) { - for ($i = 0; $i < count($ADAT['tankorTanar'][$tankorId]); $i++) { - if ($ADAT['tankorTanar'][$tankorId][$i]['tanarId'] == __USERTANARID) { define('__TANARA', true); break; } - } - if (!defined('__TANARA')) define('__TANARA', false); - - } - - // Action - if ($_TANEV['statusz'] == 'aktív') { - if ($action == 'tantargyiFeljegyzesRogzites') { - $Param = array( - 'diakId' => $diakId, - 'tankorId' => readVariable($_POST['feljegyzesTankorId'], 'id', null, $ADAT['tankorIds']), - 'dt' => readVariable($_POST['feljegyzesDt'], 'date'), - 'megjegyzes' => readVariable($_POST['megjegyzes'], 'string') - ); - if ( - __NAPLOADMIN - || ($ADAT['tankorTanaraE'][$Param['tankorId']] && strtotime($Param['dt']) >= strtotime(_HALADASI_HATARIDO)) - ) tantargyiFeljegyzesRogzites($Param); - } - } - if (isset($tankorId)) $ADAT['sniTantargyiFeljegyzes'] = getDiakFeljegyzesByTankorId($ADAT); - else $ADAT['sniTantargyiFeljegyzes'] = getDiakFeljegyzesByDt($ADAT); - } - - } - - // Tool - $TOOL['osztalySelect'] = array('tipus'=>'cella','paramName' => 'osztalyId', 'post' => array('dt')); - if (isset($osztalyId)) - $TOOL['diakSelect'] = array( - 'diakok' => $Diakok, - 'tipus'=>'cella','paramName' => 'diakId', - 'osztalyId'=> $osztalyId,'post' => array('osztalyId'), - 'statusz' => array('jogviszonyban van','magántanuló','jogviszonya felfüggesztve','jogviszonya lezárva'), - 'post' => array('osztalyId','dt') - ); - $TOOL['oldalFlipper'] = array('tipus' => 'cella', - 'url' => array('index.php?page=naplo&sub=sni&f=diakAllapot','index.php?page=naplo&sub=sni&f=fejlesztesiTerv','index.php?page=naplo&sub=sni&f=tantargyiFeljegyzesek'), - 'titleConst' => array('_DIAK_ALLAPOT','_HAVI_OSSZEGZES','_TANTARGYI_FELJEGYZESEK'), - 'post' => array('osztalyId','diakId','tankorId'), - 'paramName'=>'diakId'); - if (isset($diakId)) - $TOOL['tankorSelect'] = array('tipus' => 'sor', 'tankorok' => $TankorokMutat, 'paramName' => 'tankorId', 'post' => array('osztalyId','diakId','dt')); - if (!isset($tankorId)) - $TOOL['datumSelect'] = array( - 'lapozo' => true, - 'tipus'=>'sor', 'post'=>array('diakId', 'osztalyId', 'tankorId'), 'paramName' => 'dt', 'hanyNaponta' => 7, - 'tolDt' => $ADAT['tolDt'], - 'igDt' => $_TANEV['zarasDt'], 'override' => true - ); - getToolParameters(); - - } -?> diff --git a/mayor-orig/www/policy/private/naplo/sni/tantargyiFeljegyzesek.php b/mayor-orig/www/policy/private/naplo/sni/tantargyiFeljegyzesek.php deleted file mode 100644 index b706e6db..00000000 --- a/mayor-orig/www/policy/private/naplo/sni/tantargyiFeljegyzesek.php +++ /dev/null @@ -1,10 +0,0 @@ - -- cgit v1.2.3