2018/Feb/28 -i állapot hozzáadva, mint a módosítások kiindulási állapota

11 files changed, 672 insertions, 0 deletions

diff --git a/mayor-orig/www/skin/ajax/base/html/alert.phtml b/mayor-orig/www/skin/ajax/base/html/alert.phtml
new file mode 100644
index 00000000..e81b75ed
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/base/html/alert.phtml
@@ -0,0 +1,25 @@
+<?php
+/*
+    Module: base
+    
+    js_alert($alert)
+    html_alert($alert)
+
+    AJAX változat: csak akkor írja ki az alert-et, ha van $_GET['showAlert'] be van állítva...
+*/
+
+// ------------------------------------------------------------------- //
+// Az $alert két részből áll: típus:hiba                               //
+// típus: alert   : javaScript alert                                   //
+//	  message : hibaüzenet után az oldal betöltődik                //
+//	  page    : hibaüzenet után az oldal nem töltődik be           //
+//	  info    : információs üzenet                                 //
+// ------------------------------------------------------------------- //
+    function html_alert($alert='') {
+
+	$_SESSION['alert'] = array();
+	return true;
+
+    }
+
+?>
\ No newline at end of file
diff --git a/mayor-orig/www/skin/ajax/base/html/base.phtml b/mayor-orig/www/skin/ajax/base/html/base.phtml
new file mode 100644
index 00000000..cfa12036
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/base/html/base.phtml
@@ -0,0 +1,101 @@
+<?php
+/*
+    Module: base
+    
+    html_base($sessionID,$page,$sub,$f,$lang,$skin,$MENU)
+    html_head($page,$f,$lang,$skin)
+    html_mayor_head($sessionID,$page,$sub,$f,$lang,$MENU,$skin = 'default')
+    html_mayor_foot()
+    //page($page,$sub,$f,$lang,$skin) --> base.php
+    putValidXHTML()
+*/
+
+
+	/* Egy JSON példa
+	    echo '{ "action" : [ '
+	    .'{ "func" : "alert", "param" : [ "Helló", "World" ] }, '
+	    .'{ "func" : "update", "param" : [ { "id" : "updateForm", "content" : "Helló Update" } ]}, '
+	    .'{ "func" : "hide", "param" : [ "settings" ] },'
+	    .'{ "func" : "show", "param" : [ "updateWindow" ] },'
+	    .'{ "func" : "remove", "param" : [ "head" ] },'
+	    .'{ "func" : "removeClass", "param" : [ { "id" : "jegy-1", "class" : "jegy1" } ] },'
+	    .'{}],'
+	    .' "name" : "Violet", "occupation" : "character" }';
+	*/
+
+
+// -------------------------------------------------------------------
+// html_base() : a html oldal szerkezete
+// -------------------------------------------------------------------
+
+function html_base($sessionID,$policy,$page,$sub,$f,$lang,$skin,$MENU) {
+
+    global $_JSON;
+
+    if ($_JSON['result'] === false) @header("HTTP/1.1 400 Bad Request");
+    else @header("HTTP/1.1 200 OK");
+
+    @header('Content-type: application/json; charset=utf-8');
+    @header("Etag: ".__SALTVALUE.'-'.__SALTNAME.'-'.$_SESSION['mayorToken']); // ajax request esetén innen tudható a _SALTVALUE
+
+    _httpHeader();
+
+    if ( (!is_array($_JSON)?false:json_encode($_JSON))  === false) {
+	ob_start();
+	    define('_UNIQUE', uniqid());
+	    //echo '<div id="alertMsg'._UNIQUE.'"></div>';
+	    page($page,$sub,$f,$lang,$skin,$policy);
+	$_JSON['html'] = ob_get_contents();
+	ob_end_clean();
+    }
+    if (is_array($_SESSION['alert']) && count($_SESSION['alert'])>0) {
+	for($i=0; $i<count($_SESSION['alert']); $i++) {
+	    
+	    /* állítsuk össze a hibaüzenetet */
+	    $_E = explode(':', $_SESSION['alert'][$i]);	    
+	    $_JSON['alert'][] = $_E;
+	}
+	$_JSON['alertHTML'] = _html_base_alert($_SESSION['alert']); // UJ
+    }
+    echo json_encode($_JSON);
+    $_SESSION['alert'] = array();
+
+}
+
+function _html_base_alert($alert) {
+    if (is_array($alert))
+	foreach($alert as $a) {
+            $param = array();
+            $tmp = explode(':', $a);
+            $aType = readVariable($tmp[0], 'enum', 'message', array('message','info','page')); $aCode = $tmp[1];
+            for ($p = 2; $p < count($tmp); $p++) $param[] = htmlspecialchars($tmp[$p]);
+            $pstr = '';
+            // preparing $msg
+            if (!isset($ALERT_MSG[$aCode]) || $ALERT_MSG[$aCode] == '')
+                $msg = $ALERT_MSG['default'].' (<span class="alertParam">'.$aType.':'.$aCode.')</span>';
+            else $msg = $ALERT_MSG[$aCode];
+
+            // paraméter behelyettesítés
+            for($i = 0; $i < count($param); $i++) {
+                $_msg = $msg;
+                $msg = @str_replace("%$i%",'<span class="alertParam">'.($param[$i]).'</span>',$msg);
+                if ($param[$i] != '' and $_msg == $msg) $pstr .= '<span class="alertParam">'.($param[$i]).'</span>,';
+            }
+            if ($pstr != '') $msg .= ' (' . substr($pstr,0,-1) . ')';
+            if (($aType == 'message') or ($aType == 'page')) {
+                $title = _ERROR;
+                $class = 'errorMsg';
+                if ($aType == 'page') $showPage = false;
+            } else {
+                $title = _INFORMATION;
+                $class = 'infoMsg';
+            }
+            $msg = '<span>'.$title.':</span> ' . $msg;
+            $showPage .= '<div class="'.$class.'">'.str_replace('***','<br/>',$msg).'</div>'."\n";
+        }
+
+        return $showPage;
+
+}
+
+?>
diff --git a/mayor-orig/www/skin/ajax/module-naplo/css/naplo.css b/mayor-orig/www/skin/ajax/module-naplo/css/naplo.css
new file mode 100644
index 00000000..f8b97d3c
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/module-naplo/css/naplo.css
@@ -0,0 +1,4 @@
+
+div.beirasAdatok { font-size:large; margin:auto; width:90%; text-align: center; }
+div.beirasAdatok a { text-decoration: none; color: inherit; }
+div.beirasAdatok a:hover { text-decoration: none; color: #777777; }
diff --git a/mayor-orig/www/skin/ajax/module-naplo/css/orarend/orarend.css b/mayor-orig/www/skin/ajax/module-naplo/css/orarend/orarend.css
new file mode 100644
index 00000000..222664e5
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/module-naplo/css/orarend/orarend.css
@@ -0,0 +1,68 @@
+
+table.orarend {
+    font-size:10px;
+}
+table.orarend tr th {
+    background-color: #eeeeee;
+    color: #999999;
+    border-width: 0px 0px 0px 0px;
+    width:1%;
+    height:30px;
+    font-weight: normal;
+    border-color: #ddd;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+
+}
+table.orarend thead tr th {
+    background-color: #889999;
+    color: white;
+    height:1em;
+
+}
+table.orarend thead tr th.spec {
+    background-color: red;
+}
+
+table.orarend tr td {
+    text-align: center;
+    border-color: #ddd;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    width:18%;
+}
+
+div.unfinished {
+    background-color: yellow;
+}
+
+    table.orarend tbody tr td hr { width: 80% }
+    div.normál {}
+    div.plusz {
+	background-color: #eeccee;
+    }
+    div.elmarad {
+	color: white;
+	background-color: black;
+    }
+    div.elmarad_máskor {
+	color: white;
+	background-color: #555555;
+    }
+    div.normál_máskor {
+	color: white;
+	background-color: #776699;
+    }
+    div.felügyelet {
+	background-color: #bbaac0;
+    }
+    div.helyettesítés {
+	background-color: #ccffcc;
+    }
+    div.összevonás {
+	background-color: #aabbc0;
+    }
+    span.helyett {
+	color: gray;
+	text-decoration: line-through;
+    }
diff --git a/mayor-orig/www/skin/ajax/module-naplo/html/admin/tanevek.phtml b/mayor-orig/www/skin/ajax/module-naplo/html/admin/tanevek.phtml
new file mode 100644
index 00000000..9f32e72e
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/module-naplo/html/admin/tanevek.phtml
@@ -0,0 +1,9 @@
+<?php
+
+	function putUjTanevForm() {}
+
+	function putTanevSzemeszterekForm() {}
+
+	function putTanevAktivalForm() {}
+
+?>
diff --git a/mayor-orig/www/skin/ajax/module-naplo/html/base.phtml b/mayor-orig/www/skin/ajax/module-naplo/html/base.phtml
new file mode 100644
index 00000000..c3fe9d59
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/module-naplo/html/base.phtml
@@ -0,0 +1,6 @@
+<?php
+
+    // including base
+      include('skin/classic/module-naplo/html/share/face.phtml');
+
+?>
diff --git a/mayor-orig/www/skin/ajax/module-naplo/html/bejegyzesek/info.phtml b/mayor-orig/www/skin/ajax/module-naplo/html/bejegyzesek/info.phtml
new file mode 100644
index 00000000..94c12c57
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/module-naplo/html/bejegyzesek/info.phtml
@@ -0,0 +1,11 @@
+<?php
+
+    function putBejegyzesInfo($ADAT) {
+	echo '<div>';
+	    echo _BEJEGYZESEK_SZAMA.': ';
+	    if ($ADAT['db'] > 0) echo '<span style="color: red;">'.$ADAT['db'].'</span>';
+	    else echo $ADAT['db'];
+	echo '</div>';
+    }
+
+?>
diff --git a/mayor-orig/www/skin/ajax/module-naplo/html/haladasi/haladasi.phtml b/mayor-orig/www/skin/ajax/module-naplo/html/haladasi/haladasi.phtml
new file mode 100644
index 00000000..1511b957
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/module-naplo/html/haladasi/haladasi.phtml
@@ -0,0 +1,162 @@
+<?php
+/*
+    function putHaladasiBejegyzesek($data, $tankorId, $osztalyId, $tanarId, $title, $diakId, $order, $ADAT)
+	|- function putTankorNap($dt, $dNap, $doga, $order)
+	    |-function putHaladasiDolgozat($dt,$doga)
+	    |-function putTankorOra($dOra)
+    function putHetesForm($ADAT)
+*/
+##
+# Haladási naplo megjelenítése
+##
+
+    function putHaladasiBejegyzesek($ADAT) {
+
+	global $_TANEV;
+
+	$title = $ADAT['title'];
+	$data  = $ADAT['haladasi'];
+	$order = $ADAT['order'];
+	$tankorId = $ADAT['tankorId'];
+	$osztalyId = $ADAT['osztalyId'];
+	$tanarId = $ADAT['tanarId'];
+	$diakId = $ADAT['diakId'];
+
+        echo '<input type="hidden" name="tankorId" id="haladformTankorId" value="" />'."\n";
+
+	echo '<table class="haladasiNaplo" align="center" cellpadding="1" cellspacing="1">'."\n";
+
+	echo '<thead>'."\n";
+	echo '<tr>';
+		echo '<th colspan="3">';
+		echo '</th>';
+		echo '<th>'._TANAR.'</th><th>'._ORASZAM.'</th><th>'._TANANYAG.'</th>';
+	echo '</tr>'."\n";
+	echo '</thead>'."\n";
+	echo '<tfoot>'."\n";
+                echo '<tr><th colspan="6">';
+//                    if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) echo '<input class="gomb" type="submit" name="lapoz" value="<<" tabindex="5" />'."\n";
+                    echo ' '._IDOSZAK.': '.str_replace('-','.',_SHOW_DAYS_FROM) . '. - '. str_replace('-','.', _SHOW_DAYS_TO) .'. '."\n";
+//                    if (_SHOW_DAYS_TO < date('Y-m-d'))  echo '<input class="gomb" type="submit" name="lapoz" value=">>" tabindex="6" />'."\n";
+                echo '</th></tr>'."\n";
+	echo '</tfoot>'."\n";
+	
+	$toTime = strtotime(_SHOW_DAYS_TO);
+	$fromTime = strtotime(_SHOW_DAYS_FROM);
+
+	    for ($time = $toTime; $time >= $fromTime; $time = strtotime('-1 day',$time)) {
+		$dt = date('Y-m-d',$time);
+		$count = count($data[$dt]);
+		if ($count > 0) {
+//		    echo '<tbody class="parosNap">';
+		    putTankorNap($dt, $data[$dt], $data['dolgozatok'], $order);
+//		    echo '</tbody>'."\n";
+		}
+	    }
+
+	echo '</table>'."\n";
+
+    }
+
+
+
+
+    function putTankorNap($dt, $dNap, $doga, $order) {
+
+	$time = strtotime($dt);
+	$count = count($dNap);
+	
+//	if (date('w',$time) % 2 == 0) echo '<tbody class="parosNap">'."\n";
+//	else echo '<tbody class="paratlanNap">'."\n";
+
+	putHaladasiDolgozat($dt,$doga);
+
+	for ($i=0; $i<$count; $i++) {
+	    putTankorOra($dNap[$count-$i-1]);
+	} // órák kiírása
+
+//	echo '</tbody>'."\n";
+
+    }
+
+
+    function putHaladasiDolgozat($dt,$doga) {
+
+	for ($i=0;$i<count($doga['tervezett'][$dt]);$i++) {
+	    $did = $doga['tervezett'][$dt][$i];
+	    echo '<tr>';
+	    echo '<td colspan="8" class="dolgozat">';
+		$href = href('index.php?page=naplo&sub=osztalyozo&f=dolgozat&dolgozatId='.$did);
+//		echo '<a href="'.$href.'">';
+	    	echo _BEJELENTETT_DOLGOZAT . ': '. $doga[$did]['dolgozatNev'];
+		echo ' (' ;
+		for ($j=0;$j<count($doga[$did]['tankor']);$j++) {
+		    if ($j != 0) echo ', ';
+		    echo $doga[$did]['tankor'][$j]['tankorNev'];
+		}
+		echo ')';
+//		echo '</a>';
+	    echo '</td>';
+	    echo '</tr>'."\n";
+	}
+
+    }
+
+
+    function putTankorOra($dOra) {
+
+        global $aHetNapjai;
+
+	$modosithatoOra = false;
+		
+	if (!in_array($dOra['tipus'],array('normál','normál máskor'))) {
+	    $tipus = nagybetus(substr($dOra['tipus'],0,1));
+	    $tr_class = ' class="helyettesit"';
+	} else {
+	    $tipus = '';
+	    $tr_class = '';
+	}
+
+	echo '<tr'.$tr_class.'>';
+
+	    echo '<td>'; 
+		echo str_replace('-','.',$dOra['dt']) .'. '. $aHetNapjai[date('w',strtotime($dOra['dt']))-1].' ';
+	    echo '</td>';
+	    echo '<td class="ora">';
+		echo $dOra['ora'].'.';
+	    echo '</td>'."\n";
+	    echo '<td>';
+		echo $tipus;
+//		echo $ADAT['terem'][$dOra['teremId']]['leiras'];
+	    echo '</td>'."\n";
+
+
+	    // ----- Tanör(ok) -------------------------------
+	    echo '<td>';
+		// Ha egy normál órának több tanára is van, és módosítható az óra, akkor lehet választani a tanárok közül
+		if (count($dOra['tanár']['id']) > 1 and $modosithatoOra) {
+		    $_SEL = array($dOra['kiId'] => 'selected="selected" ');
+		    echo '<select name="K_'.$dOra['oraId'].'">'."\n";
+		    for ($t=0;$t<count($dOra['tanár']['id']);$t++) {
+			echo '<option value="'.$dOra['tanár']['id'][$t].'" '.$_SEL[$dOra['tanár']['id'][$t]].'>';
+			echo $dOra['tanár'][$dOra['tanár']['id'][$t]]['cn'];
+			echo '</option>'."\n";
+		    }
+		    echo '</select>';
+		} else {
+		    echo $dOra['kiCn'];
+		}
+	    echo '</td>'."\n";
+
+	    echo '<td>';
+		echo $dOra['oraszam'];
+	    echo '</td>'."\n";
+
+	    echo '<td>'.$dOra['leiras'].'</td>'."\n";
+
+	echo '</tr>'."\n";
+    }
+
+    function putHetesForm($ADAT) { }
+
+?>
diff --git a/mayor-orig/www/skin/ajax/module-naplo/html/hianyzas/info.phtml b/mayor-orig/www/skin/ajax/module-naplo/html/hianyzas/info.phtml
new file mode 100644
index 00000000..2d206723
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/module-naplo/html/hianyzas/info.phtml
@@ -0,0 +1,18 @@
+<?php
+
+    function putDiakHianyzasInfo($ADAT) {
+	    foreach(array_reverse($ADAT) as $dt => $D) { if ($dt!='') break; }
+	    echo '<div style="text-align: center">';
+	    if ($dt == date('Y-m-d')) {
+		echo _MA.' '._AZ_ORAK.' '.$D['oranHianyzasSzazalek'].'%-n '._VOLT_HIANYZO.'.<br/>';
+		echo _MA.' '.$D['hianyzokSulyozva'].' '._DIAK.' '._HIANYZIK.'.';
+	    } else {
+		list($ev,$ho,$nap) = explode('-',$dt);
+		echo decimal_to_roman($ho).'. '.$nap.'. napon '._AZ_ORAK.' '.$D['oranHianyzasSzazalek'].'%-n '._VOLT_HIANYZO.'.<br/>';
+		echo decimal_to_roman($ho).'. '.$nap.'. napon '.$D['hianyzokSulyozva'].' '._DIAK.' '._HIANYZOTT.'.';
+	    }
+	    echo '</div>';
+	    //echo '<a href="'.href('index.php?page=naplo&sub=hianyzas&f=info&toSkin='._SKIN).'">'._TOVABB.'</a>';
+    }
+
+?>
diff --git a/mayor-orig/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml b/mayor-orig/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml
new file mode 100644
index 00000000..c2d3b6a1
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml
@@ -0,0 +1,120 @@
+<?php
+    function putKerelmek($ADAT) {
+
+	echo '<ol style="list-style-type:none; margin:0px; padding:0px;">';
+	for ($i = 0; $i < count($ADAT['kerelmek']); $i++) {
+
+	    if ($ADAT['kerelmek'][$i]['lezarasDt']!="") $_class = ' style="color: #777777;"' ;
+	    elseif ($ADAT['kerelmek'][$i]['jovahagyasDt']!="") $_class = ' style="background-color: rgb(200,255,200);"' ;
+	    else $_class = ' style="color: black;"' ;
+
+	    if (__VEZETOSEG || __NAPLOADMIN) {      
+		echo '<li><div style="font-style:italic; background-color:#dddddd; border-style: none none solid none; border-width:1px; border-color: #777777;">'.$ADAT['kerelmek'][$i]['userAccount'].' '.superdate($ADAT['kerelmek'][$i]['rogzitesDt']).': '.$ADAT['kerelmek'][$i]['kategoria'].'</div></li>';
+	    } else {
+		echo '<li '.$_class.'>';
+		echo '<div style="font-style:italic; background-color:#dddddd; border-style: none none solid none; border-width:1px; border-color: #777777;">'.$ADAT['kerelmek'][$i]['userAccount'].' '.superdate($ADAT['kerelmek'][$i]['rogzitesDt']).': '.$ADAT['kerelmek'][$i]['kategoria'].'</div>';
+		echo '- '.htmlspecialchars($ADAT['kerelmek'][$i]['szoveg']);
+		if ($ADAT['kerelmek'][$i]['valasz']!='')
+		    echo '<div style="font-weight:bold">- '.htmlspecialchars($ADAT['kerelmek'][$i]['valasz']).'</div>';
+		echo '</li>';
+	    }
+	}
+	echo '</ol>';
+
+    }
+
+    function putKerelmekValasszal($ADAT) {
+
+	$K = array('jh'=>0,'njh'=>0);
+	$MAX = 1;
+	$dbKerelem = count($ADAT['kerelmek']);
+	$show = false;
+	for ($i = 0; $i < count($ADAT['kerelmek']); $i++) {
+	    if ($ADAT['kerelmek'][$i]['jovahagyasDt']!='') {
+		$K['jh']++; 
+		// A kérelmek a rögzítés dátuma szerint rendezettek, nem a jóváhagyás dátuma szerint!
+		if (!isset($jdt) || strtotime($jdt) < strtotime($ADAT['kerelmek'][$i]['jovahagyasDt'])) $jdt = $ADAT['kerelmek'][$i]['jovahagyasDt']; 
+	    } else $K['njh']++;
+	    $show = true;
+	}
+        if ($show) {
+/*	echo '<div style="width:90%; margin:auto; border: solid 1px rgb(50,0,50);">';
+	echo '<div style="background-color:rgb(150,100,150); color: white; padding: 5px 10px; border-bottom: solid 1px white; font-weight:bold;">Kérelmek</div>';
+	echo '<div class="onClickHideShow" style="padding: 10px 10px; background-color: #eeeeee; border-bottom: solid 1px white; border-top: solid 1px rgb(50,0,50);">';
+	    echo "Várakozó kérelmek száma: ";
+	    echo $K['jh'] . ' + '. $K['njh'];
+	    if ($jdt !='') echo "<br/>Utolsó jóváhagyás: ".$jdt;
+	echo '</div>';
+	if (__NAPLOADMIN===true || __VEZETOSEG===true)
+	    echo '<div style="background-color:rgb(150,150,200); color: white; padding: 0px; font-weight:bold; text-align: right"><a style="text-decoration: none; display: block; color: white" href="'.href('index.php?page=naplo&sub=hibabejelento&f=admin',array('policy','lang','sessionID')).'">'.'tovább...'.'</a></div>';
+	echo '</div>';
+*/
+	}
+
+	echo '<div style="display:;">';
+	for ($i = 0; $i < $dbKerelem && $i<$MAX; $i++) {
+	    $_link = href('index.php?page=naplo&sub=hibabejelento&f=admin&kerelemId='.$ADAT['kerelmek'][$i]['kerelemId']);
+	    $_K = $ADAT['kerelmek'][$i];
+	    $kerelemId = $_K['kerelemId'];
+	    $_napja = round(((strtotime(date('Y-m-d H:i:s')) - strtotime($_K['rogzitesDt']))/(24*60*60)));
+	    if ($_napja>60) $_napjaBg = '#f00; outline: solid 2px orange;'; else if ($_napja>7) $_napjaBg = '#f44336; outline: solid 2px red; '; else $_napjaBg = '#aaa';
+	    if ($_K['lezarasDt']!='') {
+		$_color = "#888"; 
+		$_class="icon-paper-clip-alt";
+	    } elseif ($_K['jovahagyasDt']!='') {
+		$_color = "#64ce64"; 
+		$_class="icon-ok-sign";
+	    } else {
+		$_color="#ce6464";
+		$_class="icon-question-sign";
+	    }
+		echo '<div style="height:2px;"></div>';
+        	echo '<div style="width:90%; margin: 0px auto; border: solid 1px rgb(50,0,50);">';
+		    echo '<div style="font-size:10px; background-color: #3c3c64; color: white; font-weight: bold; border-bottom: solid 1px #dddddd; padding:3px 10px;">'.superdate($ADAT['kerelmek'][$i]['rogzitesDt']).'</div>';
+		    echo '<div style="background-color: #cccccc; padding:10px;border-bottom: solid 1px #dddddd; padding:3px 3px; min-height:30px;">';
+			echo '<a style="color: black;" href="'.$_link.'">';
+
+			echo '<span class="'.$_class.'" style="color:'.$_color.'; float:left; font-size:30px; height:30px; line-height:30px; padding:0px 4px;"></span>';
+			echo '<span style="float:right; height:30px; background-color: '.$_napjaBg.'; color:white; padding: 0px 5px 0px 5px; font-size:25px;">';
+			echo $_napja;
+			echo '</span>';
+			echo htmlspecialchars($ADAT['kerelmek'][$i]['szoveg']);
+			echo '</a>';
+		    echo '</div>';	
+		    echo '<div style="background-color: '.$_color.'; color: white; padding:10px; border-bottom: solid 1px #3c3c64; padding:3px 10px;">'.htmlspecialchars($ADAT['kerelmek'][$i]['valasz']).' '.$_K['jovahagyasAccount'].'</div>';
+		    echo '<style type="text/css">
+			table.kerelemValasz {background-color:#ddd;}
+			table.kerelemValasz td {font-size:10px; background-color:white; padding:2px 4px; vertical-align:top;}
+			table.kerelemValasz td.dt {background-color: #eee;text-align: right;}
+		    </style>';
+		    if (count($ADAT['valaszok'][$kerelemId])>0) {
+                    $_V = $ADAT['valaszok'][$kerelemId];
+                    echo '<table class="kerelemValasz" cellpadding="1" cellspacing="1">';
+                        for ($j=0; $j<count($_V); $j++) {
+                            echo '<tr >';
+                                echo '<td class="dt">'.superdate($_V[$j]['valaszDt']).'</td>';
+                                echo '<td class="userAccount">'.$_V[$j]['userAccount'].'</td>';
+                                echo '<td>'.supertext($_V[$j]['valasz']).'</td>';
+                            echo '</tr>';
+                        }
+                    echo '</table>';
+		    }
+		echo '</div>';
+	}	
+	echo '</div>';
+
+	//if ($i!=$dbKerelem) 
+	{echo '
+	    <style type="text/css">
+		div._dotHolder {text-align:center; width:90%; margin:auto; padding:10px 0px;vertical-align:middle;}
+		div._dot {background-color:#eee;display: inline-block;border-radius: 50%;height:10px; width:10px;}
+		div._dot:hover {background-color:cornflowerblue !important;}
+		div._dotHolder:hover div._dot {background-color:#ccc;}
+	    </style>
+	    <div class="_dotHolder"><a href="'.href('index.php?page=naplo&sub=hibabejelento&f=admin').'" style="color:black;display:block;">';
+	    for ($j=0; $j<($dbKerelem-$i); $j++) { echo '<div class="_dot"></div> '; }
+	    echo '</a></div>';
+	}
+    }
+
+?>
diff --git a/mayor-orig/www/skin/ajax/module-naplo/html/orarend/orarend.phtml b/mayor-orig/www/skin/ajax/module-naplo/html/orarend/orarend.phtml
new file mode 100644
index 00000000..cb12b8cf
--- /dev/null
+++ b/mayor-orig/www/skin/ajax/module-naplo/html/orarend/orarend.phtml
@@ -0,0 +1,148 @@
+<?php
+
+    function putOrarend($ADAT) {
+
+	global $aHetNapjai;
+	if (is_array($ADAT['orarend']['assoc'])) {
+
+// dump($ADAT['csengetesiRend']);
+
+		$T = $ADAT['orarend']['assoc'];
+		echo '<table class="orarend" align="center" cellspacing="0" cellpadding="0">'."\n";
+		echo '<tbody>'."\n";
+		for($ora=$ADAT['napiMinOra']; $ora<=$ADAT['napiMaxOra']; $ora++) { 
+		    echo '<tr>';
+			echo '<th>'.$ora.'</th>';
+//			for ($nap=1; $nap<=$ADAT['hetiMaxNap']; $nap++) { // FIXME (getMaxNap)
+			    $nap=date('w',strtotime($ADAT['dt']));
+			    $dt = $ADAT['orarend']['napok'][$nap]['dt'];
+			    echo '<td>';
+				$het = 0;			    
+				$ORARENDI = array();
+				for($i=0; $i<count($T[$nap][$ora]['orak']); $i++) {
+				    $_T = $T[$nap][$ora]['orak'][$i];
+				    $ORARENDI[] = $_T['tankorId'];
+				    //
+				    $het = $_T['het'];
+				    $_ORA = $ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]; 
+				    $_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus'];
+
+				    // Az órarendből a jelek:
+				    $_targyJel = $_T['targyJel'];
+				    $_osztalyJel = $_T['osztalyJel'];
+				    // figyelem, itt jön a kiírás, a _putOra fv helyett:
+				    $_tipusClass = str_replace(' ','_',$_ORA['tipus']);
+				    
+				    echo '<div class="'.$_tipusClass.'" title="'.$_ORA['tipus'].'" >';
+					$_ferohely = $ADAT['termek'][$_T['teremId']]['ferohely'];
+					$_letszam  = $ADAT['tankorLetszamok'][$_T['tankorId']];
+					if ($_T['tankorId']!='') {
+					    echo '<span title="'.$_targyJel.' '.$_osztalyJel.' ('.$ADAT['tankorok'][$_T['tankorId']][0]['tankorId'].') '.$_tankorTipus.'" >';
+					    echo $ADAT['tankorok'][$_T['tankorId']][0]['tankorNev'];
+					    echo '</span>';
+					} else {
+					    echo "$_targyjel : $_osztalyJel : ";
+					}
+					echo ', ';
+					echo '<span title="'.$_ferohely.'/'.$_letszam.'" class="t'.( ($_ferohely!=0 && $_ferohely<$_letszam) ? 0 : 1).'">'.$ADAT['termek'][$_T['teremId']]['leiras'].'</span>';
+					echo '<br/>';
+					if ($_ORA['kit']!='') {
+					    echo '<span class="helyett">';
+					    echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+					    echo '</span>';
+					    if ($_ORA['ki']!='') echo ' '.$ADAT['tanarok'][$_ORA['ki']]['tanarNev'];
+					} else {
+					    echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+					}
+
+				    if (isset($_ORA['oo'])) echo ' &deg;'; // else tervezett
+				    if ($_tankorTipus=='délutáni') echo ' &sup1';
+
+				    echo '</div>';
+				    if (count($T[$nap][$ora]['orak'])>$i+1) echo '<hr/>';
+				}
+				/* és ide jönnek a pluszok */
+				$j=0;
+				if (is_array($ADAT['haladasi']['orak'][$dt][$ora])) foreach ($ADAT['haladasi']['orak'][$dt][$ora] as $_tankorId => $__T) {
+				    if (!is_array($ORARENDI) || !in_array($_tankorId,$ORARENDI)) {
+					if ($j!=0) echo '<hr/>'; $j++;
+					$_ORA = $ADAT['haladasi']['orak'][$dt][$ora];
+					_putOra($_ORA,$_tankorId);
+				    }
+				}
+			    echo '</td>'."\n";
+			//}
+		    echo '</tr>'."\n";
+		}
+		echo '</tbody>';
+		echo '</table>'."\n\n<!-- EOT -->\n\n";
+
+	} else {
+	    //putOrarendPlain($ADAT);
+	    echo '<div style="text-align: center">'._NO_TIMETABLE.'</div>';
+
+	}
+
+
+    }
+
+    function putOrarendPlain($ADAT) {
+	if (is_array($ADAT['orarend']['orarendiOra'])) {
+	    foreach($ADAT['orarend']['orarendiOra'] as $het => $T) {
+		echo '<table class="orarend" align="center">'."\n";
+		echo '<caption>'.$het.'. heti órarend</caption>';
+		for($ora=$ADAT['napiMinOra']; $ora<=$ADAT['napiMaxOra']; $ora++) { // FIXME (getMinOra, getMaxOra konstansok!???)
+		    echo '<tr>';
+			echo '<th>'.$ora.'</th>';
+			for ($nap=1; $nap<=$ADAT['hetiMaxNap']; $nap++) { // FIXME (getMaxNap)
+			    echo '<td>';			    
+				    $X = $ADAT['orarend']['orarendiOra'][$het][$nap][$ora];
+				    
+				    for ($i=0; $i<count($X); $i++) {
+					echo '<div class="unfinished">';
+					echo $X[$i]['targyJel'].' : ';
+					echo $X[$i]['osztalyJel'].' : ';
+					echo $X[$i]['teremId'];
+					echo '</div>';
+				    }
+			    echo '</td>'."\n";
+			}
+		    echo '</tr>'."\n";
+		}
+		echo '</table>'."\n\n<!-- EOT -->\n\n";
+	    }
+	}
+    }
+
+    function _putOra($ORA,$_tankorId) {
+	    global $ADAT;
+	    $_ORA = $ORA[$_tankorId];
+	    $_tipusClass = str_replace(' ','_',$_ORA['tipus']);
+	    $_eredetClass = $_ORA['eredet'];
+	    echo '<div class="'.$_tipusClass.' '.$_eredetClass.'" title="'.$_ORA['tipus'].'" >';
+
+		    if ($ADAT['tankorok'][$_ORA['tankorId']][0]['tankorNev']!='') {
+			echo '<span title="'.$_targyJel.' '.$_osztalyJel.' ('.$ADAT['tankorok'][$_T['tankorId']][0]['tankorId'].')" >';
+			echo $ADAT['tankorok'][$_ORA['tankorId']][0]['tankorNev'];
+			echo '</span>';
+
+			echo ', '.$ADAT['termek'][$_ORA['teremId']]['leiras'];
+			echo '<br/>';
+		    } else {
+			echo $_ORA['tipus'].' '.$_ORA['eredet'].' ('.$_ORA['feladatTipusId'].')<br/>';
+		    }
+
+	
+			echo '<span class="helyett">';
+			echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+			echo '</span>';
+			if ($_ORA['ki']!='') echo ' '.$ADAT['tanarok'][$_ORA['ki']]['tanarNev'];
+
+			if (isset($_ORA['oo'])) echo ' &deg;'; // else tervezett
+
+	    echo '</div>';
+
+    }
+
+
+?>