Rev: 4569rev4569

22 files changed, 435 insertions, 194 deletions

diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/admin/intezmenyek.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/admin/intezmenyek.css
index 25a0be92..5c3ab8a5 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/admin/intezmenyek.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/admin/intezmenyek.css
@@ -1,26 +1,26 @@
 
-    form.intezmeny { background-color: rgb(40,60,120); color: white; margin: 20px; padding: 5px; }
+    form.intezmeny { background-color: rgb(40,60,120); color: white; margin: 40px; padding: 0px 0px 10px 0px; }
     form.intezmeny h2 {
         background-color: rgb(20,40,80);
         text-align: center;
-        border: white 1px dotted;
+        border: white 1px solid;
         border-width: 1px 0px;
         padding: 3px;
     }
 
-    form.ujTelephely { background-color: rgb(40,120,120); color: white; margin: 20px; padding: 5px; margin: 0px 30px 10px 30px}
+    form.ujTelephely { background-color: rgb(40,120,120); color: white; margin: 20px; padding: 0px 0px 10px 0px; margin: 0px 30px 10px 30px}
     form.ujTelephely:hover { background-color: rgb(80,160,200); }
     form.ujTelephely h2 {
 	color: white; background-color: rgb(20,80,80); text-align: center;
-        border: white 1px dotted; border-width: 1px 0px;
+        border: white 1px solid; border-width: 1px 0px;
         padding: 3px;
     }
-    form.telephely { background-color: rgb(40,120,60); color: white; margin: 20px; padding: 5px; margin: 0px 30px 10px 30px}
+    form.telephely { background-color: rgb(40,120,60); color: white; margin: 20px; padding: 0px 0px 10px 0px; margin: 0px 30px 10px 30px}
     form.telephely:hover { background-color: rgb(120,180,60); }
     form.telephely h2 {
 	color: white; background-color: rgb(20,80,40); text-align: center;
-        border: white 1px dotted; border-width: 1px 0px;
+        border: white 1px solid; border-width: 1px 0px;
         padding: 3px; 
     }
 
-
+    form.intezmeny ul li { padding: 2px; }
\ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/admin/tanevek.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/admin/tanevek.css
index 7562ff6f..fe59dc6f 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/admin/tanevek.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/admin/tanevek.css
@@ -3,7 +3,7 @@
     form.intezmeny h2 {
 	background-color: rgb(20,40,80);
 	text-align: center;
-	border: white 1px dotted;
+	border: white 1px solid;
 	border-width: 1px 0px;
 	padding: 3px;
     }
@@ -14,4 +14,6 @@
 
     form.intezmeny fieldset p { margin-left: 50px; }
     form.intezmeny fieldset label { background-coor: red;  padding: 0px 14px 0px 0px; } 
-    form.intezmeny fieldset h3 { color: rgb(255,255,100); }
\ No newline at end of file
+    form.intezmeny fieldset h3 { font-weight: normal; color: #ffeb3b; }
+
+    form.intezmeny.tervezett { background-color: #2E7D32;  }
\ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankor.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankor.css
index f81c35f1..0c62ea0a 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankor.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankor.css
@@ -33,14 +33,13 @@ form.tankor label {
 }
 
 
-form.tankor input:hover,
+/*form.tankor input:hover*/
 form.tankor label:hover {
-    text-decoration: underline;
+    background-color: darkorange;
+    color: white;
+    cursor: pointer;
 }
 
-form.tankor input {
-    border: solid 1px blue;
-}
 
 form.tankor input.lezart { background-color: #aaaaaa; border: solid 1px black; }
 
@@ -81,3 +80,11 @@ form.tankor div:hover { background-color: #2799bb; }
 
 form.tankor p { padding: 0em 1em; }
 
+
+form.tankor span.tankorCsoportAdat { background-color: orange; border-radius:4px; padding: 2px 4px; margin: 4px;}
+form.tankor span.tankorCsoportAdat:hover { background-color: darkorange;}
+
+
+table.osztalyok tr:hover td { background-color: cornflowerblue;}
+table.osztalyok tr:hover th { background-color: cornflowerblue;}
+
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 ddf0da7d..539cd4ea 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
@@ -57,6 +57,9 @@
     table.toolBar tr td.szemely { background-color: #5A85B8; color:white; border: solid 1px #558; padding:2px 10px; color: rgba(255,255,255,0.5);}
     table.toolBar tr td.szemely:hover { color: rgba(255,255,255,1);}
 
+    table.toolBar tr td.csoport { background-color: #5A85B8; color:white; border: solid 1px #558; padding:2px 10px; color: rgba(255,255,255,0.5);}
+    table.toolBar tr td.csoport:hover { color: rgba(255,255,255,1);}
+
 
 /* TD */
     table.toolBar td {padding: 0px;}
@@ -177,7 +180,7 @@
     }
     #toolBarHamburgerLista button.hamburgerIkon:hover {background-color: rgba(90,133,184,0.6);border: solid 1px #15477B;}
 
-    .diakNev:hover, .szuloNev:hover, .tankorAdat:hover, .tanarNev:hover, .zaroJegyAdat:hover, .jegyAdat:hover, .oraAdat:hover, .jegyzetAdat:hover, .dolgozatAdat:hover { cursor: pointer; }
+    .diakNev:hover, .szuloNev:hover, .tankorAdat:hover, .tankorCsoportAdat:hover, .tanarNev:hover, .zaroJegyAdat:hover, .jegyAdat:hover, .oraAdat:hover, .jegyzetAdat:hover, .dolgozatAdat:hover, .osztalyAdat:hover { cursor: pointer; }
     .activeElement { outline: solid 2px orange; background-color: rgba(255,255,255,0.9); }
 
     #mayorSearch a.diakNev:before, #mayorSearch a.diakNev:hover:before { content:'\e0ca'; font-family: 'Elusive-Icons'; padding-right:2px; color: rgba(100,149,237,0.4);}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarendModosito.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarendModosito.css
index 1d9f527b..c25f4328 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarendModosito.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarendModosito.css
@@ -113,10 +113,19 @@ div.unfinished {
 	border: solid 1px rgb(52, 150, 185);
 	color: white;
     }
-    div.haladasi { background-color: #F44336; border: solid 1px #ccc; padding:0.5em; color:white; }
+
+    div.haladasi { background-color: #F44336; border: solid 1px #ccc; padding:0.5em; color:white; width:80%; margin:auto; border-radius: 4px; }
     div.haladasi.haladasiModositando { background-color: #4CAF50; }
     table.orarend tbody tr td div.haladasiOra { color:white; cursor: pointer; }
     div.torlesreJelolve { background-color: #888 !important; text-decoration: line-through; outline: solid 1px red; }
+
+    div.orarendModositoToolbox { background-color: #444; border: solid 1px #ccc; padding:0.5em; color:white; width:80%; margin:auto; border-radius: 4px; colow: white;}
+    div.orarendModositoToolbox table.tanarTankor {font-size: smaller; position:fixed; top:2px ; right: 2px; background-color: #444; z-index:1000; }
+    div.oraKartya.highlight { outline: solid 1px yellow }
+    div.oraKartya span.highlight { background-color:yellow; }
+    div.orarendModositoToolbox button#tankorHelper { float:right; }
+
+
 }
 @media print {
     table.toolBar {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/osztalyozo/tankor.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/osztalyozo/tankor.css
index 1d246e69..6245a71a 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/osztalyozo/tankor.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/osztalyozo/tankor.css
@@ -9,7 +9,7 @@
 
     table.osztalyozo thead th { background-color: rgb(100,120,120); }
     table.osztalyozo thead th select { background-color: rgb(100,120,120); color: white; border: 1px solid rgb(120,140,140); }
-    table.osztalyozo thead th.nev { height:30px }
+    table.osztalyozo thead th.nev { height:30px; font-size:large; font-weight:normal; }
     table.osztalyozo thead th.defaultSulyozas { background-color:lightgreen; }
     table.osztalyozo thead th select.sulyozas { width:44px; }
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/intezmenyek.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/intezmenyek.phtml
index f70e7739..d2a3d3dd 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/intezmenyek.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/intezmenyek.phtml
@@ -10,10 +10,11 @@
 
 	echo '<input type="hidden" name="action" value="intezmenyModositas" />'."\n";
 
-        echo _OMKOD . ': <input type="text" name="OMKod" id="OMKod" value="'.$Intezmeny['OMKod'].'" maxlength="8" />'."\n";
-        echo _ROVIDNEV .': <input type="text" name="rovidNev" id="rovidNev" value="'.$Intezmeny['rovidNev'].'" readonly="readonly" />'."\n";
-        echo _NEV.': <input type="text" name="nev" id="nev" value="'.$Intezmeny['nev'].'" />'."\n";
-	echo _FENNTARTO.': ';
+	echo '<ul>';
+        echo '<li>'._OMKOD . ': <input type="text" name="OMKod" id="OMKod" value="'.$Intezmeny['OMKod'].'" maxlength="8" />'."\n";
+        echo ' '._ROVIDNEV .': <input type="text" name="rovidNev" id="rovidNev" value="'.$Intezmeny['rovidNev'].'" readonly="readonly" style="width: 16em;" />'."</li>\n";
+        echo '<li>'._NEV.': <input type="text" name="nev" id="nev" value="'.$Intezmeny['nev'].'" maxlength="128" style="width:64em" />'."</li>\n";
+	echo '<li>'._FENNTARTO.': ';
 	echo '<select name="fenntarto">';
 	echo '<option value=""> - </option>';
 	foreach ($ADAT['fenntartok'] as $fenntarto) {
@@ -21,10 +22,16 @@
 	    echo '<option value="'.$fenntarto.'"'.$SEL.'>'.$fenntarto.'</option>';
 	}
 	echo '</select>';
+	echo '</li>';
+
+	echo '<li>';
 	if ($Intezmeny['alapertelmezett'])
 	    echo '<input type="checkbox" name="alapertelmezett" value="1" checked="checked" />' . _ALAPERTELMEZETT;
 	else
 	    echo '<input type="checkbox" name="alapertelmezett" value="1" />' . _ALAPERTELMEZETT;
+	echo '</li>';
+	echo '</ul>';
+
         echo '<input type="submit" value="'._OK.'" />'."\n";
 	formEnd();
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/tanevek.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/tanevek.phtml
index ba77f647..5d21add7 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/tanevek.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/tanevek.phtml
@@ -4,7 +4,7 @@
 
 	$SZEMESZTER_STATUSZ = Array('aktív','tervezett');
 
-	formBegin(array('class'=>'intezmeny'));
+	formBegin(array('class'=>'intezmeny tervezett'));
 
 	echo '<h2>'._UJ_TANEV.'</h2>'."\n";
 
@@ -14,29 +14,32 @@
 
 	//szemeszter: tanev, sorszám, status (aktív, lezárt, új, tervezett), kezdete, vége
 
-        echo _TANEV_JELE . ': <input type="text" name="ujTanev" id="tanev" value="" maxlength="4" size="4" />'."\n";
+        echo _TANEV_JELE . ': ';
+	    //echo '<input type="text" name="ujTanev" id="tanev" value="" maxlength="4" size="4" />'."\n";
+	    echo '<select name="ujTanev" id="tanev">';
+	    echo '<option value=""></option>';
+	    for ($i=2000; $i<2050; $i++) {
+		echo '<option value="'.$i.'">'.$i.'</option>';
+	    }
+	    echo '</select>';
 	echo '<hr />'."\n";
 
+	echo '<br/>';
+
+	echo '<ul>';
 	for ( $i = 1; $i <= 2; $i++ ) {
+	    echo '<li>';
 	    echo $i .'. ' . _SZEMESZTER . ":";
     	    echo '<input type="hidden" name="szemeszter[]" value="'.$i.'" />'."\n";
-    	    echo '<input class="date" type="text" name="kezdesDt[]" value="" maxlength="10" size="10" /> - '."\n";
-    	    echo '<input class="date" type="text" name="zarasDt[]" value="" maxlength="10" size="10" />'."\n";
+    	    echo '<input class="date" type="text" id="ujSzemeszter_'.$i.'_kezdesDt" name="kezdesDt[]" value="" maxlength="10" size="10" /> - '."\n";
+    	    echo '<input class="date" type="text" id="ujSzemeszter_'.$i.'_zarasDt" name="zarasDt[]" value="" maxlength="10" size="10" />'."\n";
 	    echo ' ('._TERVEZETT.')';
-	    echo '<br/>';
+	    echo '</li>';
 
-//	    echo '<select name="statusz[]">';
-//	    foreach($SZEMESZTER_STATUSZ as $key => $statusz) {
-//		    echo '<option value="'.$statusz.'">'.$statusz.'</option>';
-//	    }
-//	    echo '</select>';
 	}
-
+	echo '</ul>';
 	echo '<hr />'."\n";
 
-//	echo 'rootUser: <input type="text" name="rootUser" id="rootUser" value="root" />'."\n";
-//	echo 'rootPassword: <input type="password" name="rootPassword" id="rootPassword" value="" />'."\n";
-
         echo '<input type="submit" value="'._OK.'" />'."\n";
 
 	echo '</div>';
@@ -53,7 +56,7 @@
 	echo '<input type="hidden" name="action" value="szemeszterTorles" />'."\n";
 	echo '<input type="hidden" name="tanev" value="'.$tanev.'" />'."\n";
 	
-	echo '<h2>'._TANEV_SZEMESZTEREI.'</h2>'."\n";
+	echo '<h2>'.$tanev.'/'.($tanev+1).' '._TANEV_SZEMESZTEREI.'</h2>'."\n";
 	
 	echo '<div class="data">'."\n";
 	
@@ -95,11 +98,13 @@
 
     function putTanevLezarasForm( $ADAT ) {
 
+	$tanev=$ADAT['tanev'];
+
 	formBegin(array('class'=>'intezmeny'));
 
 	echo '<input type="hidden" name="action" value="tanevLezar" />'."\n";
 
-	echo '<h2>'._TANEV_LEZARAS.'</h2>'."\n";
+	echo '<h2>'.$tanev.'/'.($tanev+1).' '._TANEV_LEZARAS.'</h2>'."\n";
 
 	echo '<div class="data">'."\n";
 	echo '<input type="hidden" name="tanev" value="'.$ADAT['tanev'].'"/>';
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 84d3593a..805e57dc 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
@@ -52,6 +52,7 @@
 		if (defined('__TELEPHELYID')) echo '<span id="toolBarIntezmeny" title="TelephelyId:".'.__TELEPHELYID.'>'.__INTEZMENY .', ' . __TANEV.'/'.(__TANEV+1).'</span>';
 		else echo '<span id="toolBarIntezmeny">'.__INTEZMENY . '/' . __TANEV.'</span>';
 	    echo '</a>';
+	     if (MAYOR_SOCIAL === true) { echo '<span title="MaYoR Social Edition" style="font-size:8px; padding:0px 0px 0px 4px; color: #e91e63;  filter: grayscale(100%);">〽️social</span>';}
 	    if ($showHelp) echo '<span id="toolBarHelpButton" class="onClickHideShow">?</span>';
 	echo '</td>'."\n";
 	reset($TOOL); 
@@ -101,15 +102,15 @@
 	}
 	if ($_diakId>0 && _POLICY=='private') {
 	    echo '<td class="szemely diakNev" data-diakid="'.$_diakId.'">';
-		echo '<span class="icon-child" data-diakid="'.$_diakId.'"></span>'; // itt is kell a data...
+		echo '<span class="icon-child" data-diakid="'.$_diakId.'"></span>';
 	    echo '</td>'."\n";
 	} elseif ($_tanarId>0 && _POLICY=='private') {
 	    echo '<td class="szemely tanarNev" data-tanarid="'.$_tanarId.'">';
-		echo '<span class="icon-adult" data-tanarid="'.$_tanarId.'"></span>'; // itt is kell a data...
+		echo '<span class="icon-adult" data-tanarid="'.$_tanarId.'"></span>';
 	    echo '</td>'."\n";
 	} 
 	if ($_tankorId>0 && _POLICY=='private') { //--TODO css class szemely->csoport
-	    echo '<td class="szemely tankorAdat" data-tankorid="'.$_tankorId.'">';
+	    echo '<td class="csoport tankorAdat" data-tankorid="'.$_tankorId.'">';
 		echo '<span class="icon-group" data-tankorid="'.$_tankorId.'"></span>';
 	    echo '</td>'."\n";
 	}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml
index 3cd8691b..5fe6435a 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml
@@ -21,6 +21,7 @@
 	echo '<style type="text/css">
 	    
 	    table.ttf { background-color: #eee;}
+	    table.ttf thead tr th { background-color: #ddd;border-bottom: solid 1px #888; padding: 4px;}
 	    table.ttf tr.tankorHozzarendel2.exact td { background-color: cornflowerblue}
 	    table.ttf tr.tankorHozzarendel td { background-color: yellow}
 	    table.ttf tr.tankorHozzarendel2 td { background-color: orange}
@@ -30,6 +31,7 @@
 	    table.ttf tr.done td { background-color: lightgreen;}
 	    table.ttf tr td {padding:4px;}
 
+	    table.ttf tr td div.tankorLista span:hover { color: white; }
 	</style>';
 
 	// FILTEREZÉS
@@ -45,7 +47,7 @@
 	echo '<table class="ttf" cellspacing="1">';
 
 	echo '<thead>';
-	echo '<tr>';
+/*	echo '<tr>';
 	    echo '<th>';
 		echo 'Csoportnév';
 	    echo '</th>';
@@ -55,11 +57,12 @@
 	    echo '<th>';
 	    echo '</th>';
 	echo '</tr>';
-	echo '<tr>';
+*/	echo '<tr>';
 	    echo '<th colspan="6">';
 		foreach ( array('tankorHozzarendel','tankorHozzarendel2','tankorHozzarendel3','done','createTankor') as $k => $v) {
 		    echo '<input type="checkbox" name="'.$v.'" value="'.$v.'" checked="checked" />';
 		}
+		echo '<button type="button" class="nevsorSzinkron_btn">minden kész névsort szinkronizálásra jelöl</button>';
 	    echo '</th>';
 	echo '</tr>';
 	echo '</thead>';
@@ -78,8 +81,9 @@
 		$_class = '';
 	    }
 	    echo '<tr class="'.$D['action'].' '.$_class.'">';
-		echo '<td>'.$D['csoportNev'].'</td>';
+		echo '<td class="tankorCsoportAdat" data-tankorcsoportid="'.$D['csoportId'].'">'.$D['csoportNev'].'</td>';
 		echo '<td style="font-size:10px">';
+
 			echo '<div>';
 			for ($j=0;$j<count($ADAT['csoportAdat'][$D['csoportNev']]['diakNevsor']); $j++) {
 			    echo $ADAT['csoportAdat'][$D['csoportNev']]['diakNevsor'][$j];
@@ -99,11 +103,11 @@
 			echo '<select name="tankor2csoport[]">';
 			echo '<option>--'.$D['action'].'--</option>';
 			for ($j=0; $j<count($D['displayTankor']); $j++) {
-			    $_SEL = (count($D['displayTankor'])==1) ? ' selected="selected" ': '';
+			    $_SEL = (count($D['displayTankor'])==1 && $D['action']=='tankorHozzarendel') ? ' selected="selected" ': '';
 			    echo '<option value="'.$D['csoportId'].':####:'.$D['tanarId'].':####:'.$D['displayTankor'][$j]['tankorId'].':####:'.$D['oraszam'].'"    '.$_SEL.'>'.$D['displayTankor'][$j]['tankorNev'].'</option>';
 			}
 			echo '</select>';
-			echo '<div style="font-size:10px;">';
+			echo '<div class="tankorLista">';
 			for ($j=0; $j<count($D['displayTankor']); $j++) {
 			    $_tankorId = $D['displayTankor'][$j]['tankorId'];
 			    $_diffCount = count(array_diff(
@@ -115,7 +119,7 @@
 			    echo '('.$_tankorId.') tag: '.count($ADAT['tankorDiak'][$_tankorId]);
 
 			    echo " -- diff:" .$_diffCount;
-			    if ($_diffCount == 0) echo '*******';
+			    if ($_diffCount == 0) echo ' *******';
 			}
 			echo '</div>';
 			// ha ezt összehasonlítom a mayorban rögzített névsorral, akkor eldönhető lehet, hogy melyik a jó választás!
@@ -125,12 +129,31 @@
 			echo 'Új tankör létrehozása: <input type="text" name="ujTankor[]" value="'.$D['csoportId'].':####:'.$D['tanarId'].':####:'.$_osztalyok.':####:'.$D['targyId'].'.'.':####:'.$_O.':####:'.$D[1].'" />';
 		    } else {
 			echo '<div class="tankor tankorAdat tankorNev" data-tankorid="'.$D['tankorId'].'">'.$D['tankorId'].'</div>';
+
+			echo '<input type="checkbox" name="nevsorSzinkronFelulir[]" value="'.$D['csoportId'].':####:'.$D['tankorId'].'" class="nevsorSzinkronizal" />névsor felülír import alapján';
+
+
+			/*
+			echo '<label for="tnf_'.$i.'_1"><span class="icon-record"></span>';
+			echo ' nem frissít</label>';
+			echo '<input type="radio" name="tankorNevsorFrissit[]" value="" id="tnf_'.$i.'_1" />';
+			echo '<br/>';
+			echo '<label for="tnf_'.$i.'_2"><span class="icon-random"></span>';
+			echo ' importál (kibővít)</label>';
+			echo '<input type="radio" name="tankorNevsorFrissit[]" value="'.$D['csoportId'].':####:'.$D['tankorId'].'"  id="tnf_'.$i.'_2" />';
+			echo '<br/>';
+			echo '<label for="tnf_'.$i.'_3"><span class="icon-download"></span>';
+			echo ' töröl és importál</label>';
+			echo '<input type="radio" name="tankorNevsorFrissit[]" value="'.$D['csoportId'].':####:'.$D['tankorId'].'"  id="tnf_'.$i.'_3" />';
+			*/
 		    }
 
 		echo '</td>';
 	    echo '</tr>';
 	}
 	echo '</table>';
+	echo '<input type="submit" />';
+
 	formEnd();
 
     }
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml
index 2401da8f..4467fb48 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml
@@ -28,7 +28,12 @@
 
 	global $TANKOR_TIPUS;
 	/* $TOPOST['tankoradat'] */
-    
+
+	$tankorNevExtra = $TOPOST['tankoradat']['tankorNevExtra'];
+	if ($tankorNevExtra!='' && !in_array($tankorNevExtra,array_values($TANKOR_TIPUS))) {
+	    $TANKOR_TIPUS[$tankorNevExtra] = $tankorNevExtra;
+	}
+
 	if (!is_array($TARGY)) return false;
 	    $SZEMCHECK = array();
 	    for ($i=0; $i<count($TOPOST['szemeszterek']); $i++) {
@@ -87,10 +92,10 @@
 		    $_tipus=$TOPOST['tankoradat']['tipus'];
 	    }
 	    echo '<select name="tipus">';
-	    foreach ($TANKOR_TIPUS as $_k=>$_v) {
-		$_SEL = ($_v==$_tipus) ? ' selected="selected"':'';
-		echo '<option value="'.$_v.'"'.$_SEL.'>'.$_k.' - '.$_v.'</option>';
-	    }
+		foreach ($TANKOR_TIPUS as $_k=>$_v) {
+		    $_SEL = ($_v==$_tipus) ? ' selected="selected"':'';
+		    echo '<option value="'.$_v.'"'.$_SEL.'>'.$_k.' - '.$_v.'</option>';
+		}
 	    echo '</select>';
 	    if (defined('__AKG_TANKORNEV') && __AKG_TANKORNEV === true) {
 		echo '<input type="checkbox" name="tankorNevMegorzes" value="true" />';
@@ -133,7 +138,7 @@
 	    echo '</td>';
 if (count($TOPOST['tankorcsoport']['idk'])>1) {
 	    echo '<td rowspan="5" class="tankorCsoportok">';
-	    echo '<div class="header">'._TANKORCSOPORTOK.'</div>';
+	    echo '<div class="header">'._TANKOROK_CSOPORTBAN.'</div>';
 	    echo '<ul>';
 	    for ($i=0; $i<count($TOPOST['tankorcsoport']['idk']); $i++){
 		$_TA = $TOPOST['tankorcsoport']['adat'][$TOPOST['tankorcsoport']['idk'][$i]][0];
@@ -204,22 +209,32 @@ if (count($TOPOST['tankorcsoport']['idk'])>1) {
 */	    echo '</td>';
 
 	echo '</tr>';
-/* REV 2185++ - tól nem kell, nem lehet. A típus determinál 
-	echo '<tr>';
 
-	    echo '<th>'._JELENLET.'</th>';
-	    
+	echo '<tr>';
+	    echo '<th>'._TANKORCSOPORTOK.' '.$ADAT['tanev'];
+	    echo '</th>';
 	    echo '<td>';
-	    if (isset($TOPOST['tankoradat']['jelenlet'])) $_CHK[$TOPOST['tankoradat']['jelenlet']] = ' checked="checked"';
-	    else $_CHK['kötelező'] = ' checked="checked"';
-	    echo '<label for="jelKot">'._KOTELEZO.'</label>';
-	    echo '<input type="radio" id="jelKot" name="jelenlet" value="kötelező" '.$_CHK['kötelező'].' />';
-	    echo '<label for="jelNemKot">'._NEMKOTELEZO.'</label>';
-	    echo '<input type="radio" id="jelNemKot" name="jelenlet" value="nem kötelező" '.$_CHK['nem kötelező'].' />';
+	    if ($ADAT['tanev'] == __TANEV) {
+		echo '<select name="csoportId" style="width:200px;">';
+		    echo '<option>-</option>';
+		    for ($i=0; $i<count($ADAT['tankorCsoportok']); $i++) {
+			$CS = $ADAT['tankorCsoportok'][$i];
+			echo '<option value="'.$CS['csoportId'].'">'.$CS['csoportNev'].'</option>';
+		    }
+		echo '</select>';
+		echo '<input type="submit" />';
+		for ($i=0; $i<count($ADAT['tankorTankorCsoportjai']); $i++) {
+		    $CS = $ADAT['tankorTankorCsoportjai'][$i];
+		    echo '<span class="tankorCsoportAdat" data-tankorcsoportid="'.$CS['csoportId'].'">'.$CS['csoportNev'].'</span>';
+		}
+
+
+	    } else {
+		echo 'Nem módosítható';
+	    }
 	    echo '</td>';
-	    
 	echo '</tr>';
-*/
+
 	echo '</table>';
 	echo '<input type="hidden" id="jelKot" name="jelenlet" value="kötelező" />';
 	
@@ -259,7 +274,7 @@ if (count($TOPOST['tankorcsoport']['idk'])>1) {
 	    echo '</table>'."\n\n";
 
 	    echo '<h2>'._RESZTVEVO_OSZTALYOK.'</h2>';
-	    echo '<table>';
+	    echo '<table class="osztalyok">';
 	    echo '<tr><th>'._OSZTALYJELE.'</th><th></th><th>'._LEIRAS.'</th></tr>'."\n";
 	    for ($i=0; $i<count($OSZTALY); $i++) {
 		if (is_array($ADAT['tankorOsztalyok']) && in_array($OSZTALY[$i]['osztalyId'],$ADAT['tankorOsztalyok'])) $_class="vanTag"; else $_class="";
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 eccebf8a..b8d74048 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
@@ -61,7 +61,7 @@
 		$T = $ADAT['orarend']['assoc'];
 
 		if (MAYOR_SOCIAL === true) {
-		    echo '<h2 class="mayorSocialEdition">MaYoR Social Edition</h2>';
+		    // echo '<h2 class="mayorSocialEdition">MaYoR Social Edition</h2>';
 		    formBegin();
 		    echo '<input type="hidden" name="action" value="orarendiOraTeremModosit" />';
 		    echo '<input type="hidden" name="dt" value="'.$ADAT['dt'].'" />';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml
index 468d11bf..38fa3a5a 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml
@@ -24,6 +24,25 @@
 			echo ' (a törlés és teremmódosítás nem vonatkozik a már betöltött órákra)';
 		    echo '</div>';
 		}
+
+		echo '<div class="orarendModositoToolbox">';
+		    echo '<button type="button" id="tankorAjanlo">Tankör Ajánló</button>';
+		    echo ' Lerakott órák száma: <input type="text" id="sumOraszam" value="0">';
+
+		    if (is_array($ADAT['tankorok'])) {
+			echo '<table class="tanarTankor" style="display:none">';
+			foreach($ADAT['tankorok'] as $_tankorId => $_tankorAdat) {
+			    echo '<tr>';
+			    echo '<td class="tankorAdat" data-tankorid="'.$_tankorId.'">'.$_tankorAdat[0]['tankorNev'].'</td>';
+			    echo '<td>'.$_tankorAdat[0]['oraszam'].'</td>';
+			    echo '<td>'.$_tankorAdat[1]['oraszam'].'</td>';
+			    echo '</tr>';
+			}
+			echo '</table>';
+		    }
+		    echo '<button type="button" id="tankorHelper">Toolbox</button>';
+		echo '</div>';
+
 		echo '<input type="hidden" name="action" value="do" />';
 		echo '<input type="hidden" name="tanarId" value="'.$ADAT['tanarId'].'" />';
 		echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />';
@@ -75,24 +94,25 @@
 				    $_tipusClass = str_replace(' ','_',$_ORA['tipus']);				    
 				    // -------------------------------------
 				    /* Megjelenítési rétegé */                                                                                                                                                                                 
-				    $_class = ($_T['teremId']=='') ? ' nincsTerem draggable':' draggable';
+				    $_class = ($_T['teremId']=='') ? ' nincsTerem oraKartya':' oraKartya';
 				    echo '<div id="draggable'.(++$sdokrand).'" class="'.$_tipusClass.$_class.'" title="'.$_ORA['tipus'].'" id="D'.$het.'.'.$nap.'.'.$ora.'.'.$_T['tanarId'].'">';
 
-// Fejlesztés alatt, itt lehet majd felvenni az órát, ha már van órarend
-// Igaziból lehet, hogy ezt az órarend felületen célszerűbb lenne megcsinálni
-if ($ADAT['vanHaladasi'][$dt]>0) {
-    echo '<span style=" float:left; color:white; padding: 4px; ">';
-    if (isset($ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]['oraId'])) {
-	echo '<span class="icon-ok-sign oraAdat" data-oraid="'.intval($ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]['oraId']).'" title="ez az óra szerepel a haladási naplóban!"></span>';
-    } else {
-	echo '<span class="icon-minus-sign" title="ez az óra nem szerepel a haladási naplóban!"></span>';
-	// dt-ora-ki,tankorId,teremId,tipus,eredet,feladatTipusId,munkaido
-    }
-    echo '</span >';
-}
+					// Itt lehet felvenni az órát, ha már van órarend
+					if ($ADAT['vanHaladasi'][$dt]>0) {
+				    	    echo '<span style=" float:left; color:white; padding: 4px; ">';
+				    	    if (isset($ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]['oraId'])) {
+						echo '<span class="icon-ok-sign oraAdat" data-oraid="'.intval($ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]['oraId']).'" title="ez az óra szerepel a haladási naplóban!"></span>';
+				    	    } else {
+						echo '<span class="icon-minus-sign" title="ez az óra nem szerepel a haladási naplóban!"></span>';
+						// dt-ora-ki,tankorId,teremId,tipus,eredet,feladatTipusId,munkaido
+					    }
+					    echo '</span >';
+					}
+					//
 					$_ferohely = $ADAT['termek'][$_T['teremId']]['ferohely'];
 					$_letszam  = $ADAT['tankorLetszamok'][$_T['tankorId']];
 					if ($_T['tankorId']!='') {
+					    $_tankorEvesOraszam = floatval(($ADAT['tankorok'][$_T['tankorId']][0]['oraszam']+$ADAT['tankorok'][$_T['tankorId']][1]['oraszam'])/2);
 					    // HACK - találjuk ki, hogy mi a kulcsa a kártyának
 					    for ($_k=0; $_k<count($ADAT['orarend']['orarendiOra'][$het][$nap][$ora]); $_k++) {
 					        $_tmp = $ADAT['orarend']['orarendiOra'][$het][$nap][$ora][$_k];
@@ -102,8 +122,8 @@ if ($ADAT['vanHaladasi'][$dt]>0) {
 					    } unset($_tmp);
 					    // -------
 					    if ($_kulcsTolDt!='') echo '<input type="checkbox" class="minusz" name="ORARENDMINUSZ[]" value="'.$het.'.'.$nap.'.'.$ora.'.'.$_T['tanarId'].'.'.$dt.'.'.$_kulcsTolDt.'" title="'._TOROL.'" />'."\n";
-					    echo '<span title="'.$_targyJel.' '.$_osztalyJel.' ('.$ADAT['tankorok'][$_T['tankorId']][0]['tankorId'].') '.$_tankorTipus.'" >';
-					    echo $ADAT['tankorok'][$_T['tankorId']][0]['tankorNev'];
+					    echo '<span title="'.$_targyJel.' '.$_osztalyJel.' ('.$ADAT['tankorok'][$_T['tankorId']][0]['tankorId'].') '.$_tankorTipus.'"  class="tankorAdat" data-tankorid="'.$ADAT['tankorok'][$_T['tankorId']][0]['tankorId'].'" data-tankorevesoraszam="'.$_tankorEvesOraszam.'">';
+					        echo $ADAT['tankorok'][$_T['tankorId']][0]['tankorNev'];
 					    echo '</span>';
 					    //echo '<input type="checkbox" name="CSERE[]" value="'.$het.'.'.$nap.'.'.$ora.'.'.$_T['tanarId'].'" title="'._CSEREL.'" />'."\n";
 					} else {
@@ -114,12 +134,14 @@ if ($ADAT['vanHaladasi'][$dt]>0) {
 					_putTerem(array('name'=>'T_'.$het.'_'.$nap.'_'.$ora.'_'.$_T['tanarId'].'_'.$_kulcsTolDt, 'teremId'=>$_T['teremId']),$ADAT['termek']);
 					echo '<br/>';
 					if ($_ORA['kit']!='') {
-					    echo '<span class="helyett">';
-					    echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+					    echo '<span class="helyett tanarAdat tanarNev" data-tanarid="'.$_T['tanarId'].'">';
+						echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
 					    echo '</span>';
-					    if ($_ORA['ki']!='') echo ' '.$ADAT['tanarok'][$_ORA['ki']]['tanarNev'];
+					    if ($_ORA['ki']!='') echo ' <span class="tanarAdat tanarNev" data-tanarid="'.$_ORA['ki'].'">'.$ADAT['tanarok'][$_ORA['ki']]['tanarNev'].'</span>';
 					} else {
-					    echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+					    echo '<span class="tanarAdat tanarNev" data-tanarid="'.$_T['tanarId'].'">';
+						echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+					    echo '</span>';
 					}
 
 				    echo '</div>';
@@ -133,15 +155,18 @@ if ($ADAT['vanHaladasi'][$dt]>0) {
 
 
 				}
+
+				$__tankorIdHelper = 0;
 				if (isset($ADAT['haladasi']['orak'][$dt][$ora])) {
 				    foreach($ADAT['haladasi']['orak'][$dt][$ora] as $__tankorId => $_O) {
 					if (!in_array($__tankorId,$CELLATANKORIDK)) {
 					//$_O = $ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']];
-					echo '<div class="haladasiOra oraAdat '.($_O['tipus']).'" data-oraid="'.$_O['oraId'].'">';
+					$__tankorIdHelper = $_O['tankorId']; // ha több van, az utolsó lesz
+					echo '<div class="haladasiOra oraAdat '.($_O['tipus']).'" data-oraid="'.$_O['oraId'].'" data-tankorid="'.$_O['tankorId'].'">';
 					    echo '<span class="icon-time" style="margin:3px 3px;color:white; float:left;"></span>';
 					    if (!in_array($_O['tipus'],array('elmarad','elmarad_máskor'))) 
 						echo '<input type="checkbox" name="HALADASIORATOROL[]" value="'.$_O['oraId'].'" />';
-					    echo $ADAT['tankorok'][ $__tankorId ][0]['tankorNev'];
+					    echo $ADAT['tankorok'][$__tankorId][0]['tankorNev'];
 					    // array(13) { ["oraId"]=> string(5) "37936" ["dt"]=> string(10) "2016-01-08" ["ora"]=> string(2) "10" ["ki"]=> string(2) "81" ["kit"]=> NULL ["tankorId"]=> string(4) "3086" ["teremId"]=> NULL ["leiras"]=> string(0) "" ["tipus"]=> string(6) "egyéb" ["eredet"]=> string(8) "órarend" ["feladatTipusId"]=> NULL ["munkaido"]=> string(10) "lekötött" ["oo"]=> bool(false) 
 					    echo '<br/>'.$_O['tipus'];
 					    echo ' '.$_O['eredet'];
@@ -152,7 +177,7 @@ if ($ADAT['vanHaladasi'][$dt]>0) {
 				    }
 				}
 				if (count($T[$nap][$ora]['orak'])==0 || !in_array($ADAT['tanarId'],$__tanarIdk)) {
-					_putPluszOra($het,$nap,$ora,$TANKOROK,$BLOKKOK);
+					_putPluszOra($het,$nap,$ora,$TANKOROK,$BLOKKOK,$__tankorIdHelper);
 					//echo '<input type="checkbox" name="CSERE[]" value="'.$het.'.'.$nap.'.'.$ora.'.'.$_T['tanarId'].'" />';
 				}
 				//echo '<div class="draggable" style="height:10px; font-size:1px;">&nbsp;</div>';
@@ -271,18 +296,20 @@ for ($oi=0; $oi<count($ADAT['orarendioraTankor']['orarendiOra'][$het][$nap][$ora
     function putOrarendPlain($ADAT) {
     }
 
-    function _putPluszOra($het,$nap,$ora,$TANKOROK,$BLOKKOK) {
+    function _putPluszOra($het,$nap,$ora,$TANKOROK,$BLOKKOK, $tankorIdHelper = null) {
 
 
 	echo '<select name="ORARENDPLUSZ[]">';
 	    echo '<option value="">'."$het-$nap-$ora".'</option>';
 	    echo '<optgroup class="tankor" label="'._TANKOR.'">';
 	    for ($i=0; $i<count($TANKOROK); $i++) {
+		$helperStr = ($TANKOROK[$i]['tankorId'] == $tankorIdHelper) ? ' ***': '';
+		$helperHint = ($TANKOROK[$i]['tankorId'] == $tankorIdHelper) ? '1': '0';
 		$key = "T.$het.$nap.$ora.".($_id = $TANKOROK[$i]['tankorId']).'.'.$TANKOROK[$i]['tanarok'][0]['tanarId'];
 		$value = $TANKOROK[$i]['tankorNev'].' ('.$_id.')';
 		for ($j=0; $j<count($TANKOROK[$i]['tanarok']);$j++) 
 		    $value .= ' '.$TANKOROK[$i]['tanarok'][$j]['tanarNev'];
-		echo '<option value="'.$key.'">'.$value.'</option>'."\n";
+		echo '<option value="'.$key.'" data-hint="'.$helperHint.'">'.$value.$helperStr.'</option>'."\n";
 	    }
 	    echo '</optgroup><optgroup class="blokk" label="'._BLOKK.'">';
 	    for ($i=0; $i<count($BLOKKOK); $i++) {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml
index e145b5fc..5b26a9b9 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/dolgozat.phtml
@@ -51,8 +51,11 @@
 
 		    $Tankorok = $Dolgozat[$dolgozatId]['tankor'];
 		    $TankorLista = array();
-		    for ($t = 0; $t < count($Tankorok); $t++) $TankorLista[] = $Tankorok[$t]['tankorNev'];
-		    echo implode('<br />',$TankorLista);
+		    for ($t = 0; $t < count($Tankorok); $t++) {
+			$_T = $Tankorok[$t];
+			$TankorLista[] = $Tankorok[$t]['tankorNev'];
+			echo '<span class="tankorAdat" data-tankorid="'.$_T['tankorId'].'">'.$_T['tankorNev'].'</span>';
+		    }
 
 		echo '</td>';
 		echo '<td>';
@@ -74,7 +77,6 @@
 
 		echo '</td>';
 		echo '</tr>';
-		flush();
 	    }
 	} else {
 	    echo '<tr>';
@@ -85,7 +87,10 @@
 	echo '</table>';
 
 	echo '<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>'; 
-	echo '<div id="chart_div"></div>';
+	echo '<table align="center" style="width:90%; border: solid 1px #888;">';
+	echo '<tr><th>';
+	    echo '<div id="chart_div""></div>';
+	echo '</th></tr></table>';
     }
 
     function putDolgozat($Dolgozat, $valaszthatoTankorok, $Tanarok, $ADAT) {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/tankor.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/tankor.phtml
index 48dd33ec..43455749 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/tankor.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/tankor.phtml
@@ -88,7 +88,7 @@
 	    echo '<tr>'."\n";
 
 	    echo '<th class="nev" colspan="'.($colSpan+1).'">'."\n";
-		echo $Jegyek['tankörök'][$tankorId]['tankorNev'];
+		echo '<span class="tankorAdat" data-tankorid="'.$tankorId.'">'.$Jegyek['tankörök'][$tankorId]['tankorNev'].'</span>';
 		//_inlineHelp('');
 		echo ' ('.implode(', ',$Jegyek['tanárok']['tanarNevek']).')';
 	    echo '</th>'."\n";
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/tankorCsoport.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/tankorCsoport.phtml
index dda6a6dc..aff9a3df 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/tankorCsoport.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/tankorCsoport.phtml
@@ -123,7 +123,7 @@
 
 	formBegin(array('class'=>'csoportKereses'));
 
-	echo '<input type="hidden" name="action" value="tankorCsoportokKeresese" />'."\n";
+	echo '<input type="hidden" name="action" value="tankorCsoportHozzarendesTorles" />'."\n";
 	echo '<input type="hidden" name="osztalyId" value="'.$osztalyId.'" />'."\n";
 
 	echo '<table>'."\n";
@@ -133,19 +133,28 @@
 	    echo '</tr>'."\n";
 	    foreach ($ADAT['tankorCsoportAdat'] as $csoportId => $TANKORCSOPORT) {
 		echo '<tr>'."\n";
-		    echo '<th>'.$TANKORCSOPORT[0]['csoportNev'].'</th>';
+		    echo '<th class="tankorCsoportAdat" data-tankorcsoportid="'.$csoportId.'">'.$TANKORCSOPORT[0]['csoportNev'].'</th>';
 		    echo '<th>'.$csoportId.'</th>';
 		    echo '<td>';
 		    for ($i=0; $i<count($TANKORCSOPORT); $i++) {
 			$D = $TANKORCSOPORT[$i];
+			if ($D['tankorId']>0) {
+			echo '<input type="checkbox" name="hozzarendelesMegszuntetes[]" value="'.$csoportId.':'.$D['tankorId'].'" />';
 			echo '<span class="tankorAdat" data-tankorid="'.$D['tankorId'].'" style="padding:4px 2px;">'.$D['tankorNev'].'</span>';
-
+			}
 		    }
 		    echo '</td>';
 		echo '</tr>'."\n";
 	    }
+	    echo '<tr>';
+		echo '<th colspan="3">';
+		    echo '<input type="submit" value="A kijelölt hozzárendelések törlése" />';
+		echo '</th>';
+	    echo '</tr>'."\n";
+
 	echo '</table>'."\n";
 
+
 	formEnd();
 
     }
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/admin/tanevek.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/admin/tanevek.jquery.min.js
new file mode 100644
index 00000000..0f326864
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/admin/tanevek.jquery.min.js
@@ -0,0 +1,89 @@
+$(function() {
+
+    $('input.date').change(function() {
+
+	var ujSzemeszter_1_kezdesDt = $('#ujSzemeszter_1_kezdesDt').datetimepicker('getDate');
+	var ujSzemeszter_1_zarasDt = $('#ujSzemeszter_1_zarasDt');
+	var ujSzemeszter_2_kezdesDt = $('#ujSzemeszter_2_kezdesDt');
+	var ujSzemeszter_2_zarasDt = $('#ujSzemeszter_2_zarasDt');
+
+    });
+
+    var ujSzemeszter_1_kezdesDt = $('#ujSzemeszter_1_kezdesDt');
+    var ujSzemeszter_1_zarasDt = $('#ujSzemeszter_1_zarasDt');
+    var ujSzemeszter_2_kezdesDt = $('#ujSzemeszter_2_kezdesDt');
+    var ujSzemeszter_2_zarasDt = $('#ujSzemeszter_2_zarasDt');
+
+    ujSzemeszter_1_kezdesDt.datetimepicker('option', 'onSelect',
+        function (selectedDateTime) {
+            ujSzemeszter_1_zarasDt.datetimepicker('option', 'minDate', ujSzemeszter_1_kezdesDt.datetimepicker('getDate') );
+        }
+    );
+    ujSzemeszter_1_kezdesDt.datetimepicker('option', 'onClose',
+        function(dateText, inst) {
+            if (ujSzemeszter_1_zarasDt.val() != '') {
+                var testStartDate = ujSzemeszter_1_kezdesDt.datetimepicker('getDate');
+                var testEndDate = ujSzemeszter_1_zarasDt.datetimepicker('getDate');
+                if (testStartDate > testEndDate)
+                    ujSzemeszter_1_zarasDt.datetimepicker('setDate', testStartDate);
+            } else {
+                ujSzemeszter_1_zarasDt.val(dateText);
+            }
+        }
+    );
+    ujSzemeszter_1_zarasDt.datetimepicker('option', 'onSelect',
+        function (selectedDateTime) {
+            ujSzemeszter_1_kezdesDt.datetimepicker('option', 'maxDate', ujSzemeszter_1_zarasDt.datetimepicker('getDate') );
+            ujSzemeszter_2_kezdesDt.datetimepicker('option', 'minDate', ujSzemeszter_1_zarasDt.datetimepicker('getDate') );
+        }
+    );
+    ujSzemeszter_1_zarasDt.datetimepicker('option', 'onClose',
+        function(dateText, inst) {
+            if (ujSzemeszter_1_kezdesDt.val() != '') {
+                var testStartDate = ujSzemeszter_1_kezdesDt.datetimepicker('getDate');
+                var testEndDate = ujSzemeszter_1_zarasDt.datetimepicker('getDate');
+                if (testStartDate > testEndDate)
+                    ujSzemeszter_1_kezdesDt.datetimepicker('setDate', testEndDate);
+            } else {
+                ujSzemeszter_1_kezdesDt.val(dateText);
+            }
+        }
+    );
+
+    ujSzemeszter_2_kezdesDt.datetimepicker('option', 'onSelect',
+        function (selectedDateTime) {
+            ujSzemeszter_2_zarasDt.datetimepicker('option', 'minDate', ujSzemeszter_2_kezdesDt.datetimepicker('getDate') );
+            ujSzemeszter_1_zarasDt.datetimepicker('option', 'maxDate', ujSzemeszter_2_kezdesDt.datetimepicker('getDate') );
+        }
+    );
+    ujSzemeszter_2_kezdesDt.datetimepicker('option', 'onClose',
+        function(dateText, inst) {
+            if (ujSzemeszter_2_zarasDt.val() != '') {
+                var testStartDate = ujSzemeszter_2_kezdesDt.datetimepicker('getDate');
+                var testEndDate = ujSzemeszter_2_zarasDt.datetimepicker('getDate');
+                if (testStartDate > testEndDate)
+                    ujSzemeszter_2_zarasDt.datetimepicker('setDate', testStartDate);
+            } else {
+                ujSzemeszter_2_zarasDt.val(dateText);
+            }
+        }
+    );
+    ujSzemeszter_2_zarasDt.datetimepicker('option', 'onSelect',
+        function (selectedDateTime) {
+            ujSzemeszter_2_kezdesDt.datetimepicker('option', 'maxDate', ujSzemeszter_2_zarasDt.datetimepicker('getDate') );
+        }
+    );
+    ujSzemeszter_2_zarasDt.datetimepicker('option', 'onClose',
+        function(dateText, inst) {
+            if (ujSzemeszter_2_kezdesDt.val() != '') {
+                var testStartDate = ujSzemeszter_2_kezdesDt.datetimepicker('getDate');
+                var testEndDate = ujSzemeszter_2_zarasDt.datetimepicker('getDate');
+                if (testStartDate > testEndDate)
+                    ujSzemeszter_2_kezdesDt.datetimepicker('setDate', testEndDate);
+            } else {
+                ujSzemeszter_2_kezdesDt.val(dateText);
+            }
+        }
+    );
+
+});
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/import/tantargyFelosztas.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/import/tantargyFelosztas.jquery.min.js
index f1a2f730..84d9a911 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/import/tantargyFelosztas.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/import/tantargyFelosztas.jquery.min.js
@@ -6,6 +6,9 @@ $(function() {
 	    cls = element.val();
 	    $('table.ttf tr.'+element.val()).toggle();
     });
-});
 
 
+    $('table.ttf button.nevsorSzinkron_btn').bind('click', function() {
+	$('table.ttf tbody input[type="checkbox"].nevsorSzinkronizal').prop( "checked", true );
+    });
+});
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 fd9e8336..d35c38c7 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
@@ -113,6 +113,19 @@ $(function() {
 	
     });
 
+    $(document).on('click', '.tankorCsoportAdat', function(event) {
+        element = $(event.target);
+	var elementData = element.data();
+	var ID = '';
+	if ( elementData.hasOwnProperty('tankorcsoportid')==true ) {
+    	    ID = element.data('tankorcsoportid');
+	} else if ( $(this).data().hasOwnProperty('tankorcsoportid')==true ) {
+    	    ID = $(this).data('tankorcsoportid');
+	}
+    	if (ID!='') ajaxGetTankorCsoportAdat(ID);
+	
+    });
+
     $(document).on('click', '.osztalyAdat', function(event) {
         element = $(event.target);
 	var elementData = element.data();
@@ -289,6 +302,22 @@ ajaxGetTankorAdat = function(tankorId) {
                     //console.log(jqXHR);
     });
 }
+ajaxGetTankorCsoportAdat = function(tankorCsoportId) {
+    postData = { 'tankorCsoportId':tankorCsoportId, 'mayorToken': ($('body').data('mayortoken')) }
+    $.ajax({
+                    type: "POST",
+                    url: "index.php?page=naplo&sub=tools&f=getTankorCsoportAdat&policy=private&skin=ajax&sessionID="+$('body').data('sessionid'),
+                    data: postData,
+                    dataType: 'json'
+    }).done(function( msg, status, jqXHR ) {
+                    processJSONTankorCsoportAdat(msg);
+            	    updateSalt(jqXHR.getResponseHeader('Etag'));
+		    mayorNaploEventHandlers();
+    }).fail(function( jqXHR, textStatus, errorThrown ) {
+		    //console.log('hiba történt!'+textStatus);
+                    //console.log(jqXHR);
+    });
+}
 ajaxGetOsztalyAdat = function(osztalyId) {
     postData = { 'osztalyId':osztalyId, 'mayorToken': ($('body').data('mayortoken')) }
     $.ajax({
@@ -642,14 +671,20 @@ processJSONTanarAdat = function( adat ) {
 	    if (adat['tovabbkepzesForduloDt']!='') content += '<li>Továbbképzés forduló dátum: '+adat['tovabbkepzesForduloDt']+'</li>';
 	    content += '</ul>';
 	}
-	content += '<span style="display:none" id="mayorsidewindowtype" data-mayorsidewindowtype="tanar"></span>';
+
 	if (    $('#updateWindowSide').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtype')!='tanar' ) {
     	    $('#updateWindowSideSubTitle').html('<a href="'+href({'page':'naplo','sub':'intezmeny','f':'tanar','tanarId':adat['tanarId']})+'">'+adat['tanarNev']+'</a>');
     	    $('#updateWindowSideSubContent').html(content);
+	    $('#mayorsidewindowtype').data('mayorsidewindowtypesub','tanar');
     	    $('#updateWindowSideSub').addClass('nyitva');
 	} else {
+	    content += '<span style="display:none" id="mayorsidewindowtype" data-mayorsidewindowtype="tanar"></span>';
+	    if ($('#updateWindowSideSub').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtypesub')!='tanar') {
+		$('#updateWindowSideSub').removeClass('nyitva');
+	    }
     	    $('#updateWindowSideTitle').html('<a href="'+href({'page':'naplo','sub':'intezmeny','f':'tanar','tanarId':adat['tanarId']})+'">'+adat['tanarNev']+'</a>');
     	    $('#updateWindowSideContent').html(content);
+	    $('#mayorsidewindowtype').data('mayorsidewindowsubtype','');
     	    $('#updateWindowSide').addClass('nyitva');
 	}
 
@@ -814,15 +849,18 @@ processJSONOsztalyAdat = function(adat) {
     content += '<div id="mayorNaviIconHolder">';
 	content += '<div class="mayorNaviIcon"><a href="'+href({'page':'naplo','sub':'orarend','f':'orarend','osztalyId':adat['osztalyId']})+'"><span class="icon-th"></span><br/>Órarend</a></div>';
 	content += '<div class="mayorNaviIcon"><a href="'+href({'page':'naplo','sub':'haladasi','f':'haladasi','osztalyId':adat['osztalyId']})+'"><span class="icon-file-edit-alt"></span><br/>Haladási</a></div>';
+	content += '<div class="mayorNaviIcon"><a href="'+href({'page':'naplo','sub':'intezmeny','f':'osztaly','osztalyId':adat['osztalyId']})+'"><span class="icon-cog"></span><br/>Beállítások</a></div>';
     content += '</div>';
 
+    title = '<a href="'+  href({'page':'naplo','sub':'intezmeny','f':'osztaly','osztalyId':adat['osztalyId']}) +'">'+adat['nev']+'</a>';
+
     content += '<span style="display:none" id="mayorsidewindowtype" data-mayorsidewindowtype="osztaly"></span>';
     if (    $('#updateWindowSide').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtype')!='osztaly' ) {
-	$('#updateWindowSideSubTitle').html(adat['nev']);
+	$('#updateWindowSideSubTitle').html(title);
 	$('#updateWindowSideSubContent').html(content);
 	$('#updateWindowSideSub').addClass('nyitva');    
     } else {
-	$('#updateWindowSideTitle').html(adat['nev']);
+	$('#updateWindowSideTitle').html(title);
 	$('#updateWindowSideContent').html(content);
 	$('#updateWindowSide').addClass('nyitva');    
     }
@@ -865,6 +903,14 @@ processJSONTankorAdat = function(adat) {
 	content += '<li>óraszám: '+adat['oraszam']+'</li>';
     content += '</ul>';
 
+    if (typeof(adat.tankorCsoport) !== 'undefined') if (adat.tankorCsoport.length>0) { // todo
+	content += '<h3>Tankörcsoport ('+adat.tankorCsoport.length+')</h3>';
+	content += '<ul>';
+	for (i=0; i<adat.tankorCsoport.length; i++) {
+	    content += '<li>'+adat.tankorCsoport[i].csoportNev+'</li>';
+	}
+	content += '</ul>';
+    }
     if (adat.tankorBlokk.length>0) {
 	content += '<h3>Tankörblokk ('+adat.tankorBlokk.length+')</h3>';
 	content += '<ul>';
@@ -891,14 +937,16 @@ processJSONTankorAdat = function(adat) {
     content += '<h3>Osztályok</h3>';
     content += '<ul>';
 	if (adat.osztalyIds!=undefined) {
-	for (i=0; i<adat.osztalyIds.length; i++) {
+	  for (i=0; i<adat.osztalyIds.length; i++) {
 	    osztalyId = adat.osztalyIds[i];
 	    for (j=0; j<adat.osztalyok.length; j++) {
 		var index = adat.osztalyok[j].osztalyId
 		if (index == osztalyId) osztalyAdat = adat.osztalyok[j];
 	    }
-	    content += '<li><a href="'+  href({'page':'naplo','sub':'intezmeny','f':'osztaly','osztalyId':osztalyId}) +'">'+osztalyAdat.osztalyJel+' ('+osztalyAdat.leiras+') '+osztalyAdat.osztalyfonokNev+'</a></li>';
-	}
+	    content += '<li class="osztalyAdat" data-osztalyid="'+osztalyId+'">'+osztalyAdat.osztalyJel+' ('+osztalyAdat.leiras+') '+osztalyAdat.osztalyfonokNev+'</a>';
+	    // content += '<a href="'+  href({'page':'naplo','sub':'intezmeny','f':'osztaly','osztalyId':osztalyId}) +'"> <span class="icon-cog"> </a></li>';
+	    content += '</li>';
+	  }
 	}
     content += '</ul>';
 
@@ -915,20 +963,55 @@ processJSONTankorAdat = function(adat) {
 	}
     content += '</ul>';
 
-    content += '<span style="display:none" id="mayorsidewindowtype" data-mayorsidewindowtype="tankor"></span>';
     if (    $('#updateWindowSide').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtype')!='tankor' ) {
-//	$('#updateWindowSideSubTitle').html(adat['tankorNev']);
         $('#updateWindowSideSubTitle').html('<a href="'+href({'page':'naplo','sub':'intezmeny','f':'tankor','tankorId':adat['tankorId']})+'">'+adat['tankorNev']+'</a>');
 	$('#updateWindowSideSubContent').html(content);
-	$('#updateWindowSideSub').addClass('nyitva');    
+	$('#mayorsidewindowtype').data('mayorsidewindowtypesub','tankor');
+	$('#updateWindowSideSub').addClass('nyitva');
     } else {
-//	$('#updateWindowSideTitle').html(adat['tankorNev']);
+	if (    $('#updateWindowSideSub').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtypesub')!='tankor' ) {
+	    $('#updateWindowSideSub').removeClass('nyitva');
+	}
+        content += '<span style="display:" id="mayorsidewindowtype" data-mayorsidewindowtype="tankor" data-mayorsidewindowtypesub=""></span>';
         $('#updateWindowSideTitle').html('<a href="'+href({'page':'naplo','sub':'intezmeny','f':'tankor','tankorId':adat['tankorId']})+'">'+adat['tankorNev']+'</a>');
 	$('#updateWindowSideContent').html(content);
+	$('#mayorsidewindowtype').data('mayorsidewindowsubtype','');
 	$('#updateWindowSide').addClass('nyitva');    
     }
+    // IDE
+
+}
+
+processJSONTankorCsoportAdat = function(adat) {
+
+	if (adat.visibleData != true) return false;
+        var content = '';
+
+	content += '<div id="mayorNaviIconHolder">';
+	content += '</div>';
+
+    if (adat.tankorCsoportTankorei.length>0) {
+	content += '<h3>Tankörök ('+adat.tankorCsoportTankorei.length+')</h3>';
+	content += '<ul>';
+	for (i=0; i<adat.tankorCsoportTankorei.length; i++) {
+	    var _x = adat.tankorCsoportTankorei[i].tankorAdat[adat.tankorCsoportTankorei[i].tankorId][0];
+	    var _y = adat.tankorCsoportTankorei[i].tankorAdat[adat.tankorCsoportTankorei[i].tankorId][1];
+	    content += '<li class="tankorAdat" data-tankorid="'+_x.tankorId+'">'+_x.tankorNev+' '+_x.oraszam+'ó '+_y.oraszam+'ó</li>';
+	}
+	content += '</ul>';
+    }
 
     // IDE
+    content += '<span style="display:none" id="mayorsidewindowtype" data-mayorsidewindowtype="tankorCsoport"></span>';
+    if (    $('#updateWindowSide').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtype')!='tankorCsoport' ) {
+        $('#updateWindowSideSubTitle').html('<a href="'+href({'page':'naplo','sub':'tanev','f':'tankorCsoport','tankorCsoportId':adat['tankorCsoportId']})+'">'+adat['tankorCsoportNev']+' ('+adat['tankorCsoportId']+')</a>');
+	$('#updateWindowSideSubContent').html(content);
+	$('#updateWindowSideSub').addClass('nyitva');    
+    } else {
+        $('#updateWindowSideTitle').html('<a href="'+href({'page':'naplo','sub':'tanev','f':'tankorCsoport','tankorCsoportId':adat['tankorCsoportId']})+'">'+adat['tankorCsoportNev']+' ('+adat['tankorCsoportId']+')</a>');
+	$('#updateWindowSideContent').html(content);
+	$('#updateWindowSide').addClass('nyitva');    
+    }
 
 }
 
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.jquery.min.js
index ceca5176..7beb8aea 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.jquery.min.js
@@ -2,11 +2,41 @@ $(function() {
     $('#haladasiModositando').bind('click', function(event) {
 	$target = $(event.target);
 	$target.parent('div').toggleClass('haladasiModositando');
-	//alert('Ez a funkció egy új fejlesztés!');
-	//console.log($target);
     });
 
     $('table.orarend tbody tr td input[type=checkbox]').click(function() {
 	$(this).closest('div').toggleClass('torlesreJelolve');
     }); 
+
+    $('#tankorAjanlo').click(function() {
+	$('table#orarend tbody tr td select[name="ORARENDPLUSZ[]"').each(function() {
+	    selectElement = this;
+	    $(this).find('option[data-hint="1"]').attr('selected','selected');
+
+	})
+    }); 
+
+    $('div span.tankorAdat').each(function(a) {
+	    elem = $(this);
+	    // v = parseFloat($('#sumOraszam').val()) + parseFloat(elem.data('tankorevesoraszam'));
+	    v = parseInt($('#sumOraszam').val()) + 1;
+	    $('#sumOraszam').val(v);
+    });
+
+    $('div.orarendModositoToolbox table.tanarTankor tr td.tankorAdat').hover(function(event) {
+	$target = $(event.target);
+	$('div.oraKartya span[data-tankorid="'+$target.data('tankorid')+'"]').toggleClass('highlight');
+	$('div.oraKartya span[data-tankorid="'+$target.data('tankorid')+'"]').parent('div').toggleClass('highlight');
+    });
+    $('table#orarend span').hover(function(event) {
+	$target = $(event.target);
+	$('div.oraKartya span[data-tankorid="'+$target.data('tankorid')+'"]').toggleClass('highlight');
+	$('div.oraKartya span[data-tankorid="'+$target.data('tankorid')+'"]').parent('div').toggleClass('highlight');
+    });
+
+    $('#tankorHelper').bind('click', function(event) {
+	$('div.orarendModositoToolbox table.tanarTankor').toggle();
+    });
+
+
 });
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.js
index 25ab35a1..e69de29b 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.js
@@ -1,80 +0,0 @@
-/*
-Event.observe(window, 'load', myPSFLoader, false);
-
-function myPSFLoader(evt) {
-
-    doOnChange = function(event) {
-	var element = $(Event.element(event));
-        if (element.hasClassName('orarendTankor')) {
-	    var idArray = element.getAttribute('id').split('_');
-	    var id = idArray[1]+'_'+idArray[2]+'_'+idArray[3];
-	    var orarendTankor = element.up('table').getElementsBySelector('select.orarendTankor');
-	    var ertek = $F(element);
-	    $A(orarendTankor).each(
-                function (elem, index) {
-		    if (elem.getAttribute('id').include(id)) {
-			elem.setValue(ertek);
-		    }
-                }
-            );  
-
-        }
-    }
-
-    Event.observe(document.body, 'mayor:change',  doOnChange);
-
-    Event.observe(document.body, 'change', doOnChange);
-
-//    Sortable.create('test', { tag:'div', overlap:'horizontal',constraint:false });
-    Sortable.create('orarend', { tag:'div', only:'draggable' , 
-	tree: true, 
-	treeTag: 'div',
-	overlap:'vertical',
-	dropOnEmpty:true,
-	constraint:false,
-	onEnd: function(){
-    	    alert('onEnd');
-	},
-	onChange:function(e){
-//	    $('infoBox').update( Form.Element.getValue( e.down('input')) );
-
-	    e.addClassName('moved');
-
-	    e.down('input').checked=false;
-	    e.down('input').hide();
-
-//	    e.down('input').value='test';
-
-	    // ez az eredeti helye (het.nap.ora.tanarId)
-	    $('infoBox1').update( (e.down('input').value) );
-	    // ez az új helye
-	    $('infoBox2').update( e.up('td').getAttribute('id') );
-
-	} });
-
-//    new Draggable('draggable', { revert: true });
-//    Droppables.add('droppable', { accept: 'draggable' });
-
-//    Sortable.create(
-//        'sortable',
-//        {onUpdate:function(){$('debug').update(++callsToOnUpdate+' call(s) to onUpdate')}}
-//    );
-
-//    $('targySelect').disable();
-//    $('targySelect').hide(); $('mozgat').hide();
-//    $('action').value='ujSorrend';
-//    $('targyUl').show(); $('submit').show();
-
-
-//    Sortable.create(
-//	"draggable",
-//	{dropOnEmpty:true,handle:'handle',containment:["draggable"],constraint:false,onChange:function(){}}
-//    );
-
-
-//    $('serialize').observe('click', function(event) {
-//        alert(Sortable.serialize('sortable'));
-//    });
-
-}
-*/
\ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
index b5a27219..5ec0ede5 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
@@ -21,15 +21,18 @@ $(function() {
 	});
        var chart = new google.visualization.Calendar(document.getElementById('chart_div'));
        var options = {
-	    title: "Dolgozatok",
-	    height: 350,
+	    title: "Dolgozatok (terhelés)",
 	    colorAxis: {colors:['cornflowerblue','#ff0000']},
+	    calendar: {
+		daysOfWeek: 'VHKSCPS'
+	    }
        };
        chart.draw(data, options);
     }
 
 
-/*    google.charts.load('current', {'packages':['timeline']});
+/*
+    google.charts.load('current', {'packages':['timeline']});
     google.charts.setOnLoadCallback(drawChart);
     function drawChart() {
       var data = new google.visualization.dataTable();