Rev: 4572rev4572

9 files changed, 95 insertions, 28 deletions

diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index cc8a8a9f..6dc04883 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4569
+4572
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
index 9c46b400..e5090c18 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
@@ -39,15 +39,17 @@
 	// Az érintett tankörök id-inek listája
 	$tankorIds = $tankorAdat = array();
 	if (is_array($Tankorok) && ($count = count($Tankorok)) > 0) {
-	    $tankorFeltetel = 'tankorId IN (' . $Tankorok[0]['tankorId'];
-	    $tankorIds[] = $Tankorok[0]['tankorId'];
-	    $Tankorok[0]['tanar'] = getTankorTanaraiByInterval($Tankorok[0]['tankorId'], array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor'));
-	    $tankorAdat[$Tankorok[0]['tankorId']] = $Tankorok[0];
+	    $_tankorId = intval($Tankorok[0]['tankorId']);
+	    $tankorFeltetel = 'tankorId IN (' . $_tankorId;
+	    $tankorIds[] = $_tankorId;
+	    $Tankorok[0]['tanar'] = getTankorTanaraiByInterval($_tankorId, array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor'));
+	    $tankorAdat[$_tankorId] = $Tankorok[0];
 	    for ($i = 1; $i < $count; $i++) {
-		$tankorFeltetel .= ', '.$Tankorok[$i]['tankorId'];
-		$tankorIds[] = $Tankorok[$i]['tankorId'];
-		$Tankorok[$i]['tanar'] = getTankorTanaraiByInterval($Tankorok[$i]['tankorId'], array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor'));
-		$tankorAdat[$Tankorok[$i]['tankorId']] = $Tankorok[$i];
+		$_tankorId = intval($Tankorok[$i]['tankorId']);
+		$tankorFeltetel .= ', '.$_tankorId;
+		$tankorIds[] = $_tankorId;
+		$Tankorok[$i]['tanar'] = getTankorTanaraiByInterval($_tankorId, array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor'));
+		$tankorAdat[$_tankorId] = $Tankorok[$i];
 	    }
 	    $tankorFeltetel .= ')';
 	} 
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php
index 17acc6ff..e0fe07db 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarendModosito-pre.php
@@ -33,7 +33,14 @@
     $refTolDt = readVariable($_POST['refTolDt'],'date');
     $refIgDt = readVariable($_POST['refIgDt'],'date');
 
-    if ($refTolDt=='' || $refIgDt=='') $_SESSION['alert'][] = 'info:nincs_intervallum';
+    if ($refTolDt=='' || $refIgDt=='') {
+	//$_SESSION['alert'][] = 'info:nincs_intervallum';
+	$refTolIgNincsKitoltve = true;	
+    }
+    if ($tanarId=='' && $osztalyId =='') {
+	$missingTanarOsztaly = true;
+    }
+
 
     $ADAT['telephelyek'] = getTelephelyek();
     $ADAT['haladasiModositando'] = readVariable($_POST['haladasiModositando'], 'bool');
@@ -67,9 +74,18 @@
 
     // itt ellenőrizzük, hogy a dt (referenciadátum) beleesik-e a tolIg be!
     if (isset($tolDt) && isset($refTolDt) && isset($refIgDt)) {
-	if (strtotime($tolDt)<strtotime($refTolDt)) $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!';
-	if (strtotime($tolDt)>strtotime($refIgDt)) $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!';
-	if (strtotime($refTolDt)>strtotime($refIgDt)) $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!';
+	if (strtotime($tolDt)<strtotime($refTolDt)) {
+	    // $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!';
+	    $refDtHibas = true;
+	}
+	if (strtotime($tolDt)>strtotime($refIgDt)) {
+	    // $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!';
+	    $refDtHibas = true;
+	}
+	if (strtotime($refTolDt)>strtotime($refIgDt)) {
+	    // $_SESSION['alert'][] = 'message:wrong_data:hibás referenciadátum!';
+	    $refDtHibas = true;
+	}
     }
     if ($action==='do') {
 	$HOT = readVariable($_POST['HALADASIORATOROL'],'id');
@@ -262,6 +278,9 @@
 	    'tolDt' => date('Y-m-d', strtotime('last Monday', strtotime($_TANEV['kezdesDt']))),
 //	    'tolDt' => $_TANEV['elozoZarasDt'],
 	    'igDt' => $_TANEV['kovetkezoKezdesDt'],
+	    'kotelezo' => true,
+	    'hianyzik' => $refTolIgNincsKitoltve,
+	    'hibas' => $refDtHibas
 	);
        $TOOL['datumTolIgSelect'] = array(
             'tipus' => 'sor', 'title' => 'REFDT',
@@ -272,18 +291,28 @@
 	    'override' => true,
             'tolDt' => date('Y-m-d', strtotime('last Monday', strtotime($_TANEV['kezdesDt']))),
             'igDt' => $_TANEV['zarasDt'],
+	    'kotelezo' => true,
+	    'hianyzik' => $refTolIgNincsKitoltve,
+	    'hibas' => $refDtHibas
         );
+	
 
 	//$TOOL['orarendiHetSelect'] = array('tipus'=>'cella' , 'paramName' => 'het', 'post'=>array('targyId','tankorId','osztalyId','tanarId'), 'disabled'=>true);
 //	if ($osztalyId!='' || $diakId!='') {
 //	    $TOOL['diakSelect'] = array('tipus'=>'sor','paramName'=>'diakId', 'post'=>array('refTolDt','refIgDt','tolDt','osztalyId','telephely'));
 //	} else 
 //	    $TOOL['munkakozossegSelect'] = array('tipus'=>'sor', 'paramName'=>'mkId', 'post'=>array('refTolDt','refIgDt','tolDt','telephely'));
-	$TOOL['tanarSelect'] = array('tipus'=>'cella', 'paramName'=>'tanarId', 'post'=>array('refTolDt','refIgDt','tolDt','telephely'));
-	$TOOL['osztalySelect']= array('tipus'=>'cella', 'paramName'=>'osztalyId', 'post'=>array('refTolDt','refIgDt','tolDt'));
+	$TOOL['tanarSelect'] = array('tipus'=>'cella', 'paramName'=>'tanarId', 'post'=>array('refTolDt','refIgDt','tolDt','telephely'),
+	    'kotelezo'=>true,
+	    'hianyzik'=>$missingTanarOsztaly
+	);
+	$TOOL['osztalySelect']= array('tipus'=>'cella', 'paramName'=>'osztalyId', 'post'=>array('refTolDt','refIgDt','tolDt'),
+	    'kotelezo'=>true,
+    	    'hianyzik'=>$missingTanarOsztaly
+	);
 //	$TOOL['telephelySelect'] = array('tipus'=>'cella', 'paramName'=>'telephely', 'post'=>array('refTolDt','refIgDt','tolDt','mkId','tanarId'));
 //	$TOOL['teremSelect'] = array('tipus'=>'cella', 'paramName'=>'teremId', 'telephely'=>$telephely, 'post'=>array('refTolDt','refIgDt','tolDt','telephely'));
-        if ($osztalyId!='' || $tanarId!='' || $diakId!='' || $mkId!='') $TOOL['tankorSelect'] = array('tipus'=>'sor','paramName'=>'tankorId', 'post'=>array('refTolDt','refIgDt','tolDt','osztalyId','targyId','tanarId','diakId','telephely'));
+//        if ($osztalyId!='' || $tanarId!='' || $diakId!='' || $mkId!='') $TOOL['tankorSelect'] = array('tipus'=>'sor','paramName'=>'tankorId', 'post'=>array('refTolDt','refIgDt','tolDt','osztalyId','targyId','tanarId','diakId','telephely'));
 	getToolParameters();
 
 ?>
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 539cd4ea..849a5afe 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
@@ -31,7 +31,6 @@
 
     table.toolBar form { margin: 0px; padding: 0px;}
 
-/* TH */
 
     table.toolBar th {
 	background-color: rgb(90,133,184);
@@ -45,6 +44,12 @@
 	border-width: 1px 1px 1px 1px;
 	border-style: solid;
     }
+
+    table.toolBar tr.kotelezo.hianyzo td.toolBarTool table ,
+	table.toolBar td.toolBarTool.kotelezo.hianyzo { background-color: orange }
+    table.toolBar tr.kotelezo.hibas td.toolBarTool table ,
+	table.toolBar td.toolBarTool.kotelezo.hibas { background-color: red; }
+
     table.toolBar th button.toolBarClear { float:right; border: none; background-color: #5A85B8; height:10px;font-size:9px; color:inherit; padding:0px 2px; color: rgba(255,255,255,0.5);}
     table.toolBar th button.toolBarClear:hover { color: rgba(255,255,255,1);}
 
@@ -61,7 +66,6 @@
     table.toolBar tr td.csoport:hover { color: rgba(255,255,255,1);}
 
 
-/* TD */
     table.toolBar td {padding: 0px;}
     table.toolBar td form td {padding: 1px;}
     table.toolBar td.gap { width: 50%; border-spacing: 0px; }
@@ -161,6 +165,8 @@
 
     table.toolBar input { font-size: 10px; }
 
+    table.toolbar tr.kotelezo table th.toolBarTool { background-color: orange !important; }
+
     table.toolBar #toolBarHamburgerVezerlo { color:rgb(170, 170, 170);  }
     table.toolBar #toolBarHamburgerVezerlo:hover { color:white; }
     
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 c25f4328..8e20186a 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
@@ -121,9 +121,11 @@ div.unfinished {
 
     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 {border-radius: 2px; margin: 2px 1px;}
     div.oraKartya.highlight { outline: solid 1px yellow }
     div.oraKartya span.highlight { background-color:yellow; }
-    div.orarendModositoToolbox button#tankorHelper { float:right; }
+    div.orarendModositoToolbox button#tankorHelper {  }
 
 
 }
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 805e57dc..cd9ec7cc 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
@@ -44,7 +44,12 @@
 	    echo '</th>';
 	    $colspan++;
 	}
-
+	if (_POLICY=='private') {
+	    echo '<th style="width:32px;">';
+		echo '<button type="submit" class="toolBarLeft icon-search mayorSearchIcon"></button>';
+	    echo '</th>';
+	    $colspan++;
+	}
 	echo '<td class="toolBarTitle" id="toolBarTitle" colspan="3">';
 	    if (defined('__PAGETITLE')) echo __PAGETITLE.'<br/>';
 	    else echo 'MaYoR elektronikus napló'.'<br/>';
@@ -57,12 +62,18 @@
 	echo '</td>'."\n";
 	reset($TOOL); 
 	foreach ( $TOOL as $tool => $params ) {
+
 //	    if ( function_exists( $func = "put$tool" ) && $params['tipus']=='cella') {
 	    if ( isset($params['tipus']) && $params['tipus']=='cella') {
 		if (isset($params['title'])) $title = '__'.$params['title'];
 		else $title = '__'.nagybetus($tool).'TITLE';
 
-		echo '<td class="toolBarTool cella" style="position:; vertical-align:top">';
+		$_kotelezoClass = ($params['kotelezo'] === true) ? 'kotelezo':'';
+		$_hianyzoClass = ($params['hianyzik'] === true) ? 'hianyzo':'';
+		$_hibasClass = ($params['hibas'] === true) ? 'hibas':'';
+
+		echo '<td class="toolBarTool cella '.$_kotelezoClass.' '.$_hianyzoClass.' '.$_hibasClass.'" style="position:; vertical-align:top">';
+
 		echo '<table style="/*border-bottom:solid 1px #558;*/" >'."\n";
 		    if (defined($title)) {
 			echo '<tr><th>';
@@ -138,8 +149,11 @@
 	reset($TOOL);
 	foreach ( $TOOL as $tool => $params ) {
 	    if ( function_exists( $func = "put$tool" ) && $params['tipus']=='sor') {
-		echo '<tr><td colspan="'.($colspan).'">';
-
+		$_kotelezoClass = ($params['kotelezo'] === true) ? 'kotelezo':'';
+		$_hianyzoClass = ($params['hianyzik'] === true) ? 'hianyzo':'';
+		$_hibasClass = ($params['hibas'] === true) ? 'hibas':'';
+		echo '<tr class="'.$_kotelezoClass.' '.$_hianyzoClass.' '.$_hibasClass.'">';
+		echo '<td colspan="'.($colspan).'">';
 		echo '<table align="center" cellspacing="0"><tr>';
 		if (isset($params['title'])) $title = '__'.$params['title'];
 		else $title = '__'.nagybetus($tool).'TITLE';
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 38fa3a5a..160c2be7 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
@@ -2,10 +2,14 @@
 
     function putOrarend($ADAT) {
 
+	global $aHetNapjai;
+
 	echo '<div id="infoBox1"></div>';
 	echo '<div id="infoBox2"></div>';
 
-	global $aHetNapjai;
+	// jó lenne tudni, hogy milyen tipikus dátumbeállítások vannak
+	// az orarendiHet beállítás is jól jönne itt
+
 	$TANKOROK = $ADAT['felvehetoTankorok'];
 	$BLOKKOK = $ADAT['felvehetoBlokkok'];
 	if (is_array($ADAT['felvehetoTankorok']) && count($ADAT['felvehetoTankorok']) > 0) {
@@ -59,8 +63,14 @@
 			    $_th_class = ($ADAT['vanHaladasi'][$dt]['db']>0) ? 'spec': '';
 			    echo '<th class="'.$_th_class.'">';
 				if (count($ADAT['vanHaladasi'][$dt]['db'])>0) echo '<span class="icon-record" style="color: #E91E63" title="Már van betöltve haladási napló!"></span> ';
-				echo '<span>'.str_replace('-','.',$ADAT['orarend']['napok'][$nap]['dt']).'. ('.$ADAT['orarend']['napok'][$nap]['het'].')</span> ';
+				echo '<span>'.str_replace('-','.',$ADAT['orarend']['napok'][$nap]['dt']).'.';
+				echo '</span> ';
+
 				echo ($ADAT['orarend']['napok'][$nap]['megjegyzes']=='') ? $aHetNapjai[($nap-1)] : $ADAT['orarend']['napok'][$nap]['megjegyzes'];
+				    echo '<br/>Órarendi hét: <select>';
+					echo '<option>'.$ADAT['orarend']['napok'][$nap]['het'].'</option>';
+				    echo '</select> ';
+
 			    echo '</th>';
 			}		
     		echo '</tr>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml
index 79c33e0f..81a60f0e 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/diak.phtml
@@ -110,8 +110,12 @@
 		echo '<th class="t" title="'.$_title.'">';
 		    if (count($ADAT['targyTankor'][$targyId]) == 1) {
 			echo '<a href="'.href('index.php?page=naplo&sub=osztalyozo&f=tankor&tankorId='.$ADAT['targyTankor'][$targyId][0]['tankorId']).'">'.$targyNev.'</a>';
-		    } else
-		    echo $targyNev;
+		    } else {
+			echo $targyNev;
+			for ($i=0; $i<count($ADAT['targyTankor'][$targyId]); $i++) {
+			    echo '<a style="background-color:#aaa; border-radius:2px; color: #666; margin: 0px 4px; padding: 0px 2px;" href="'.href('index.php?page=naplo&sub=osztalyozo&f=tankor&tankorId='.$ADAT['targyTankor'][$targyId][$i]['tankorId']).'">'.($i+1).'</a>';
+			}
+		    }
 		    /* VIRTUAL */
 		    echo ' <select class="eeHidden" style="display:none"><option value="1">kis</option><option value="2">normál</option><option value="3">dolgozat</option><option value="4">témazáró</option><option value="5">vizsga</option></select>';
 		    putJegySelect(array(
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 d35c38c7..c57e142e 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
@@ -907,7 +907,7 @@ processJSONTankorAdat = function(adat) {
 	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 += '<li class="tankorCsoportAdat" data-tankorcsoportid="'+adat.tankorCsoport[i].csoportId+'">'+adat.tankorCsoport[i].csoportNev+'</li>';
 	}
 	content += '</ul>';
     }