Az eredeti forráskódok frissítve a http://mayor.hu -ról

6 files changed, 71 insertions, 8 deletions

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 f12a5b14..c88905c2 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
@@ -251,6 +251,13 @@
     div.arckepContainer.szulo span {background-color: #40e0d0; }
     div.arckepContainer.diak span {background-color: #6495ed; }
 
+    span.cimke { margin:0px 1px; border-radius: 2px; font-size:xx-small; color:white; padding: 0px 2px 0px 2px;  background-color:#ddd; }
+    span.cimke_0 { background-color: #4caf50; }
+    span.cimke_1 { background-color: red; }
+    span.cimke_2 { background-color: orange; }
+    span.cimke_3 { background-color: #3f51b5; }
+    span.cimke_4 { background-color: #673ab7; }
+
 @media (max-width: 764px) {
 
     #toolBarTitle {display:;}
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 cd9ec7cc..0c5f7937 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
@@ -3,7 +3,6 @@
     if (_RIGHTS_OK !== true) die();
 
     require_once('include/share/date/names.php');
-
     if (_RUNLEVEL!=='cron') putEszkozSor();
 
     function putUjIntezmeny() {
@@ -61,10 +60,11 @@
 	    if ($showHelp) echo '<span id="toolBarHelpButton" class="onClickHideShow">?</span>';
 	echo '</td>'."\n";
 	reset($TOOL); 
-	foreach ( $TOOL as $tool => $params ) {
 
+	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';
 
@@ -274,9 +274,8 @@
     }
 
     function putForrasSelect() {
-
 	global $TOOL;
-	putToolFormStart('forrasSelect');
+	putToolFormStart('forrasSelect','forras');
 	    echo '<select name="'.$TOOL['forrasSelect']['paramName'].'" class="onChangeSubmit">';
 		echo '<option value=""> - </option>'."\n";
 		$SEL = array($TOOL['forrasSelect']['paramValue'] => ' selected="selected" ');
@@ -285,7 +284,6 @@
 		}
 	    echo '</select>';
 	putToolFormStop();
-
     }
 
     function putIntezmenySelect() {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml
index 7ffeccad..c1d40d25 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/export/kretaOrarend.phtml
@@ -4,6 +4,7 @@
 
         formBegin(array('action'=>href('index.php?page=naplo&sub=export&f=kretaOrarend'), 'class'=>"export"));
         echo '<input type="hidden" name="action" value="kretaOrarendExport" />'."\n";
+	echo '<input type="hidden" name="dt" value="'.$ADAT['dt'].'" />'."\n";
 
         echo '<fieldset><legend>Kréta - Órarend export</legend>'."\n";
         echo '<table>'."\n";
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index 419fbc49..00077ba0 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -8,8 +8,11 @@
 	    echo ($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA;
 	    echo '</span>';
 	    echo ' – <span class="tankorNev tankorAdat" data-tankorid="'.$ADAT['oraAdat']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span>';
+	    if ($ADAT['oraAdat']['cimkeLeiras']!='') {
+		echo ' – '.'<span class="cimke cimke_'.(intval($ADAT['oraAdat']['cimkeId'])%5).'">'.$ADAT['oraAdat']['cimkeLeiras'].'</span>';
+	    }
 	    echo ' – <span class="tanarNev" data-tanarid="'.$ADAT['oraAdat']['ki'].'">'.$ADAT['oraAdat']['kiCn'].'</span>';
-	    // echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>';
+
 
 	echo '</fieldset>'."\n";
 
@@ -124,10 +127,12 @@ echo '<style type="text/css">
 	    if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat'));
 	    echo '<input type="hidden" name="action" value="hazifeladatBeiras"/>';
 	    echo '<input type="hidden" name="oraId" value="'.$ADAT['oraAdat']['oraId'].'"/>';
+	    echo '<input type="hidden" name="cimkeId" value="'.$ADAT['oraAdat']['cimkeId'].'"/>';
 	    echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>';
 
 	    echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n";
-		if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt']) && $ADAT['oraAdat']['oraBeirhato']===true) {
+//		if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt']) && $ADAT['oraAdat']['oraBeirhato']===true) {
+		if ($ADAT['oraAdat']['oraId']>0 && $ADAT['oraAdat']['oraBeirhato']===true ) {
 		    echo '<input type="text" name="oraLeiras" value="'.$ADAT['oraAdat']['leiras'].'" style="width:70%">';
 		    echo '<input type="submit">';
 		} else {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml
index b476482c..01a9b0d8 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml
@@ -423,5 +423,44 @@ function putOsztalyJellegek($ADAT,$osztalyJellegId) {
 
 }
 
+function putOidEllenor($ADAT) {
+
+	formBegin(array('class'=>'osztalyForm'));
+	echo '<input type="hidden" name="action" value="oidEllenor" />';
+	echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />';
+	echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />';
+
+	echo '<h1>'._OIDELLENOR.'</h1>';
+	
+	if (is_array($ADAT['oidCheck'])) {
+	    echo '<table>';
+	    foreach($ADAT['oidCheck'] as $oId=>$DA) {
+	      for ($i=0; $i<count($DA); $i++) {
+		$D = $DA[$i];
+		echo '<tr>';
+		echo '<td>'.$oId.'</td>';
+		echo '<td class="diakAdat diakNev" data-diakid="'.$D['diakId'].'">'.$D['diakId'].'</td>';
+		echo '<td class="diakAdat diakNev" data-diakid="'.$D['diakId'].'">'.$D['diakNev'].'</td>';
+		echo '<td>'.$D['oId'].'</td>';
+		echo '<td>';
+		    if ($ADAT['osztalyAdat']['osztalyJel']!=$D['osztalyJel']) {echo '!!!!!!!';}
+		    //echo '72455076207';
+		    echo $D['osztalyJel'];
+		echo '</td>';
+		echo '</tr>';
+	      }
+	    }
+	    echo '</table>';
+	}
+	echo '<textarea name="oidtxt" rows="10">';
+	    echo $ADAT['oidtxt'];
+	echo '</textarea>';
+
+	echo '<br/><input type="submit" value="'._OK.'" />';
+
+	formEnd();
+
+}
+
 
 ?>
\ No newline at end of file
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 756ec408..6811b588 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
@@ -13,7 +13,7 @@ function putTanarLista($ADAT) {
 	    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>';
+	    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++) {
@@ -28,6 +28,19 @@ function putTanarLista($ADAT) {
 		    echo $munkakozossegei[$j]['munkakozossegNev']. ' munkaközösség-vezető';
 		echo '</div>';
 	    }
+
+/*
+	    $targyai = explode(',',$T['kepesitesTargyIdk']);
+	    if (count($targyai)>0) {
+		echo '<div class="" style="color:#aaa; font-size:smaller">';
+		for ($j=0; $j<count($targyai); $j++) {
+		    $_targyId = $targyai[$j];
+		    echo ' '.$ADAT['targyak'][$_targyId][0]['targyNev'].' ';
+		}
+		echo '</div>';
+	    }
+*/
+
 	echo '</td>';
 	if (($i+1) % 3 == 0 && $i!=count($ADAT['tanarok'])-1) echo '</tr><tr>';
     }