Rev: 4620rev4620

30 files changed, 272 insertions, 38 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 24fa9a00..a28d2964 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4615
+4620
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 24fa9a00..a28d2964 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4615
+4620
diff --git a/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli-pre.php b/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli-pre.php
index d84e66e3..48d4a293 100644
--- a/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli-pre.php
+++ b/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli-pre.php
@@ -27,7 +27,7 @@
 	    $ADATOK = getFelvetelizoAdatok($nev,$oktid);
 	    if (is_array($ADATOK)) {
 		$SZOBELI = getSzobeliByOktid(intval($ADATOK['oktid']));
-  		//$EREDMENY = getIdeiglenesRangsor(intval($ADATOK['oktid']));
+  		$EREDMENY = getIdeiglenesRangsor(intval($ADATOK['oktid']));
 		//$EREDMENY = getSzobeliEredmeny($ADATOK['id']);
 		//$JEL = getJelentkezes(intval($ADATOK['id']));
 	    }
diff --git a/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli.php b/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli.php
index 05db10b7..205970ec 100644
--- a/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli.php
+++ b/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli.php
@@ -14,7 +14,7 @@ if (_LEKERDEZHETO) {
 	//if ($ADATOK['evfolyam']!='hat') 
 //	putJelentkezes($JEL,$ADATOK);
 	putSzobeliEredmeny($SZOBELI,$ADATOK);
-//	putIdeiglenesEredmeny($EREDMENY,$ADATOK,$JEL);
+	putIdeiglenesEredmeny($EREDMENY,$ADATOK,$JEL);
 	$stamp = time();
 	if (
 	    __FELVETELIADMIN===true ||
diff --git a/mayor-orig/mayor-felveteli/www/skin/classic/module-felveteli/html/szobeli.phtml b/mayor-orig/mayor-felveteli/www/skin/classic/module-felveteli/html/szobeli.phtml
index ff7d58f0..928dbf79 100644
--- a/mayor-orig/mayor-felveteli/www/skin/classic/module-felveteli/html/szobeli.phtml
+++ b/mayor-orig/mayor-felveteli/www/skin/classic/module-felveteli/html/szobeli.phtml
@@ -522,7 +522,9 @@ területek között.
 <p>
 Ennek megfelelően azt sem tudhatjuk, hogy ki lesz az, aki a rangsorból
 ténylegesen hozzánk fog beiratkozni.
-</p><p>
+</p>
+<!--
+<p>
 A korábbi évek tapasztalatai alapján azonban igyekszünk valamifajta
 támpontot adni: megírjuk, mekkora esélyt látunk a hozzánk való
 bekerülésre. Ennek az információnak egyetlen háttere a meghirdetett
@@ -533,7 +535,9 @@ harmadában szereplők helyzete sem reménytelen. Még olyan eset is
 előfordulhat, hogy a számítógép azonos összpontszám esetén különböző
 becslést ad. (Ha ez ténylegesen megtörténnék, az azonos pontszámúakat
 föl fogjuk venni.)
-</p></div>';
+</p>
+-->
+</div>';
 
     }
 
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 24fa9a00..a28d2964 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4615
+4620
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 24fa9a00..a28d2964 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4615
+4620
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 24fa9a00..a28d2964 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 @@
-4615
+4620
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 24fa9a00..a28d2964 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4615
+4620
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 24fa9a00..a28d2964 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 @@
-4615
+4620
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 24fa9a00..a28d2964 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 @@
-4615
+4620
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 24fa9a00..a28d2964 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 @@
-4615
+4620
diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
index ad1abcff..eeaca556 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
@@ -143,6 +143,15 @@ CREATE TABLE `ora` (
   CONSTRAINT `ora_ibfk_5` FOREIGN KEY (`feladatTipusId`) REFERENCES `%DB%`.`feladatTipus` (`feladatTipusId`) ON DELETE SET NULL ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci ;
 
+CREATE TABLE `oraHazifeladat` (
+  `hazifeladatId` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `oraId` int(10) unsigned DEFAULT NULL,
+  `hazifeladatLeiras` text COLLATE utf8_hungarian_ci NOT NULL,
+  PRIMARY KEY (`hazifeladatId`),
+  UNIQUE KEY `oraId` (`oraId`),
+  CONSTRAINT `oraHazifeladat_ibfk_1` FOREIGN KEY (`oraId`) REFERENCES `ora` (`oraId`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
 CREATE TABLE `orarendiOraTankor` (
   `tanarId` int(10) unsigned NOT NULL,
   `osztalyJel` varchar(7) COLLATE utf8_bin NOT NULL,
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 24fa9a00..a28d2964 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4615
+4620
diff --git a/mayor-orig/mayor-naplo/update/pre004616-1-naplo.sql b/mayor-orig/mayor-naplo/update/pre004616-1-naplo.sql
new file mode 100644
index 00000000..d1aa055d
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004616-1-naplo.sql
@@ -0,0 +1,25 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4616 $$
+
+CREATE PROCEDURE upgrade_database_4616()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+IF NOT EXISTS (
+    SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='oraHazifeladat'
+) THEN
+
+CREATE TABLE `oraHazifeladat` (
+  `hazifeladatId` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `oraId` int(10) unsigned DEFAULT NULL,
+  `hazifeladatLeiras` text COLLATE utf8_hungarian_ci NOT NULL,
+  PRIMARY KEY (`hazifeladatId`),
+  UNIQUE KEY `oraId` (`oraId`),
+  CONSTRAINT `oraHazifeladat_ibfk_1` FOREIGN KEY (`oraId`) REFERENCES `ora` (`oraId`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+END IF;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4616();
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
index e5090c18..0be1c61a 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
@@ -72,10 +72,12 @@
 	// Csatlakozás az adatbázishoz
 	$lr = db_connect('naplo', array('fv' => 'getHaladasi'));
         $q = "SELECT oraId, dt, ora, ki, kit, tankorId, teremId, ora.leiras, tipus, eredet, csoportId, feladatTipusId,
+		hazifeladatId,
 		getOraTolTime(oraId) AS tolTime,
 		getOraIgTime(oraId) AS igTime
                         FROM ora 
 			LEFT JOIN tankorCsoport USING (tankorId) 
+			LEFT JOIN oraHazifeladat USING (oraId) 
 			LEFT JOIN ".__INTEZMENYDBNEV.".feladatTipus USING (feladatTipusId)
                             WHERE dt>='%s' AND dt<='%s' AND tipus NOT LIKE 'elmarad%%'
                             $feltetel $teremFeltetel
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php
index 73430f3d..7c4c4b4e 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php
@@ -23,15 +23,17 @@
                                  TRIM(CONCAT_WS(' ', t2.viseltNevElotag, t2.viseltCsaladiNev, t2.viseltUtonev)) AS kitCn,
                                  tankorNev,
 				 feladatTipusId,
-				 munkaido
+				 munkaido,
+				 hazifeladatId, hazifeladatLeiras
                             FROM `%s`.ora
+			    LEFT JOIN `%s`.oraHazifeladat USING (oraId)
                             LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
                             LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t1 ON ki=t1.tanarId
                             LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t2 ON kit=t2.tanarId
                     	    LEFT JOIN ".__INTEZMENYDBNEV.".feladatTipus USING (feladatTipusId)
                     	    LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId)
                             WHERE oraId=%u AND (tanev=%u OR feladatTipusId IS NOT NULL)";
-	    $v = array(tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev);
+	    $v = array(tanevDbNev(__INTEZMENY, $tanev),tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev);
 	    return db_query($q, array('fv' => 'getOraAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v), $olr);
 
         } else {
@@ -345,7 +347,9 @@
 	    array_unshift($v, $tolDt, $igDt, $tanarId);
 	    $RESULT = db_query($q, array('modul' => 'naplo', 'fv' => 'getTanarOrak', 'result' => 'idonly', 'values' => $v));			 
 	} else {
-	    $q = "SELECT * FROM ora WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora";
+	    $q = "SELECT * FROM ora 
+LEFT JOIN oraHazifeladat USING (oraId)
+WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora";
 	    array_unshift($v, $tolDt, $igDt, $tanarId, $tanarId);
 	    if ($SET['result']=='assoc') 
 		$RESULT = db_query($q, array('modul' => 'naplo', 'fv' => 'getTanarOrak', 'keyfield' => 'ora', 'result' => 'assoc', 'values' => $v));
@@ -385,10 +389,14 @@
 	    $RE = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v));
 	} else {
 	    if ($SET['elmaradokNelkul'])
-		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).") 
+		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora 
+LEFT JOIN oraHazifeladat USING (oraId)
+WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).") 
 			AND tipus NOT IN ('elmarad','elmarad máskor')";
 	    else 
-		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).")";
+		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora
+LEFT JOIN oraHazifeladat USING (oraId)
+WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).")";
 	    $R = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v));
 	    $RE['tankorok']=array();
 	    for ($i = 0; $i < count($R); $i++) {
diff --git a/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/haladasi.php b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/haladasi.php
index 023785f5..10ba3f24 100644
--- a/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/haladasi.php
+++ b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/haladasi.php
@@ -35,4 +35,7 @@
     define('_TOROL','töröl');
     define('_BEALLITASAI', 'beállításai');
 
+    define('_HAZIFELADAT','Házi feladat');
+
+
 ?>
diff --git a/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/hazifeladat.php b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/hazifeladat.php
new file mode 100644
index 00000000..eea20314
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/hazifeladat.php
@@ -0,0 +1,41 @@
+<?php
+/* --------------------------------------  /
+
+    Module:	naplo
+    File:	haladasi.php
+    Nyelv:	hu_HU (magyar)
+
+/  -------------------------------------- */
+
+    define('__PAGETITLE','Haladási napló - Házi feladat');
+    define('_DATUM','dátum');
+    define('_ORA','óra');
+    define('_TANKOR','tankör');
+    define('_TANAR','tanár');
+    define('_ORASZAM','óraszám');
+    define('_TANANYAG','tananyag');
+    define('_IDOSZAK','időszak');
+    define('_HALADASI_NAPLO','haladási napló');
+    define('_BEJELENTETT_DOLGOZAT','bejelentett dolgozat');
+    define('_BEJELENTVE','bejelentve');
+    define('_MODOSIT','módosít');
+    define('_ROGZIT','rögzít');
+    define('_NINCS_BEIRVA','nincs beírva');
+    define('_HIANYZOK','hiányzók');
+    define('_HET','órarendi hét');
+    define('_NINCS_ORAJA','Erre a napra (még) nincs óra bejegyezve.');
+    define('_HETESEK','Hetesek');
+    define('_TANITASI_NAP','tanítási nap');    
+    define('_TANMENET','tanmenet...');
+    define('_TANMENET_RESZLETEI','tanmenet részletei');
+
+    define('_TANKOR_HALADASI','tankör haladási naplója');
+    define('_FELADAT_TIPUS','-- feladatok --');
+    define('_PLUSZ_FELADATOK','plusz feladatok');
+    define('_TOROL','töröl');
+    define('_BEALLITASAI', 'beállításai');
+
+    define('_ALAPADATOK','Óra adatok');
+    define('_HAZIFELADAT','Házi feladat');
+
+?>
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
new file mode 100644
index 00000000..a4a1e696
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
@@ -0,0 +1,60 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+    if (!__TANAR && !__DIAK && !__NAPLOADMIN && !__VEZETOSEG && !__TITKARSAG) $_SESSION['alert'][] = 'page:insufficient_access';
+
+    require_once('include/modules/naplo/share/tanar.php');
+    require_once('include/modules/naplo/share/osztaly.php');
+    require_once('include/modules/naplo/share/ora.php');
+    require_once('include/modules/naplo/share/oraModifier.php');
+    require_once('include/modules/naplo/share/orarend.php');
+    require_once('include/modules/naplo/share/diak.php');
+    require_once('include/modules/naplo/share/tankor.php');
+    require_once('include/modules/naplo/share/dolgozat.php');
+    require_once('include/modules/naplo/share/kepzes.php');
+    require_once('include/modules/naplo/share/nap.php');
+    require_once('include/modules/naplo/share/terem.php');
+    require_once('include/modules/naplo/share/tanmenet.php');
+    require_once('include/modules/naplo/share/hetes.php');
+    require_once('include/modules/naplo/share/helyettesitesModifier.php');
+    require_once('include/modules/naplo/share/file.php');
+    require_once('include/share/date/names.php');
+
+    $ADAT['oraId' ] = $oraId = readVariable($_POST['oraId'],'id',readVariable($_GET['oraId'],'id'));
+//    $ADAT['hazifeladatId' ] = $hazifeladatId = readVariable($_POST['hazifeladatId'],'id', readVariable($_GET['hazifeladatId'],'id'));
+    $ADAT['hazifeladatLeiras' ] = readVariable($_POST['hazifeladatLeiras'],'string');
+    $ADAT['oraAdat'] = getOraadatById($oraId);
+    $action = readVariable($_POST['action'],'strictstring',null,array('hazifeladatBeiras'));
+
+    $q = "SELECT hazifeladatId FROM oraHazifeladat WHERE oraId=%u";
+    $values = array($ADAT['oraId']);
+    $ADAT['hazifeladatId'] = $hazifeladatId = db_query($q, array('modul'=>'naplo','result'=>'value','values'=>$values));
+
+    if ($action=='hazifeladatBeiras') {
+
+	if ($hazifeladatId>0) { // update
+	    $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s' WHERE hazifeladatId=%u";
+	    $values = array($ADAT['hazifeladatLeiras'],$ADAT['hazifeladatId']);
+	    $r = db_query($q, array('modul'=>'naplo','result'=>'update','values'=>$values));
+	} elseif ($oraId>0) { // insert
+	    $q = "INSERT IGNORE INTO oraHazifeladat (hazifeladatLeiras,oraId) VALUES ('%s',%u)";
+	    $values = array($ADAT['hazifeladatLeiras'],$ADAT['oraId']);
+	    $hazifeladatId = db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values));
+	}
+
+    }
+
+    $q = "SELECT * FROM oraHazifeladat WHERE oraId=%u";
+    $values = array($ADAT['oraId']);
+    $ADAT['hazifeladatAdat'] =  db_query($q, array('modul'=>'naplo','result'=>'record','values'=>$values));
+
+
+    $TOOL['vissza'] = array('tipus'=>'vissza',
+        'paramName'=>'vissza',
+        'icon'=>'',
+        'postOverride' => array('igDt'=>$igDt,'tanarId'=>$tanarId,'page'=>'naplo','sub'=>'haladasi','f'=>'haladasi')
+    );
+    if (isset($oraId)) $TOOL['tanarOraLapozo'] = array('tipus'=>'sor', 'oraId' => $oraId, 'post'=>array('tanarId'));
+    getToolParameters();
+
+?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat.php
new file mode 100644
index 00000000..f98f0079
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat.php
@@ -0,0 +1,11 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+
+    global $ADAT,$skin;
+
+    putHazifeladat($ADAT);
+    if ($ADAT['title']!='') {
+	if (isset($ADAT['osztalyId'])) putHetesForm($ADAT);
+    }
+?>
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 849a5afe..8f26e848 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
@@ -214,7 +214,7 @@
 
 /*    #updateWindowSide h3:before { font-family: 'Elusive-Icons'; font-size:10px; content: "\e0a4"; padding-right:8px;font-weight:100; }*/
 
-    .updateWindowSide button.mentes,    .updateWindowSide button.torles  { margin: 4px 18px; height:2em; border-radius:2px; border: solid 1px white; color:white; background-color: #ddd;}
+    .updateWindowSide button.mentes,    .updateWindowSide button.torles  { margin: 4px 18px; height:2em; border-radius:2px; border: solid 1px white; color:white; background-color: #2196f3;}
     .updateWindowSide button.mentes:hover { background-color: lightgreen; }
     .updateWindowSide button.torles:hover { background-color: red; }
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
index 27eb51f1..e6377aeb 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
@@ -433,6 +433,7 @@
 			    echo '</span>';
 			}
 			echo '<input type="hidden" name="tanmenetIdContainer[]" value="'.$ADAT['tankorTanmenet'][ $dOra['tankorId'] ].'" />'."\n";
+			echo '<input type="hidden" name="hazifeladatIdContainer[]" value="'.$ADAT['tankorHazifeladat'][ $dOra['tankorId'] ].'" />'."\n";
 			echo '<input type="hidden" name="tankorIdContainer[]" value="'.$dOra['tankorId'].'" />'."\n";
 		// -------------------------------------------------------------------------	
 	    echo '</td>'."\n";
@@ -485,7 +486,6 @@
 		    echo $dOra['oraszam'];
 		    echo '</a>';
 
-
 		} else { // itt kiírhatjuk a heti terhelését
 		    //echo '<span style="color: purple;" title="a típusból ezen a héten összesen">eheti:'.($ADAT['oraTerheles'][$dOra['feladatTipusId']]['db']-$SZLO[$dOra['feladatTipusId']])."/".($ADAT['oraTerheles'][$dOra['feladatTipusId']]['db']).'</span>';
 		    //echo '<span style="color: purple;" title="a típusból ezen a héten összesen">eheti:'.($SZLO['sum']-$SZLO['sum_c'])."/".($SZLO['sum']).'</span>';
@@ -514,6 +514,16 @@
 		    if (count($_C)>0) echo '<span class="cimke">'.implode('</span> <span class="cimke">',$_C).'</span>';
 		  }
 		}
+		echo '<a href="'.href('index.php?page=naplo&sub=haladasi&f=hazifeladat&oraId='.$dOra['oraId'].'&hazifeladatId='.$ADAT['tankorHazifeladat'][ $dOra['oraId'] ]).'" class="onClickUpdateWindow" title="'._HAZIFELADAT.'">';
+		    if ($dOra['hazifeladatId']>0) {
+			echo '<span class="icon-home-alt" style="color: #ff5722"></span>';
+		    } else {
+			echo '<span class="icon-home" style="color: #aaa"></span>';
+		    }
+		echo '</a>';
+
+
+
 	    echo '</td>';
 	    // ----- Leírás ---------------------------------
 		if ($modosithatoOra) {
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
new file mode 100644
index 00000000..acf8fcae
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -0,0 +1,47 @@
+<?php
+
+    function putHazifeladat($ADAT) {
+
+	echo '<style type="text/css">';
+	echo '    
+	    fieldset.adatok { margin-bottom:1em; width:80%; margin-left:auto; margin-right:auto; border-radius: 2px; border: solid 1px #ddd;}
+	    fieldset.adatok legend { border-radius: 2px; background-color: #ff5722; color:white; padding: 2px 4px; }
+	';
+	echo '</style>';
+
+	echo '<fieldset class="adatok"><legend>'._ALAPADATOK.'</legend>'."\n";
+
+	    echo superdate($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA.' – <span class="tankorNev" data-tankorid="'.$ADAT['oraId']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span> – '.$ADAT['oraAdat']['kiCn'];
+
+	    echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>';
+
+	echo '</fieldset>'."\n";
+
+	if (__DIAK===true) {
+
+	    echo '<fieldset class="adatok"><legend>'._HAZIFELADAT.'</legend>'."\n";
+		echo ($ADAT['hazifeladatAdat']['hazifeladatLeiras']);
+	    echo '</fieldset>'."\n";
+
+	} else {
+	    echo '<script src="//cdn.ckeditor.com/4.14.0/basic/ckeditor.js"></script>';
+	    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="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>';
+
+	    echo '<fieldset class="adatok"><legend>'._HAZIFELADAT.'</legend>'."\n";
+	    echo '<textarea name="hazifeladatLeiras" class="wysiwyg" rows="10" cols="80" style="width:100%">';
+		echo htmlspecialchars($ADAT['hazifeladatAdat']['hazifeladatLeiras']);
+	    echo '</textarea>';
+	    echo "
+                <script>
+                        CKEDITOR.replace( 'hazifeladatLeiras' );
+                </script>";
+	    echo '<input type="submit">';
+	    echo '</fieldset>'."\n";
+	    if ($skin != 'ajax') formEnd();
+	}
+    }
+
+?>
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
index f8b8d393..0aba3072 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
@@ -234,7 +234,6 @@
 				    //
 				    $het = $_T['het'];
 				    $_ORA = $ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]; 
-
 				    $_valosTeremId = (is_null($_ORA['teremId']))? $_T['teremId']:$_ORA['teremId'];
 
 				    $_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus'];
@@ -262,8 +261,12 @@
 				    $_hianyzasAdat =  $ADAT['hianyzas'][$_ORA['oraId']][0];
 				    $_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':''; 
 				    echo '<div class="'.$_tipusClass.$_frissClass.$_oraMostVanClass.$_utolsooraClass.$_hianyzasClass.' '.$_oraAdat.'" data-oraid="'.$_ORA['oraId'].'" title="'.$_ORA['tipus'].'" >';
+				    if (isset($_ORA['hazifeladatId'])) {
+					echo '<span class="icon-home-alt" title="h.f." style="color:#e91e63; padding-right:2px;"></span>';
+				    }
 
 				    if (is_array($_hianyzasAdat)) {
+
 					echo '<span class="hianyzasTicker '.ekezettelen($_hianyzasAdat['hTipus']).' '.ekezettelen($_hianyzasAdat['statusz']).' '.ekezettelen($_hianyzasAdat['igazolas']).'">';
 					if ($_hianyzasAdat['hTipus']=='hiányzás') 
 						echo '<span class="icon-hearing-impaired"></span>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
index c57e142e..251155a1 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
@@ -698,6 +698,7 @@ processJSONOraAdat = function(adat) {
 	content += '<div id="mayorNaviIconHolder">';
 	content += '<div class="mayorNaviIcon"><a href="'+href({'page':'naplo','sub':'haladasi','f':'haladasi','tanarId':adat['oraAdat']['ki'],'tankorId':adat['oraAdat']['tankorId']})+'"><span class="icon-file-edit-alt"></span><br/>Haladási</a></div>';
 	content += '<div class="mayorNaviIcon"><a href="'+href({'page':'naplo','sub':'hianyzas','f':'ora','oraId':adat['oraId']})+'"><span class="icon-calendar-sign"></span><br/>Hiányzások</a></div>';
+	content += '<div class="mayorNaviIcon"><a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'"><span class="icon-home-alt"></span><br/>Házi feladat</a></div>';
 	content += '</div>';
 
 	content += '<h3>A haladási óra adatai</h3>';	
@@ -731,6 +732,16 @@ processJSONOraAdat = function(adat) {
 	if (adat['dolgozatBeirhato']) {
 		content += adat['dolgozatForm'];
 	}
+
+
+	content += '<h3>Házi feladat ';
+	content += '<a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'"><span class="icon-home-alt"></span></a>';
+	content += '</h3>';
+	if (adat['oraAdat']['hazifeladatId']>0) {
+	    content += '<div style="border: solid 1px #999">';
+	    content += adat['oraAdat']['hazifeladatLeiras'];
+	    content += '</div>';
+	}
 	if (adat['elozoOrak']!=undefined && adat['elozoOrak'].length>0) {
 	    content += '<h3>Előző órák</h3>';
 	    content += '<ul>';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 24fa9a00..a28d2964 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4615
+4620
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 24fa9a00..a28d2964 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4615
+4620
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 827f42b3..0edf8168 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4615
-20d7753c1c535b0a4818eb95d5fd5a24  mayor-fenntarto-rev4615.tgz
-4ca8feda2eb7bd4292a1e8c11b1ea431  mayor-installer-sulix-rev4615.tgz
-5e8719043ff5be041cf6381dc7fd5a37  mayor-wiki-rev4615.tgz
-27048cdf2874834ea7e90b623a95e6ed  mayor-installer-rev4615.tgz
-9a0903b99a678e7462b017949e28ddea  mayor-portal-rev4615.tgz
-e83d0a201c72622327c2fe429a189b6c  mayor-felveteli-rev4615.tgz
-4b29973efd2db54531cb60701a0ea861  mayor-jatek-rev4615.tgz
-601b725a99d0e1db0926ca3847a7a90c  mayor-locales-jp_JP-rev4615.tgz
-919c2be9b048b386f3bf47280d0ea3dc  mayor-locales-de_DE-rev4615.tgz
-851d75158703328299ebaf489fe20edb  mayor-locales-en_US-rev4615.tgz
-40e0cdad372e3842c2de38f1d284df41  mayor-naplo-rev4615.tgz
-a0994f4851dde2913b74f830b90ed3db  mayor-base-rev4615.tgz
+Revision 4620
+a7050bfe3ad7da519f16d9e6b45ab09e  mayor-fenntarto-rev4620.tgz
+5ec3faa1b2d8015f722c3aecc318ca5c  mayor-installer-sulix-rev4620.tgz
+db84cf60e0922dfefd55d54a1e5947b8  mayor-wiki-rev4620.tgz
+a37fb46ecbd07afcc8f56c25523f277a  mayor-installer-rev4620.tgz
+0ccf4b6ddc415d1d5aecc01361533c3a  mayor-portal-rev4620.tgz
+c4438be853a0c809259607610faff18c  mayor-felveteli-rev4620.tgz
+1268b2331e8b5c4b15efd80d296f63db  mayor-jatek-rev4620.tgz
+f2a7ed4ccb5a3e5fd83d141aead01372  mayor-locales-jp_JP-rev4620.tgz
+c4b12b07414cd32c31a4fc0eaf3cdb2b  mayor-locales-de_DE-rev4620.tgz
+343e3ecb45051417cbefddd38f7fd381  mayor-locales-en_US-rev4620.tgz
+52187c43b0564fc2d84172c210b17fc9  mayor-naplo-rev4620.tgz
+1f2fa00c5ad41834745fbd22d88b882e  mayor-base-rev4620.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 24fa9a00..a28d2964 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4615
+4620