aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-base/www/include/backend/ads/session/base.php2
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php6
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/base.php2
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php2
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php4
-rw-r--r--mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php8
-rw-r--r--mayor-orig/mayor-base/www/include/base/mysql.php4
-rw-r--r--mayor-orig/mayor-base/www/skin/classic/base/css/base.css3
-rw-r--r--mayor-orig/mayor-base/www/skin/default/base/html/base.phtml5
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php4
-rw-r--r--mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.2020.html107
-rw-r--r--mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html103
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev2
-rw-r--r--mayor-orig/mayor-jatek/log/mayor-jatek.rev2
-rw-r--r--mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev2
-rw-r--r--mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev2
-rw-r--r--mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev2
-rw-r--r--mayor-orig/mayor-naplo/config/module-naplo/config-pl.php.example4
-rw-r--r--mayor-orig/mayor-naplo/config/module-naplo/config-vmg.php.example5
-rw-r--r--mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql12
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/update/pre004682-1-intezmeny.sql17
-rw-r--r--mayor-orig/mayor-naplo/update/pre004715-1-intezmeny.sql12
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php25
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php5
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php6
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend-pre.php14
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php3
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php15
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php5
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php2
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php4
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css7
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml8
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml1
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml9
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml39
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml15
-rw-r--r--mayor-orig/mayor-portal/install/mayor-portal/mysql/mayor-portal.sql20
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-portal/update/rev004693-1-mayor_portal.sql32
-rw-r--r--mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql12
-rw-r--r--mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php12
-rw-r--r--mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php6
-rw-r--r--mayor-orig/mayor-portal/www/policy/private/portal/hirek/egyhir-pre.php1
-rw-r--r--mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin-pre.php35
-rw-r--r--mayor-orig/mayor-portal/www/policy/private/portal/hirek/hirekAdmin.php6
-rw-r--r--mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php8
-rw-r--r--mayor-orig/mayor-portal/www/policy/private/portal/portal/portal.php1
-rw-r--r--mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php9
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/egyhir.css34
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/css/hirek/hirekAdmin.css15
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css13
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml46
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml66
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/doboz.phtml3
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml18
-rw-r--r--mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js38
-rw-r--r--mayor-orig/mayor-wiki/log/mayor-wiki.rev2
-rw-r--r--mayor-orig/md5sum26
-rw-r--r--mayor-orig/rev.txt2
-rw-r--r--rev.txt2
66 files changed, 662 insertions, 225 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index d197bb6d..7e1fd933 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4675
+4716
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-base/www/include/backend/mysql/session/accountInfo.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php
index 113e380b..5643f0af 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/accountInfo.php
@@ -140,7 +140,7 @@
$_THESE = '*';
$v = array();
}
- $q = "SELECT $_THESE FROM groups WHERE groupCn='%s' AND policy='%s'";
+ $q = "SELECT $_THESE FROM `groups` WHERE groupCn='%s' AND policy='%s'";
array_push($v, $groupCn, $toPolicy);
$A = db_query($q, array('fv' => 'mysqlGetGroupInfo', 'modul' => $modul, 'result' => 'record', 'values' => $v), $lr);
@@ -185,7 +185,7 @@
$lr = db_connect($modul, array('fv' => 'mysqlChangeGroupInfo'));
if (!$lr) return false;
- $q = "SELECT gid FROM groups WHERE groupCn='%s' AND policy='%s'";
+ $q = "SELECT gid FROM `groups` WHERE groupCn='%s' AND policy='%s'";
$v = array($groupCn, $toPolicy);
$gid = db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr);
if ($gid === false) { db_close($lr); return false; }
@@ -241,7 +241,7 @@
$v = array($attr);
}
}
- $q = "UPDATE groups SET $W WHERE groupCn='%s' AND policy='%s'";
+ $q = "UPDATE `groups` SET $W WHERE groupCn='%s' AND policy='%s'";
array_push($v, $groupCn, $toPolicy);
db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'values' => $v), $lr);
}
diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php
index 35272ff8..2964957b 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/base.php
@@ -32,7 +32,7 @@
}
// Az gid lekérdezése
- $q = "SELECT gid FROM groups WHERE groupCn = '%s' AND policy = '%s'";
+ $q = "SELECT gid FROM `groups` WHERE groupCn = '%s' AND policy = '%s'";
$v = array($groupCn, $toPolicy);
$gid = db_query($q, array('fv' => 'mysqlMemberOf', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr);
if ($gid === false) {
diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php
index 25ff9132..4f34aea6 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/createAccount.php
@@ -79,7 +79,7 @@
$category = $SET['groups'][$i];
$groupCn = kisbetus(ekezettelen($category));
if ($category == '') continue;
- $q = "SELECT gid FROM groups WHERE groupCn='%s'";
+ $q = "SELECT gid FROM `groups` WHERE groupCn='%s'";
$gid = db_query($q, array('fv' => 'mysqlCreateAccount', 'modul' => $modul, 'result' => 'value', 'values' => array($groupCn)), $lr);
if ($gid === false || is_null($gid)) { // --FIXME -- ez jó így BENCE radyx
if ($SET['createGroup']) {
diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php
index d1bc4f7b..495af44d 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/createGroup.php
@@ -16,14 +16,14 @@
if (!$lr) return false;
// cn ütközés ellenőrzése
- $q = "SELECT COUNT(*) FROM groups WHERE policy='%s' AND groupCn='%s'";
+ $q = "SELECT COUNT(*) FROM `groups` WHERE policy='%s' AND groupCn='%s'";
$v = array($toPolicy, $groupCn);
$num = db_query($q, array('fv' => 'mysqlCreateGroup', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr);
if ($num === false) { db_close($lr); return false; }
if ($num > 0) { $_SESSION['alert'][] = 'message:multi_uid:'.$groupCn; db_close($lr); return false; }
// csoport felvétel
- $q = "INSERT INTO groups (groupCn, groupDesc, policy) VALUES ('%s', '%s','%s')";
+ $q = "INSERT INTO `groups` (groupCn, groupDesc, policy) VALUES ('%s', '%s','%s')";
$v = array($groupCn, $groupDesc, $toPolicy);
$gid = db_query($q, array('fv' => 'mysqlCreateGroup', 'modul' => $modul, 'result' => 'insert', 'values' => $v), $lr);
if ($gid === false) { db_close($lr); return false; }
diff --git a/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php b/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php
index fa4584b0..ef249342 100644
--- a/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php
+++ b/mayor-orig/mayor-base/www/include/backend/mysql/session/search/searchAccount.php
@@ -64,7 +64,7 @@
if (!$lr) return false;
// Keresés
if ($attr == 'member') {
- $q = "SELECT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM groups LEFT JOIN members
+ $q = "SELECT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM `groups` LEFT JOIN members
ON members.gid=groups.gid
LEFT JOIN accounts USING (uid)
WHERE gid IN
@@ -72,7 +72,7 @@
AND groups.policy='%s'";
$v = array_merge($searchAttrs, array($pattern, $toPolicy, $toPolicy));
} else {
- $q = "SELECT DISTINCT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM groups LEFT JOIN members
+ $q = "SELECT DISTINCT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM `groups` LEFT JOIN members
ON members.gid=groups.gid
LEFT JOIN accounts USING (uid)
WHERE `%s` LIKE '%%%s%%' AND groups.policy='%s'";
@@ -122,7 +122,7 @@
$homeDirectory = $ret['homeDirectory']; // de nem használjuk semmire...
// A user csoport törlése
- $q = "DELETE FROM groups WHERE gid=%u";
+ $q = "DELETE FROM `groups` WHERE gid=%u";
$v = array($ret['uid']);
$r = db_query($q, array('fv' => 'mysqlDeleteAccount', 'modul' => $modul, 'values' => $v), $lr);
if (!$r) { db_close($lr); return false; }
@@ -155,7 +155,7 @@
}
// csoport törlése
- $q = "DELETE FROM groups WHERE policy='%s' AND groupCn='%s'";
+ $q = "DELETE FROM `groups` WHERE policy='%s' AND groupCn='%s'";
$v = array($toPolicy, $groupCn);
$r = db_query($q, array('fv' => 'mysqlDeleteGroup', 'modul' => "$toPolicy auth", 'values' => $v));
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-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 '<script language="JavaScript" type="text/javascript" charset="utf-8" src="'.$_f.'?ver='._MAYORREV.'"></script>'."\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) {
<script src="skin/classic/share/javascript/tiny_mce/tiny_mce.js" type="text/javascript"></script>
<script src="skin/classic/module-portal/javascript/hirek/egyhir.php?lang='.$lang.'" type="text/javascript"></script>';
}
-
+*/
// if (file_exists(($_f="skin/$skin/base/javascript/jstorage.min.js")) ) {
// echo '<script language="JavaScript" type="text/javascript" charset="utf-8" src="'.$_f.'?ver='._MAYORREV.'"></script>'."\n";
// }
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index d197bb6d..7e1fd933 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4675
+4716
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 @@
<?php
+if (in_array(__PORTAL_CODE,array('vmg','kos'))) {
+
if (__PORTAL_CODE=='kos' || $sub == 'kos') {
$MENU['felveteli'] = array(
array('txt' => '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-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 @@
+<div class="felveteli">
+<h1>Középiskolai felvételi</h1>
+<h2>2020/2021-es tanév</h2>
+
+<div style="margin-top: 6px; text-align:center;">
+ <a style="font-weight: bold; font-size: 16px; color: #837389;" href="/vmg/felveteli/FT2020.pdf">
+ Felvételi Tájékoztató 2020/2021 [PDF]
+ </a>
+</div>
+<!--
+<h3>Gyakran Ismételt Kérdések</h3>
+<p>
+<ul>
+<li><a class="gyik" href="index.php?page=felveteli&f=felveteli-gyik">Gy.I.K.</a></li>
+<li><a href="index.php?page=felveteli&f=pontszamito">Pontszámító Kalkulátor</a></li>
+</ul>
+</p>
+-->
+<h3>Letölthető dokumentumok</h3>
+<ul>
+<li>
+<a href="/vmg/felveteli/FT2020.pdf">A Városmajori Gimnázium Felvételi Tájékoztatója 2020/2021</a> (.pdf)
+</li><li style="">
+<a href="https://www.oktatas.hu/kozneveles/kozepfoku_felveteli_eljaras/kozepfoku_felveteli_eljaras_informacioi">
+Oktatási Hivatal Tájékoztatója a középfokú beiskolázási határidőkről, időpontokról
+</a> (oktatas.hu)</li>
+</ul>
+
+<h3>Fontos dátumok</h3>
+
+<dl>
+<dt >2019. október 17.</dt>
+<dd >
+A felvételi tájékoztató megjelenése.
+</dd>
+
+ <dt >2019. november 11. 18:00 </dt>
+ <dd >Tájékoztató értekezletet a felvételi eljárás rendjéről, induló osztályokról</dd>
+
+ <dt >2019. november 11-15.</dt>
+ <dd>Iskola bemutatkozás és nyílt órák (előzetes jelentkezéssel!)</dd>
+
+ <dt >2019. december 6.<code class="hatarido icon-time"></code></dt>
+ <dd >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.
+ </dd>
+
+ <dt >2020. január 18. 10<sup>00</sup> <code class="icon-child"></code></dt>
+ <dd >Írásbeli felvételi vizsgák az érintett 6 évfolyamos gimnáziumokban. (2x45 perc) </dd>
+
+ <dt >2020. január 18. 10<sup>00</sup> <code class="icon-child"></code></dt>
+ <dd >Í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)</dd>
+
+ <dt >2020. január 25. 8:00-16:00 <code class="hat icon-camera"> 6</code> <code class="negy icon-camera"> 4-5</code></dt>
+ <dd >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</dd>
+
+ <dt>2020. február 19. <code class="hatarido icon-time"></code></dt>
+ <dd>Tanulói Jelentkezési Lapok és Tanulói Adatlapok leadási határideje </dd>
+
+ <dt>2020. február 24. - 2020. március 13. <code class="icon-child"></code></dt>
+ <dd>Szóbeli beszélgetések a kiírás szerint.</dd>
+
+ <dt>2020. március 16.</dt>
+ <dd>Ideiglenes felvételi jegyzék közzététele.</dd>
+
+</dl>
+
+<h3 id="kiemelt">Kiemelt adatok</h3>
+
+<dl>
+<dt>Az iskola rövid neve és címe:</dt>
+<dd>Városmajori Gimnázium<br/>
+ 1122. Budapest, Városmajor u. 71.<br/>
+ Tel: 214-1554; Fax: 214-1479<br/>
+ Telephely kódja: 001<br/>
+</dd>
+<dt>A gimnázium központi azonosító kódja:</dt>
+<dd style="font-family: monospace; font-size:20px">035242</dd>
+
+
+<dt>A 2019/2020-es tanévben indítandó tanulócsoportok azonosító számai:</dt>
+<dd>
+<style type="text/css">
+ a {}
+ table.tagozatok td { height: 2em; }
+ table.tagozatok a:before { content: "☞ "; font-size: 1.4em; }
+ table.tagozatok a:hover { text-decoration: underline; }
+ table.tagozatok tr:hover td { color:cornflowerblue; }
+</style>
+
+<table class="tagozatok">
+<tr><th>Az osztály jele</th><th>megnevezése</th><th>kódja</th></tr>
+<tr><td>7.&nbsp;A</td><td><a href="index.php?page=felveteli&f=hatevfolyamos">általános egyedi tantervű osztály (angol)</a></td><td>0710</td></tr>
+<tr><td>7.&nbsp;B</td><td><a href="index.php?page=felveteli&f=hatevfolyamos">általános egyedi tantervű osztály (német)</a></td><td>0720</td></tr>
+<tr><td>9.&nbsp;C</td><td><a href="index.php?page=felveteli&f=enek">ének-zene speciális tantervű csoport (angol)</a></td><td>0930</td></tr>
+<tr><td>9.&nbsp;C</td><td><a href="index.php?page=felveteli&f=human">magyar egyedi tantervű csoport (angol)</a></td><td>0934</td></tr>
+<tr><td>9.&nbsp;D</td><td><a href="index.php?page=felveteli&f=matematika">matematika tehetséggondozó csoport (angol)</a></td><td>0940</td></tr>
+<tr><td>9.&nbsp;D</td><td><a href="index.php?page=felveteli&f=fizika">fizika egyedi tantervű csoport (angol)</a></td><td>0942</td></tr>
+<tr><td>9/Ny.&nbsp;E</td><td><a href="index.php?page=felveteli&f=otevfolyamos">általános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (német)</a></td><td>0850</td></tr>
+<tr><td>9/Ny.&nbsp;E</td><td><a href="index.php?page=felveteli&f=otevfolyamos">általános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (spanyol)</a></td><td>0855</td></tr>
+</table>
+</dd>
+
+</dl>
+
+</div>
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..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
@@ -1,107 +1,10 @@
<div class="felveteli">
<h1>Középiskolai felvételi</h1>
-<h2>2020/2021-es tanév</h2>
+<h2>2021/2022-es tanév</h2>
<div style="margin-top: 6px; text-align:center;">
- <a style="font-weight: bold; font-size: 16px; color: #837389;" href="/vmg/felveteli/FT2020.pdf">
- Felvételi Tájékoztató 2020/2021 [PDF]
+ <a style="font-weight: bold; font-size: 16px; color: #837389;" href="/vmg/felveteli/FT2021b.pdf" title="Fissítve: 2020. november 9.">
+ Felvételi Tájékoztató 2021/2022 (.pdf)
</a>
</div>
-<!--
-<h3>Gyakran Ismételt Kérdések</h3>
-<p>
-<ul>
-<li><a class="gyik" href="index.php?page=felveteli&f=felveteli-gyik">Gy.I.K.</a></li>
-<li><a href="index.php?page=felveteli&f=pontszamito">Pontszámító Kalkulátor</a></li>
-</ul>
-</p>
--->
-<h3>Letölthető dokumentumok</h3>
-<ul>
-<li>
-<a href="/vmg/felveteli/FT2020.pdf">A Városmajori Gimnázium Felvételi Tájékoztatója 2020/2021</a> (.pdf)
-</li><li style="">
-<a href="https://www.oktatas.hu/kozneveles/kozepfoku_felveteli_eljaras/kozepfoku_felveteli_eljaras_informacioi">
-Oktatási Hivatal Tájékoztatója a középfokú beiskolázási határidőkről, időpontokról
-</a> (oktatas.hu)</li>
-</ul>
-
-<h3>Fontos dátumok</h3>
-
-<dl>
-<dt >2019. október 17.</dt>
-<dd >
-A felvételi tájékoztató megjelenése.
-</dd>
-
- <dt >2019. november 11. 18:00 </dt>
- <dd >Tájékoztató értekezletet a felvételi eljárás rendjéről, induló osztályokról</dd>
-
- <dt >2019. november 11-15.</dt>
- <dd>Iskola bemutatkozás és nyílt órák (előzetes jelentkezéssel!)</dd>
-
- <dt >2019. december 6.<code class="hatarido icon-time"></code></dt>
- <dd >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.
- </dd>
-
- <dt >2020. január 18. 10<sup>00</sup> <code class="icon-child"></code></dt>
- <dd >Írásbeli felvételi vizsgák az érintett 6 évfolyamos gimnáziumokban. (2x45 perc) </dd>
-
- <dt >2020. január 18. 10<sup>00</sup> <code class="icon-child"></code></dt>
- <dd >Í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)</dd>
-
- <dt >2020. január 25. 8:00-16:00 <code class="hat icon-camera"> 6</code> <code class="negy icon-camera"> 4-5</code></dt>
- <dd >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</dd>
-
- <dt>2020. február 19. <code class="hatarido icon-time"></code></dt>
- <dd>Tanulói Jelentkezési Lapok és Tanulói Adatlapok leadási határideje </dd>
-
- <dt>2020. február 24. - 2020. március 13. <code class="icon-child"></code></dt>
- <dd>Szóbeli beszélgetések a kiírás szerint.</dd>
-
- <dt>2020. március 16.</dt>
- <dd>Ideiglenes felvételi jegyzék közzététele.</dd>
-
-</dl>
-
-<h3 id="kiemelt">Kiemelt adatok</h3>
-
-<dl>
-<dt>Az iskola rövid neve és címe:</dt>
-<dd>Városmajori Gimnázium<br/>
- 1122. Budapest, Városmajor u. 71.<br/>
- Tel: 214-1554; Fax: 214-1479<br/>
- Telephely kódja: 001<br/>
-</dd>
-<dt>A gimnázium központi azonosító kódja:</dt>
-<dd style="font-family: monospace; font-size:20px">035242</dd>
-
-
-<dt>A 2019/2020-es tanévben indítandó tanulócsoportok azonosító számai:</dt>
-<dd>
-<style type="text/css">
- a {}
- table.tagozatok td { height: 2em; }
- table.tagozatok a:before { content: "☞ "; font-size: 1.4em; }
- table.tagozatok a:hover { text-decoration: underline; }
- table.tagozatok tr:hover td { color:cornflowerblue; }
-</style>
-
-<table class="tagozatok">
-<tr><th>Az osztály jele</th><th>megnevezése</th><th>kódja</th></tr>
-<tr><td>7.&nbsp;A</td><td><a href="index.php?page=felveteli&f=hatevfolyamos">általános egyedi tantervű osztály (angol)</a></td><td>0710</td></tr>
-<tr><td>7.&nbsp;B</td><td><a href="index.php?page=felveteli&f=hatevfolyamos">általános egyedi tantervű osztály (német)</a></td><td>0720</td></tr>
-<tr><td>9.&nbsp;C</td><td><a href="index.php?page=felveteli&f=enek">ének-zene speciális tantervű csoport (angol)</a></td><td>0930</td></tr>
-<tr><td>9.&nbsp;C</td><td><a href="index.php?page=felveteli&f=human">magyar egyedi tantervű csoport (angol)</a></td><td>0934</td></tr>
-<tr><td>9.&nbsp;D</td><td><a href="index.php?page=felveteli&f=matematika">matematika tehetséggondozó csoport (angol)</a></td><td>0940</td></tr>
-<tr><td>9.&nbsp;D</td><td><a href="index.php?page=felveteli&f=fizika">fizika egyedi tantervű csoport (angol)</a></td><td>0942</td></tr>
-<tr><td>9/Ny.&nbsp;E</td><td><a href="index.php?page=felveteli&f=otevfolyamos">általános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (német)</a></td><td>0850</td></tr>
-<tr><td>9/Ny.&nbsp;E</td><td><a href="index.php?page=felveteli&f=otevfolyamos">általános tantervű (nyelvi előkészítős, 1+4 évfolyamos) csoport (spanyol)</a></td><td>0855</td></tr>
-</table>
-</dd>
-
-</dl>
-
</div>
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index d197bb6d..7e1fd933 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4675
+4716
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index d197bb6d..7e1fd933 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4675
+4716
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 d197bb6d..7e1fd933 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 @@
-4675
+4716
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index d197bb6d..7e1fd933 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4675
+4716
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 d197bb6d..7e1fd933 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 @@
-4675
+4716
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 d197bb6d..7e1fd933 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 @@
-4675
+4716
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 d197bb6d..7e1fd933 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 @@
-4675
+4716
diff --git a/mayor-orig/mayor-naplo/config/module-naplo/config-pl.php.example b/mayor-orig/mayor-naplo/config/module-naplo/config-pl.php.example
index 97988330..9a075903 100644
--- a/mayor-orig/mayor-naplo/config/module-naplo/config-pl.php.example
+++ b/mayor-orig/mayor-naplo/config/module-naplo/config-pl.php.example
@@ -137,6 +137,10 @@
define('_JELES_ATLAG', 4.75);
define('_JELES_LEGGYENGEBB_JEGY', 3);
+ // A kréta órarend exportban használt hetirend típusok a Kréta adatszótára szerint...
+ global $kretaHETIREND;
+ $kretaHETIREND = array(1 => 'A hét', 2 => 'B hét', 3 => 'Minden hét');
+
*/
?> \ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/config/module-naplo/config-vmg.php.example b/mayor-orig/mayor-naplo/config/module-naplo/config-vmg.php.example
index 1eb19228..ae181515 100644
--- a/mayor-orig/mayor-naplo/config/module-naplo/config-vmg.php.example
+++ b/mayor-orig/mayor-naplo/config/module-naplo/config-vmg.php.example
@@ -112,6 +112,11 @@
define('_JELES_ATLAG', 4.75);
define('_JELES_LEGGYENGEBB_JEGY', 3);
+ // A kréta órarend exportban használt hetirend típusok a Kréta adatszótára szerint...
+ global $kretaHETIREND;
+ $kretaHETIREND = array(1 => 'A hét', 2 => 'B hét', 3 => 'Minden hét');
+
+
*/
?> \ No newline at end of file
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 d197bb6d..7e1fd933 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4675
+4716
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-naplo/update/pre004715-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004715-1-intezmeny.sql
new file mode 100644
index 00000000..485aab2a
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004715-1-intezmeny.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4715 $$
+
+CREATE PROCEDURE upgrade_database_4715()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+ALTER TABLE zaroJegy MODIFY `megjegyzes` enum('dicséret','figyelmeztető','') COLLATE utf8_hungarian_ci DEFAULT NULL;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4715();
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php
index 48cf5f52..0c458ea8 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/export/kretaOrarend.php
@@ -6,12 +6,23 @@
$lr = db_connect('naplo');
// orarendiOra - tankor
+ // Így több hetes órarend esetén mindent külön felvesz az egyes hetekre, nem használja a "Minden hétre" lehetőséget...
$q = "SELECT * from orarendiOra
LEFT JOIN orarendiOraTankor USING (tanarId, targyJel, osztalyJel)
LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId)
+ WHERE orarendiOra.tolDt <= '%s' AND '%s' <= orarendiOra.igDt
ORDER BY tanarId, het, nap, ora";
- $v = array();
- $ADAT['orak'] = db_query($q, array('fv' => 'getOrarendAdat', 'result'=>'indexed','value'=>$v), $lr);
+ // A hetek összegét kérdezzük le, ez egy hetes órarend esetén nem változtat semmit
+ // Kéthetes órarendnél 1 -> A hét, 2 -> B hét, 1+2=3 -> Minden hét
+ // Más esetekben már nem lesz jó...
+ $q = "select sum(het) as het,nap,ora,tanarId,osztalyJel,targyJel,teremId,leiras,tankorId from orarendiOra
+ LEFT JOIN orarendiOraTankor USING (tanarId, targyJel, osztalyJel)
+ LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId)
+ WHERE orarendiOra.tolDt <= '%s' AND '%s' <= orarendiOra.igDt
+ group by nap,ora,tanarId,osztalyJel,targyJel,teremId,leiras,tankorId
+ ORDER BY tanarId, het, nap, ora";
+ $v = array($ADAT['dt'], $ADAT['dt']);
+ $ADAT['orak'] = db_query($q, array('fv' => 'getOrarendAdat', 'result'=>'indexed','values'=>$v), $lr);
$q = "SELECT tankorId, tankorNev, targyNev, kretaTargyNev, csoportNev FROM ".__INTEZMENYDBNEV.".tankor
LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
LEFT JOIN ".__INTEZMENYDBNEV.".targy USING (targyId)
@@ -20,14 +31,18 @@
WHERE tanev=".__TANEV." AND szemeszter=1";
$v = array();
- $ADAT['tankor'] = db_query($q, array('fv' => 'getOrarendAdat/tankor', 'result'=>'assoc','keyfield'=>'tankorId','value'=>$v), $lr);
+ $ADAT['tankor'] = db_query($q, array('fv' => 'getOrarendAdat/tankor', 'result'=>'assoc','keyfield'=>'tankorId','values'=>$v), $lr);
foreach ($ADAT['tankor'] as $_tankorId => $T) {
$M = explode(' ', $T['csoportNev']);
- if (strpos($T['csoportNev'],',') !== false) $ADAT['t2osztaly'][$_tankorId] = '';
+ // Ha van a csoportnévben vessző vagy aláhúzás, akkor több osztályhoz tartozik,
+ // pl: "9.a, 9.b tnf", "11. inf_A", "12.inf_E"
+ if (strpos($T['csoportNev'],',') !== false || strpos($T['csoportNev'],'_') !== false) $ADAT['t2osztaly'][$_tankorId] = '';
else $ADAT['t2osztaly'][$_tankorId] = $M[0];
-
+ // Ha nincs benne szóköz és aláhúzás sem, akkor egy osztály jele valójában a MaYoR csoportnév
+ // csoportot jelöl pl: "12.inf_E", "9.a csop1", "7.a, 7.b tnl"
+ // osztályt jelöl pl: "8.b"
if (strpos($T['csoportNev'],' ') === false && strpos($T['csoportNev'],'_') === false) $ADAT['t2csoport'][$_tankorId] = '';
else $ADAT['t2csoport'][$_tankorId] = $T['csoportNev'];
}
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/export/kretaOrarend-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend-pre.php
index 65b52e40..b9af3e72 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kretaOrarend-pre.php
@@ -12,7 +12,8 @@
Helyiség: a tanóra helyisége (ha nincs ilyen nevű helyiség a rendszerben, akkor ez rögzítésre kerül)
- - A Heti rend - a config_xyz.php-ben: felsorolja az orarendiHet --> Kréta "Hetirend" típusú adatszótárának elemeit
+ - A Heti rend - a config_xyz.php-ben: $kretaHETIREND felsorolja az orarendiHet --> Kréta "Hetirend" típusú adatszótárának elemeit
+ a lekérdezés a hetek összegét veszi: 1 --> A hét, 2 --> B hét, 1+2=3 --> Minden hét
- Minden tárgynál be van írva a kretaTargyNev
- Feltételezzük, hogy minden tankör pontosan egy csoportba tartozik bele, s a csoportok a Kréta csoportoknak/osztályoknak megfelelők
- A csoportok elnevezésében feltételezések:
@@ -32,11 +33,11 @@ if (!__NAPLOADMIN && !__VEZETOSEG) {
require_once('include/modules/naplo/share/targy.php');
require_once('include/modules/naplo/share/file.php');
+ $dt = $ADAT['dt'] = readVariable($_POST['dt'], 'date');
if ($action == "kretaOrarendExport") {
$ADAT['tanar'] = getTanarok(array('result'=>'assoc'));
$ADAT['export'] = getOrarendAdat($ADAT);
-
$ADAT['formatum'] = readVariable($_POST['formatum'], 'enum', null, array('csv','ods','xml'));
if ($ADAT['formatum'] == 'xml') $ADAT['mime'] = 'application/vnd.ms-excel';
if (isset($ADAT['formatum'])) {
@@ -48,6 +49,13 @@ if (!__NAPLOADMIN && !__VEZETOSEG) {
}
-
+ $TOOL['datumSelect'] = array(
+ 'tipus'=>'sor', 'post'=>array('formatum'),
+ 'paramName' => 'dt',
+ 'tolDt' => date('Y-m-d', strtotime('last Monday', strtotime($_TANEV['kezdesDt']))),
+ 'igDt' => $_TANEV['zarasDt'],
+ 'override' => true
+ );
+ getToolParameters();
}
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/intezmeny/osztaly-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly-pre.php
index 9222a0c8..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
@@ -19,6 +19,7 @@ require_once('include/modules/naplo/share/tankorDiakModifier.php');
require_once('include/modules/naplo/share/hianyzasModifier.php');
require_once('include/modules/naplo/share/jegyModifier.php');
require_once('include/modules/naplo/share/jegy.php');
+require_once('include/modules/naplo/share/kereso.php');
require_once('include/share/net/upload.php');
define('FILE_UPLOAD_DIR',_DOWNLOADDIR.'/private/naplo/upload/');
@@ -116,7 +117,19 @@ if (isset($osztalyId)) {
$ADAT['diakok'] = getDiakok(array('tanev' => $tanev));
}
-if ($action == 'osztalyAdatModositas' && __NAPLOADMIN) {
+
+if ($action == 'oidEllenor' && __NAPLOADMIN===true) {
+
+ // --TODO
+ $_re = str_replace(' ',"\n",str_replace('\r','\n',$_POST['oidtxt']));
+ $oidxp = explode("\n",str_replace(' ',"\n",str_replace('\r','\n',$_POST['oidtxt'])));
+ $ADAT['oidtxt'] = $_re;
+ for($i=0; $i<count($oidxp); $i++) {
+ $_oid = trim($oidxp[$i]);
+ $ADAT['oidCheck'][$_oid] = getDiakokByPattern($_oid);
+ }
+
+} elseif ($action == 'osztalyAdatModositas' && __NAPLOADMIN) {
$leiras = readVariable($_POST['leiras'], 'string');
$ofoTanarId = readVariable($_POST['ofoTanarId'], 'id');
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php
index 20ca97a5..a1c51b8c 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/osztaly.php
@@ -12,7 +12,8 @@
// Osztályhoz rendelés
if (isset($ADAT['osztalyId']) && ($ADAT['osztalyAdat']["kezdoTanev"]<=$ADAT['tanev'] && $ADAT['osztalyAdat']["vegzoTanev"]>=$ADAT['tanev'])) {
-
+
+
putOsztalyAdatokForm($ADAT);
if ($ADAT['osztalyJellegek'][ $ADAT['osztalyAdat']['osztalyJellegId'] ]['kovOsztalyJellegId'] != 0) { // NyEK évfolyam
@@ -24,6 +25,8 @@
}
putUjTagForm($ADAT);
+ if (__NAPLOADMIN ===true) putOidEllenor($ADAT);
+
if (__NAPLOADMIN) {
if ($fileName == '') {
putFileSelectForm('naplo_intezmeny:diak',array('osztalyId','tanev'));
diff --git a/mayor-orig/mayor-naplo/www/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<count($ADAT['tanarok']); $i++) {
$_tanarId = $ADAT['tanarok'][$i]['tanarId'];
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 @@
<input class="mayorToken" type="hidden" name="mayorToken" value="'.$_SESSION['mayorToken'].'" />
<input type="hidden" name="action" value="oraBeiras" />
<input type="hidden" name="oraId" value="'.$oraId.'" />
+ <input type="hidden" name="cimkeId" value="'.$_JSON['oraAdat']['cimkeId'].'" />
<textarea name="leiras" style="margin-top:8px; width:99%; height:100px;">'. supertext($_JSON['oraAdat']['leiras']).'</textarea>';
$oraForm .= '<button type="button" class="setOraAdat mentes" value="mentés" data-oraid="'.$oraId.'"><span class="icon-ok"></span> MENTÉS </button>';
$oraForm .= '</form>';
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/base.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml
index cd9ec7cc..0c5f7937 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml
@@ -3,7 +3,6 @@
if (_RIGHTS_OK !== true) die();
require_once('include/share/date/names.php');
-
if (_RUNLEVEL!=='cron') putEszkozSor();
function putUjIntezmeny() {
@@ -61,10 +60,11 @@
if ($showHelp) echo '<span id="toolBarHelpButton" class="onClickHideShow">?</span>';
echo '</td>'."\n";
reset($TOOL);
- foreach ( $TOOL as $tool => $params ) {
+ foreach ( $TOOL as $tool => $params ) {
// if ( function_exists( $func = "put$tool" ) && $params['tipus']=='cella') {
if ( isset($params['tipus']) && $params['tipus']=='cella') {
+
if (isset($params['title'])) $title = '__'.$params['title'];
else $title = '__'.nagybetus($tool).'TITLE';
@@ -274,9 +274,8 @@
}
function putForrasSelect() {
-
global $TOOL;
- putToolFormStart('forrasSelect');
+ putToolFormStart('forrasSelect','forras');
echo '<select name="'.$TOOL['forrasSelect']['paramName'].'" class="onChangeSubmit">';
echo '<option value=""> - </option>'."\n";
$SEL = array($TOOL['forrasSelect']['paramValue'] => ' selected="selected" ');
@@ -285,7 +284,6 @@
}
echo '</select>';
putToolFormStop();
-
}
function putIntezmenySelect() {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml
index 7ffeccad..c1d40d25 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml
@@ -4,6 +4,7 @@
formBegin(array('action'=>href('index.php?page=naplo&sub=export&f=kretaOrarend'), 'class'=>"export"));
echo '<input type="hidden" name="action" value="kretaOrarendExport" />'."\n";
+ echo '<input type="hidden" name="dt" value="'.$ADAT['dt'].'" />'."\n";
echo '<fieldset><legend>Kréta - Órarend export</legend>'."\n";
echo '<table>'."\n";
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..00077ba0 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 '</span>';
echo ' – <span class="tankorNev tankorAdat" data-tankorid="'.$ADAT['oraAdat']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span>';
+ if ($ADAT['oraAdat']['cimkeLeiras']!='') {
+ echo ' – '.'<span class="cimke cimke_'.(intval($ADAT['oraAdat']['cimkeId'])%5).'">'.$ADAT['oraAdat']['cimkeLeiras'].'</span>';
+ }
echo ' – <span class="tanarNev" data-tanarid="'.$ADAT['oraAdat']['ki'].'">'.$ADAT['oraAdat']['kiCn'].'</span>';
- // echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>';
+
echo '</fieldset>'."\n";
@@ -124,10 +127,12 @@ echo '<style type="text/css">
if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat'));
echo '<input type="hidden" name="action" value="hazifeladatBeiras"/>';
echo '<input type="hidden" name="oraId" value="'.$ADAT['oraAdat']['oraId'].'"/>';
+ echo '<input type="hidden" name="cimkeId" value="'.$ADAT['oraAdat']['cimkeId'].'"/>';
echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>';
echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n";
- if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt']) && $ADAT['oraAdat']['oraBeirhato']===true) {
+// if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt']) && $ADAT['oraAdat']['oraBeirhato']===true) {
+ if ($ADAT['oraAdat']['oraId']>0 && $ADAT['oraAdat']['oraBeirhato']===true ) {
echo '<input type="text" name="oraLeiras" value="'.$ADAT['oraAdat']['leiras'].'" style="width:70%">';
echo '<input type="submit">';
} else {
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..01a9b0d8 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,44 @@ function putOsztalyJellegek($ADAT,$osztalyJellegId) {
}
+function putOidEllenor($ADAT) {
+
+ formBegin(array('class'=>'osztalyForm'));
+ echo '<input type="hidden" name="action" value="oidEllenor" />';
+ echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />';
+ echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />';
+
+ echo '<h1>'._OIDELLENOR.'</h1>';
+
+ if (is_array($ADAT['oidCheck'])) {
+ echo '<table>';
+ foreach($ADAT['oidCheck'] as $oId=>$DA) {
+ for ($i=0; $i<count($DA); $i++) {
+ $D = $DA[$i];
+ echo '<tr>';
+ echo '<td>'.$oId.'</td>';
+ echo '<td class="diakAdat diakNev" data-diakid="'.$D['diakId'].'">'.$D['diakId'].'</td>';
+ echo '<td class="diakAdat diakNev" data-diakid="'.$D['diakId'].'">'.$D['diakNev'].'</td>';
+ echo '<td>'.$D['oId'].'</td>';
+ echo '<td>';
+ if ($ADAT['osztalyAdat']['osztalyJel']!=$D['osztalyJel']) {echo '!!!!!!!';}
+ //echo '72455076207';
+ echo $D['osztalyJel'];
+ echo '</td>';
+ echo '</tr>';
+ }
+ }
+ echo '</table>';
+ }
+ echo '<textarea name="oidtxt" rows="10">';
+ echo $ADAT['oidtxt'];
+ echo '</textarea>';
+
+ echo '<br/><input type="submit" value="'._OK.'" />';
+
+ formEnd();
+
+}
+
?> \ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml
index 756ec408..6811b588 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml
@@ -13,7 +13,7 @@ function putTanarLista($ADAT) {
if ($T['titulus']!='') echo '<div class="titulus">'.$T['titulus'].'</div>';
if ($T['statusz']=='külső óraadó') echo '<div class="titulus">'.$T['statusz'].'</div>';
if ($T['besorolas']=='Gyakornok') echo '<div class="titulus">'.kisbetus($T['besorolas']).'</div>';
-// if ($T['besorolas']=='Mesterpedagógus') echo '<div class="titulus">'.kisbetus($T['besorolas']).'</div>';
+ if ($T['besorolas']=='Mesterpedagógus') echo '<div class="titulus">'.kisbetus($T['besorolas']).'</div>';
$osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]);
for ($j=0; $j<count($osztalyai); $j++) {
@@ -28,6 +28,19 @@ function putTanarLista($ADAT) {
echo $munkakozossegei[$j]['munkakozossegNev']. ' munkaközösség-vezető';
echo '</div>';
}
+
+/*
+ $targyai = explode(',',$T['kepesitesTargyIdk']);
+ if (count($targyai)>0) {
+ echo '<div class="" style="color:#aaa; font-size:smaller">';
+ for ($j=0; $j<count($targyai); $j++) {
+ $_targyId = $targyai[$j];
+ echo ' '.$ADAT['targyak'][$_targyId][0]['targyNev'].' ';
+ }
+ echo '</div>';
+ }
+*/
+
echo '</td>';
if (($i+1) % 3 == 0 && $i!=count($ADAT['tanarok'])-1) echo '</tr><tr>';
}
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..f53e34a7 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
@@ -41,7 +41,7 @@ CREATE TABLE `hirek` (
`lang` varchar(5) default 'hu_HU',
`cim` text,
`txt` text,
- `owner` varchar(10) default NULL,
+ `owner` varchar(255) default NULL,
`flag` tinyint(3) unsigned NOT NULL default '0',
`cid` tinyint(3) unsigned NOT NULL default '0',
`pic` varchar(20) default NULL,
@@ -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 d197bb6d..7e1fd933 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4675
+4716
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/update/rev004710-1-mayor_portal.sql b/mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql
new file mode 100644
index 00000000..5ac98672
--- /dev/null
+++ b/mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql
@@ -0,0 +1,12 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4710 $$
+
+CREATE PROCEDURE upgrade_database_4710()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+ALTER TABLE `hirek` MODIFY `owner` varchar(255) DEFAULT NULL;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_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 c93a81bd..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
@@ -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,16 @@
}
} 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; $i<count($DATA['kategoriaId']); $i++) {
+ $q = "INSERT IGNORE INTO `hirKategoria` (hirId,kategoriaId) VALUES (%u,%u)";
+ $v = array($hirId,$DATA['kategoriaId'][$i]);
+ db_query($q,array('modul'=>'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..7b59782a 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
@@ -13,7 +13,7 @@
return $r;
}
- function getHirek($SET = array('all'=>true,'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'];
@@ -42,7 +44,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<count($KATEGORIAIDK); $i++) {
+ $_id = $KATEGORIAIDK[$i];
+ $_leiras = readVariable($_POST['leiras_'.$_id],'string');
+ $_precode = readVariable($_POST['precode_'.$_id],'string');
+ $_postcode = readVariable($_POST['postcode_'.$_id],'string');
+ $q = "UPDATE kategoriak SET leiras='%s',precode='%s',postcode='%s' WHERE id=%u";
+ $v = array($_leiras,$_precode,$_postcode,$_id);
+ db_query($q,array('modul'=>'portal','values'=>$v));
+ }
+ $KATEGORIAIDK = readVariable($_POST['kategoriaTorlendo'],'id');
+ for ($i=0; $i<count($KATEGORIAIDK); $i++) {
+ $_id = $KATEGORIAIDK[$i];
+ $q = "DELETE FROM kategoriak WHERE id=%u";
+ $v = array($_id);
+ db_query($q,array('modul'=>'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 @@
<?php
- global $HIREK;
- putHirek($HIREK['szovegek']);
+ global $ADAT;
+
+ putKategoriaSzerkeszto($ADAT['kategoriak']);
+ putHirek($ADAT);
?>
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; $i<count($ADAT['kategoriak']); $i++) {
+ $RESTRICTKATEGORIA[] = intval($ADAT['kategoriak'][$i]['id']);
+ }
+ $kategoriaId = readVariable($_GET['kategoriaId'],'id',null,$RESTRICTKATEGORIA);
+ $ADAT['kategoriaId'] = $kategoriaId;
+ $ADAT['hirek'] = getHirek(array('kategoria'=>array($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/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/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; $i<count($ADAT['kategoriak']); $i++) {
+ $RESTRICTKATEGORIA[] = intval($ADAT['kategoriak'][$i]['id']);
+ }
+ $kategoriaId = readVariable($_GET['kategoriaId'],'id',null,$RESTRICTKATEGORIA);
+ $ADAT['kategoriaId'] = $kategoriaId;
+
+ $FILTER=array('tolDt'=>date('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/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..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;
@@ -86,8 +93,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 c75b2756..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
@@ -27,9 +27,13 @@
formBegin();
if (__HIREKADMIN===true) {
+ echo '<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js" charset="utf-8"></script>';
echo '<table class="egyhirdetail" cellspacing="1">';
- echo '<tr><th colspan="3">'._BEALLITASOK.'</th></tr>';
+ echo '<tr><th colspan="3">';
+ echo _BEALLITASOK;
+ if ($HIR['owner']!='') echo ' ('.$HIR['owner'].')';
+ echo '</th></tr>';
echo '<tr><td style="text-align:right">';
echo _TOLDT.': <input type="text" name="kdt" id="kdt" value="'.$HIR['kdt'].'" class="datetime" /><br/>';
@@ -39,21 +43,34 @@
echo '<td>';
reset($LANGUAGES);
- echo '<select name="lang">';
- for($i=0; $i<count($LANGUAGES); $i++) {
+
+ if (count($LANGUAGES) == 1) {
+ echo '<input type="hidden" name="lang" value="'.$LANGUAGES[0].'" />';
+ } else {
+ echo '<select name="lang">';
+ for($i=0; $i<count($LANGUAGES); $i++) {
//echo '<input type="checkbox" name="policies" value="'.$LANGUAGES[$i].'" />';
$_CHK = ($LANGUAGES[$i]==$HIR['lang']) ? ' selected="selected" ':'';
echo '<option value="'.$LANGUAGES[$i].'" '.$_CHK.'/>';
echo $LANGUAGES[$i];
echo '</option>';
+ }
+ echo '</select>';
}
- echo '</select>';
-
- _putKategoriak($ADAT,$HIR['cid']);
+ // _putKategoriak($ADAT,$HIR['cid']);
echo '</td>';
- echo '<td>';
- echo $HIR['owner'];
+ echo '<td style="line-height:2em; max-width: 300px">';
+ // ujfajta kategoria kezelés
+ $SELECTED_HIRKATEGORIAK = explode(',',$HIR['hirkategoriak']);
+ for ($i=0; $i<count($ADAT['kategoriak']); $i++) {
+ $_D = $ADAT['kategoriak'][$i];
+ $_SEL = (in_array($_D['id'],$SELECTED_HIRKATEGORIAK)) ? ' selected ':'';
+
+ echo '<span class="kategoriaSelector '.$_SEL.'" id="kategoriaSelector_'.$_D['id'].'" data-kategoriaid="'.$_D['id'].'">'.$_D['leiras'].'</span> ';
+ }
+ echo '<span id="kategoriaSelectorContainer"></span>';
+ // -------------------------
echo '</td>';
echo '</tr>';
@@ -66,7 +83,6 @@
$_CHK = ($FLAGS[$i]==$HIR['flag']) ? ' checked="checked" ':'';
echo '<input type="radio" id="F'.$i.'" name="flag" value="'.$FLAGS[$i].'" '.$_CHK.'/>';
echo '<label for="F'.$i.'">';
- echo '&nbsp;&nbsp;&nbsp;&nbsp;';
echo $FLAGSS[$i];
echo '('.$FLAGS[$i].')';
echo '</label>';
@@ -123,8 +139,8 @@
echo "\n".'<textarea name="txt" id="txt" class="wysiwyg" rows="10" cols="80">'.htmlspecialchars($HIR['txt']).'</textarea>'."\n";
echo '<br/>';
- echo _KEP;
- echo '<input type="text" name="pic" id="pic" size="128" value="'.$HIR['pic'].'" /><br/>';
+ echo _KEP.': ';
+ echo '<input type="text" name="pic" id="pic" size="128" value="'.$HIR['pic'].'" placeholder="https://"/><br/>';
echo '<input type="submit" value="'._ROGZIT.'" />';
echo '<input type="hidden" name="action" value="save" />';
echo '<input type="hidden" name="hirId" value="'.($HIR['id']).'" />';
@@ -135,6 +151,14 @@
echo '</div>';
+ echo '<script type="text/javascript">';
+ echo "
+ CKEDITOR.replace('txt', {
+ uiColor: '#eeeeee',
+ entities_latin : false
+ });
+";
+ echo '</script>';
if (__HIREKADMIN===true) {
echo '<hr/>';
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..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
@@ -1,27 +1,55 @@
<?php
- function putHirek($ADAT) {
+ function putKategoriaSzerkeszto($ADAT) {
+ if (!in_array(__PORTAL_CODE,array('vmg','kanizsay'))) return false;
+ formBegin();
+ echo '<table align="center">';
+
+ for ($i=0; $i<count($ADAT); $i++) {
+ $D = $ADAT[$i];
+ echo '<tr>';
+ echo '<td><input type="hidden" name="kategoriaId[]" value="'.$D['id'].'" />';
+ echo '<input type="checkbox" name="kategoriaTorlendo[]" value="'.$D['id'].'" title="Törlöm!" />';
+ echo $D['id'];
+ echo '</td>';
+// echo '<td>'.$D['leiras'].'</td>';
+ echo '<td><input type="text" name="leiras_'.$D['id'].'" value="'.$D['leiras'].'" placeholder="leírás" /></td>';
+ echo '<td><input type="text" name="precode_'.$D['id'].'" value="'.htmlentities($D['precode']).'" placeholder="precode" /></td>';
+ echo '<td><input type="text" name="postcode_'.$D['id'].'" value="'.htmlentities($D['postcode']).'" placeholder="postcode" /></td>';
+ echo '<td>'.$D['precode'].'</td>';
+ echo '<td>'.$D['postcode'].'</td>';
+ echo '</tr>';
+ }
-/*
- hideShowContainer
- onClickHideShow
- openable
-*/
+ echo '<tr>';
+ echo '<td><input type="text" name="id" value="" placeholder="id" /></td>';
+ echo '<td><input type="text" name="leiras" value="" placeholder="leírás" /></td>';
+ echo '<td><input type="text" name="precode" value="" placeholder="precode" /></td>';
+ echo '<td><input type="text" name="postcode" value="" placeholder="postcode" /></td>';
+ echo '</tr>';
+ echo '<tr><th colspan="4">';
+ echo '<input type="hidden" name="action" value="kategoriaSzerkeszt" />';
+ echo '<input type="submit">';
+ echo '</th></tr>';
+ echo '</table>';
+ 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 '<table class="hAdmin hideShowContainer" align="center">';
- echo '<tr><th colspan="5"><button type="button" class="onClickHideShow">+++</button></th></tr>'."\n";
- for ($i=0; $i<count($ADAT); $i++) {
- $D = $ADAT[$i];
+ echo '<table class="hAdmin hideShowContainer" align="center" cellspacing="1">';
+ echo '<tr><th colspan="7"><button type="button" class="onClickHideShow"> + Mindent mutass! + </button></th></tr>'."\n";
+ for ($i=0; $i<count($ADAT['szovegek']); $i++) {
+ $D = $ADAT['szovegek'][$i];
if ($D['class']==0) $_class='class="unk"'; else
if (strtotime($D['vdt'])<$now || $D['flag']==0) $_class='class="old openable" style="display: none"'; else $_class="";
echo '<tr '.$_class.'>';
- echo '<td>';
- echo $D['lang'];
- echo '</td>';
+ // echo '<td>';
+ // echo $D['lang'];
+ // echo '</td>';
echo '<td>';
echo '<a href="'.href('index.php?page=portal&sub=hirek&f=egyhir&hirId='.$D['id']).'">';
@@ -36,10 +64,20 @@
echo ' '.$D['csoport'];
echo '</td>';
echo '<td>';
- echo $D['owner'];
+ if ($D['hirkategoriak']!='') {
+ $_K = explode(',',$D['hirkategoriak']);
+ for($j=0; $j<count($_K); $j++) {
+ echo ' '.$ADAT['kategoriaId2txt'][$_K[$j]][0]['leiras'];
+ }
+ }
echo '</td>';
echo '<td>';
+ echo $D['owner'];
+ echo '</td>';
+ echo '<td style="white-space: nowrap">';
echo $D['kdt'];
+ echo '</td>';
+ echo '<td style="white-space: nowrap">';
echo $D['vdt'];
echo '</td></tr>';
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 = '<a href="'.$SET['header-link'].'">'.$cime.'</a>';
+ if (isset($SET['header-css']) && $SET['header-css']!='') $_style = $SET['header-css'];
echo '<div class="doboz">';
- echo '<div class="dobozCim" style="width: '.$width.'; background-color: '.$SET['header-color'].'"><span>'.$cime.'</span></div>';
+ echo '<div class="dobozCim" style="width: '.$width.'; background-color: '.$SET['header-color'].'; '.$_style.'"><span>'.$cime.'</span></div>';
echo '<div class="dobozTart" style="background-color: '.$bgcolor.'">'.$bele.'</div>';
echo '</div>';
diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml
index 37812ac0..5a1c26b5 100644
--- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml
+++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml
@@ -9,6 +9,16 @@
}
} else {
+
+ $KATEGORIAID2LEIRAS = (reindex($ADAT['kategoriak'],array('id')));
+
+ if ($ADAT['kategoriaId']>0 && $KATEGORIAID2LEIRAS[$ADAT['kategoriaId']][0]['leiras']!='') {
+ echo '<h2 class="hirKategoriaSelected">';
+ echo ucfirst($KATEGORIAID2LEIRAS[$ADAT['kategoriaId']][0]['leiras']);
+ echo '<a href="'.href('index.php?page=portal&f=portal&sub=portal').'" class="icon-remove-sign"></a>';
+ echo '</h2>';
+ }
+
for ($i=0; $i<count($ADAT['hirek']['szovegek']); $i++) {
$D = $ADAT['hirek']['szovegek'][$i];
@@ -34,7 +44,13 @@
for ($j=0; $j<count($CSOPORT); $j++) echo '<span class="tag">'.$CSOPORT[$j].'</span>';
//echo '</span>';
}
-
+ if ($D['hirkategoriak']!='') {
+ $D['kategoriaIdk'] = explode(',',$D['hirkategoriak']);
+ for ($j=0; $j<count($D['kategoriaIdk']); $j++ ) {
+ echo ' · ';
+ echo '<a href="'.href('index.php?page=portal&sub=portal&f=portal&kategoriaId='.$D['kategoriaIdk'][$j]).'" class="hirkategoriaLeiras">'.$KATEGORIAID2LEIRAS[$D['kategoriaIdk'][$j]][0]['leiras'].'</a>';
+ }
+ }
echo '</div>';
}
echo '<div class="hir">';
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..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
@@ -10,4 +10,42 @@ $(function() {
}
});
+ $('span.kategoriaSelector').click(function() {
+ $(this).toggleClass('selected');
+ $(this).toggleClass('modified');
+ $('#kategoriaSelectorContainer').html('');
+ $('span.kategoriaSelector.selected').each(function() {
+ $('<input />', {
+ type: 'hidden',
+ name: 'kategoriaId[]',
+ value: $(this).data('kategoriaid')
+ }).appendTo($('#kategoriaSelectorContainer'));
+ });
+ });
+
+ $('#kategoriaSelectorContainer').html('');
+ $('span.kategoriaSelector.selected').each(function() {
+ $('<input />', {
+ type: 'hidden',
+ name: 'kategoriaId[]',
+ value: $(this).data('kategoriaid')
+ }).appendTo($('#kategoriaSelectorContainer'));
+ });
+
+
+/*
+ myForm.on('submit', function(e) {
+ //e.preventDefault();
+ $('span.kategoriaSelector.selected').each(function() {
+ $('<input />', {
+ 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 d197bb6d..7e1fd933 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4675
+4716
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 247c88cd..5531868f 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4675
-443fba38b8b1c4ff6408bd0e3665e12c mayor-fenntarto-rev4675.tgz
-0b32e36aacda0b14b87fe55bce5294c7 mayor-installer-sulix-rev4675.tgz
-f4c8499c2792b24ada5c44ea2282cf57 mayor-wiki-rev4675.tgz
-f74fd05a167bea6ccc15f3ef500a59e8 mayor-installer-rev4675.tgz
-8c685cbdfc12344d3abe3e3a0d7cd248 mayor-portal-rev4675.tgz
-ae5ec7cfa8a2c64182717796aa034124 mayor-felveteli-rev4675.tgz
-99137f734125a76b92372855bbcb755c mayor-jatek-rev4675.tgz
-761efab4d1e78176625bcfc1781bd675 mayor-locales-jp_JP-rev4675.tgz
-d9d6dbbfc617fe7ac17e3eb4f547476d mayor-locales-de_DE-rev4675.tgz
-fefca256d0fcb93b5a1281881a824730 mayor-locales-en_US-rev4675.tgz
-e778d007c77fe9b68c2bbeadfc36c805 mayor-naplo-rev4675.tgz
-cf933bc85930cdee356d8675dee61fa8 mayor-base-rev4675.tgz
+Revision 4716
+0f149dad48a74cdfd6db3ce36573b331 mayor-fenntarto-rev4716.tgz
+7e22010b99732f93605b078d36e69081 mayor-installer-sulix-rev4716.tgz
+2d5749d97df238b72eab1bf77ec6a271 mayor-wiki-rev4716.tgz
+afad598f7355efbca1f13c554fb7e964 mayor-installer-rev4716.tgz
+9d6d2711f8e2c8179011790fe573c045 mayor-portal-rev4716.tgz
+b7b2abdc8a6d7d8b38d92b6a28fa6ac4 mayor-felveteli-rev4716.tgz
+42ed1ddcfd864bef749cfa062495c5d3 mayor-jatek-rev4716.tgz
+b3388a5cb6503038338f51c1526e862c mayor-locales-jp_JP-rev4716.tgz
+91a9afd725673ff17d817f0772341f12 mayor-locales-de_DE-rev4716.tgz
+dfca36e6a631328724b05dc7318e124f mayor-locales-en_US-rev4716.tgz
+6730ac88c50aa7282647e4e81f0864d9 mayor-naplo-rev4716.tgz
+c184a7209b582c9b97489c9c938fe145 mayor-base-rev4716.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index d197bb6d..7e1fd933 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4675
+4716
diff --git a/rev.txt b/rev.txt
index d197bb6d..7e1fd933 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4675
+4716