Rev: 4535rev4535

9 files changed, 131 insertions, 14 deletions

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);