From 2b0a27070679ce94cf13a80fb207be9218491afe Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sun, 3 May 2020 20:55:03 +0200
Subject: Rev: 4652
---
.../module-naplo/html/orarend/orarend.phtml | 28 ++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
(limited to 'mayor-orig/mayor-naplo/www/skin')
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 f36850bc..4f38a41c 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
@@ -390,13 +390,14 @@ if (MAYOR_SOCIAL === true) {
}
*/
/* és ide jönnek a pluszok */
+
$j=0;
if (is_array($ADAT['haladasi']['orak'][$dt][$ora])) {
foreach ($ADAT['haladasi']['orak'][$dt][$ora] as $_tankorId => $__T) {
if (!is_array($ORARENDI) || !in_array($_tankorId,$ORARENDI)) {
if ($j!=0) echo '
'; $j++;
$_ORA = $ADAT['haladasi']['orak'][$dt][$ora];
- _putOra($_ORA,$_tankorId,$TANKOR_DOLGOZAT);
+ _putOra($_ORA,$_tankorId,$TANKOR_DOLGOZAT); // hazi
}
}
}
@@ -460,10 +461,33 @@ if (MAYOR_SOCIAL === true) {
function _putOra($ORA,$_tankorId,$TANKOR_DOLGOZAT) {
global $ADAT;
if ($_tankorId=='') return false;
+ // list($oraId,$oraAdat);
$_ORA = $ORA[$_tankorId];
$_tipusClass = str_replace(' ','_',$_ORA['tipus']);
$_eredetClass = $_ORA['eredet'];
- echo '';
+ $dt = $_ORA['dt'];
+ echo '
';
+
+ // HÁZI
+ if (isset($_ORA['hazifeladatId'])) {
+ 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 '';
+ }
+
+ if ($_ORA['cimkeLeiras']!='') {
+ $_cimkeMod = intval($_ORA['cimkeId']) % 5;
+ echo ''.$_ORA['cimkeLeiras'].'';
+ }
+ // HÁZI qfix
+
if ($TANKOR_DOLGOZAT[$_tankorId][$_ORA['dt']]>0) echo '';
echo '';
echo $ADAT['tankorok'][$_ORA['tankorId']][0]['tankorNev'];
--
cgit v1.2.3