Rev: 4637rev4637

17 files changed, 48 insertions, 28 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index b02620cf..95871898 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4636
+4637
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index b02620cf..95871898 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4636
+4637
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index b02620cf..95871898 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4636
+4637
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index b02620cf..95871898 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4636
+4637
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 b02620cf..95871898 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 @@
-4636
+4637
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index b02620cf..95871898 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4636
+4637
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 b02620cf..95871898 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 @@
-4636
+4637
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 b02620cf..95871898 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 @@
-4636
+4637
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 b02620cf..95871898 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 @@
-4636
+4637
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index b02620cf..95871898 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4636
+4637
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 92d07ee8..c755a77e 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
@@ -72,7 +72,7 @@
 	// Csatlakozás az adatbázishoz
 	$lr = db_connect('naplo', array('fv' => 'getHaladasi'));
         $q = "SELECT oraId, dt, ora, ki, kit, tankorId, teremId, ora.leiras, tipus, eredet, csoportId, feladatTipusId,
-		hazifeladatId,
+		hazifeladatId,hazifeladatFeltoltesEngedely,
 		getOraTolTime(oraId) AS tolTime,
 		getOraIgTime(oraId) AS igTime
                         FROM ora 
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 e267cf27..ce15cd4d 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
@@ -527,6 +527,25 @@
 		  }
 		}
 		echo '<a href="'.href('index.php?page=naplo&sub=haladasi&f=hazifeladat&oraId='.$dOra['oraId'].'&hazifeladatId='.$ADAT['tankorHazifeladat'][ $dOra['oraId'] ]).'" class="onClickUpdateWindow" title="'._HAZIFELADAT.'">';
+
+		
+                                   if (isset($dOra['hazifeladatId'])) {
+                                        if ($dOra['hazifeladatFeltoltesEngedely']==1) {
+                                            $_icon = 'icon-paper-clip-alt';
+                                            if ($ADAT['diakHazifeladat'][$dOra['oraId']]['hazifeladatDiakStatus'] == 'kész') { $_hfcolor = 'lightgreen';
+                                            } else { $_hfcolor = '#3f51b5'; }
+                                        } else {
+                                            $_icon= 'icon-home-alt';
+                                            if ($ADAT['diakHazifeladat'][$dOra['oraId']]['hazifeladatDiakStatus'] == 'kész') { $_hfcolor = 'lightgreen';
+                                            } else { $_hfcolor = '#e91e63'; }
+                                        }
+                                        echo '<span class="'.$_icon.'" title="h.f." style="color:'.$_hfcolor.';"></span>';
+		    } else {
+			echo '<span class="icon-home" style="color: #aaa"></span>';
+		    }
+
+/*
+
 		    if ($dOra['hazifeladatId']>0) {
 			if ($ADAT['diakHazifeladat'][$dOra['oraId']]['hazifeladatDiakStatus'] =='kész') {
 			    $hfColor = 'lightgreen';
@@ -537,6 +556,7 @@
 		    } else {
 			echo '<span class="icon-home" style="color: #aaa"></span>';
 		    }
+*/
 		echo '</a>';
 
 
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index b02620cf..95871898 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4636
+4637
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index b02620cf..95871898 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4636
+4637
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 64df47f5..e9fcae00 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4636
-3984cb91cd9401421a7c228920d9afa8  mayor-fenntarto-rev4636.tgz
-e9dc0d99d56ed7ce0feac0b88d517b49  mayor-installer-sulix-rev4636.tgz
-9ed22b632285302d049d4d615b0e65cf  mayor-wiki-rev4636.tgz
-2ac683038891b9b45e5c6e49f41e90f6  mayor-installer-rev4636.tgz
-64a4bd3f5dedd3dd85b20f6a16add9a6  mayor-portal-rev4636.tgz
-6730cc3657155fccbcb90e01c1698b62  mayor-felveteli-rev4636.tgz
-43524fe82ae26bc04368eb604585f8d7  mayor-jatek-rev4636.tgz
-e7a3f8a719957e93270e9957da4ac705  mayor-locales-jp_JP-rev4636.tgz
-6388bc1e38d1010b7232fee7e0cd6805  mayor-locales-de_DE-rev4636.tgz
-43cc1f581483a40a268865af7f2f9353  mayor-locales-en_US-rev4636.tgz
-9049ffb272a96153f0f33ff7e52b63df  mayor-naplo-rev4636.tgz
-ed384ad9581b23262a1266d1fbd25d5c  mayor-base-rev4636.tgz
+Revision 4637
+588b4c979441d03ba6c86041a843af62  mayor-fenntarto-rev4637.tgz
+7be62e04c249568e49bac68494c23c92  mayor-installer-sulix-rev4637.tgz
+26d52f64978716c433a2c7efa7fb4972  mayor-wiki-rev4637.tgz
+7ae35eb41ab0732cb6fd13cb30562eb5  mayor-installer-rev4637.tgz
+75ab9de0395d8e8b230a735bd6f59bd6  mayor-portal-rev4637.tgz
+cdce8a0d509864318413f38ef150d1a9  mayor-felveteli-rev4637.tgz
+0491aa64b4ad1521e925453835294c5a  mayor-jatek-rev4637.tgz
+74805cf512f319c21f9c117ff7fdd5bd  mayor-locales-jp_JP-rev4637.tgz
+faac8242608a681416545dd52a07985f  mayor-locales-de_DE-rev4637.tgz
+08e49eed5031987d0337d86041c6bf11  mayor-locales-en_US-rev4637.tgz
+a4fa9808a2ed5cd7b951d352d2e26a96  mayor-naplo-rev4637.tgz
+c595577e28baed7306d8016bf7515393  mayor-base-rev4637.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index b02620cf..95871898 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4636
+4637
diff --git a/rev.txt b/rev.txt
index b02620cf..95871898 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4636
+4637