diff options
| author | M.Gergo | 2020-03-25 10:35:03 +0100 |
|---|---|---|
| committer | M.Gergo | 2020-03-25 10:35:03 +0100 |
| commit | c84903ec54e700bae146f44f1e3ddbba1a5b5eef (patch) | |
| tree | b0637cfa55b3df19ece17f56a7f2a45f4777a48c /mayor-orig/mayor-naplo/www | |
| parent | 9229709aeaa2849c1f33db0819ac3865e7c29f61 (diff) | |
| download | mayor-rev4637.tar.gz mayor-rev4637.zip | |
Rev: 4637rev4637
Diffstat (limited to 'mayor-orig/mayor-naplo/www')
| -rw-r--r-- | mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php | 2 | ||||
| -rw-r--r-- | mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml | 20 |
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>'; |