From 05cd10ac470512a35ac392856baabe8b0619add5 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Sun, 6 Sep 2020 12:06:53 +0200 Subject: Rev: 4678 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index d197bb6d..3c4089ce 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4675 +4678 -- cgit v1.2.3 From 847eb4a21606966ac5573c6ed6df878eff93841a Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 10 Sep 2020 13:20:03 +0200 Subject: Rev: 4680 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- .../www/include/backend/ads/session/base.php | 2 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../policy/private/naplo/intezmeny/osztaly-pre.php | 15 ++++++++++++- .../www/policy/private/naplo/intezmeny/osztaly.php | 5 ++++- .../module-naplo/html/intezmeny/osztaly.phtml | 21 +++++++++++++++++ mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 19 files changed, 67 insertions(+), 30 deletions(-) (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/mayor-base/www/include/backend/ads/session/base.php b/mayor-orig/mayor-base/www/include/backend/ads/session/base.php index 3a727c3b..edb47858 100644 --- a/mayor-orig/mayor-base/www/include/backend/ads/session/base.php +++ b/mayor-orig/mayor-base/www/include/backend/ads/session/base.php @@ -138,7 +138,7 @@ $userDn = ADSuserAccountToDn($userAccount, $toPolicy); if (in_array($group, $AUTH[$toPolicy]['categories'])) { - if (strpos($userDn, ',ou='.ekezettelen($group).',') !== false) return true; + if (strpos(kisbetus($userDn), ',ou='.ekezettelen($group).',') !== false) return true; # Ha nincs megfelelő ou-ban, akkor nézzük a csoport tagságot - így berakható időszakosan akárki pl a titkárság kategóriába... # else return false; } diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4678 +4680 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 3c4089ce..e9f0a693 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 @@ -4678 +4680 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4678 +4680 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 3c4089ce..e9f0a693 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 @@ -4678 +4680 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 3c4089ce..e9f0a693 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 @@ -4678 +4680 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 3c4089ce..e9f0a693 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 @@ -4678 +4680 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=$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 ''; + echo ''; + echo ''; + + echo '

'._OIDELLENOR.'

'; + + var_dump($ADAT['oidCheck']); + + echo ''; + + echo '
'; + + formEnd(); + +} + ?> \ No newline at end of file diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4678 +4680 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index ceb87b49..a4b66494 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4678 -ae37f4627dc0b9d59b8f7d02f6a36567 mayor-fenntarto-rev4678.tgz -8701623ef3593718cdc4e916cb9beb45 mayor-installer-sulix-rev4678.tgz -67af2c56005638e1e987413d22429ac0 mayor-wiki-rev4678.tgz -2d9568b5e406bb195ad41b8a17616445 mayor-installer-rev4678.tgz -9cbef6c69c497940efaf9b32a7c9d542 mayor-portal-rev4678.tgz -b7e19d4216b5bab9f6e3d39f88b96eb4 mayor-felveteli-rev4678.tgz -2aece1e47be886e15341154afc3ef82f mayor-jatek-rev4678.tgz -0a1e9519b2c195ad2cfd53698e1edd83 mayor-locales-jp_JP-rev4678.tgz -17b9730d7e0766198c0f0d536fda000d mayor-locales-de_DE-rev4678.tgz -0a6684550a20f620b6e590feed384d68 mayor-locales-en_US-rev4678.tgz -417c3c4ec00fe453667175ed3b0dd435 mayor-naplo-rev4678.tgz -8f7e80787a56704f86db4101ad727229 mayor-base-rev4678.tgz +Revision 4680 +2adbe6892159370933630427685df89c mayor-fenntarto-rev4680.tgz +d12171381221c6da70355cac5edd40db mayor-installer-sulix-rev4680.tgz +a927f2c159b6967bbe164d62093eb29d mayor-wiki-rev4680.tgz +573f950dc80937ac4ef84925395124bc mayor-installer-rev4680.tgz +d8331f6f3fab928c0b63fd81f6d96c80 mayor-portal-rev4680.tgz +1922b6d82fd3442a2302f236db7762d2 mayor-felveteli-rev4680.tgz +eaf37db5261e944960739a8189c683d4 mayor-jatek-rev4680.tgz +75a0246fda3ebfcf818f2d37b2ee252c mayor-locales-jp_JP-rev4680.tgz +a2c562ba77ded498a38be164592d1cf9 mayor-locales-de_DE-rev4680.tgz +eb8c5997b1bf68d17e70684ed41ad2d0 mayor-locales-en_US-rev4680.tgz +4cd73545ae83ce4a2ec4ead62d793813 mayor-naplo-rev4680.tgz +4e0e32b4ec5359c77b50748e5a805de6 mayor-base-rev4680.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 3c4089ce..e9f0a693 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4678 +4680 diff --git a/rev.txt b/rev.txt index 3c4089ce..e9f0a693 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4678 +4680 -- cgit v1.2.3 From dc2b3d12c866d02833def3704cbb0725e04ca7a1 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 10 Sep 2020 13:45:03 +0200 Subject: Rev: 4681 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../policy/private/naplo/intezmeny/osztaly-pre.php | 2 +- .../module-naplo/html/intezmeny/osztaly.phtml | 22 ++++++++++++++++-- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 17 files changed, 48 insertions(+), 30 deletions(-) (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index e9f0a693..ee67738f 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4680 +4681 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index e9f0a693..ee67738f 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4680 +4681 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index e9f0a693..ee67738f 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4680 +4681 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index e9f0a693..ee67738f 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4680 +4681 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 e9f0a693..ee67738f 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 @@ -4680 +4681 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index e9f0a693..ee67738f 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4680 +4681 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 e9f0a693..ee67738f 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 @@ -4680 +4681 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 e9f0a693..ee67738f 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 @@ -4680 +4681 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 e9f0a693..ee67738f 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 @@ -4680 +4681 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index e9f0a693..ee67738f 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4680 +4681 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 62d0f384..0acd5f0f 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 @@ -125,7 +125,7 @@ if ($action == 'oidEllenor' && __NAPLOADMIN===true) { $oidxp = explode("\n",str_replace(' ',"\n",str_replace('\r','\n',$_POST['oidtxt']))); $ADAT['oidtxt'] = $_re; for($i=0; $i'._OIDELLENOR.''; - var_dump($ADAT['oidCheck']); - + if (is_array($ADAT['oidCheck'])) { + echo ''; + foreach($ADAT['oidCheck'] as $oId=>$DA) { + for ($i=0; $i'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + } + echo '
'.$oId.''.$D['diakId'].''.$D['diakNev'].''.$D['oId'].''; + if ($ADAT['osztalyAdat']['osztalyJel']!=$D['osztalyJel']) {echo '!!!!!!!';} + //echo '72455076207'; + echo $D['osztalyJel']; + echo '
'; + } echo ''; diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index e9f0a693..ee67738f 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4680 +4681 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index e9f0a693..ee67738f 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4680 +4681 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index a4b66494..7c9ee0ee 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4680 -2adbe6892159370933630427685df89c mayor-fenntarto-rev4680.tgz -d12171381221c6da70355cac5edd40db mayor-installer-sulix-rev4680.tgz -a927f2c159b6967bbe164d62093eb29d mayor-wiki-rev4680.tgz -573f950dc80937ac4ef84925395124bc mayor-installer-rev4680.tgz -d8331f6f3fab928c0b63fd81f6d96c80 mayor-portal-rev4680.tgz -1922b6d82fd3442a2302f236db7762d2 mayor-felveteli-rev4680.tgz -eaf37db5261e944960739a8189c683d4 mayor-jatek-rev4680.tgz -75a0246fda3ebfcf818f2d37b2ee252c mayor-locales-jp_JP-rev4680.tgz -a2c562ba77ded498a38be164592d1cf9 mayor-locales-de_DE-rev4680.tgz -eb8c5997b1bf68d17e70684ed41ad2d0 mayor-locales-en_US-rev4680.tgz -4cd73545ae83ce4a2ec4ead62d793813 mayor-naplo-rev4680.tgz -4e0e32b4ec5359c77b50748e5a805de6 mayor-base-rev4680.tgz +Revision 4681 +15c2a2e023f8d05716b1baed93973bdc mayor-fenntarto-rev4681.tgz +46aa3cf4b5efa5ee0ca4cf78d8cc1eaf mayor-installer-sulix-rev4681.tgz +a014e0b2366869b03f60954498f55e63 mayor-wiki-rev4681.tgz +754361c37b37ae4cc9cf9e6f8d647c7d mayor-installer-rev4681.tgz +4d879e5cf7746acd5f12d84bee8717a8 mayor-portal-rev4681.tgz +393e2c0e36081ba94e8b547b6ed03a7c mayor-felveteli-rev4681.tgz +8b4e6e23d43ffba1a2e351200a03fd47 mayor-jatek-rev4681.tgz +b42789275534e1b605ce8611fef58534 mayor-locales-jp_JP-rev4681.tgz +af3e34234540ba2adddd58bb844e8baa mayor-locales-de_DE-rev4681.tgz +77483820d31eab179c30146544683ccf mayor-locales-en_US-rev4681.tgz +76f0f3df73e4fc536bd2075e5ecfb5d7 mayor-naplo-rev4681.tgz +456ef5dcce3b8420acceff4170d38ff7 mayor-base-rev4681.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index e9f0a693..ee67738f 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4680 +4681 diff --git a/rev.txt b/rev.txt index e9f0a693..ee67738f 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4680 +4681 -- cgit v1.2.3 From 4151aba7656fb165c54f9b77553ce96f75a52d51 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Tue, 22 Sep 2020 14:30:03 +0200 Subject: Rev: 4683 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- .../install/module-naplo/mysql/intezmeny.sql | 12 +++++----- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../mayor-naplo/update/pre004682-1-intezmeny.sql | 17 ++++++++++++++ mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- .../classic/module-portal/html/hirek/egyhir.phtml | 8 +++++++ mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 18 files changed, 58 insertions(+), 33 deletions(-) create mode 100644 mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index ee67738f..44f34c74 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4681 +4683 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index ee67738f..44f34c74 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4681 +4683 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index ee67738f..44f34c74 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4681 +4683 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index ee67738f..44f34c74 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4681 +4683 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 ee67738f..44f34c74 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 @@ -4681 +4683 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index ee67738f..44f34c74 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4681 +4683 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 ee67738f..44f34c74 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 @@ -4681 +4683 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 ee67738f..44f34c74 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 @@ -4681 +4683 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 ee67738f..44f34c74 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 @@ -4681 +4683 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 1912a862..8254eb20 100644 --- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql +++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql @@ -68,10 +68,10 @@ CREATE TABLE `telephely` ( CREATE TABLE `szulo` ( `szuloId` int(10) unsigned NOT NULL AUTO_INCREMENT, - `nevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', + `nevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '', `csaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `utonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', - `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', + `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '', `szuleteskoriCsaladinev` varchar(32) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `szuleteskoriUtonev` varchar(32) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `nem` enum('fiú','lány') COLLATE utf8_hungarian_ci DEFAULT NULL, @@ -102,10 +102,10 @@ CREATE TABLE `diak` ( `adoazonosito` bigint(10) unsigned zerofill DEFAULT NULL, `szemelyiIgazolvanySzam` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL, `tartozkodasiOkiratSzam` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL, - `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', + `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '', `viseltCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `viseltUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', - `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', + `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '', `szuleteskoriCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `szuleteskoriUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `szuletesiHely` varchar(32) COLLATE utf8_hungarian_ci DEFAULT NULL, @@ -263,7 +263,7 @@ CREATE TABLE `tanar` ( `oId` bigint(20) unsigned DEFAULT NULL, `beDt` date DEFAULT NULL, `kiDt` date DEFAULT NULL, - `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT NULL, + `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '', `viseltCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `viseltUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `szuletesiHely` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL, @@ -271,7 +271,7 @@ CREATE TABLE `tanar` ( `dn` varchar(128) COLLATE utf8_hungarian_ci DEFAULT NULL, `szuleteskoriUtonev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', `szuleteskoriCsaladinev` varchar(64) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', - `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci NOT NULL DEFAULT '', + `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT '', `hetiMunkaora` decimal(3,1) DEFAULT '0.0', `NEKAzonosito` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL, `statusz` enum('határozatlan idejű','határozott idejű','tartósan távol','jogviszonya lezárva','külső óraadó') COLLATE utf8_hungarian_ci DEFAULT 'határozatlan idejű', diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index ee67738f..44f34c74 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4681 +4683 diff --git a/mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql new file mode 100644 index 00000000..121f2c88 --- /dev/null +++ b/mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql @@ -0,0 +1,17 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4682 $$ + +CREATE PROCEDURE upgrade_database_4682() +BEGIN +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +ALTER TABLE `tanar` MODIFY `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT ''; +ALTER TABLE `tanar` MODIFY `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT ''; +ALTER TABLE `szulo` MODIFY `nevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT ''; +ALTER TABLE `szulo` MODIFY `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT ''; +ALTER TABLE `diak` MODIFY `viseltNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT ''; +ALTER TABLE `diak` MODIFY `szuleteskoriNevElotag` varchar(8) COLLATE utf8_hungarian_ci DEFAULT ''; + +END $$ +DELIMITER ; +CALL upgrade_database_4682(); diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index ee67738f..44f34c74 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4681 +4683 diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml index c75b2756..afebf8bc 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml @@ -27,6 +27,7 @@ formBegin(); if (__HIREKADMIN===true) { + echo ''; echo ''; echo ''; @@ -135,6 +136,13 @@ echo ''; + echo ''; if (__HIREKADMIN===true) { echo '
'; diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index ee67738f..44f34c74 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4681 +4683 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 7c9ee0ee..b0ed190b 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4681 -15c2a2e023f8d05716b1baed93973bdc mayor-fenntarto-rev4681.tgz -46aa3cf4b5efa5ee0ca4cf78d8cc1eaf mayor-installer-sulix-rev4681.tgz -a014e0b2366869b03f60954498f55e63 mayor-wiki-rev4681.tgz -754361c37b37ae4cc9cf9e6f8d647c7d mayor-installer-rev4681.tgz -4d879e5cf7746acd5f12d84bee8717a8 mayor-portal-rev4681.tgz -393e2c0e36081ba94e8b547b6ed03a7c mayor-felveteli-rev4681.tgz -8b4e6e23d43ffba1a2e351200a03fd47 mayor-jatek-rev4681.tgz -b42789275534e1b605ce8611fef58534 mayor-locales-jp_JP-rev4681.tgz -af3e34234540ba2adddd58bb844e8baa mayor-locales-de_DE-rev4681.tgz -77483820d31eab179c30146544683ccf mayor-locales-en_US-rev4681.tgz -76f0f3df73e4fc536bd2075e5ecfb5d7 mayor-naplo-rev4681.tgz -456ef5dcce3b8420acceff4170d38ff7 mayor-base-rev4681.tgz +Revision 4683 +5ab848461fcb7c8f0e675e0ba565dfb6 mayor-fenntarto-rev4683.tgz +acab3f4d1dc57153e4737352e0b2513e mayor-installer-sulix-rev4683.tgz +67c861aee289395a3cb38590d67ce66a mayor-wiki-rev4683.tgz +6f0f8a265ca71ed5eedd44b33856b3b0 mayor-installer-rev4683.tgz +f1d56379fd6d7ac8086be051d95e4da5 mayor-portal-rev4683.tgz +e37c44fb0101398b91fe7c3371399672 mayor-felveteli-rev4683.tgz +0eff173e22c1dbdb55b53f65eecbaf94 mayor-jatek-rev4683.tgz +b2c987867d7f4b0c5e2cb6727ec3c9b7 mayor-locales-jp_JP-rev4683.tgz +11dd8efcac7603550dd6db72476e2a26 mayor-locales-de_DE-rev4683.tgz +180cebdc87e92c057e8870d8f3b77b91 mayor-locales-en_US-rev4683.tgz +1d142f81e335acfe4a50fe626a6c864a mayor-naplo-rev4683.tgz +7a2430870a191b80dc09cba2322b4b0d mayor-base-rev4683.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index ee67738f..44f34c74 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4681 +4683 diff --git a/rev.txt b/rev.txt index ee67738f..44f34c74 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4681 +4683 -- cgit v1.2.3 From a5ac3d0ab4015ed2683706cd0677ce6ce159f0ed Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Wed, 21 Oct 2020 20:35:04 +0200 Subject: Rev: 4691 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- mayor-orig/mayor-base/www/include/base/mysql.php | 4 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- .../www/static/hu_HU/felveteli/felveteli.2020.html | 107 +++++++++++++++++++++ .../www/static/hu_HU/felveteli/felveteli.html | 105 +------------------- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- .../www/policy/private/portal/portal/portal.php | 1 + .../classic/module-portal/html/hirek/egyhir.phtml | 5 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 ++--- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 20 files changed, 144 insertions(+), 132 deletions(-) create mode 100644 mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.2020.html (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-base/www/include/base/mysql.php b/mayor-orig/mayor-base/www/include/base/mysql.php index 819fdcd0..e4322dc8 100644 --- a/mayor-orig/mayor-base/www/include/base/mysql.php +++ b/mayor-orig/mayor-base/www/include/base/mysql.php @@ -91,11 +91,11 @@ mysqli_set_charset($lr, "utf8"); mysqli_query($lr, "SET NAMES utf8"); mysqli_query($lr, "SET collation_connection='utf8_hungarian_ci'"); - mysqli_query($lr, "SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))"); + mysqli_query($lr, "SET SESSION sql_mode=(SELECT REPLACE(REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''),'NO_ZERO_DATE',''))"); } else { mysql_query("SET NAMES utf8", $lr); mysql_query("SET collation_connection='utf8_hungarian_ci'", $lr); - mysql_query("SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''))", $lr); + mysql_query("SET SESSION sql_mode=(SELECT REPLACE(REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''),'NO_ZERO_DATE',''))", $lr); } } else { $_SESSION['alert'][] = "message:sql_select_db_failure:db_connect/${SET['fv']}:$modul:".$MYSQL_DATA[$modul]['db']; diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.2020.html b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.2020.html new file mode 100644 index 00000000..13dd5cfa --- /dev/null +++ b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.2020.html @@ -0,0 +1,107 @@ +
+

Középiskolai felvételi

+

2020/2021-es tanév

+ +
+ + Felvételi Tájékoztató 2020/2021 [PDF] + +
+ +

Letölthető dokumentumok

+ + +

Fontos dátumok

+ +
+
2019. október 17.
+
+A felvételi tájékoztató megjelenése. +
+ +
2019. november 11. 18:00
+
Tájékoztató értekezletet a felvételi eljárás rendjéről, induló osztályokról
+ +
2019. november 11-15.
+
Iskola bemutatkozás és nyílt órák (előzetes jelentkezéssel!)
+ +
2019. december 6.
+
Jelentkezési határidő az egységes követelmények szerint tartott + a felvételi eljárást megelőző írásbeli felvételi vizsgára. +
+ +
2020. január 18. 1000
+
Írásbeli felvételi vizsgák az érintett 6 évfolyamos gimnáziumokban. (2x45 perc)
+ +
2020. január 18. 1000
+
Írásbeli felvételi a nyolcadik évfolyamok számára a felvételi eljárást + megelőző írásbeli vizsgát szervező középiskolákban. (2x45 perc)
+ +
2020. január 25. 8:00-16:00 6 4-5
+
A felvételi eljárást megelőző központi írásbeli dolgozatok megtekintése négyévfolyamos, hatévfolyamos és a nyelvi előkészítős képzésre jelentkezőknek
+ +
2020. február 19.
+
Tanulói Jelentkezési Lapok és Tanulói Adatlapok leadási határideje
+ +
2020. február 24. - 2020. március 13.
+
Szóbeli beszélgetések a kiírás szerint.
+ +
2020. március 16.
+
Ideiglenes felvételi jegyzék közzététele.
+ +
+ +

Kiemelt adatok

+ +
+
Az iskola rövid neve és címe:
+
Városmajori Gimnázium
+ 1122. Budapest, Városmajor u. 71.
+ Tel: 214-1554; Fax: 214-1479
+ Telephely kódja: 001
+
+
A gimnázium központi azonosító kódja:
+
035242
+ + +
A 2019/2020-es tanévben indítandó tanulócsoportok azonosító számai:
+
+ + +
'._BEALLITASOK.'
+ + + + + + + + + +
Az osztály jelemegnevezésekódja
7. Aáltalános egyedi tantervű osztály (angol)0710
7. Báltalános egyedi tantervű osztály (német)0720
9. Cének-zene speciális tantervű csoport (angol)0930
9. Cmagyar egyedi tantervű csoport (angol)0934
9. Dmatematika tehetséggondozó csoport (angol)0940
9. Dfizika egyedi tantervű csoport (angol)0942
9/Ny. Eáltalános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (német)0850
9/Ny. Eáltalános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (spanyol)0855
+ + + + + diff --git a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html index 13dd5cfa..d8acbde8 100644 --- a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html +++ b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html @@ -1,107 +1,10 @@

Középiskolai felvételi

-

2020/2021-es tanév

+

2021/2022-es tanév

- - Felvételi Tájékoztató 2020/2021 [PDF] + + Felvételi Tájékoztató 2021/2022 [PDF]
- -

Letölthető dokumentumok

- - -

Fontos dátumok

- -
-
2019. október 17.
-
-A felvételi tájékoztató megjelenése. -
- -
2019. november 11. 18:00
-
Tájékoztató értekezletet a felvételi eljárás rendjéről, induló osztályokról
- -
2019. november 11-15.
-
Iskola bemutatkozás és nyílt órák (előzetes jelentkezéssel!)
- -
2019. december 6.
-
Jelentkezési határidő az egységes követelmények szerint tartott - a felvételi eljárást megelőző írásbeli felvételi vizsgára. -
- -
2020. január 18. 1000
-
Írásbeli felvételi vizsgák az érintett 6 évfolyamos gimnáziumokban. (2x45 perc)
- -
2020. január 18. 1000
-
Írásbeli felvételi a nyolcadik évfolyamok számára a felvételi eljárást - megelőző írásbeli vizsgát szervező középiskolákban. (2x45 perc)
- -
2020. január 25. 8:00-16:00 6 4-5
-
A felvételi eljárást megelőző központi írásbeli dolgozatok megtekintése négyévfolyamos, hatévfolyamos és a nyelvi előkészítős képzésre jelentkezőknek
- -
2020. február 19.
-
Tanulói Jelentkezési Lapok és Tanulói Adatlapok leadási határideje
- -
2020. február 24. - 2020. március 13.
-
Szóbeli beszélgetések a kiírás szerint.
- -
2020. március 16.
-
Ideiglenes felvételi jegyzék közzététele.
- -
- -

Kiemelt adatok

- -
-
Az iskola rövid neve és címe:
-
Városmajori Gimnázium
- 1122. Budapest, Városmajor u. 71.
- Tel: 214-1554; Fax: 214-1479
- Telephely kódja: 001
-
-
A gimnázium központi azonosító kódja:
-
035242
- - -
A 2019/2020-es tanévben indítandó tanulócsoportok azonosító számai:
-
- - - - - - - - - - - - -
Az osztály jelemegnevezésekódja
7. Aáltalános egyedi tantervű osztály (angol)0710
7. Báltalános egyedi tantervű osztály (német)0720
9. Cének-zene speciális tantervű csoport (angol)0930
9. Cmagyar egyedi tantervű csoport (angol)0934
9. Dmatematika tehetséggondozó csoport (angol)0940
9. Dfizika egyedi tantervű csoport (angol)0942
9/Ny. Eáltalános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (német)0850
9/Ny. Eáltalános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (spanyol)0855
-
- -
- -
+ \ No newline at end of file diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4683 +4691 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 44f34c74..54f5b275 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 @@ -4683 +4691 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4683 +4691 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 44f34c74..54f5b275 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 @@ -4683 +4691 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 44f34c74..54f5b275 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 @@ -4683 +4691 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 44f34c74..54f5b275 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 @@ -4683 +4691 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php index 1640b057..6e9d1cc3 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php @@ -3,6 +3,7 @@ global $skin; /* $skinnek lennie kell */ + if (defined('_POLICY') && defined('__PORTAL_CODE') && file_exists('policy/'._POLICY.'/portal/portal/portal_'.__PORTAL_CODE.'.'.$skin.'.php') ) { require('policy/'._POLICY.'/portal/portal/portal_'.__PORTAL_CODE.'.'.$skin.'.php'); } elseif (file_exists('policy/'._POLICY.'/portal/portal/portal_'.demo.'.'.$skin.'.php')) { diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml index afebf8bc..b8e0f7ee 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml @@ -27,7 +27,7 @@ formBegin(); if (__HIREKADMIN===true) { - echo ''; + echo ''; echo ''; echo ''; @@ -139,7 +139,8 @@ echo ''; diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 44f34c74..54f5b275 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4683 +4691 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index b0ed190b..052b0a58 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4683 -5ab848461fcb7c8f0e675e0ba565dfb6 mayor-fenntarto-rev4683.tgz -acab3f4d1dc57153e4737352e0b2513e mayor-installer-sulix-rev4683.tgz -67c861aee289395a3cb38590d67ce66a mayor-wiki-rev4683.tgz -6f0f8a265ca71ed5eedd44b33856b3b0 mayor-installer-rev4683.tgz -f1d56379fd6d7ac8086be051d95e4da5 mayor-portal-rev4683.tgz -e37c44fb0101398b91fe7c3371399672 mayor-felveteli-rev4683.tgz -0eff173e22c1dbdb55b53f65eecbaf94 mayor-jatek-rev4683.tgz -b2c987867d7f4b0c5e2cb6727ec3c9b7 mayor-locales-jp_JP-rev4683.tgz -11dd8efcac7603550dd6db72476e2a26 mayor-locales-de_DE-rev4683.tgz -180cebdc87e92c057e8870d8f3b77b91 mayor-locales-en_US-rev4683.tgz -1d142f81e335acfe4a50fe626a6c864a mayor-naplo-rev4683.tgz -7a2430870a191b80dc09cba2322b4b0d mayor-base-rev4683.tgz +Revision 4691 +71107f2d0381381d16916e473db42dba mayor-fenntarto-rev4691.tgz +a80ee713915cb729bf44f9c831f3e74a mayor-installer-sulix-rev4691.tgz +a0777d620e206b07b6e3565864a58fec mayor-wiki-rev4691.tgz +a58f5bd16055fc5f168b39a70052de05 mayor-installer-rev4691.tgz +512a43eb1223ecec3b81ea1eda4c16f6 mayor-portal-rev4691.tgz +21a67636b6d1d0c2ca040d1210901aaf mayor-felveteli-rev4691.tgz +1d2ff3b0f71141f6e3c916c749eab426 mayor-jatek-rev4691.tgz +f5490a7abb4629401ac267ec0e23a9ac mayor-locales-jp_JP-rev4691.tgz +d9d56f15c55aaca9e5e6447455e8b593 mayor-locales-de_DE-rev4691.tgz +b03f1fa2e742a0d3245a1c1b719dbd6f mayor-locales-en_US-rev4691.tgz +5b7345dd3db4f2aa184d4440beb7bd5e mayor-naplo-rev4691.tgz +6b1cef87715c325d36a3d24e66378cbf mayor-base-rev4691.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 44f34c74..54f5b275 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4683 +4691 diff --git a/rev.txt b/rev.txt index 44f34c74..54f5b275 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4683 +4691 -- cgit v1.2.3 From c279e479aa9c943fd0fc2b396638a5208c78cfb9 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Wed, 28 Oct 2020 11:35:04 +0100 Subject: Rev: 4695 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- .../mayor-base/www/skin/classic/base/css/base.css | 3 +- .../www/skin/default/base/html/base.phtml | 5 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- .../include/menu/public/hu_HU/module-felveteli.php | 4 ++ mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../install/mayor-portal/mysql/mayor-portal.sql | 18 ++++-- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- .../update/rev004693-1-mayor_portal.sql | 32 +++++++++++ .../www/include/modules/portal/hirek/egyhir.php | 9 ++- .../www/include/modules/portal/share/hirek.php | 2 +- .../www/policy/private/portal/hirek/egyhir-pre.php | 1 + .../policy/private/portal/hirek/hirekAdmin-pre.php | 35 +++++++++++- .../www/policy/private/portal/hirek/hirekAdmin.php | 6 +- .../classic/module-portal/css/hirek/egyhir.css | 34 +++++++++-- .../classic/module-portal/css/hirek/hirekAdmin.css | 15 ++++- .../www/skin/classic/module-portal/css/portal.css | 6 +- .../classic/module-portal/html/hirek/egyhir.phtml | 35 ++++++++---- .../module-portal/html/hirek/hirekAdmin.phtml | 66 +++++++++++++++++----- .../classic/module-portal/html/share/doboz.phtml | 3 +- .../module-portal/javascript/portal.jquery.min.js | 29 ++++++++++ mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 ++++----- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 32 files changed, 282 insertions(+), 75 deletions(-) create mode 100644 mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css index 54b53fb8..4ee80f46 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css +++ b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css @@ -102,7 +102,8 @@ padding-left: 140px; } - #nav li { position: relative; } + #nav li { position: relative; } + #nav li:first { white-space: nowrap; } #nav > li { float: left; z-index: 20; text-align: center; padding: 0; /* background-color: #3fa79c; */ background-color: #3496B9; diff --git a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml index 19dfa38e..78a5dea8 100644 --- a/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml +++ b/mayor-orig/mayor-base/www/skin/default/base/html/base.phtml @@ -137,7 +137,8 @@ function includeJS($page,$sub,$f,$skin) { echo ''."\n"; } } - if (__RICH_TEXT_EDITOR===true && $f == 'egyhir') { +/* + if (__RICH_TEXT_EDITOR===true && $f == 'egyhir') { // disabled // Koschtit Image Gallery if ($page == 'portal') { //require_once('skin/classic/share/javascript/koschtit/ki_include.php'); @@ -147,7 +148,7 @@ function includeJS($page,$sub,$f,$skin) { '; } - +*/ // if (file_exists(($_f="skin/$skin/base/javascript/jstorage.min.js")) ) { // echo ''."\n"; // } diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php b/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php index 4fa2aa1d..953cc817 100644 --- a/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php +++ b/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php @@ -1,5 +1,7 @@ 'Felvételi (általános iskola)', 'url' => 'index.php?page=felveteli&sub=kos') @@ -45,4 +47,6 @@ array('txt' => '6.', 'url' => 'index.php?page=felveteli&sub=tajekoztato/20082009&f=6'), ); */ + +} ?> diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4691 +4695 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 54f5b275..9bce5583 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 @@ -4691 +4695 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4691 +4695 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 54f5b275..9bce5583 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 @@ -4691 +4695 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 54f5b275..9bce5583 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 @@ -4691 +4695 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 54f5b275..9bce5583 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 @@ -4691 +4695 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql b/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql index 842760b7..61655882 100644 --- a/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql +++ b/mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql @@ -61,13 +61,23 @@ SET character_set_client = @saved_cs_client; DROP TABLE IF EXISTS `kategoriak`; CREATE TABLE `kategoriak` ( - `id` mediumint(8) unsigned NOT NULL default '0', - `leiras` varchar(70) NOT NULL default '', + `id` mediumint(8) unsigned NOT NULL DEFAULT '0', + `leiras` varchar(70) NOT NULL DEFAULT '', `precode` text, - `postcode` text + `postcode` text, + UNIQUE KEY `id` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1; - +DROP TABLE IF EXISTS `hirKategoria`; +CREATE TABLE `hirKategoria` ( + `hirId` int(10) unsigned NOT NULL, + `kategoriaId` mediumint(8) unsigned NOT NULL, + PRIMARY KEY (`hirId`,`kategoriaId`), + KEY `hirKategoria_FKIndex1` (`hirId`), + KEY `hirKategoria_FKIndex2` (`kategoriaId`), + CONSTRAINT `hirKategoria_ibfk_1` FOREIGN KEY (`hirId`) REFERENCES `hirek` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `hirKategoria_ibfk_2` FOREIGN KEY (`kategoriaId`) REFERENCES `kategoriak` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci; -- -- Table structure for table `linkek` -- diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql b/mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql new file mode 100644 index 00000000..5b36028d --- /dev/null +++ b/mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql @@ -0,0 +1,32 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4693 $$ + +CREATE PROCEDURE upgrade_database_4693() +BEGIN +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +IF NOT EXISTS (SELECT * FROM information_schema.STATISTICS WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='kategoriak' AND COLUMN_NAME='id') THEN + ALTER TABLE `kategoriak` ADD UNIQUE INDEX (id); +END IF; + +ALTER TABLE `hirek` ENGINE = InnoDB; +ALTER TABLE `kategoriak` ENGINE = InnoDB; + +IF NOT EXISTS (SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='hirKategoria') THEN +CREATE TABLE `hirKategoria` ( + `hirId` int(10) unsigned NOT NULL, + `kategoriaId` mediumint(8) unsigned NOT NULL, + PRIMARY KEY (`hirId`,`kategoriaId`), + KEY `hirKategoria_FKIndex1` (`hirId`), + KEY `hirKategoria_FKIndex2` (`kategoriaId`), + CONSTRAINT `hirKategoria_ibfk_1` FOREIGN KEY (`hirId`) REFERENCES `hirek` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `hirKategoria_ibfk_2` FOREIGN KEY (`kategoriaId`) REFERENCES `kategoriak` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci ; +END IF; + +-- hirek.cid --> hirKategoria kapcsolo +INSERT IGNORE INTO hirKategoria SELECT hirek.id as hirId,hirek.cid AS kategoriaId from hirek where hirek.cid!=0; + +END $$ +DELIMITER ; +CALL upgrade_database_4693(); diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php index c93a81bd..1c5c8bc9 100644 --- a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php +++ b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php @@ -13,7 +13,7 @@ $flag = intval($DATA['flag']); $class = intval($DATA['class']); $lang = (in_array($DATA['lang'],$LANGUAGES)) ? $DATA['lang'] : _DEFAULT_LANG; - if ($DATA['cid']>0) $cid = $DATA['cid']; + if ($DATA['cid']>0) $cid = $DATA['cid']; // -- TODO!!!! $csoport = $DATA['csoport']; if ($hirId!='' && __HIREKADMIN == false ) { $q = "SELECT owner FROM hirek WHERE owner='%s'"; @@ -41,6 +41,13 @@ } } else $q = ''; if ($q!='') $r = db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v)); + if (is_array($DATA['kategoriaId'])) { + for ($i=0; $i'portal','result'=>'insert','values'=>$v)); + } + } return $r; } diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php index d7db431e..0de316b6 100644 --- a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php +++ b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php @@ -42,7 +42,7 @@ } else $WHERE = ''; if ($SET['all']===true) $WHERE = ''; - $q = "SELECT * FROM hirek $WHERE ORDER BY kdt DESC,vdt DESC".$L; + $q = "SELECT hirek.*, hirek.id AS hirId, GROUP_CONCAT(kategoriaId) AS hirkategoriak FROM hirek LEFT JOIN hirKategoria ON (hirek.id=hirId) $WHERE GROUP BY hirek.id ORDER BY kdt DESC,vdt DESC".$L; $HIREK['szovegek'] = db_query($q, array('modul'=>'portal','result'=>'indexed')); return $HIREK; } diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php index 0d5cbf71..ef18e58c 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php @@ -26,6 +26,7 @@ if (_RIGHTS_OK !== true) die(); $DATA['flag']= readVariable($_POST['flag'],'numeric',null); $DATA['class']= readVariable($_POST['class'],'numeric',null); $DATA['cid']= readVariable($_POST['cid'],'numeric',null); + $DATA['kategoriaId']= readVariable($_POST['kategoriaId'],'id',null); $DATA['lang'] = readVariable($_POST['lang'],'strictstring',$LANGUAGES); $DATA['owner'] = _USERACCOUNT; if (is_array($_POST['csoport'])) { diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php index 630c9cbd..1e51b811 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php @@ -6,6 +6,39 @@ } require_once('include/modules/portal/share/hirek.php'); - $HIREK = getHirek(array('all'=>true)); // minden nyelvű hír + if ($action=='kategoriaSzerkeszt') { + $_id = readVariable($_POST['id'],'id'); + if (is_numeric($_id)) { + $_leiras = readVariable($_POST['leiras'],'string'); + $_precode = readVariable($_POST['precode'],'html'); + $_postcode = readVariable($_POST['postcode'],'html'); + $q = "INSERT INTO kategoriak (id,leiras,precode,postcode) VALUES (%u,'%s','%s','%s')"; + $v = array($_id,$_leiras,$_precode,$_postcode); + db_query($q,array('modul'=>'portal','values'=>$v)); + } + $KATEGORIAIDK = readVariable($_POST['kategoriaId'],'id'); + for ($i=0; $i'portal','values'=>$v)); + } + $KATEGORIAIDK = readVariable($_POST['kategoriaTorlendo'],'id'); + for ($i=0; $i'portal','values'=>$v)); + } + } + + + $ADAT = getHirek(array('all'=>true)); // minden nyelvű hír + $ADAT['kategoriak'] = getKategoriak(); + $ADAT['kategoriaId2txt'] = reindex($ADAT['kategoriak'],array('id')); +dump($ADAT['kategoriaId2txt']); ?> diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php index 2474b23e..909018dc 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php @@ -1,5 +1,7 @@ diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css index 8be4a7c3..1ea5cb6d 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css @@ -3,40 +3,62 @@ div.egyhir { margin-left: 50px; + margin-right:50px; } div.egyhir form { font-weight: bold; + margin-bottom: 40px; + border-bottom: solid 1px #eee; } div.egyhir label { - + padding-right: 1em; } div.egyhir input { - background-color: white; +/* background-color: white; border: solid 1px #667766; - } +*/ } div.egyhir textarea { width: 80%; height: 300px; +/* border: solid 1px #667766; background-color: white; +*/ } table.egyhirdetail { background-color: #eeeeee; - border-bottom: solid 2px #667766; } table.egyhirdetail td { border: solid 1px #667766; + line-height: 2em; + padding: 0.4em; } table.egyhirdetail th { - background-color: #667766; + background-color: cornflowerblue; color: white; height:30px; - border-bottom: solid 2px #001100; } .mceEditor iframe { border: blue 1px solid; } + + #pic, #cim { line-height: 1.4em; margin-bottom:1em;} + +span.kategoriaSelector { border-radius: 4px; padding: 2px 4px; background-color: white; border: solid 1px black; font-weight:normal; +cursor: pointer; +-webkit-transition : 100ms ease-out; + -moz-transition : 100ms ease-out; + -o-transition : 100ms ease-out; + transition : 100ms ease-out; + } + +span.kategoriaSelector.selected { background-color: #d64161; color:white; } +span.kategoriaSelector.modified { background-color: #878f99; color:white; border-color:white; } +span.kategoriaSelector.selected.modified { background-color: #6b5b95; color:white; border-color: black;} +span.kategoriaSelector:hover { border: solid 1px #6b5b95; background-color: #ff7b25; color:white; } +span.kategoriaSelector.selected:hover { background-color: #878f99; color:white; } + diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css index 9e05068d..347cd17f 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css @@ -10,15 +10,24 @@ table.hAdmin { background-color: #445560; - + width:90%; } table.hAdmin tr td { - background-color: #eeeeee; + background-color: #eee; + padding: 2px 4px; + line-height: 1.6em; + } + table.hAdmin tr:hover td { + outline: solid 1px #d64161; + background-color: #fff; } + table.hAdmin tr td.latszik { + background-color: #d64161; color:white; + } table.hAdmin tr.unk td { - background-color: #993456; + background-color: #feb236; } table.hAdmin tr.old td { background-color: #999999; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css index cc128d4f..5152e545 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css @@ -86,8 +86,10 @@ hr {display: none;} table.portalMain div.dobozTart a { color: black } - - + + div.static h1 { margin: 20px;} + div.static p { margin-left: 26px; margin-right:26px; margin-bottom: 1.2rem; font-size: 14px; line-height:1.6em;} + @media (max-width: 850px) { .bal, .jobb { display: none; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml index b8e0f7ee..f24068ca 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml @@ -30,7 +30,10 @@ echo ''; echo '
'._BEALLITASOK.'
'; - echo ''; + echo ''; echo ''; - echo ''; echo ''; @@ -67,7 +83,6 @@ $_CHK = ($FLAGS[$i]==$HIR['flag']) ? ' checked="checked" ':''; echo ''; echo ''; @@ -124,8 +139,8 @@ echo "\n".''."\n"; echo '
'; - echo _KEP; - echo '
'; + echo _KEP.': '; + echo '
'; echo ''; echo ''; echo ''; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml index 6dc5900d..1f55154a 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml @@ -1,27 +1,55 @@ '; + + for ($i=0; $i'; + echo ''; +// echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } -/* - hideShowContainer - onClickHideShow - openable -*/ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
'._BEALLITASOK.'
'; + echo _BEALLITASOK; + if ($HIR['owner']!='') echo ' ('.$HIR['owner'].')'; + echo '
'; echo _TOLDT.':
'; @@ -40,21 +43,34 @@ echo '		'; reset($LANGUAGES); - echo ''; + for($i=0; $i'; $_CHK = ($LANGUAGES[$i]==$HIR['lang']) ? ' selected="selected" ':''; echo ''; + } + echo ''; } - echo ''; - _putKategoriak($ADAT,$HIR['cid']); echo ''; - echo $HIR['owner']; + echo ''; + // ujfajta kategoria kezelés + $SELECTED_HIRKATEGORIAK = explode(',',$HIR['hirkategoriak']); + for ($i=0; $i'.$_D['leiras'].' '; + } + echo ''; + // ------------------------- echo '
'; + echo ''; + echo $D['id']; + echo ''.$D['leiras'].''.$D['precode'].''.$D['postcode'].'
'; + echo ''; + echo ''; + echo '
'; + formEnd(); + } + function putHirek($ADAT) { $CLASS = array(1=>'külső hír',2=>'kis hír',6=>'csak belső',0=>'ISMERETLEN'); $FLAGS = array(0=>'nem látszik', 1=>'látszik', 2=>2, 3=>3); $now = time(); - echo ''; - echo ''."\n"; - for ($i=0; $i'; + echo ''."\n"; + for ($i=0; $i'; - echo ''; + // echo ''; echo ''; echo ''; + echo ''; + echo ''; echo "\n\n"; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml index 7c903e27..8c8ded7b 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml @@ -22,8 +22,9 @@ $bgcolor = ($SET['background-color']=='') ? '#eeeeee' : $SET['background-color'] ; $width = ($SET['width']=='') ? '100%':$SET['width']; if ($SET['header-link']!='') $cime = ''.$cime.''; + if (isset($SET['header-css']) && $SET['header-css']!='') $_style = $SET['header-css']; echo '
'; - echo '
'.$cime.'
'; + echo '
'.$cime.'
'; echo '
'.$bele.'
'; echo '
'; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js index 0969c5c7..41d70923 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js @@ -10,4 +10,33 @@ $(function() { } }); + $('span.kategoriaSelector').click(function() { + $(this).toggleClass('selected'); + $(this).toggleClass('modified'); + $('#kategoriaSelectorContainer').html(''); + $('span.kategoriaSelector.selected').each(function() { + $('', { + type: 'hidden', + name: 'kategoriaId[]', + value: $(this).data('kategoriaid') + }).appendTo($('#kategoriaSelectorContainer')); + }); + }); + + +/* + myForm.on('submit', function(e) { + //e.preventDefault(); + $('span.kategoriaSelector.selected').each(function() { + $('', { + type: 'text', + name: 'kategoriaId[]', + value: $(this).data('kategoriaid') + }).appendTo(myForm); // append each input to the form + }); + + //myForm.submit(); // submit the form + }); +*/ + }); diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 54f5b275..9bce5583 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4691 +4695 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 052b0a58..39f0774c 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4691 -71107f2d0381381d16916e473db42dba mayor-fenntarto-rev4691.tgz -a80ee713915cb729bf44f9c831f3e74a mayor-installer-sulix-rev4691.tgz -a0777d620e206b07b6e3565864a58fec mayor-wiki-rev4691.tgz -a58f5bd16055fc5f168b39a70052de05 mayor-installer-rev4691.tgz -512a43eb1223ecec3b81ea1eda4c16f6 mayor-portal-rev4691.tgz -21a67636b6d1d0c2ca040d1210901aaf mayor-felveteli-rev4691.tgz -1d2ff3b0f71141f6e3c916c749eab426 mayor-jatek-rev4691.tgz -f5490a7abb4629401ac267ec0e23a9ac mayor-locales-jp_JP-rev4691.tgz -d9d56f15c55aaca9e5e6447455e8b593 mayor-locales-de_DE-rev4691.tgz -b03f1fa2e742a0d3245a1c1b719dbd6f mayor-locales-en_US-rev4691.tgz -5b7345dd3db4f2aa184d4440beb7bd5e mayor-naplo-rev4691.tgz -6b1cef87715c325d36a3d24e66378cbf mayor-base-rev4691.tgz +Revision 4695 +8006f6a2333f838cf1c3a4c464aed480 mayor-fenntarto-rev4695.tgz +0413e87eaa2472d46297b1b1e67964c9 mayor-installer-sulix-rev4695.tgz +7b1958ba242c788088f8e0fa8b19ac06 mayor-wiki-rev4695.tgz +ce7a02daded0bc1a5b9379455fe7d497 mayor-installer-rev4695.tgz +31a165054c79b9638a9d31cdaedb2f28 mayor-portal-rev4695.tgz +d4f27043abc3a93c21d8939bd1ecb2e5 mayor-felveteli-rev4695.tgz +93cab4f2a25ecae24063f2a189884046 mayor-jatek-rev4695.tgz +2d3becd23208144f80333ee7855359d3 mayor-locales-jp_JP-rev4695.tgz +9bd9f2a196265369cf9edc46c17adf51 mayor-locales-de_DE-rev4695.tgz +620f79072f95112bc578085c4bb0829b mayor-locales-en_US-rev4695.tgz +c869569cb053d07c3b3fc97f47c7a86e mayor-naplo-rev4695.tgz +79f3aac8fcfb484b28f30467c7056505 mayor-base-rev4695.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 54f5b275..9bce5583 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4691 +4695 diff --git a/rev.txt b/rev.txt index 54f5b275..9bce5583 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4691 +4695 -- cgit v1.2.3 From 5d168373f8d3de040dd0f696f2f783958b1304de Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 19 Nov 2020 14:20:03 +0100 Subject: Rev: 4710 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- .../www/static/hu_HU/felveteli/felveteli.html | 6 ++--- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../include/modules/naplo/share/oraModifier.php | 5 +++-- .../www/include/modules/naplo/share/tanar.php | 6 +++-- .../policy/private/naplo/intezmeny/valtas-pre.php | 2 ++ .../module-naplo/html/intezmeny/valtas.phtml | 15 ++++++++++++- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- .../www/include/modules/portal/hirek/egyhir.php | 3 +++ .../www/include/modules/portal/share/hirek.php | 4 +++- .../policy/private/portal/portal/portal-pre.php | 8 ++++++- .../www/policy/public/portal/portal/portal-pre.php | 9 +++++++- .../www/skin/classic/module-portal/css/portal.css | 9 +++++++- .../classic/module-portal/html/hirek/egyhir.phtml | 2 +- .../module-portal/html/hirek/hirekAdmin.phtml | 2 +- .../classic/module-portal/html/share/hirek.phtml | 18 ++++++++++++++- .../module-portal/javascript/portal.jquery.min.js | 9 ++++++++ mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 29 files changed, 110 insertions(+), 42 deletions(-) (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html index d8acbde8..4d68ac34 100644 --- a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html +++ b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html @@ -3,8 +3,8 @@

2021/2022-es tanév

- - Felvételi Tájékoztató 2021/2022 [PDF] + + Felvételi Tájékoztató 2021/2022 (.pdf)
- \ No newline at end of file + diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4695 +4710 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 9bce5583..de4ba040 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 @@ -4695 +4710 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4695 +4710 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 9bce5583..de4ba040 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 @@ -4695 +4710 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 9bce5583..de4ba040 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 @@ -4695 +4710 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 9bce5583..de4ba040 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 @@ -4695 +4710 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php index 625b6b13..031ad51e 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php @@ -36,8 +36,9 @@ return ($_TANEV['szemeszter'][1]['statusz'] == 'aktív') // Csak aktív szemeszterbe írhatunk && ( ((__VEZETOSEG || __NAPLOADMIN) && $Feladat && $haladasiOraAdat['eredet']=='órarend') - || $time <= time() - ) // A jövőbeli órák nem írhatók be, kivéve, ha az előírt tanári feladat (pl versenyfelügyelet)! + || $time <= time() // A jövőbeli órák nem írhatók be, kivéve, ha az előírt tanári feladat (pl versenyfelügyelet)! + || $time >= time() // Pandemic Release + ) && ( // Az admin bármikor módosíthat - de csak vezetői utasításra teszi! __NAPLOADMIN diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php index 5e23e4ec..0a931863 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php @@ -66,9 +66,11 @@ } elseif ($SET['mkId'] == '') { if (count($where) > 0) $W = 'WHERE ' . implode(' AND ',$where); $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz, - hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora + hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora $extraAttrs - FROM ".__INTEZMENYDBNEV.".tanar $W ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)"; + FROM ".__INTEZMENYDBNEV.".tanar +-- LEFT JOIN ".__INTEZMENYDBNEV.".tanarKepesites USING (tanarId) LEFT JOIN ".__INTEZMENYDBNEV.".kepesitesTargy USING (kepesitesId) + $W ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)"; } else { if (count($where) > 0) $W = 'AND ' . implode(' AND ',$where); $q = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz, 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 8c0d870c..fb04a3ca 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 @@ -5,6 +5,7 @@ require_once('include/modules/naplo/share/intezmenyek.php'); require_once('include/modules/naplo/share/szemeszter.php'); require_once('include/modules/naplo/share/tanar.php'); + require_once('include/modules/naplo/share/targy.php'); require_once('include/modules/naplo/share/osztaly.php'); require_once('include/modules/naplo/share/munkakozosseg.php'); @@ -40,6 +41,7 @@ } } $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus,statusz,besorolas','telephelyId'=>__TELEPHELYID)); + $ADAT['targyak'] = getTargyak(array('arraymap'=>array('targyId'))); $lr = db_connect('naplo_intezmeny'); for($i=0; $i'.$T['titulus'].''; if ($T['statusz']=='külső óraadó') echo '
'.$T['statusz'].'
'; if ($T['besorolas']=='Gyakornok') echo '
'.kisbetus($T['besorolas']).'
'; -// if ($T['besorolas']=='Mesterpedagógus') echo '
'.kisbetus($T['besorolas']).'
'; + if ($T['besorolas']=='Mesterpedagógus') echo '
'.kisbetus($T['besorolas']).'
'; $osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]); for ($j=0; $j'; } + +/* + $targyai = explode(',',$T['kepesitesTargyIdk']); + if (count($targyai)>0) { + echo '
'; + for ($j=0; $j'; + } +*/ + echo ''; if (($i+1) % 3 == 0 && $i!=count($ADAT['tanarok'])-1) echo '
'; } diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php index 1c5c8bc9..652c18ae 100644 --- a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php +++ b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php @@ -41,6 +41,9 @@ } } else $q = ''; if ($q!='') $r = db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v)); + $q = "DELETE FROM `hirKategoria` WHERE hirId=%u"; + $v = array($hirId); + db_query($q,array('modul'=>'portal','result'=>'delete','values'=>$v)); if (is_array($DATA['kategoriaId'])) { for ($i=0; $itrue,'tolDt'=>'', 'igDt'=>'', 'id' => '', 'flag'=>array(), 'class'=>array(), 'cid'=>array(), 'limit'=>'', 'lang'=>'hu_HU') ) { + function getHirek($SET = array('all'=>true,'tolDt'=>'', 'igDt'=>'', 'id' => '', 'flag'=>array(), 'class'=>array(), 'cid'=>array(), 'limit'=>'', 'lang'=>'hu_HU', 'kategoria'=>array()) ) { $tolDt = $SET['tolDt']; $igDt = $SET['igDt']; if ($tolDt!='') $W[] = "kdt<='$tolDt'"; @@ -21,6 +21,8 @@ if (count($SET['flag'])>0) $W[] = "flag IN (".implode(',',$SET['flag']).")"; if (count($SET['class'])>0) $W[] = "class IN (".implode(',',$SET['class']).")"; if (count($SET['cid'])>0) $W[] = "cid IN (".implode(',',$SET['cid']).")"; + if (is_array($SET['kategoria']) && count($SET['kategoria'])>0 && !is_null($SET['kategoria'][0])) + $W[] = "kategoriaId IN (".implode(',',$SET['kategoria']).")"; if ($SET['lang']!='') $W[] = "lang='".$SET['lang']."'"; if ($SET['limit']!='') $L = ' LIMIT '.$SET['limit']; diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php index dc4e79d5..d8026e35 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php @@ -5,7 +5,13 @@ require_once('include/modules/portal/share/kerdoiv.php'); require_once('include/modules/session/groupInfo.php'); - $ADAT['hirek'] = getHirek(array('cid'=>array(0),'tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1,6),'csoport'=>$AUTH['my']['categories'])); + $ADAT['kategoriak'] = getKategoriak(); + for ($i=0; $iarray($kategoriaId),'cid'=>array(0),'tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1,6),'csoport'=>$AUTH['my']['categories'])); $ADAT['kerdoiv'] = getKerdoiv(_POLICY); $ev=date('Y');$honap=date('m');$nap=date('d'); diff --git a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php index d02f5484..44906949 100644 --- a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php +++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php @@ -14,7 +14,14 @@ // $ADAT['nevnap']['ma'] = getNevnap(date('m'),date('d')); // $ADAT['nevnap']['holnap'] = getNevnap(date('m'),date('d')+1); - $FILTER=array('tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1)); + $ADAT['kategoriak'] = getKategoriak(); + for ($i=0; $idate('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1),'kategoria'=>array($kategoriaId)); if (defined('__PORTAL_RESTRICT_CID')) $FILTER['cid'] = explode(',',__PORTAL_RESTRICT_CID); diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css index 5152e545..9ea85cbc 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css @@ -68,6 +68,13 @@ div.egyHir span.tag { background-color: #bbb; padding: 0px 4px; margin: 0px 2px; border-radius:2px; color:white;} + div.egyHirmeta a { color: #aaa; border-bottom: dotted 1px #bbb} + div.egyHirmeta a:hover { color: #444; border-bottom: solid 1px #bbb} + + h2.hirKategoriaSelected { text-align: center; padding-left:22px; padding-right:22px; color: #7d96a0 ; text-decoration: underline solid #eee; font-weight:100; letter-spacing:2px; font-size: 24px; font-variant:small-caps} + h2.hirKategoriaSelected a { display:none; color: #d64161; padding-left: 6px; font-size:14px;} + h2.hirKategoriaSelected:hover { padding-right:0px;} + h2.hirKategoriaSelected:hover a { display: inline-block;} div.egyHir:after { clear: both; @@ -87,7 +94,7 @@ hr {display: none;} table.portalMain div.dobozTart a { color: black } - div.static h1 { margin: 20px;} + div.static h1 { margin: 20px; } div.static p { margin-left: 26px; margin-right:26px; margin-bottom: 1.2rem; font-size: 14px; line-height:1.6em;} @media (max-width: 850px) { diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml index f24068ca..e3a31005 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml @@ -57,7 +57,7 @@ } echo ''; } - _putKategoriak($ADAT,$HIR['cid']); + // _putKategoriak($ADAT,$HIR['cid']); echo ''; echo '
'; - echo $D['lang']; - echo ''; + // echo $D['lang']; + // echo ''; echo ''; @@ -36,10 +64,20 @@ echo ' '.$D['csoport']; echo ''; - echo $D['owner']; + if ($D['hirkategoriak']!='') { + $_K = explode(',',$D['hirkategoriak']); + for($j=0; $j'; echo ''; + echo $D['owner']; + echo ''; echo $D['kdt']; + echo ''; echo $D['vdt']; echo '
'; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml index 1f55154a..a995e638 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml @@ -40,7 +40,7 @@ $FLAGS = array(0=>'nem látszik', 1=>'látszik', 2=>2, 3=>3); $now = time(); echo ''; - echo ''."\n"; + echo ''."\n"; for ($i=0; $i0 && $KATEGORIAID2LEIRAS[$ADAT['kategoriaId']][0]['leiras']!='') { + echo '

'; + echo ucfirst($KATEGORIAID2LEIRAS[$ADAT['kategoriaId']][0]['leiras']); + echo ''; + echo '

'; + } + for ($i=0; $i'.$CSOPORT[$j].''; //echo ''; } - + if ($D['hirkategoriak']!='') { + $D['kategoriaIdk'] = explode(',',$D['hirkategoriak']); + for ($j=0; $j'.$KATEGORIAID2LEIRAS[$D['kategoriaIdk'][$j]][0]['leiras'].''; + } + } echo ''; } echo '
'; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js index 41d70923..55364674 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js @@ -23,6 +23,15 @@ $(function() { }); }); + $('#kategoriaSelectorContainer').html(''); + $('span.kategoriaSelector.selected').each(function() { + $('', { + type: 'hidden', + name: 'kategoriaId[]', + value: $(this).data('kategoriaid') + }).appendTo($('#kategoriaSelectorContainer')); + }); + /* myForm.on('submit', function(e) { diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 39f0774c..c59d4b06 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4695 -8006f6a2333f838cf1c3a4c464aed480 mayor-fenntarto-rev4695.tgz -0413e87eaa2472d46297b1b1e67964c9 mayor-installer-sulix-rev4695.tgz -7b1958ba242c788088f8e0fa8b19ac06 mayor-wiki-rev4695.tgz -ce7a02daded0bc1a5b9379455fe7d497 mayor-installer-rev4695.tgz -31a165054c79b9638a9d31cdaedb2f28 mayor-portal-rev4695.tgz -d4f27043abc3a93c21d8939bd1ecb2e5 mayor-felveteli-rev4695.tgz -93cab4f2a25ecae24063f2a189884046 mayor-jatek-rev4695.tgz -2d3becd23208144f80333ee7855359d3 mayor-locales-jp_JP-rev4695.tgz -9bd9f2a196265369cf9edc46c17adf51 mayor-locales-de_DE-rev4695.tgz -620f79072f95112bc578085c4bb0829b mayor-locales-en_US-rev4695.tgz -c869569cb053d07c3b3fc97f47c7a86e mayor-naplo-rev4695.tgz -79f3aac8fcfb484b28f30467c7056505 mayor-base-rev4695.tgz +Revision 4710 +cb8cda74ec914985cfc33eeb1c0f600b mayor-fenntarto-rev4710.tgz +fce4128a082128b51ccd3c1f7da49d16 mayor-installer-sulix-rev4710.tgz +57cf545c827177cc44b1b976799235e0 mayor-wiki-rev4710.tgz +6093ef06efd2db548e5e6478e277df76 mayor-installer-rev4710.tgz +6020d68cd542a943247ae84e62f82271 mayor-portal-rev4710.tgz +bfeaeacfbb2e08af566791a15d22e94f mayor-felveteli-rev4710.tgz +92806a3648b8ae4d97cf4931539bc2ac mayor-jatek-rev4710.tgz +77ecb781efc6202022fbc0c88c339944 mayor-locales-jp_JP-rev4710.tgz +52e12bcaca7f74a4be364bc52babfd3c mayor-locales-de_DE-rev4710.tgz +91ef318a14aed435ef505255cefde6d0 mayor-locales-en_US-rev4710.tgz +b54133612c87fd2c3de6094485296e19 mayor-naplo-rev4710.tgz +1386d084c17d51d0fd101f37c37b02bd mayor-base-rev4710.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 9bce5583..de4ba040 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4695 +4710 diff --git a/rev.txt b/rev.txt index 9bce5583..de4ba040 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4695 +4710 -- cgit v1.2.3 From eba77eabc9b033ef3b904eec7737bc997db37596 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Wed, 25 Nov 2020 13:30:04 +0100 Subject: Rev: 4712 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../private/naplo/haladasi/hazifeladat-pre.php | 3 ++- .../policy/private/naplo/tools/getOraAdat-pre.php | 4 +++- .../www/skin/classic/module-naplo/css/naplo.css | 7 ++++++ .../module-naplo/html/haladasi/hazifeladat.phtml | 6 ++++- .../install/mayor-portal/mysql/mayor-portal.sql | 2 +- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- .../update/rev004710-1-mayor_portal.sql | 12 ++++++++++ mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 21 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4710 +4712 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 de4ba040..acbf96c3 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 @@ -4710 +4712 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4710 +4712 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 de4ba040..acbf96c3 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 @@ -4710 +4712 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 de4ba040..acbf96c3 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 @@ -4710 +4712 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 de4ba040..acbf96c3 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 @@ -4710 +4712 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index de4ba040..acbf96c3 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4710 +4712 diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php index 86ca57a0..a973e454 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php @@ -80,7 +80,8 @@ } if ($oraId>0 && $ADAT['oraAdat']['oraBeirhato']===true ) { $leiras = readVariable($_POST['oraLeiras'],'string'); - updateHaladasiNaploOra($oraId, $leiras); + $cimkeId = readVariable($_POST['cimkeId'],'string'); + updateHaladasiNaploOra($oraId, $leiras, $cimkeId); } } elseif (__TANAR===true && $action=='lattam') { $lr = db_connect('naplo'); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php index 064bc796..308e7b4f 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php @@ -25,7 +25,8 @@ $dolgozatBeirhato = $oraBeirhato; if ($oraBeirhato===true && $action=='oraBeiras') { $leiras = readVariable($_POST['leiras'], 'string'); - updateHaladasiNaploOra($oraId,$leiras); + $cimkeId = readVariable($_POST['cimkeId'], 'id'); + updateHaladasiNaploOra($oraId,$leiras,$cimkeId); } $_JSON['oraAdat'] = $ORAADAT = getOraAdatById($oraId); if ($ORAADAT['hazifeladatId']>0) { @@ -56,6 +57,7 @@ + '; $oraForm .= ''; $oraForm .= ''; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css index f12a5b14..c88905c2 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css @@ -251,6 +251,13 @@ div.arckepContainer.szulo span {background-color: #40e0d0; } div.arckepContainer.diak span {background-color: #6495ed; } + span.cimke { margin:0px 1px; border-radius: 2px; font-size:xx-small; color:white; padding: 0px 2px 0px 2px; background-color:#ddd; } + span.cimke_0 { background-color: #4caf50; } + span.cimke_1 { background-color: red; } + span.cimke_2 { background-color: orange; } + span.cimke_3 { background-color: #3f51b5; } + span.cimke_4 { background-color: #673ab7; } + @media (max-width: 764px) { #toolBarTitle {display:;} diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml index 419fbc49..dd9c3687 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml @@ -8,8 +8,11 @@ echo ($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA; echo ''; echo ' – '.$ADAT['oraAdat']['tankorNev'].''; + if ($ADAT['oraAdat']['cimkeLeiras']!='') { + echo ' – '.''.$ADAT['oraAdat']['cimkeLeiras'].''; + } echo ' – '.$ADAT['oraAdat']['kiCn'].''; - // echo '

'.$ADAT['oraAdat']['leiras'].'

'; + echo ''."\n"; @@ -124,6 +127,7 @@ echo '