diff options
Diffstat (limited to 'mayor-orig')
51 files changed, 512 insertions, 182 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml index bd5ee4d7..a5fd80a6 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml +++ b/mayor-orig/mayor-base/www/skin/classic/base/html/base.phtml @@ -71,8 +71,6 @@ function html_head($page,$sub,$f,$lang,$skin) { echo '<title>'; if (defined('_SITE')) echo _SITE.' - '; echo _MAIN_TITLE; - echo ' '; - echo _MAYORREV; echo '</title>'."\n"; includeCSS($page,$sub,$f,$skin); includeCSS($page,$sub,$f,$skin,'handheld'); // install css for handheld devices @@ -459,7 +457,7 @@ function html_mayor_head($sessionID,$page,$sub,$f,$lang,$MENU,$skin = _DEFAULT_S function html_mayor_foot() { $_defaultPageLayout = ($_SESSION['pageLayout']==0) ? 'leftpad' : 'toppad'; - echo '<div class="mayorfoot '.$_defaultPageLayout.'" id="mayorfoot">'._MAIN_FOOTER.'</div>'."\n\n"; + echo '<div class="mayorfoot '.$_defaultPageLayout.'" id="mayorfoot">'._MAIN_FOOTER.' '._MAYORREV.'</div>'."\n\n"; echo "</body>\n</html>"; } diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev +++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev +++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev +++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev +++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql index 86b27d3f..6d7c5890 100644 --- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql +++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql @@ -140,6 +140,7 @@ CREATE TABLE `diak` ( `telefon` varchar(64) COLLATE utf8_hungarian_ci DEFAULT NULL, `mobil` varchar(64) COLLATE utf8_hungarian_ci DEFAULT NULL, `email` varchar(96) COLLATE utf8_hungarian_ci DEFAULT NULL, + `emailMagan` varchar(255) COLLATE utf8_hungarian_ci DEFAULT NULL, `statusz` enum('felvételt nyert','jogviszonyban van','magántanuló','egyéni munkarend','vendégtanuló','jogviszonya felfüggesztve','jogviszonya lezárva') COLLATE utf8_hungarian_ci NOT NULL, `penzugyiStatusz` enum('állami finanszírozás','térítési díj','tandíj') COLLATE utf8_hungarian_ci DEFAULT 'állami finanszírozás', `szocialisHelyzet` set('szülei elváltak','három vagy több gyerekes család','rendszeres gyermekvédelmi támogatást kap','állami gondozott','veszélyeztetett','hátrányos helyzetű','halmozottan hátrányos helyzetű','sajátos nevelési igényű') COLLATE utf8_hungarian_ci DEFAULT NULL, diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql index 853375b0..16b9e1f6 100644 --- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql +++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql @@ -174,8 +174,8 @@ CREATE TABLE `oraHazifeladatDiak` ( CREATE TABLE `orarendiOraTankor` ( `tanarId` int(10) unsigned NOT NULL, - `osztalyJel` varchar(7) COLLATE utf8_bin NOT NULL, - `targyJel` varchar(32) COLLATE utf8_bin NOT NULL, + `osztalyJel` varchar(7) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `targyJel` varchar(96) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `tankorId` int(10) unsigned NOT NULL, PRIMARY KEY (`tanarId`,`osztalyJel`,`targyJel`), KEY `orarendiOraTankor_tankorId` (`tankorId`), @@ -233,7 +233,7 @@ CREATE TABLE `orarendiOra` ( `ora` tinyint(3) unsigned NOT NULL, `tanarId` int(10) unsigned NOT NULL, `osztalyJel` varchar(7) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, - `targyJel` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `targyJel` varchar(96) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, `teremId` smallint(5) unsigned DEFAULT NULL, `tolDt` date NOT NULL DEFAULT '0000-00-00', `igDt` date DEFAULT NULL, diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-naplo/update/pre004800-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004800-1-intezmeny.sql new file mode 100644 index 00000000..9c9b6a20 --- /dev/null +++ b/mayor-orig/mayor-naplo/update/pre004800-1-intezmeny.sql @@ -0,0 +1,17 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4800 $$ +CREATE PROCEDURE upgrade_database_4800() +BEGIN + +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +IF NOT EXISTS ( + SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='diak' AND COLUMN_NAME='emailMagan' +) THEN + + alter table `diak` ADD `emailMagan` varchar(255) AFTER `email`; +END IF; + +END $$ +DELIMITER ; +CALL upgrade_database_4800(); diff --git a/mayor-orig/mayor-naplo/update/pre004812-1-naplo.sql b/mayor-orig/mayor-naplo/update/pre004812-1-naplo.sql new file mode 100644 index 00000000..d5644095 --- /dev/null +++ b/mayor-orig/mayor-naplo/update/pre004812-1-naplo.sql @@ -0,0 +1,13 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4812 $$ + +CREATE PROCEDURE upgrade_database_4812() +BEGIN +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +ALTER TABLE `orarendiOra` MODIFY `targyJel` varchar(96) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL; +ALTER TABLE `orarendiOraTankor` MODIFY `targyJel` varchar(96) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL; + +END $$ +DELIMITER ; +CALL upgrade_database_4812(); diff --git a/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php b/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php index 7b6c55ae..b015cf54 100644 --- a/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php +++ b/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php @@ -104,14 +104,16 @@ 'osszesites' => array(array('txt' => 'Összesítés')), ); $MENU['modules']['naplo']['sub']['intezmeny'] = array( - 'tankorDiak' => array(array('txt' => 'Tankörnévsor', 'url' => 'index.php?page=naplo&sub=intezmeny&f=tankorDiak')), + 'valtas'=> array(array('txt' => 'Intézmény, tanévváltás', 'url' => 'index.php?page=naplo&sub=intezmeny&f=valtas')), + 'osztaly' => array(array('txt' => 'Osztályok', 'url' => 'index.php?page=naplo&sub=intezmeny&f=osztaly')), + 'diak' => array(array('txt' => 'Diákok', 'url' => 'index.php?page=naplo&sub=intezmeny&f=diak')), 'diakTankor' => array(array('txt' => 'Diák tankörei', 'url'=> 'index.php?page=naplo&sub=intezmeny&f=diakTankor')), 'diakTankorJelentkezes' => array(array('txt' => 'Diák választott tankörei', 'url'=> 'index.php?page=naplo&sub=intezmeny&f=diakTankorJelentkezes')), - 'diak' => array(array('txt' => 'Diákok', 'url' => 'index.php?page=naplo&sub=intezmeny&f=diak')), 'diakFelmentes' => array(array('txt' => 'Felmentés', 'url' => 'index.php?page=naplo&sub=intezmeny&f=diakFelmentes')), - 'valtas'=> array(array('txt' => 'Tanévváltás', 'url' => 'index.php?page=naplo&sub=intezmeny&f=valtas')), + 'tankorDiak' => array(array('txt' => 'Tankörnévsor', 'url' => 'index.php?page=naplo&sub=intezmeny&f=tankorDiak')), 'tovabbkepzes' => array(array('txt' => 'Továbbképzés')), 'kepzesOraterv' => array(array('txt' => 'Képzés óraterv')), + 'tankorTanarHozzarendeles' => array(array('txt' => 'Tantárgyfelosztás, tankör-tanár')), ); $MENU['modules']['naplo']['sub']['orarend'] = array( 'helyettesites' => array(array('txt'=> 'Helyettesítések')), diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/helyettesites.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/helyettesites.php index 2fbbc4ac..152c5371 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/helyettesites.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/helyettesites.php @@ -418,7 +418,7 @@ $error = ''; db_start_trans($lr); - $q = "INSERT INTO csere VALUES ('')"; + $q = "INSERT INTO csere VALUES (NULL)"; $csereId = db_query($q, array('fv' => 'oraMozgatas', 'modul' => 'naplo', 'result' => 'insert', 'rollback' => true), $lr); if (!$csereId) { if ($olr == '') db_close($lr); return false; } @@ -561,7 +561,7 @@ db_start_trans($lr); - $q = "INSERT INTO csere VALUES ('')"; + $q = "INSERT INTO csere VALUES (NULL)"; $csereId1 = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'result' => 'insert', 'rollback' => true), $lr); if (!$csereId1) { if ($olr == '') db_close($lr); return false; } @@ -614,7 +614,7 @@ db_start_trans($lr); - $q = "INSERT INTO csere VALUES ('')"; + $q = "INSERT INTO csere VALUES (NULL)"; $csereId2 = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'result' => 'insert', 'rollback' => true), $lr); if (!$csereId2) { if ($olr == '') db_close($lr); return false; } diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/intezmeny/tankorTanarHozzarendeles.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/intezmeny/tankorTanarHozzarendeles.php index 600ee897..4e178097 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/intezmeny/tankorTanarHozzarendeles.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/intezmeny/tankorTanarHozzarendeles.php @@ -158,7 +158,7 @@ hetiMunkaora,hetiKotelezoOraszam, hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam FROM tanar WHERE statusz IN ('határozatlan idejű','határozott idejű','külső óraadó') - AND beDt<'".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') + AND beDt<='".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') AND tanarId IN (".implode(',', array_fill(0, count($Szuro['tanarIds']), '%u')).")"; $v = array_merge($v, $Szuro['tanarIds']); } @@ -168,7 +168,7 @@ hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam FROM tanar LEFT JOIN mkTanar USING (tanarId) WHERE statusz IN ('határozatlan idejű','határozott idejű','külső óraadó') - AND beDt<'".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') + AND beDt<='".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') AND mkId IN (".implode(',', array_fill(0, count($Szuro['mkIds']), '%u')).")"; $v = array_merge($v, $Szuro['mkIds']); } @@ -179,7 +179,7 @@ FROM tanar LEFT JOIN tanarKepesites USING (tanarId) LEFT JOIN kepesitesTargy USING (kepesitesId) WHERE statusz IN ('határozatlan idejű','határozott idejű','külső óraadó') - AND beDt<'".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') + AND beDt<='".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') AND targyId IN (".implode(',', array_fill(0, count($targyIds), '%u')).")"; $v = array_merge($v, $targyIds); $q[] = "SELECT tanarId, concat_ws(' ',viseltNevElotag,viseltCsaladinev,viseltUtonev) as tanarNev, @@ -188,7 +188,7 @@ FROM tanar LEFT JOIN mkTanar USING (tanarId) LEFT JOIN targy USING (mkId) WHERE statusz IN ('határozatlan idejű','határozott idejű','külső óraadó') - AND beDt<'".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') + AND beDt<='".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') AND targyId IN (".implode(',', array_fill(0, count($targyIds), '%u')).")"; $v = array_merge($v, $targyIds); diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/intezmeny/terem.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/intezmeny/terem.php index ee640a54..82326db2 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/intezmeny/terem.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/intezmeny/terem.php @@ -3,7 +3,7 @@ function teremAdatModositas($ADAT,$uj=false) { if ($uj===true) { - $q = "INSERT INTO `terem` (`teremId`,`leiras`,`tipus`,`ferohely`,`telephelyId`) VALUES ((SELECT max(teremId)+1 FROM terem AS s),'%s','%s',%u,NULL)"; + $q = "INSERT INTO `terem` (`teremId`,`leiras`,`tipus`,`ferohely`,`telephelyId`) VALUES ((SELECT IF(teremId>0,max(teremId)+1,1) FROM terem AS s),'%s','%s',%u,NULL)"; $v = array($ADAT['leiras'], $ADAT['tipus'], intval($ADAT['ferohely'])); } else { $q = "UPDATE `terem` SET `leiras`='%s',`tipus`='%s'"; @@ -13,6 +13,10 @@ if (isset($ADAT['telephelyId'])) { $q .= ",`telephelyId`=%u"; $v[] = $ADAT['telephelyId']; } else { $q .= ",`telephelyId`=NULL"; } + if ($ADAT['teremIdMod']!='' && $ADAT['teremIdMod']!=$ADAT['teremId']) { + $q .= ",`teremId`=".intval($ADAT['teremIdMod']); + } + $q .= " WHERE teremId=%u"; $v[] = $ADAT['teremId']; } diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/orarend/convert-aSc Timetables Ctrl-Shift-E.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/orarend/convert-aSc Timetables Ctrl-Shift-E.php index 01e14858..fe656b3a 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/orarend/convert-aSc Timetables Ctrl-Shift-E.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/orarend/convert-aSc Timetables Ctrl-Shift-E.php @@ -72,7 +72,9 @@ dump($Tanarok); $oJelek = explode(',', $rec[4]); if (count($oJelek) > 1) $osztalyJel = $oJelek[0].'...'; // Nem fér ki több, csak jelezzük, hogy volt még... else $osztalyJel = $oJelek[0]; // nem érdemes szétvágni, mert nem feleltethető meg... + $osztalyJel = substr($osztalyJel,0,16); $targyJel = mb_convert_encoding($rec[6],'UTF-8','ISO-8859-2'); //.$rec[12]; + $targyJel = substr($targyJel,0,32); $teremIds = explode(',',$rec[9]); // szétvág $tolDt = $ADAT['tolDt']; $igDt = $ADAT['igDt']; diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php index 45d8754c..2180b9b1 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php @@ -20,7 +20,17 @@ } return getOrarend($TANKORIDK, array('tolDt'=>$tolDt, 'igDt'=>$igDt)); } - + + function getLebegoOrarendiOra($tanarId, $SET=array('tolDt'=>'','igDt'=>'')) { + $tolDt = $SET['tolDt']; $igDt = $SET['igDt']; + initTolIgDt(__TANEV, $tolDt, $igDt); + + $q = "SELECT * FROM orarendiOra LEFT JOIN orarendiOraTankor USING (tanarId,osztalyJel,targyJel) + WHERE igDt>='%s' AND tolDt<='%s' AND tanarId=%u"; + $v = array($tolDt, $igDt, $tanarId); + $RES = db_query($q, array('fv' => 'getLebegoOrarendiOra', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v)); + return $RES; + } // ++ function getOrarendByTanarId($tanarId, $SET=array('tolDt'=>'','igDt'=>'', 'telephely'=>null, 'orarendiOraTankor'=>false)) { $tolDt = $SET['tolDt']; $igDt = $SET['igDt']; diff --git a/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/intezmeny/osztaly.php b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/intezmeny/osztaly.php index ba29df82..6329029f 100644 --- a/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/intezmeny/osztaly.php +++ b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/intezmeny/osztaly.php @@ -1,6 +1,6 @@ <?php - define('__PAGETITLE','Osztályok adminisztálása'); + define('__PAGETITLE','Osztály'); define('__PAGEHELP','Új osztály felvételének vagy a kiválasztott osztály osztályfőnökének, tagjainak és telephelyének módosító oldala. Az osztálytagok képzéshez rendelésének előfeltétele, hogy az osztályhoz a "Képzések" menüpontban a választható képzések az osztályhoz legyenek rendelve.'); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kreta-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kreta-pre.php index 0f68d17a..63b90b8f 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kreta-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kreta-pre.php @@ -155,7 +155,7 @@ if (!__NAPLOADMIN && !__VEZETOSEG) { $_csoportNev = getTankorCsoportByTankorId($ADAT['tankorok'][$i]['tankorId'])[0]['csoportNev']; $_osztalyIds = getTankorOsztalyaiByTanev($ADAT['tankorok'][$i]['tankorId']); - $_osztalyJel = $ADAT['osztalyAdat'][$_osztalyIds[0]]['osztalyJel']; + $_osztalyJel = kisbetus($ADAT['osztalyAdat'][$_osztalyIds[0]]['osztalyJel']); if (count($osztalyIds) > 1 || $_osztalyJel != $_csoportNev) { $EXPORT[$j][] = ''; $EXPORT[$j][] = $_csoportNev; // B oszlop: csoport név 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 0acd5f0f..0ef378b5 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 @@ -2,11 +2,39 @@ if (_RIGHTS_OK !== true) die(); -if (__NAPLOADMIN!==true) $_SESSION['alert'][]='page:insufficient_access'; + + require_once('include/modules/naplo/share/osztaly.php'); + require_once('include/modules/naplo/share/szemeszter.php'); + require_once('include/modules/naplo/share/intezmenyek.php'); + + $ADAT['tablo']['tanevek'] = getTanevek(true); + $ADAT['tablo']['telephely'] = getTelephelyek(); + $ADAT['tablo']['telephelyIds'] = array(); + foreach ($ADAT['tablo']['telephely'] as $i => $tAdat) $ADAT['tablo']['telephelyIds'][] = $tAdat['telephelyId']; + + $ADAT['tablo']['osztalyId'] = $osztalyId = $_POST['osztalyId'] = readVariable($_POST['osztalyId'], 'id', readVariable($_GET['osztalyId'],'id',null)); + $ADAT['tablo']['tanev'] = $tanev = readVariable($_POST['tanev'], 'numeric unsigned', __TANEV, $ADAT['tablo']['tanevek']); + + //$telephelyId = readVariable($_POST['telephelyId'], 'id'); + + if ($osztalyId!='') { + $ADAT['tablo']['osztalyAdat'] = getOsztalyAdat($osztalyId, $tanev); + $ADAT['tablo']['diakok'] = getDiakok(array('tanev' => $tanev,'osztalyId'=>$osztalyId)); + $ADAT['tablo']['diakIds'] = array_keys(reindex($ADAT['tablo']['diakok'],array('diakId'))); + $ADAT['tablo']['diakKepzes'] = getKepzesByDiakId($ADAT['tablo']['diakIds'], array('result' => 'assoc')); + } + + $TOOL['osztalySelect'] = array('tipus'=>'cella','paramName' => 'osztalyId', 'post'=>array('tanev','telephelyId','dt'), 'telephelyId' => $telephelyId); + + +// ------------------------------ + +if (__NAPLOADMIN!==true) { + +} else { // naploadmin require_once('include/share/date/names.php'); require_once('include/modules/naplo/share/file.php'); -require_once('include/modules/naplo/share/osztaly.php'); require_once('include/modules/naplo/share/osztalyModifier.php'); require_once('include/modules/naplo/share/intezmenyek.php'); require_once('include/modules/naplo/share/diak.php'); @@ -24,7 +52,7 @@ require_once('include/share/net/upload.php'); define('FILE_UPLOAD_DIR',_DOWNLOADDIR.'/private/naplo/upload/'); -if (defined('__INTEZMENY') and __INTEZMENY != '') { +if (defined('__INTEZMENY') && __INTEZMENY != '') { $ADAT['tanevek'] = getTanevek(true); $ADAT['tanarok'] = getTanarok(); $ADAT['kepzesek'] = getKepzesek(); @@ -350,7 +378,11 @@ $TOOL['datumSelect'] = array('tipus'=>'sor','paramName'=>'dt','tolDt'=>$TA['eloz $TOOL['oldalFlipper'] = array('tipus' => 'cella', 'url' => array('index.php?page=naplo&sub=intezmeny&f=kepzes'), 'titleConst' => array('_KEPZES'), 'post' => array(''), 'paramName'=>'kepzesId'); // paramName ? +} // naploadmin + getToolParameters(); + + ?>
\ No newline at end of file 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 a1c51b8c..5c2061dc 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 @@ -1,7 +1,12 @@ <?php - if (_RIGHTS_OK !== true) die(); +if (_RIGHTS_OK !== true) die(); +if (__NAPLOADMIN!==true) { + global $ADAT; + putOsztalyGrid($ADAT['tablo']); + +} else { global $ADAT, $fileName, $ADATOK, $MEZO_LISTA, $attrList; if ($ADAT['updatedFromFile']===true) { @@ -10,10 +15,11 @@ } else { + putOsztalyGrid($ADAT['tablo']); + // 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 @@ -44,5 +50,5 @@ putUjOsztalyForm($ADAT); } } - +} // naploadmin ?> diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankorTanarHozzarendeles-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankorTanarHozzarendeles-pre.php index 3b5f5133..e7f65b68 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankorTanarHozzarendeles-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankorTanarHozzarendeles-pre.php @@ -1,7 +1,7 @@ <?php if (_RIGHTS_OK !== true) die(); - if (!__NAPLOADMIN && !__VEZETOSEG) { $_SESSION['alert'] = 'page:insufficient_access'; } + if (!__NAPLOADMIN && !__VEZETOSEG && !__TANAR) { $_SESSION['alert'] = 'page:insufficient_access'; } else { require_once('include/modules/naplo/share/osztaly.php'); @@ -19,7 +19,7 @@ 'osztalyIds'=>readVariable($_POST['osztalyIds'],'id',array()), 'mkIds'=>readVariable($_POST['mkIds'],'id',array()), 'tanarNelkuliTankorok' => readVariable($_POST['tanarNelkuliTankorok'],'bool'), - 'tanarIds'=>readVariable($_POST['tanarIds'],'id',array()), + 'tanarIds'=>readVariable($_POST['tanarIds'],'id',(!__NAPLOADMIN&&!__VEZETOSEG)?array(__USERTANARID):array()), 'targyIds'=>readVariable($_POST['targyIds'],'id',array()), ); foreach ($ADAT['szuro']['targyak'] as $idx => $tAdat) $ADAT['targyAdat'][ $tAdat['targyId'] ] = $tAdat; @@ -36,29 +36,31 @@ foreach ($ADAT['tankorok'] as $tAdat) if (is_array($tAdat['tanarIds']) && count($tAdat['tanarIds'])>0) $ADAT['keszTankorDb']++; $ADAT['tankorStat'] = getTankorStat(); - if ($action == 'tankorTanarFelvesz') { + if (__NAPLOADMIN===true || __VEZETOSEG===true) { - $tankorId = readVariable($_POST['tankorId'],'id'); - $tanarId = readVariable($_POST['tanarId'],'id'); - $_JSON = array( + if ($action == 'tankorTanarFelvesz') { + + $tankorId = readVariable($_POST['tankorId'],'id'); + $tanarId = readVariable($_POST['tanarId'],'id'); + $_JSON = array( 'post' => $_POST, 'result' => tankorTanarModosit($tankorId, $tanarId, array('tanev'=>__TANEV)) - ); + ); - } elseif ($action == 'tankorTanarTorol') { + } elseif ($action == 'tankorTanarTorol') { - $_tankorId = readVariable($_POST['tankorId'],'id'); - $_tanarId = readVariable($_POST['tanarId'],'id'); - tankorTanarTorol($_tankorId,$_tanarId,array('tanev'=>$tanev)); + $_tankorId = readVariable($_POST['tankorId'],'id'); + $_tanarId = readVariable($_POST['tanarId'],'id'); + tankorTanarTorol($_tankorId,$_tanarId,array('tanev'=>$tanev)); - $_JSON = array( - 'post' => $_POST, - ); + $_JSON = array( + 'post' => $_POST, + ); + } } //dump($ADAT['tanarok']); - } ?>
\ No newline at end of file diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/terem-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/terem-pre.php index 3afa9ce2..3c8c6bda 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/terem-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/terem-pre.php @@ -19,6 +19,7 @@ $ADAT['teremIds'] = array_keys($ADAT['teremAdat']); $ADAT['teremTipusok'] = getSetField('naplo_intezmeny','terem','tipus'); $ADAT['teremId'] = readVariable($_POST['teremId'], 'id', readVariable($_GET['teremId'], 'id', null, $ADAT['teremIds']), $ADAT['teremIds']); + $ADAT['teremIdMod'] = readVariable($_POST['teremIdMod'], 'id', null); if ($action == 'teremAdatModositas' || $action=='ujTerem') { @@ -27,7 +28,8 @@ $D['ferohely'] = readVariable($_POST['ferohely'], 'numeric unsigned'); $D['tipus'] = readVariable($_POST['tipus'], 'enum', $ADAT['teremTipusok']); $D['telephelyId'] = readVariable($_POST['telephelyId'], 'id', readVariable($_GET['telephelyId'], 'id', null, $ADAT['telephelyIds']), $ADAT['telephelyIds']); -//echo '<pre>'; var_dump($ADAT['teremIds']); echo '</pre>'; + $D['teremId'] = $ADAT['teremId']; + $D['teremIdMod'] = $ADAT['teremIdMod']; teremAdatModositas($D,($action=='ujTerem')); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php index fb04a3ca..954eebba 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php @@ -8,6 +8,7 @@ require_once('include/modules/naplo/share/targy.php'); require_once('include/modules/naplo/share/osztaly.php'); require_once('include/modules/naplo/share/munkakozosseg.php'); + require_once('include/modules/naplo/share/kepesites.php'); $intezmeny = readVariable($_POST['intezmeny'], 'strictstring', defined('__INTEZMENY') ? __INTEZMENY : null ); if ($action == 'intezmenyValasztas') { @@ -40,13 +41,24 @@ } } } - $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus,statusz,besorolas','telephelyId'=>__TELEPHELYID)); + $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'email,titulus,statusz,besorolas','telephelyId'=>__TELEPHELYID)); $ADAT['targyak'] = getTargyak(array('arraymap'=>array('targyId'))); + + + $ADAT['kepesitesek'] = getKepesitesek(); +// $ADAT['vegzettsegek'] = getEnumField('naplo_intezmeny', 'kepesites', 'vegzettseg'); +// $ADAT['fokozatok'] = getEnumField('naplo_intezmeny', 'kepesites', 'fokozat'); +// $ADAT['specializaciok'] = getEnumField('naplo_intezmeny', 'kepesites', 'specializacio'); + +//dump($ADAT['kepesitesek']); + $lr = db_connect('naplo_intezmeny'); for($i=0; $i<count($ADAT['tanarok']); $i++) { $_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/private/naplo/intezmeny/valtas.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas.php index 3d15f4de..d5ddca45 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas.php @@ -2,6 +2,7 @@ if (_RIGHTS_OK !== true) die(); global $ADAT; - putTanarLista($ADAT); + if (__INTEZMENY=='kanizsay') putTanarLista_large($ADAT); + else putTanarLista($ADAT); ?> diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendBetolto-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendBetolto-pre.php index df4db33a..98e19dfb 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendBetolto-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendBetolto-pre.php @@ -16,6 +16,7 @@ require_once('include/modules/naplo/share/tankor.php'); require_once('include/modules/naplo/share/targy.php'); // require_once('include/modules/naplo/share/diak.php'); + require_once('include/share/net/upload.php'); $ADAT['tanev'] = $tanev = readVariable($_POST['tanev'], 'numeric unsigned', __TANEV); if ($tanev == __TANEV) $TA = $_TANEV; @@ -37,6 +38,16 @@ // ----- action ----- // if ($action == 'fileBetoltes') { + if ($_FILES['upfile']['size'] > 0) { + try { + $FILEADAT = array('subdir'=>_DOWNLOADDIR.'/private/naplo/orarend/','filename'=>$_FILES['upfile']['name']); + mayorFileUpload($FILEADAT, false); + } catch (Exception $e) { + dump($e); + } +// $ADAT['fileName'] = $fileName = $_FILES['upfile']['tmp_name']; + $ADAT['fileName'] = $fileName = $FILEADAT['subdir'].$FILEADAT['filename']; + } if (isset($fileName) && isset($conv) && isset($tanev) && isset($tolDt) && isset($igDt) && isset($orarendiHet)) { if (file_exists($fileName)) { require_once("include/modules/naplo/orarend/convert-$conv.php"); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php index e0fe07db..250197a0 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php @@ -194,11 +194,11 @@ $ADAT['orarend'] = getOrarendByTanarId($tanarId,array('tolDt'=>$tolDt,'igDt'=>$igDt,'telephely'=>$telephely,'orarendiOraTankor'=>true)); $ADAT['toPrint'] = $ADAT['tanarok'][$tanarId]['tanarNev']; $ADAT['felvehetoTankorok'] = getTankorByTanarId($tanarId,$tanev, array('csakId'=>false,'tolDt'=>$refTolDt, 'igDt'=>$refIgDt)); - //======================== /* illesszük ide az Órarendi óra tankör összerendezés 4.6 */ $ADAT['orarendioraTankor'] = getOrarendByTanarId($tanarId,array('tolDt'=>$tolDt,'igDt'=>$igDt,'orarendiOraTankor'=>true)); //======================== + // $ADAT['orarendiOra'] = getLebegoOrarendiOra($tanarId,array('tolDt'=>$tolDt,'igDt'=>$igDt)); $TANKORIDK = getTankorByTanarId($tanarId, __TANEV, array('csakId' => true, 'tolDt' => $tolDt, 'igDt' => $igDt, 'result' => 'indexed', 'tanarral' => false)); $ADAT['haladasi'] = getOrak($TANKORIDK, array('tolDt'=>$tolDt,'igDt'=>$igDt, 'result'=>'likeOrarend', 'elmaradokNelkul'=>false)); $ADAT['vanHaladasi'] = checkHaladasi(array('tolDt'=>$refTolDt,'igDt'=>$refIgDt)); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito.php index 59ad88ac..4cffc162 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito.php @@ -10,5 +10,10 @@ && count($ADAT['felvehetoTankorok']) > 0 ) putOrarend($ADAT); + // if ($ADAT['orarendiOra']) putOrarendLebego($ADAT); + + if (count($ADAT['felvehetoTankorok']) === 0) { + echo 'Nincs felvehető tanköre a megadott tanárnak!'; + } ?> diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php index 2b9ad588..4d2893a9 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php @@ -18,7 +18,7 @@ if ($ADAT['targyBontasStatus']===false && $action=='targyBontasInit') { $ADAT['targyBontasStatus'] = initFromLastYear(); } -dump($ADAT); + // telephely - csak szűréshez kell $ADAT['telephelyId'] = $telephelyId = readVariable($_POST['telephelyId'], 'id'); // kötelező szűrési opció @@ -85,7 +85,6 @@ dump($ADAT); $ADAT['oraterv'] = kepzesOratervSorrend($evfolyamJel, $ADAT['osztalyIds'], $ADAT['kepzesIds']); // itt volt a targyAdat... felkerült az elejére $ADAT['osztalyTargyBontas'] = getKepzesTargyBontasByOsztalyIds($osztalyIds); -//dump($ADAT['osztalyTargyBontas']); } $ADAT['oratervenKivuliTankorok'] = getOratervenKivuliTankorIds(); 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); ?> diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css index a346f49c..684a4b0b 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css @@ -74,7 +74,7 @@ div.tanarTankor table tbody tr th.slctd { background-color: rgba(0,200,0,0.7); } div.tanarTankor table tbody tr td:hover input[type="checkbox"] { display:table-cell; } -pre { text-align: left; } + pre { text-align: left; } div.tankorTanar table#tt thead tr th.szurt { display: none; } div.tankorTanar table#tt thead tr td.szurt { display: none; } div.tankorTanar table#tt tbody tr td.szurt { display: none; } @@ -90,5 +90,5 @@ pre { text-align: left; } filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); } - + table#tt tr td.checked { background-color: lightgreen !important;} diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml index c217bd88..0f754633 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml @@ -409,6 +409,7 @@ echo '<td>'."\n"; echo '<span class="icon-envelope"></span>'; echo '<input type="text" id="email" name="email" value="'.$diakAdat['email'].'" />'; + echo '<input type="text" id="emailMagan" name="emailMagan" value="'.$diakAdat['emailMagan'].'" />'; echo '</td>'."\n"; echo '</tr><tr>'; echo '<th>'; 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 01a9b0d8..26fbea77 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 @@ -462,5 +462,67 @@ function putOidEllenor($ADAT) { } +function putOsztalyGrid($ADAT) { + echo '<style type="text/css"> +div.osztalyGrid { + width:100%; + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: center; + align-items: auto; + align-content: start +} +div.osztalyGrid .item { + flex: 0 0 auto; + margin: 10px; + width: 160px; + background-color: #eee; + text-align:center; + padding:4px 4px; + border-radius:2px; +} + +h1.osztaly,h2.osztalyfonok,h3.kepzes { text-align:center; } +div.osztalyGrid span.diakNev {display: inline-block; width:100%; background-color:white; border-radius:2px;} + +div.osztalyGrid .item:hover { + background-color: #ddd; +} + +img.arckep {height:230px; margin-bottom: 2px; border: solid 1px #ccc;} +h2.osztalyfonok { font-size: 14px; } + +</style>'; + + echo '<h1 class="osztaly">'.$ADAT['osztalyAdat']['osztalyJel'].'</h1>'; + echo '<h2 class="osztalyfonok">'; + for ($i=0; $i<count($ADAT['osztalyAdat']['osztalyfonokok']); $i++) { + echo '<div class="item">'; + echo '<img src="'.getFaceURI($ADAT['osztalyAdat']['osztalyfonokok'][$i]['tanarId'],'tanar').'" class="arckep"><br/>'; + echo $ADAT['osztalyAdat']['osztalyfonokok'][$i]['tanarNev']; + echo '<br/><i>osztályfőnök</i>'; + echo '</div>'; + } + // echo $ADAT['osztalyAdat']['osztalyfonokNev']; + echo '</h2>'; + if (count($ADAT['osztalyAdat']['kepzes'])>0) { + echo '<h3 class="kepzes">'; + for ($i=0; $i<count($ADAT['osztalyAdat']['kepzes']); $i++) { + echo $ADAT['osztalyAdat']['kepzes'][$i]['kepzesNev']; + if ($i+1<count($ADAT['osztalyAdat']['kepzes'])) echo ', '; + } + echo '</h3>'; + } + echo '<div class="osztalyGrid">'; + for ($i=0; $i<count($ADAT['diakok']); $i++) { + $_D = $ADAT['diakok'][$i]; + echo '<div class="item diakNev" data-diakid="'.$_D['diakId'].'">'; // class="diakNev" -- jogosultságok! + echo '<img src="'.getFaceURI($_D['diakId'],'diak').'" class="arckep" style="min-height:200px; min-width:100%"><br/>'; + echo '<span class="diakNev">'.$_D['diakNev'].'</span>'; + echo '</div>'; + } + echo '</div>'; +} ?>
\ No newline at end of file diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml index 40ee0453..e01375dc 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml @@ -8,8 +8,17 @@ function putTanarLista($ADAT) { echo '<tr>'; for($i=0; $i<count($ADAT['tanarok']); $i++) { $T = $ADAT['tanarok'][$i]; - echo '<td>'; - putFace($T['tanarId'],'tanar',0); + echo '<td style="text-align:center">'; + + if (($_img = getFaceURI($T['tanarId'],'tanar')) != '') { + echo '<img src="'.$_img.'" style="height:200px">'; + } else { + echo '<div class="arckepPlaceholder" style="display:flex; flex-direction: column">'; + echo '<div class="icon-adult" style="font-size:120px; color:#eee;"></div>'; + echo '</div>'; + } + + //putFace($T['tanarId'],'tanar',0); echo '</td><td>'; echo '<span class="tanarNev" data-tanarid="'.$T['tanarId'].'">'.$T['tanarNev'].'</span>'; if ($T['titulus']!='') echo '<div class="titulus">'.$T['titulus'].'</div>'; @@ -18,7 +27,7 @@ function putTanarLista($ADAT) { elseif ($T['besorolas']=='Mesterpedagógus') echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>'; elseif ($T['besorolas']=='Pedagógus I.') echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>'; elseif ($T['besorolas']=='Pedagógus II.') echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>'; -// else echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>'."\n"; + else echo '<div class="titulus">'.lcfirst($T['besorolas']).'</div>'."\n"; $osztalyai = ($ADAT[$T['tanarId']]['osztalyfonok']); for ($j=0; $j<count($osztalyai); $j++) { @@ -49,15 +58,18 @@ function putTanarLista($ADAT) { echo '</div>'; } + $munkakozossegei = ($ADAT[$T['tanarId']]['munkakozosseg']); - echo '<div class="munkakozossegVezeto">'; - $_MKNEV = array(); - for ($j=0; $j<count($munkakozossegei); $j++) { - $_mkId = $munkakozossegei[$j]; - $_MKNEV[] = $munkakozossegei[$j]['munkakozossegNev']; + if (count($munkakozossegei)>0) { + echo '<div class="munkakozossegVezeto">'; + // $_MKNEV = array(); + // for ($j=0; $j<count($munkakozossegei); $j++) { + // $_mkId = $munkakozossegei[$j]; + // $_MKNEV[] = $munkakozossegei[$j]['munkakozossegNev']; + // } + // echo implode(', ',$_MKNEV).' munkaközösségi tag'; + echo '</div>'; } - echo implode(', ',$_MKNEV).' munkaközösségi tag'; - echo '</div>'; if ($T['elerhetoseg']!='') echo '<div class="elerhetoseg"><span class="icon-phone" style="padding-right:0.4em"></span>'.$T['elerhetoseg'].'</div>'; if ($T['email']!='') echo '<div class="email"><span class="icon-envelope" style="padding-right:0.4em"></span>'.$T['email'].'</div>'; @@ -69,55 +81,101 @@ function putTanarLista($ADAT) { echo '</table>'; } -/* -function putIntezmenyValaszto($Intezmenyek) { - - formBegin(); - echo '<input type="hidden" name="action" value="intezmenyValasztas" />'."\n"; +function putTanarLista_large($ADAT) { - echo '<select name="intezmeny">'."\n"; - $SEL = array(__INTEZMENY => ' selected="selected"'); + echo '<style type="text/css"> - for ($i = 0; $i < count($Intezmenyek); $i++) { +div.tanarGrid { + width:100%; + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: center; + align-items: auto; + align-content: start +} +div.tanarGrid .item { + flex: 0 0 auto; + margin: 10px; + width: 300px; + background-color: #eee; + text-align:center; + padding:4px 4px; + border-radius:2px; +} - $rovidnev = $Intezmenyek[$i]['rovidNev']; - if ($Intezmenyek[$i]['alapertelmezett'] == 1) - echo '<option value="'.$rovidnev.'" class="default"'.$SEL[$rovidnev].'>'; - else - echo '<option value="'.$rovidnev.'"'.$SEL[$rovidnev].'>'; +h1.osztaly,h2.osztalyfonok,h3.kepzes { text-align:center; } - echo $Intezmenyek[$i]['nev'].' ('.$Intezmenyek[$i]['OMKod'].')'; - echo '</option>'."\n"; +div.tanarGrid .item:hover { background-color: #ddd; } - } +img.arckep {min-height:300px; height:300px; margin-bottom: 2px; border: solid 1px #ddd; filter: grayscale(100%); } +div.tanarGrid .item:hover img.arckep { filter: none; } - echo '</select>'."\n"; +div.arckepPlaceholder {min-height:300px; min-width:100%; height:300px; margin-bottom: 2px; border: solid 1px #fff;} +h2.osztalyfonok { font-size: 14px; } +div.titulus {padding-bottom:4px;} +div.besorolas { font-size:x-small; color: #aaa;} - echo '<input type="submit" value="'._OK.'" />'."\n"; + </style>'; - formEnd(); + echo '<div class="tanarGrid">'; + for($i=0; $i<count($ADAT['tanarok']); $i++) { + $T = $ADAT['tanarok'][$i]; -} + echo '<div class="item tanarNev" data-tanarid="'.$T['tanarId'].'">'; + if (($_img = getFaceURI($T['tanarId'],'tanar')) != '') echo '<img src="'.$_img.'" class="arckep">'; + else { + echo '<div class="arckepPlaceholder" style="display:flex; flex-direction: column">'; + // echo '<div class="icon-adult" style="font-size:120px; color:#eee;"></div>'; + echo '</div>'; + } -function putTanevValaszto($Tanevek) { + echo '<br/>'; - formBegin(); + echo '<div style="font-size: 14px; padding:6px 4px 2px 4px;">'.$T['tanarNev'].'</div>'; - echo '<input type="hidden" name="action" value="tanevValasztas" />'."\n"; + if ($T['titulus']!='') echo '<div class="titulus">'.$T['titulus'].'</div>'; + if ($T['statusz']=='külső óraadó') echo '<div class="titulus">'.$T['statusz'].'</div>'; - echo '<select name="tanev">'."\n"; - $SEL = array(__TANEV => ' selected="selected"'); - for ($i = 0; $i < count($Tanevek); $i++) { - echo '<option value="'.$Tanevek[$i].'"'.$SEL[$Tanevek[$i]].'>'; - echo $Tanevek[$i]; - echo '</option>'."\n"; + $osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]); + for ($j=0; $j<count($osztalyai); $j++) { + $_osztalyId = $osztalyai[$j]; + if ($ADAT['osztalyok'][$_osztalyId]['osztalyJel']!='') { + echo '<div class="osztalyfonok osztalyAdat" data-osztalyid="'.$_osztalyId.'" style="color:#aaa; font-size:smaller">osztályfőnök '.$ADAT['osztalyok'][$_osztalyId]['osztalyJel']; + if ($ADAT['osztalyok'][$_osztalyId]['leiras']!='') echo ' ('.$ADAT['osztalyok'][$_osztalyId]['leiras'].')'; + echo '</div>'; + } + } + + $munkakozossegei = ($ADAT['tanarMunkakozosseg'][$T['tanarId']]); // vezetett + for ($j=0; $j<count($munkakozossegei); $j++) { + $_mkId = $munkakozossegei[$j]; + echo '<div class="munkakozossegVezeto" style="color:#aaa; font-size:smaller">'; + //echo $munkakozossegei[$j]['munkakozossegNev']. ' munkaközösség-vezető'; + echo 'munkaközösség-vezető'; + echo '</div>'; + } + + if (count($T['kepesites'])>0) { + echo '<div class="" style="color:#aaa; font-size:smaller">'; + for ($j=0; $j<count($T['kepesites']); $j++) { + $_kepesites = $T['kepesites'][$j]; + echo ($_kepesites['kepesitesNev']); + echo '<br/>'; } - echo '</select>'."\n"; + echo '</div>'; + } - echo '<input type="submit" value="'._OK.'" />'."\n"; + echo '<div class="besorolas">'.kisbetus($T['besorolas']).'</div>'; - formEnd(); + if ($T['email']!='') echo '<div class="email" style="margin-top:0.4em; font-size:x-small; color:#888;"><span class="icon-envelope"></span> '.$T['email'].'</div>'; + + echo '</div>'; + + } + echo '</div>'; } -*/ + + ?> diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml index aa9747fc..fa705502 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml @@ -122,9 +122,11 @@ else { $class='tantan'; } $class .= ' col-'.$_tankorAdat['tankorId'].' row-'.$_tanarAdat['tanarId']; if (in_array($_tankorAdat['targyId'], $_tanarAdat['targyIds'])) { + $_CHK = in_array($_tanarAdat['tanarId'],$_tankorAdat['tanarIds']) ? ' checked="checked" ':''; + $_RO = (__NAPLOADMIN===true || __VEZETOSEG===true) ? '':' disabled="disabled" readonly="readonly" '; + $class .= in_array($_tanarAdat['tanarId'],$_tankorAdat['tanarIds']) ? ' checked ':''; echo '<td id="cell_'.$_tanarAdat['tanarId'].'_'.$_tankorAdat['tankorId'].'" class="'.$class.'">'; - $_CHK = in_array($_tanarAdat['tanarId'],$_tankorAdat['tanarIds']) ? 'checked="checked" ':''; - echo '<input type="checkbox" class="chkTT" name="tanarTankor[]" value="'.$_tanarAdat['tanarId'].'_'.$_tankorAdat['tankorId'].'" '.$_CHK.'/>'; + echo '<input type="checkbox" class="chkTT" name="tanarTankor[]" value="'.$_tanarAdat['tanarId'].'_'.$_tankorAdat['tankorId'].'" '.$_CHK.$_RO.'/>'; echo '</td>'; } else { echo '<td class="disable '. $class.'"></td>'; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml index 68c826f9..470c57f8 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml @@ -68,9 +68,13 @@ echo '<div style="background-color: #eeeeee; text-align:left;">'; - echo '<label for="teremId">'._TEREMID.'</label>'."\n"; - echo '<span id="teremId">'.$ADAT['teremId'].'</span><br />'; - + if ($ADAT['teremId']>0) { + // echo '<label for="teremId">'._TEREMID.'</label>'."\n"; + // echo '<span id="teremId">'.$ADAT['teremId'].'</span><br/>'; + echo '<label for="teremIdMod">'._TEREMID.' változtatás:</label>'."\n"; + echo $ADAT['teremId'].'→'; + echo '<input type="text" id="teremIdMod" name="teremIdMod" value='.$ADAT['teremId'].'><br />'; + } echo '<label for="leiras">'._LEIRAS.'</label>'."\n"; echo '<input type="text" size="64" name="leiras" id="leiras" value="'.$tAdat['leiras'].'" /><br />'."\n"; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml index 6811b588..0a2e7fde 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml @@ -1,5 +1,102 @@ <?php +function putTanarLista_large($ADAT) { + + echo '<style type="text/css"> + +div.tanarGrid { + width:100%; + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: center; + align-items: auto; + align-content: start +} +div.tanarGrid .item { + flex: 0 0 auto; + margin: 10px; + width: 300px; + background-color: #eee; + text-align:center; + padding:4px 4px; + border-radius:2px; +} + +h1.osztaly,h2.osztalyfonok,h3.kepzes { text-align:center; } + +div.tanarGrid .item:hover { + background-color: #ddd; +} + +img.arckep {min-height:300px; height:300px; margin-bottom: 2px; border: solid 1px #ddd;} +div.arckepPlaceholder {min-height:300px; min-width:100%; height:300px; margin-bottom: 2px; border: solid 1px #fff;} +h2.osztalyfonok { font-size: 14px; } +div.titulus {padding-bottom:4px;} +div.besorolas { font-size:x-small; color: #aaa;} + + </style>'; + + echo '<div class="tanarGrid">'; + for($i=0; $i<count($ADAT['tanarok']); $i++) { + $T = $ADAT['tanarok'][$i]; + + echo '<div class="item tanarNev" data-tanarid="'.$T['tanarId'].'">'; + if (($_img = getFaceURI($T['tanarId'],'tanar')) != '') echo '<img src="'.$_img.'" class="arckep">'; + else { + echo '<div class="arckepPlaceholder" style="display:flex; flex-direction: column">'; + // echo '<div class="icon-adult" style="font-size:120px; color:#eee;"></div>'; + echo '</div>'; + } + + echo '<br/>'; + + echo '<div style="font-size: 14px; padding:6px 4px 2px 4px;">'.$T['tanarNev'].'</div>'; + + if ($T['titulus']!='') echo '<div class="titulus">'.$T['titulus'].'</div>'; + if ($T['statusz']=='külső óraadó') echo '<div class="titulus">'.$T['statusz'].'</div>'; + + $osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]); + for ($j=0; $j<count($osztalyai); $j++) { + $_osztalyId = $osztalyai[$j]; + if ($ADAT['osztalyok'][$_osztalyId]['osztalyJel']!='') { + echo '<div class="osztalyfonok osztalyAdat" data-osztalyid="'.$_osztalyId.'" style="color:#aaa; font-size:smaller">osztályfőnök '.$ADAT['osztalyok'][$_osztalyId]['osztalyJel']; + if ($ADAT['osztalyok'][$_osztalyId]['leiras']!='') echo ' ('.$ADAT['osztalyok'][$_osztalyId]['leiras'].')'; + echo '</div>'; + } + } + + $munkakozossegei = ($ADAT['tanarMunkakozosseg'][$T['tanarId']]); // vezetett + for ($j=0; $j<count($munkakozossegei); $j++) { + $_mkId = $munkakozossegei[$j]; + echo '<div class="munkakozossegVezeto" style="color:#aaa; font-size:smaller">'; + echo $munkakozossegei[$j]['munkakozossegNev']. ' munkaközösség-vezető'; + echo '</div>'; + } + + if (count($T['kepesites'])>0) { + echo '<div class="" style="color:#aaa; font-size:smaller">'; + for ($j=0; $j<count($T['kepesites']); $j++) { + $_kepesites = $T['kepesites'][$j]; + echo ($_kepesites['kepesitesNev']); + echo '<br/>'; + } + echo '</div>'; + } + + echo '<div class="besorolas">'.kisbetus($T['besorolas']).'</div>'; + + // dump($T); + if ($T['email']!='') echo '<div class="email" style="margin-top:0.4em; font-size:x-small; color:#888;"><span class="icon-envelope"></span> '.$T['email'].'</div>'; + + echo '</div>'; + + } + echo '</div>'; +} + + + function putTanarLista($ADAT) { echo '<table class="tanarLista" align="center" cellpadding="1" cellspacing="1">'; @@ -48,55 +145,5 @@ function putTanarLista($ADAT) { echo '</table>'; } -/* -function putIntezmenyValaszto($Intezmenyek) { - - formBegin(); - - echo '<input type="hidden" name="action" value="intezmenyValasztas" />'."\n"; - - echo '<select name="intezmeny">'."\n"; - $SEL = array(__INTEZMENY => ' selected="selected"'); - for ($i = 0; $i < count($Intezmenyek); $i++) { - - $rovidnev = $Intezmenyek[$i]['rovidNev']; - if ($Intezmenyek[$i]['alapertelmezett'] == 1) - echo '<option value="'.$rovidnev.'" class="default"'.$SEL[$rovidnev].'>'; - else - echo '<option value="'.$rovidnev.'"'.$SEL[$rovidnev].'>'; - - echo $Intezmenyek[$i]['nev'].' ('.$Intezmenyek[$i]['OMKod'].')'; - echo '</option>'."\n"; - - } - - echo '</select>'."\n"; - - echo '<input type="submit" value="'._OK.'" />'."\n"; - - formEnd(); - -} - -function putTanevValaszto($Tanevek) { - - formBegin(); - - echo '<input type="hidden" name="action" value="tanevValasztas" />'."\n"; - - echo '<select name="tanev">'."\n"; - $SEL = array(__TANEV => ' selected="selected"'); - for ($i = 0; $i < count($Tanevek); $i++) { - echo '<option value="'.$Tanevek[$i].'"'.$SEL[$Tanevek[$i]].'>'; - echo $Tanevek[$i]; - echo '</option>'."\n"; - } - echo '</select>'."\n"; - - echo '<input type="submit" value="'._OK.'" />'."\n"; - - formEnd(); -} -*/ ?> diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml index d6f037b0..cadb9520 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml @@ -2,8 +2,7 @@ function putFileValaszto($ADAT) { - formBegin(array('class'=>'file')); - + echo formBegin(array('class'=>'file','enctype'=>'multipart/form-data')); echo '<input type="hidden" name="action" value="fileBetoltes" />'."\n"; echo '<input type="hidden" name="tanev" value="'.$ADAT['tanev'].'" />'."\n"; echo '<input type="hidden" name="tolDt" value="'.$ADAT['tolDt'].'" />'."\n"; @@ -12,6 +11,11 @@ echo '<label for="fileName">'._FILENAME.'</label>'."\n"; echo '<input type="text" id="fileName" name="fileName" value="'.$ADAT['fileName'].'" /><br />'; + + echo '<br/>'; + echo '<input type="file" name="upfile" /> (maximum méret: '.human_filesize(file_upload_max_size()).')'; + echo '<br/>'; + echo '<input type="checkbox" checked="checked" name="lezaras" value="true" id="lezaras" /><label for="lezaras">'._LEZARAS.'</label><br />'; echo '<select name="conv">'."\n"; echo '<option value=""> - </option>'."\n"; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml index 160c2be7..60095e83 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml @@ -12,6 +12,11 @@ $TANKOROK = $ADAT['felvehetoTankorok']; $BLOKKOK = $ADAT['felvehetoBlokkok']; + + if (!is_array($ADAT['felvehetoTankorok']) || count($ADAT['felvehetoTankorok'])==0) { + echo "nincs felvehető tankör!"; + } + if (is_array($ADAT['felvehetoTankorok']) && count($ADAT['felvehetoTankorok']) > 0) { $T = $ADAT['orarend']['assoc']; @@ -306,6 +311,10 @@ for ($oi=0; $oi<count($ADAT['orarendioraTankor']['orarendiOra'][$het][$nap][$ora function putOrarendPlain($ADAT) { } + function putOrarendLebego($ADAT) { + // dump($ADAT['orarendiOra']); + } + function _putPluszOra($het,$nap,$ora,$TANKOROK,$BLOKKOK, $tankorIdHelper = null) { diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/face.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/face.phtml index 7f8119e2..3d053a3b 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/face.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/face.phtml @@ -1,4 +1,25 @@ <?php + function getFaceURI($Id,$tipus) { + if (in_array($tipus,array('diak','diák'))) { + $subdir=__TANEV; + } elseif (in_array($tipus,array('tanar','tanár'))) { + $subdir=ekezettelen($tipus); + } else { + $subdir=''; + } + + if ($subdir!='') { + foreach (array('jpg') as $ext) { + $img = $Id.'.'.$ext; + if (file_exists(_DOWNLOADDIR.'/'._POLICY.'/naplo/face/'.$subdir.'/'.$img)) { + $file = 'index.php?policy='._POLICY.'&sessionID='._SESSIONID.'&page=session&f=download&download='.sha1($Id).'&dir=naplo/face/'.$subdir.'&file='.$img; + return $file; + } + } + } + return ''; + } + function putFace($Id,$tipus,$height='50',$return=true) { $ICON = array( diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/targyBontas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/targyBontas.phtml index 07f83e8a..f5bc8f47 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/targyBontas.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/targyBontas.phtml @@ -198,7 +198,7 @@ $stat['ko']++; echo '<ul>'; foreach ($ADAT['oratervenKivuliTankorok'] as $idx => $okAdat) { if ($idx<30) { - echo '<li>'; + echo '<li class="tankorAdat" data-tankorid="'.$okAdat['tankorId'].'">'; echo $okAdat['tankorNev'].' ('.$okAdat['tankorId'].') <span class="diff">['.(is_null($okAdat['diff'])?'-':$okAdat['diff']).']</span>'; echo '</li>'; } diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js index ece36953..e779ccd4 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js @@ -667,6 +667,9 @@ processJSONTanarAdat = function( adat ) { content += '<h3>Egyéb adatok</h3>'; content += '<ul>'; + if (adat['email']!='') content += '<li>Email: '+adat['email']+'</li>'; + if (adat['titulus']!=null) content += '<li>Titulus: '+adat['titulus']+'</li>'; + if (adat['oId']!='') content += '<li>Oktatási azonosító: '+adat['oId']+'</li>'; if (adat['beDt']!='') content += '<li>Munkaviszony: '+adat['beDt']+ (adat['kiDt']==null?'':' – '+adat['kiDt']) +'</li>'; if (adat['hetiMunkaora']!='') content += '<li>Heti munkaóra: '+adat['hetiMunkaora']+'</li>'; if (adat['hetiKotelezoOraszam']!='') content += '<li>Heti kötelező óraszám: '+adat['hetiKotelezoOraszam']+'</li>'; diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index eda99782..b9400eb9 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4793 +4814 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 99d60cdf..be18dc68 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4793 -ba5f756bba5ac3c7e78ce579c0597ffd mayor-fenntarto-rev4793.tgz -578d1032911dfc9fbdffc059f26040b1 mayor-installer-sulix-rev4793.tgz -9a44651fd5295ec9a68bde87f1aee714 mayor-wiki-rev4793.tgz -db7ba8f62aa6543ef3e1a0da2ac237a0 mayor-installer-rev4793.tgz -96034aee700ab8d17530450735b87c91 mayor-portal-rev4793.tgz -50bdbc83ed1faa7215189bca5bfa91ef mayor-felveteli-rev4793.tgz -c252464d47ca71cf4d296e5172811392 mayor-jatek-rev4793.tgz -447b4dad54de496a4dbf9bd0fb50d731 mayor-locales-jp_JP-rev4793.tgz -f04b6e815313c6ff3480f0c07bc28759 mayor-locales-de_DE-rev4793.tgz -7ed3deea683647b2392f65a4b1efd8e3 mayor-locales-en_US-rev4793.tgz -9fa6fbf0d5023d2e88d82d3b45ecf86a mayor-naplo-rev4793.tgz -e0e11de853ea059ea2c6c1a35f68b946 mayor-base-rev4793.tgz +Revision 4814 +cd7fc10dcf79c62ce89fc6b77578234a mayor-fenntarto-rev4814.tgz +4a70532ef01f11d6cf2d3d621f5f9d02 mayor-installer-sulix-rev4814.tgz +f3221ed70e528fcb695f34872c69faf0 mayor-wiki-rev4814.tgz +f5588048fe6c00b6469383751428874c mayor-installer-rev4814.tgz +276ce6833f9b753ac51e1cd7853911a8 mayor-portal-rev4814.tgz +6608fe933660e14e2592537ceffffcf6 mayor-felveteli-rev4814.tgz +90ae3a5f8de83585b859fddbe8902fb1 mayor-jatek-rev4814.tgz +c9e2958cc1b03ca02d2351a8bbbd882c mayor-locales-jp_JP-rev4814.tgz +b97bbe45b33f212f3da8f10f36ac24d0 mayor-locales-de_DE-rev4814.tgz +5c4ca4d31dbadee09b2b145903cfb5b3 mayor-locales-en_US-rev4814.tgz +775ef34d6d8ac7534fca9c5d1f794e2c mayor-naplo-rev4814.tgz +aacb1e36257fbd4202a6d3109b4ca581 mayor-base-rev4814.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index eda99782..b9400eb9 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4793 +4814 |