aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-naplo/www
diff options
context:
space:
mode:
authorM.Gergo2020-03-26 03:05:03 +0100
committerM.Gergo2020-03-26 03:05:03 +0100
commitff3a100975b80c7a69668815ba5c75413861f1ee (patch)
tree42f4404b13140d4ae0d03d68701d13820ac00ed7 /mayor-orig/mayor-naplo/www
parent7651026adb5dbb1dc672d9772335125170d2d091 (diff)
downloadmayor-ff3a100975b80c7a69668815ba5c75413861f1ee.tar.gz
mayor-ff3a100975b80c7a69668815ba5c75413861f1ee.zip
Rev: 4638
Diffstat (limited to 'mayor-orig/mayor-naplo/www')
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php2
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml20
2 files changed, 21 insertions, 1 deletions
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>';