Rev: 4641rev4641

19 files changed, 73 insertions, 35 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php
index 602f26e1..60ddb4fa 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php
@@ -24,16 +24,20 @@
                                  tankorNev,
 				 feladatTipusId,
 				 munkaido,
-				 hazifeladatId, hazifeladatLeiras
+				 hazifeladatId, 
+				hazifeladatLeiras,
+				cimkeId, cimkeLeiras
                             FROM `%s`.ora
 			    LEFT JOIN `%s`.oraHazifeladat USING (oraId)
+			    LEFT JOIN `%s`.oraCimke USING (oraId)
+                            LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId)
                             LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
                             LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t1 ON ki=t1.tanarId
                             LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t2 ON kit=t2.tanarId
                     	    LEFT JOIN ".__INTEZMENYDBNEV.".feladatTipus USING (feladatTipusId)
                     	    LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId)
                             WHERE oraId=%u AND (tanev=%u OR feladatTipusId IS NOT NULL)";
-	    $v = array(tanevDbNev(__INTEZMENY, $tanev),tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev);
+	    $v = array(tanevDbNev(__INTEZMENY, $tanev),tanevDbNev(__INTEZMENY, $tanev), tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev);
 	    return db_query($q, array('fv' => 'getOraAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v), $olr);
 
         } else {
@@ -349,6 +353,8 @@
 	} else {
 	    $q = "SELECT * FROM ora 
 LEFT JOIN oraHazifeladat USING (oraId)
+LEFT JOIN oraCimke USING (oraId)
+LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId)
 WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora";
 	    array_unshift($v, $tolDt, $igDt, $tanarId, $tanarId);
 	    if ($SET['result']=='assoc') 
@@ -389,13 +395,19 @@ WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora";
 	    $RE = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v));
 	} else {
 	    if ($SET['elmaradokNelkul'])
-		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora 
+		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime, cimkeId, cimkeLeiras 
+FROM ora 
 LEFT JOIN oraHazifeladat USING (oraId)
+LEFT JOIN oraCimke USING (oraId)
+LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId)
 WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).") 
 			AND tipus NOT IN ('elmarad','elmarad máskor')";
 	    else 
-		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora
+		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime, cimkeId, cimkeLeiras 
+FROM ora
 LEFT JOIN oraHazifeladat USING (oraId)
+LEFT JOIN oraCimke USING (oraId)
+LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId)
 WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).")";
 	    $R = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v));
 	    $RE['tankorok']=array();
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 4477f75c..b4449090 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
@@ -316,6 +316,13 @@
 
     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;}
+    td.cimke span.cimke_0 { background-color: #4caf50; }
+    td.cimke span.cimke_1 { background-color: red; }
+    td.cimke span.cimke_2 { background-color: orange; }
+    td.cimke span.cimke_3 { background-color: #3f51b5; }
+    td.cimke span.cimke_4 { background-color: #673ab7; }
+
+
 }
 @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/orarend/orarend.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
index fab07933..836e0ee2 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
@@ -207,6 +207,15 @@ div.unfinished {
     table.orarend div.orarendTools span.dolgozat:hover { color: orange;}
     table.orarend div.orarendTools span.bezar:hover { color: #f06; }
 
+    table.orarend span.cimke { margin:0px 1px; border-radius: 2px; font-size:xx-small; color:white; padding: 0px 2px 0px 2px;  background-color:#ddd; }
+    table.orarend span.cimke_0 { background-color: #4caf50; }
+    table.orarend span.cimke_1 { background-color: red; }
+    table.orarend span.cimke_2 { background-color: orange; }
+    table.orarend span.cimke_3 { background-color: #3f51b5; }
+    table.orarend span.cimke_4 { background-color: #673ab7; }
+
+
+
     h2.mayorSocialEdition {
     text-align: center;
     background-color: #f06;
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 ce15cd4d..fa46ad2c 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="8" class="fejlec8">';
+	echo '<th colspan="9" 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="8">';
+		echo '<th colspan="10">';
                 //    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>';
 
@@ -197,7 +197,7 @@
 		if (__PLUSZBEIRHAT===true && !$jovoDt) echo '<div class="icon-plus-sign rejtMutat"></div>';
 	    echo '</th>'."\n";
 	    // Az első cella a dátum/nap
-	    echo '<th colspan="8" class="nap">';
+	    echo '<th colspan="9" class="nap">';
 		echo str_replace('-','.',$dt) .'. ';
 		echo '<span class="napNev">'.$aHetNapjai[(date('w',$time)+6)%7].'</span>';
 		if ($napInfo2['napszam']!='' || $napInfo['orarendiHet'] != 0) {
@@ -237,7 +237,7 @@
 		if (__PLUSZBEIRHAT===true) putUjOra(array('dt'=>$dt, 'ora'=>$j));
 	    }	    
 	} else {
-	    echo '<tr><th colspan="9" class="nincsOra">'._NINCS_ORAJA.'</th></tr>';
+	    echo '<tr><th colspan="10" class="nincsOra">'._NINCS_ORAJA.'</th></tr>';
 //	    if ($tanitasiNap && strtotime(date('Y-m-d'))>=strtotime($dt)) {
 //	    if ( 
 //		(strtotime(date('Y-m-d'))>=strtotime($dt) 
@@ -523,9 +523,14 @@
 		    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>';
+		    if (count($_C)>0) { // vigyázz, csak egy címke engedélyezett! (egyelőre, különben sérül a getHaladasi)
+			$_cimkeId =  $dOra['cimke'][0];
+			echo '<span class="cimke cimke_'.$_cimkeId.'">'.implode('</span> <span class="cimke">',$_C).'</span>';
+		    }
 		  }
 		}
+	    echo '</td>';
+	    echo '<td class="cimke">';
 		echo '<a href="'.href('index.php?page=naplo&sub=haladasi&f=hazifeladat&oraId='.$dOra['oraId'].'&hazifeladatId='.$ADAT['tankorHazifeladat'][ $dOra['oraId'] ]).'" class="onClickUpdateWindow" title="'._HAZIFELADAT.'">';
 
 		
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 5c75bfb6..77ad0bce 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
@@ -274,6 +274,11 @@
 					echo '<span class="'.$_icon.'" title="h.f." style="color:'.$_hfcolor.'; padding-right:2px;"></span>';
 				    }
 
+				    if ($_ORA['cimkeLeiras']!='') {
+					$_cimkeMod = intval($_ORA['cimkeId']) % 5;
+					echo '<span class="cimke cimke_'.$_cimkeMod.'">'.$_ORA['cimkeLeiras'].'</span>';
+				    }
+
 				    if (is_array($_hianyzasAdat)) {
 					echo '<span class="hianyzasTicker '.ekezettelen($_hianyzasAdat['hTipus']).' '.ekezettelen($_hianyzasAdat['statusz']).' '.ekezettelen($_hianyzasAdat['igazolas']).'">';
 					if ($_hianyzasAdat['hTipus']=='hiányzás') 
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4640
+4641
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index a29c6989..adaa176a 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4640
-b51060c311067404ac189cad6cace9b7  mayor-fenntarto-rev4640.tgz
-cddc7e2f50f0488aafbecfde00f85221  mayor-installer-sulix-rev4640.tgz
-a497bc01ef299e59fd3ee697a5587d9b  mayor-wiki-rev4640.tgz
-83a6acdac73692b2f682b454e08b3c17  mayor-installer-rev4640.tgz
-5ebfe1aab6a41b565c217d9286522560  mayor-portal-rev4640.tgz
-d70c7ff14d8a857d4f214289fe9864cd  mayor-felveteli-rev4640.tgz
-634acc85bd9fbfeae1af698539e67124  mayor-jatek-rev4640.tgz
-e73a9088ced43dcb8710190f487eb7e3  mayor-locales-jp_JP-rev4640.tgz
-c294db378132eb75cea51997581ebd07  mayor-locales-de_DE-rev4640.tgz
-6f14ab873b407d1d97348895c5ef8a2e  mayor-locales-en_US-rev4640.tgz
-c217cd9212716e3d3de34ffb930db72e  mayor-naplo-rev4640.tgz
-a1459d17b6ac376e21051b4009263c9b  mayor-base-rev4640.tgz
+Revision 4641
+44d402ba720498fa9854aad8f429f72f  mayor-fenntarto-rev4641.tgz
+851f5b333b2376ed254ce81436eddfe9  mayor-installer-sulix-rev4641.tgz
+a71abc62c249ec0c77acb501a3604b21  mayor-wiki-rev4641.tgz
+f1457a281600ccc724490109f33b27b4  mayor-installer-rev4641.tgz
+f4417038061794ba5993d980a9feb50a  mayor-portal-rev4641.tgz
+9b974665458ba4cd3dc77b2eded8eceb  mayor-felveteli-rev4641.tgz
+b23f9ee726139fc59679fefabd4e055e  mayor-jatek-rev4641.tgz
+2868255ebd7d7e177882e26e55302069  mayor-locales-jp_JP-rev4641.tgz
+89e7fee6921db98077fc68b293b8202f  mayor-locales-de_DE-rev4641.tgz
+5a182f830d98f9ff8de8954fe2de82d2  mayor-locales-en_US-rev4641.tgz
+d7ab17e3bdc7871aaa9cf481a14e979c  mayor-naplo-rev4641.tgz
+4a2448198c67b5b16268e7c58b11f92b  mayor-base-rev4641.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index f201ebe0..3f4f4b89 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4640
+4641