From f594cba3efc0da6c87b3da9e288245f237cfac51 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Tue, 24 Mar 2020 22:22:19 +0100
Subject: Rev: 4635

---
 mayor-orig/mayor-naplo/log/mayor-naplo.rev                  |  2 +-
 .../skin/classic/module-naplo/html/orarend/orarend.phtml    | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'mayor-orig/mayor-naplo')

diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 2e58f957..2996c056 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4633
+4635
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 c04cd9ec..5c75bfb6 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
@@ -262,9 +262,16 @@
 				    $_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':''; 
 				    echo '<div class="'.$_tipusClass.$_frissClass.$_oraMostVanClass.$_utolsooraClass.$_hianyzasClass.' '.$_oraAdat.'" data-oraid="'.$_ORA['oraId'].'" title="'.$_ORA['tipus'].'" >';
 				    if (isset($_ORA['hazifeladatId'])) {
-					if ($_ORA['diakHazifeladat']['hazifeladatDiakStatus'] == 'kész') $_hfcolor = 'lightgreen';
-					else $_hfcolor = '#e91e63';
-					echo '<span class="icon-home-alt" title="h.f." style="color:'.$_hfcolor.'; padding-right:2px;"></span>';
+					if ($_ORA['hazifeladatFeltoltesEngedely']==1) {
+					    $_icon = 'icon-paper-clip-alt';
+					    if ($_ORA['diakHazifeladat']['hazifeladatDiakStatus'] == 'kész') { $_hfcolor = 'lightgreen';
+					    } else { $_hfcolor = '#3f51b5'; }
+					} else {
+					    $_icon= 'icon-home-alt';
+					    if ($_ORA['diakHazifeladat']['hazifeladatDiakStatus'] == 'kész') { $_hfcolor = 'lightgreen';
+					    } else { $_hfcolor = '#e91e63'; }
+					}
+					echo '<span class="'.$_icon.'" title="h.f." style="color:'.$_hfcolor.'; padding-right:2px;"></span>';
 				    }
 
 				    if (is_array($_hianyzasAdat)) {
-- 
cgit v1.2.3