Rev: 4535rev4535

33 files changed, 342 insertions, 27 deletions

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 ad7ad3aa..bc766bbd 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
@@ -949,6 +949,12 @@ CREATE TABLE `diakNyelvvizsga` (
   CONSTRAINT `diakNyelvvizsga_ibfk_2` FOREIGN KEY (`targyId`) REFERENCES `targy` (`targyId`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
 
+CREATE TABLE `cimke` (
+  `cimkeId` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cimkeLeiras` varchar(16) NOT NULL,
+  PRIMARY KEY (`cimkeId`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
  DELIMITER //  
  DROP FUNCTION IF EXISTS diakNaploSorszam //                                                                                                                                                                                            
  CREATE function diakNaploSorszam ( thisDiakId INT, thisTanev INT, thisOsztalyId INT ) returns INT                                                                                                         
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 eaf74280..138e8c86 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
@@ -727,6 +727,14 @@ CREATE TABLE `jegyzetTankor` (
   CONSTRAINT `jegyzetTankor_ibfk_2` FOREIGN KEY (`tankorId`) REFERENCES `%DB%`.`tankor` (`tankorId`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
 
+ CREATE TABLE `oraCimke` (
+  `oraId` int(10) unsigned NOT NULL,
+  `cimkeId` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`oraId`,`cimkeId`),
+  CONSTRAINT `oraCimke_ibfk_1` FOREIGN KEY (`oraId`) REFERENCES `ora` (`oraId`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `oraCimke_ibfk_2` FOREIGN KEY (`cimkeId`) REFERENCES `%DB%`.`cimke` (`cimkeId`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
 DROP FUNCTION IF EXISTS getNev;
 DROP FUNCTION IF EXISTS getOraIgTime;
 DROP FUNCTION IF EXISTS getOraTolTime;
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 322150f6..75c5751d 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4526
+4535
diff --git a/mayor-orig/mayor-naplo/update/pre004531-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004531-1-intezmeny.sql
new file mode 100644
index 00000000..c616f6d4
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004531-1-intezmeny.sql
@@ -0,0 +1,19 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4531 $$
+
+CREATE PROCEDURE upgrade_database_4531()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+IF NOT EXISTS (SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='cimke') THEN
+ CREATE TABLE `cimke` (
+  `cimkeId` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cimkeLeiras` varchar(16) NOT NULL,
+  PRIMARY KEY (`cimkeId`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+END IF;
+
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4531();
diff --git a/mayor-orig/mayor-naplo/update/pre004531-2-naplo.sql b/mayor-orig/mayor-naplo/update/pre004531-2-naplo.sql
new file mode 100644
index 00000000..54d52778
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004531-2-naplo.sql
@@ -0,0 +1,20 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4531_2 $$
+
+CREATE PROCEDURE upgrade_database_4531_2()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+IF NOT EXISTS (SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='oraCimke') THEN
+ CREATE TABLE `oraCimke` (
+  `oraId` int(10) unsigned NOT NULL,
+  `cimkeId` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`oraId`,`cimkeId`),
+  CONSTRAINT `oraCimke_ibfk_1` FOREIGN KEY (`oraId`) REFERENCES `ora` (`oraId`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `oraCimke_ibfk_2` FOREIGN KEY (`cimkeId`) REFERENCES %INTEZMENYDB%.`cimke` (`cimkeId`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+END IF;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4531_2();
diff --git a/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql
new file mode 100644
index 00000000..d8a4ec87
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql
@@ -0,0 +1 @@
+CALL upgrade_database_4531();
diff --git a/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql b/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql
new file mode 100644
index 00000000..d19581ef
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql
@@ -0,0 +1 @@
+CALL upgrade_database_4531_2();
diff --git a/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php b/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php
index 73e66f5b..488d5ec1 100644
--- a/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php
+++ b/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php
@@ -554,6 +554,7 @@
 	    'zaradek' => array(array('txt' => 'Záradék')),
 	    'terem' => array(array('txt' => 'Terem')),
 	    'verseny' => array(array('txt' => 'Verseny')),
+	    'oraCimke' => array(array('txt' => 'Haladási óra címkék')),
 	);
 	$MENU['modules']['naplo']['sub']['ertekeles'] = array(
 	    'kerdoivBetoltes' => array(array('txt' => 'Kérdőív betöltése')),
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php
index 38c03a11..91e3905a 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php
@@ -80,6 +80,8 @@
     }
     if (!defined('__TANITASINAP_HETENTE')) define('__TANITASINAP_HETENTE',5);
 
+    if (!define('__ORACIMKE_ENABLED')) define('__ORACIMKE_ENABLED',true) ;
+
     /* üzenő szerepkor beallitasa */
 	if (__UZENOADMIN===true) {
     	    $__asWho = readVariable($_POST['asWho'],'strictstring','asIs',array('asAdmin','asIs'));
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 7b890fad..9c46b400 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
@@ -124,6 +124,12 @@
 		}
 		$sor['csoport'] = $tankorAdat[$sor['tankorId']]['csoport'];
 	    }
+	    if (__ORACIMKE_ENABLED === true) {
+		// Cimkek
+		$q = "SELECT cimkeId from oraCimke where oraId=%u";
+		$v = array($sor['oraId']);
+		$sor['cimke'] = db_query($q, array('fv' => 'getHaladasi/cimkek', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v), $lr);
+	    }
 	    $ret[$sor['dt']][] = $sor;
 	}
         // Nap információk lekérdezése
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 cdadeb00..73430f3d 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
@@ -622,4 +622,16 @@
 	return false;
     }
 
+    function getOraCimkek() {
+	return getCimkek();
+    }
+    function getCimkek() {
+	if (__ORACIMKE_ENABLED === true) {
+	    $q = "SELECT * FROM ".__INTEZMENYDBNEV.".cimke ORDER BY cimkeLeiras";
+	    $R = db_query($q,array('debug'=>false,'fv'=>'getCimkek','modul'=>'naplo','values'=>$v,'result'=>'indexed'),$olr_naplo);
+	    return $R;
+	}
+    }
+
+
 ?>
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 9165ac7c..53b6c763 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
@@ -78,7 +78,7 @@
         return $RESULT;
     }
 
-    function updateHaladasiNaploOra($oraId, $leiras, $csoportAdat = '', $ki = '', $olr = '') {
+    function updateHaladasiNaploOra($oraId, $leiras, $cimkeId=0, $csoportAdat = '', $ki = '', $olr = '') {
 
         $RESULT = true;
 
@@ -135,6 +135,17 @@
                 $RESULT = db_query($q, array('fv' => 'updateHaladasiNaploOra', 'modul' => 'naplo', 'values' => $v), $lr);
                 //$_SESSION['alert'][] = $q;
             }
+
+	    if (__ORACIMKE_ENABLED === true) {
+            	$q = "DELETE FROM oraCimke WHERE oraId=%u";
+            	$v = array($oraId);
+        	db_query($q, array('fv' => 'updateHaladasiNaploOra/cimke', 'modul' => 'naplo', 'values' => $v), $lr);
+		if ($cimkeId>0) { // később tömb!
+            	    $q = "INSERT IGNORE INTO oraCimke VALUES (%u,%u)";
+            	    $v = array($oraId,$cimkeId,$oraId);
+        	    db_query($q, array('fv' => 'updateHaladasiNaploOra/cimke', 'modul' => 'naplo', 'values' => $v), $lr);
+		}
+	    }
         } else {
 //          $RESULT = false; // igaziból nincs hiba, hisz nem csináltunk semmit
             $_SESSION['alert'][] = 'message:wrong_data:nem modosithato ora!!!';
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php
index 5ae3a43a..0e2a5836 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php
@@ -419,4 +419,9 @@
 	return reindex($result,$SET['arraymap']);
     }
 
+    function orarendvane() {
+	$q = "SELECT IF(count(*)>0,1,0) FROM orarendiOra";
+	return db_query($q, array('fv'=>'orarendvane','modul'=>'naplo','result'=>'value'));
+    }
+
 ?>
diff --git a/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/intezmeny/oraCimke.php b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/intezmeny/oraCimke.php
new file mode 100644
index 00000000..a6b4a2e8
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/intezmeny/oraCimke.php
@@ -0,0 +1,9 @@
+<?php
+
+    define('__PAGETITLE','Órarendi óra címkék');
+
+    define('_LEIRAS','Leírás');
+    define('_CIMKEID','Címke id');
+    define('_UJCIMKE','Új címke:');
+
+?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings-pre.php
new file mode 100644
index 00000000..8f637334
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings-pre.php
@@ -0,0 +1,16 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+
+    if (!__NAPLOADMIN && !__VEZETOSEG) {
+	$_SESSION['alert'][] = "page:insufficient_access";
+    } else {
+
+	if ($action=='set') {
+
+	}
+
+    }
+
+
+?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings.php
new file mode 100644
index 00000000..b8ae846a
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/settings.php
@@ -0,0 +1,14 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+
+    global $ADAT;
+
+    if (is_array($ADAT)) {
+
+	putNaploSettings($ADAT);
+
+    }
+    
+
+?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
index 460e4ec9..31511d7b 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
@@ -40,9 +40,11 @@ if ( $skin == 'ajax'
             	$oraId = $oraIds[$i];
 		$_ki = readVariable($_POST['K_'.$oraId], 'id', '');
 		$_leiras = readVariable($_POST['L_'.$oraId],'string', '');
+		$_cimkeId = intval(readVariable($_POST['C_'.$oraId],'string', ''));
 		$_csoportAdat = readVariable($_POST['M_'.$oraId], 'string', '');
-		if (isset($_POST['L_'.$oraId]))
-            		$_JSON['result'] = $_JSON['result'] && updateHaladasiNaploOra($oraId, $_leiras, $_csoportAdat, $_ki, $lr);
+		if (isset($_POST['L_'.$oraId])) {
+            	    $_JSON['result'] = $_JSON['result'] && updateHaladasiNaploOra($oraId, $_leiras, $_cimkeId, $_csoportAdat, $_ki, $lr);
+		}
 	    }
         }
 	// ez DUPlikátum, a nem ajaxnál is ezt tesszük ám!
@@ -189,11 +191,12 @@ if ( $skin == 'ajax'
 		    //EXPERIMENTAL: $_modTs = readVariable($_POST['T_'.$oraId], 'datetime', '');
 		    $_ki = readVariable($_POST['K_'.$oraId], 'numeric', '');
 		    $_leiras = readVariable($_POST['L_'.$oraId],'string', ''); //htmlspecialchars($_POST['L_'.$oraId])
+		    $_cimkeId = intval(readVariable($_POST['C_'.$oraId],'string', '')); 
 		    $_csoportAdat = readVariable($_POST['M_'.$oraId], 'string', ''); //numeric:numeric ???
 		    // paraméterek: $oraId, $leiras, $csoportAdat = 'csoportId:tankorId', $ki = '', $olr = '')
 		    if (isset($_POST['L_'.$oraId])) // a biztonság kedvéért ellenőrizzük
-            		updateHaladasiNaploOra($oraId, $_leiras, $_csoportAdat, $_ki, $lr);
-            	    //EXPERIMENTAL: updateHaladasiNaploOra($oraId, $_leiras, $_csoportAdat, $_ki, $_modTs, $lr);
+            		updateHaladasiNaploOra($oraId, $_leiras, $_cimkeId, $_csoportAdat, $_ki, $lr);
+            	    //EXPERIMENTAL: updateHaladasiNaploOra($oraId, $_leiras, $_cimke, $_csoportAdat, $_ki, $_modTs, $lr);
 		}
             }
 	    $UJORA = readVariable($_POST['UJORA'],'string');
@@ -215,7 +218,7 @@ if ( $skin == 'ajax'
 	    if (is_array($_POST)) foreach ($_POST as $_key => $_leiras) {
 		if (substr($_key,0,3) === 'LE_' && $_leiras!='' && is_numeric($UJORAIDK[$_dt][$_ora])) {
 		    list($_rest, $_dt,$_ora) = explode('_',$_key);
-		    updateHaladasiNaploOra($UJORAIDK[$_dt][$_ora],$_leiras,'',$tanarId,$lr);
+		    updateHaladasiNaploOra($UJORAIDK[$_dt][$_ora],$_leiras,0,'',$tanarId,$lr);
 		}
 	    }
 	    //***
@@ -371,6 +374,7 @@ if ( $skin == 'ajax'
 	
 	    $ADAT['szabadTermek'] = getSzabadTermekByDtInterval($tolDt,$igDt, null,'ora');
 	    $ADAT['tankorTipusok'] = getTankorTipusok();
+	    if (__ORACIMKE_ENABLED === true) $ADAT['cimkek'] = getCimkek();
     /* ------------------------------------------------- */
         // toolBar
 	$TOOL['datumSelect'] = array(
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke-pre.php
new file mode 100644
index 00000000..dbca2542
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke-pre.php
@@ -0,0 +1,43 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+
+    if (!__NAPLOADMIN) {
+        $_SESSION['alert'][] = 'page:insufficient_access';
+    } else {
+
+	require_once('include/modules/naplo/share/ora.php');
+
+	if ($action == 'oraCimkez') {
+
+	    $D['cimkeId'] = readVariable($_POST['oraCimkeId'], 'id');
+	    $D['cimkeLeiras'] = readVariable($_POST['oraCimkeLeiras'], 'string');
+
+	    for($i=0; $i<count($D['cimkeId']); $i++) {
+		if ($D['cimkeLeiras'][$i]=='') {
+    		    $q = "DELETE FROM cimke WHERE cimkeId = %u";
+		    $v = array($D['cimkeId'][$i]);
+		    db_query($q, array('fv'=>'oraCimke','modul'=>'naplo_intezmeny','values'=>$v));
+		}
+	    }
+	    for($i=0; $i<count($D['cimkeLeiras']); $i++) {
+		if ($D['cimkeId'][$i]>0) {
+		    if ($D['cimkeLeiras'][$i]!='') {
+    			$q = "UPDATE cimke SET cimkeLeiras = '%s' WHERE cimkeId = %u";
+			$v = array($D['cimkeLeiras'][$i],$D['cimkeId'][$i]);
+		    }
+		} elseif ($D['cimkeLeiras'][$i]!='') {
+		    $q = "INSERT INTO  cimke (cimkeLeiras) VALUES ('%s')";
+		    $v = array($D['cimkeLeiras'][$i]);
+		}
+		db_query($q, array('fv'=>'oraCimke','modul'=>'naplo_intezmeny','values'=>$v));
+	    }
+
+	    //teremAdatModositas($D,($action=='ujTerem'));
+	    //unset($ADAT['teremId']);
+	}
+
+	$ADAT['cimkek'] = getoracimkek();
+
+    }
+?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke.php
new file mode 100644
index 00000000..b1732496
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/oraCimke.php
@@ -0,0 +1,8 @@
+<?php
+
+    if (_RIGHTS_OK !== true) die();
+
+    global $ADAT;
+
+    putOraCimkeLista($ADAT);
+?>
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 0bff88bf..5097037f 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
@@ -60,7 +60,7 @@ if (__NAPLOADMIN && isset($_POST['fileName']) && $_POST['fileName'] != '') {
 			$MEZO_LISTA = $_POST['MEZO_LISTA'];
 			$KULCS_MEZOK = $_POST['KULCS_MEZOK'];
 			updateOsztaly($osztalyId, $fileName, $MEZO_LISTA, $KULCS_MEZOK, $mezo_elvalaszto, readVariable($_POST['rovatfej'], 'bool'));
-
+			$ADAT['updatedFromFile']=true;
 		} // MEZO_LISTA tömb
 	} else {
 		$_SESSION['alert'][] = 'message:file_not_found:'.$fileName;
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 c4f0ca80..20ca97a5 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
@@ -4,6 +4,12 @@
 
     global $ADAT, $fileName, $ADATOK, $MEZO_LISTA, $attrList;
 
+    if ($ADAT['updatedFromFile']===true) {
+
+	echo "KÉSZ!";
+	
+    } else {
+
 	// Osztályhoz rendelés
 	if (isset($ADAT['osztalyId']) && ($ADAT['osztalyAdat']["kezdoTanev"]<=$ADAT['tanev'] && $ADAT['osztalyAdat']["vegzoTanev"]>=$ADAT['tanev'])) {
 		
@@ -34,7 +40,6 @@
 	} elseif (__NAPLOADMIN) {
 		putUjOsztalyForm($ADAT);
 	}
-
-
+    }
 
 ?>
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 99ece06d..8c0d870c 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
@@ -39,7 +39,7 @@
 	    }
 	}
     }
-    $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus','telephelyId'=>__TELEPHELYID));
+    $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus,statusz,besorolas','telephelyId'=>__TELEPHELYID));
     $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/orarend/orarend-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
index f570cc8f..a7022d00 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
@@ -21,6 +21,7 @@
 	require_once('include/modules/naplo/share/jegyzet.php');
 	require_once('include/modules/naplo/share/hianyzas.php');
 
+
     // -- TESZT - savePageState()
     define('__PAGE_PRESET', false); // kísérlet vége. no
     $preSetLoad = readVariable($_POST['preSetLoad'],'bool',false);
@@ -264,8 +265,11 @@
 	$ADAT['diakId'] = $diakId;
 	$ADAT['tankorId'] = $tankorId;
 	$ADAT['teremId'] = $teremId;
-	if ($skin=='ajax' && $_REQUEST['httpResponse']=='json') $_JSON['orarend']=$ADAT;
-
+	if ($skin=='ajax' && $_REQUEST['httpResponse']=='json') {
+	    $_JSON['orarend']=$ADAT;
+	} else {
+	    $ADAT['orarendvane'] = orarendvane();
+	}
 //=====================================
 
         $TOOL['datumSelect'] = array(
@@ -309,4 +313,5 @@
 	if ($stateCounter>0) setcookie($page.'_'.$sub.'_'.$f, implode('+',$SAVESTATE), 0, '', '', TRUE, TRUE);
     }
 
+
 ?>
\ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
index b0ed3b60..761156cd 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend.php
@@ -2,6 +2,8 @@
 
     global $ADAT;
 
+    if ($ADAT['orarendvane']==0)
+	putNincsOrarend();
     if (is_array($ADAT))
 	putOrarend($ADAT);
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css
index 0bd630d9..063488d4 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css
@@ -169,9 +169,12 @@
 		border: solid 1px #999;	    
 	}
 	input.gomb:hover { 
-		background-color: #009900;
-		color: white;
+		background-color: rgba(255,255,255,0.9); 
+	}
+	input.gomb.DOA.processing { 
+		border-color:orange;
 	}
+
 /*	input.rejtettGomb { border: solid 1px rgb(50,60,80);; background-color: rgb(50,60,80); }
 	input.rejtettGomb:hover { border: solid 1px orange; background-color: rgb(80,60,50); color: white }
 */
@@ -311,6 +314,9 @@
     }
     form.exportForm input:hover { color:black; border-color: black; background-color: white; opacity: 1; }
     form.exportForm input:active { background-color: cornflowerblue; color:white; }
+
+    td.cimke { text-align:center; white-space: wrap; background-color: rgba(255,255,255,0.3);}
+    td.cimke span.cimke {background-color: orange; color:white; font-size:x-small; padding:0px 2px; border-radius: 2px; margin:2px;}
 }
 @media print {
     table.haladasiBejegyzesek thead tr th { border-bottom: solid 1px black;}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/oraCimke.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/oraCimke.css
new file mode 100644
index 00000000..cb91e123
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/oraCimke.css
@@ -0,0 +1,15 @@
+
+    div.terem { text-align: center; background-color: #ffffff; }
+    div.terem table { margin: auto; background-color: #555555; }
+    div.terem table th { background-color: white; padding: 2px 4px; font-size:large; background-color: #555555; color:white; border-bottom:solid 2px white; padding:1px 10px;}
+    div.terem table td { background-color: rgb(240,240,240); text-align: left;  padding: 2px 4px; }
+    div.terem table tr:hover td { background-color: #826373; color: white; }
+    div.terem table tr td a { color: black; }
+    div.terem table tr:hover td a {  color: white; }
+
+    form.terem h1 { background-color: #555555; color:white; margin:0px; padding:0.4em 0.2em; border-bottom: solid 2px lightgreen;} 
+
+    form.terem { background-color: ; width: 80%; margin: auto;  padding: 20px; text-align: center; }
+    form.terem label { margin-left: 10px; margin-right:1em; }
+    form.terem div.tipus { width: 200px; float: right; background-color: #dddddd; border-width: 0px 1px 1px 1px; border-style: solid; border-color: #555555;}
+/*    form.terem label, form.terem input, form.terem select { vertical-align: top; }*/
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/settings.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/settings.phtml
new file mode 100644
index 00000000..eb19b314
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/settings.phtml
@@ -0,0 +1,11 @@
+<?php
+
+    function putNaploSettings() {
+
+	formBegin();
+
+	formEnd();
+
+    }
+
+?>
\ No newline at end of file
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 0638edf6..27eb51f1 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
@@ -53,7 +53,7 @@
 		    echo ($ADAT['oraTerheles'][$ADAT['tanarId']]['ossz']['heti']);
 	    }
 	echo '</th>';
-	echo '<th colspan="7" class="fejlec8">';
+	echo '<th colspan="8" class="fejlec8">';
     	    if ($tanarId!='') {
         	echo '<span class="tanarNev" data-tanarid="'.$tanarId.'">'.$title.'</span>';
 		if ($ADAT['csakUres']==true) {
@@ -106,7 +106,7 @@
 			echo ($ADAT['oraTerheles'][$ADAT['tanarId']]['ossz']['heti']);
 		    }
 		echo '</th>';
-		echo '<th colspan="7">';
+		echo '<th colspan="8">';
                 //    if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) echo '<input class="gomb" type="submit" name="lapoz" value="<<" tabindex="5" />'."\n";
 		    if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) 	echo '<button class="gomb" type="submit" name="lapoz1" value="prevWeek" tabindex="7"><span class="icon-chevron-left"></span></button>';
 
@@ -189,7 +189,7 @@
 		if (__PLUSZBEIRHAT===true) echo '<div class="icon-plus-sign rejtMutat"></div>';
 	    echo '</th>'."\n";
 	    // Az első cella a dátum/nap
-	    echo '<th colspan="7" class="nap">';
+	    echo '<th colspan="8" class="nap">';
 		echo str_replace('-','.',$dt) .'. ';
 		echo '<span class="napNev">'.$aHetNapjai[(date('w',$time)+6)%7].'</span>';
 		if ($napInfo2['napszam']!='' || $napInfo['orarendiHet'] != 0) {
@@ -229,7 +229,7 @@
 		if (__PLUSZBEIRHAT===true) putUjOra(array('dt'=>$dt, 'ora'=>$j));
 	    }	    
 	} else {
-	    echo '<tr><th colspan="8" class="nincsOra">'._NINCS_ORAJA.'</th></tr>';
+	    echo '<tr><th colspan="9" class="nincsOra">'._NINCS_ORAJA.'</th></tr>';
 //	    if ($tanitasiNap && strtotime(date('Y-m-d'))>=strtotime($dt)) {
 //	    if ( 
 //		(strtotime(date('Y-m-d'))>=strtotime($dt) 
@@ -272,7 +272,7 @@
 	for ($i=0;$i<count($doga['tervezett'][$dt]);$i++) {
 	    $did = $doga['tervezett'][$dt][$i];
 	    echo '<tr>';
-	    echo '<td colspan="8" class="dolgozat">';
+	    echo '<td colspan="9" class="dolgozat">';
 		$href = href('index.php?page=naplo&sub=osztalyozo&f=dolgozat&dolgozatId='.$did);
 		echo '<a href="'.$href.'">';
 	    	echo _BEJELENTETT_DOLGOZAT . ': '. $doga[$did]['dolgozatNev'];
@@ -484,6 +484,8 @@
 		    echo '<a href="'.href('index.php?page=naplo&sub=tanmenet&f=tanmenetInfo&tanmenetId='.$ADAT['tankorTanmenet'][ $dOra['tankorId'] ]).'" class="onClickUpdateWindow" title="'._TANMENET.'">';
 		    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>';
@@ -492,16 +494,39 @@
 		}
 	    echo '</td>'."\n";
 
+	    echo '<td class="cimke">';
+		if (__ORACIMKE_ENABLED === true) {
+		  if ($modosithatoOra) {
+		    if (count($ADAT['cimkek'])>0) {
+		    echo '<select name="C_'.$dOra['oraId'].'" data-oraid="'.$dOra['oraId'].'" class="data">';
+		    echo '<option value=""></option>';
+		    for ($c = 0; $c<count($ADAT['cimkek']); $c++) {
+			$_SEL = (in_array($ADAT['cimkek'][$c]['cimkeId'], $dOra['cimke'])) ? 'selected="selected"':'';
+			echo '<option value="'.$ADAT['cimkek'][$c]['cimkeId'].'" '.$_SEL.'>'.($ADAT['cimkek'][$c]['cimkeLeiras']).'</option>';
+		    }
+		    echo '</select>';
+		    }
+		  } else {
+		    $_C = array();
+		    for ($c = 0; $c<count($ADAT['cimkek']); $c++) {
+			if (in_array($ADAT['cimkek'][$c]['cimkeId'], $dOra['cimke'])) $_C[] = $ADAT['cimkek'][$c]['cimkeLeiras'];
+		    }		    
+		    if (count($_C)>0) echo '<span class="cimke">'.implode('</span> <span class="cimke">',$_C).'</span>';
+		  }
+		}
+	    echo '</td>';
 	    // ----- Leírás ---------------------------------
 		if ($modosithatoOra) {
 		    echo '<td class="l">';
+
+
 		    if ($dOra['leiras']!='') { // beírva
-			echo '<input type="text" tabindex="1" name="L_'.($dOra['oraId']).'" class="data beirva" size="30" value="'.htmlspecialchars($dOra['leiras']).'" />';
-			echo '<span class="INFO" id="B_'.($dOra['oraId']).'"></span>';
+			echo '<input type="text" tabindex="1" name="L_'.($dOra['oraId']).'" class="data beirva ROA" size="30" value="'.htmlspecialchars($dOra['leiras']).'" />';
+			echo '<span class="INFO" id="B_'.($dOra['oraId']).'"><span class="icon-ok-sign"></span></span>';
 			echo '<input type="submit" class="gomb DOA" value="'._OK.'" tabindex="" />';
 		    } else {
-			echo '<input type="text" tabindex="1" name="L_'.($dOra['oraId']).'" class="data" size="30" value="'.htmlspecialchars($dOra['leiras']).'" />';
-			echo '<span class="INFO" id="B_'.($dOra['oraId']).'">✓</span>';
+			echo '<input type="text" tabindex="1" name="L_'.($dOra['oraId']).'" class="data ROA" size="30" value="'.htmlspecialchars($dOra['leiras']).'" />';
+			echo '<span class="INFO" id="B_'.($dOra['oraId']).'"><span class="icon-ok-sign"></span></span>';
 			echo '<input type="submit" class="gomb DOA" value="'._OK.'" tabindex="" />';
 		    }
 		    echo '<input type="hidden" name="oraId[]" value="'.$dOra['oraId'].'" />';
@@ -513,6 +538,7 @@
 			echo '<td class="nincsBeirva">'._NINCS_BEIRVA;
 		    }
 		}
+
 	    echo '</td>'."\n";
 
 	    // ----- Hiányzók -------------------------------
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/oraCimke.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/oraCimke.phtml
new file mode 100644
index 00000000..af3cd4c0
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/oraCimke.phtml
@@ -0,0 +1,49 @@
+<?php
+
+    function putOraCimkeLista($ADAT) {
+
+	formBegin();
+	echo '<input type="hidden" name="action" value="oraCimkez" />';
+	echo '<div class="terem">'."\n";
+
+	    echo '<table cellpassing="1" cellspacing="1">'."\n";
+
+	    echo '<thead><tr>';
+		echo '<th>'._CIMKEID.'</th>';
+		echo '<th>'._LEIRAS.'</th>';
+	    echo '</tr></thead>'."\n";
+	    echo '<tfoot><tr>';
+		echo '<th colspan="2">';
+		    echo '<input type="submit">';
+		echo '</th>';
+	    echo '</tr></tfoot>'."\n";
+	    echo '<tbody>';
+	    foreach ($ADAT['cimkek'] as $i => $D) {
+		echo '<tr>';
+		    echo '<td>'.$D['cimkeId'].'</td>';
+		    echo '<td>';
+			echo '<span class="icon-pencil-alt" style="color:#aaa;"></span> ';
+			echo '<input type="text" name="oraCimkeLeiras[]" data-cimkeid="'.$D['cimkeId'].'" value="'.$D['cimkeLeiras'].'" />';
+			echo '<input type="hidden" name="oraCimkeId[]" value="'.$D['cimkeId'].'" />';
+		    echo '</td>';
+		echo '</tr>'."\n";
+	    }
+	    echo '<tr>';
+		    echo '<td>'._UJCIMKE.'</td>';
+		    echo '<td>';
+			echo '<span class="icon-pencil" style="color:#aaa;"></span> ';
+			echo '<input type="text" name="oraCimkeLeiras[]" value="" />';
+		    echo '</td>';
+	    echo '</tr>'."\n";
+	    echo '</tbody>'."\n";
+
+	    echo '</table>'."\n";
+
+	echo '</div>'."\n";
+
+	formEnd();
+
+    }
+
+
+?>
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 75e6f446..756ec408 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
@@ -11,10 +11,14 @@ function putTanarLista($ADAT) {
 	echo '</td><td>';
 	    echo '<span class="tanarNev" data-tanarid="'.$T['tanarId'].'">'.$T['tanarNev'].'</span>';
 	    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>';
+
 	    $osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]);
 	    for ($j=0; $j<count($osztalyai); $j++) {
 		$_osztalyId = $osztalyai[$j];
-		echo '<br/><div class="osztalyfonok" style="color:#aaa; font-size:smaller">osztályfőnök '.$ADAT['osztalyok'][$_osztalyId]['osztalyJel'];
+		echo '<div class="osztalyfonok" style="color:#aaa; font-size:smaller">osztályfőnök '.$ADAT['osztalyok'][$_osztalyId]['osztalyJel'];
 		echo ' ('.$ADAT['osztalyok'][$_osztalyId]['leiras'].')</div>';
 	    }
 	    $munkakozossegei = ($ADAT['tanarMunkakozosseg'][$T['tanarId']]); // vezetett
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 798c8e85..eccebf8a 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
@@ -1,5 +1,9 @@
 <?php
 
+    function putNincsOrarend() {
+	echo '<h2 class="mayorSocialEdition"><span class="icon-th" style="padding-right:8px;"></span>Nincs órarend!</h2>';
+    }
+
     function csengetesiRend($csengetesiRendTipus, $telephelyId, $nap, $ora, $ADAT) {
 	$most = false;
 	if ($ADAT[$csengetesiRendTipus][$telephelyId][$nap][$ora]!='') $n = $nap;
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml
index 1bb2f616..7720f2ba 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml
@@ -66,7 +66,7 @@
 			$SEL = array($RovatfejAttrs[$j] => ' selected="selected" ');
 			echo '<option value="">-</option>'."\n";
 			while(list($a,$txt) = each($attrs)) {
-				echo '<option value="'.$a.'"'.$SEL[$a].'>'.$txt.'</option>'."\n";
+				echo '<option value="'.$a.'"'.$SEL[$a].'>'.$txt.' ('.$a.')</option>'."\n";
 			}
 			echo '</select>'."\n";
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/haladasi.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/haladasi.jquery.min.js
index 68881382..890b8b46 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/haladasi.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/haladasi.jquery.min.js
@@ -23,8 +23,10 @@ $(function() { /* onload */
     });
     $('body').click(function(event) {
 	var x = $(event.target);
-	if (x.hasClass('gomb DOA'))
+	if (x.hasClass('gomb DOA')) {
 	    x.prop('disabled', false);
+	    x.addClass('processing');
+	}
     });
     $('.exportForm').click(function(event) {
 	$('table.haladasiBejegyzesek input[type="text"].data').prop('readonly',true);