From ff3a100975b80c7a69668815ba5c75413861f1ee Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Thu, 26 Mar 2020 03:05:03 +0100
Subject: Rev: 4638

---
 mayor-orig/mayor-naplo/log/mayor-naplo.rev           |  2 +-
 .../www/include/modules/naplo/haladasi/haladasi.php  |  2 +-
 .../module-naplo/html/haladasi/haladasi.phtml        | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 2 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 b02620cf..7ea43f6c 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4636
+4638
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>';
 
 
-- 
cgit v1.2.3