From 31bf036be3be01ef7b3bbc9dc08813f0740dab9a Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Mon, 23 Mar 2020 01:17:58 +0100 Subject: Rev: 4630 --- .../module-naplo/css/haladasi/hazifeladat.css | 31 ++++++++++++++ .../module-naplo/html/haladasi/haladasi.phtml | 7 ++- .../module-naplo/html/haladasi/hazifeladat.phtml | 50 ++++++++++++++++++++-- .../module-naplo/html/orarend/orarend.phtml | 6 +-- 4 files changed, 86 insertions(+), 8 deletions(-) create mode 100644 mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css (limited to 'mayor-orig/mayor-naplo/www/skin') diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css new file mode 100644 index 00000000..1cce1e3e --- /dev/null +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css @@ -0,0 +1,31 @@ + + fieldset.adatok { margin-bottom:1em; width:80%; margin-left:auto; margin-right:auto; border-radius: 2px; border: solid 1px #ddd;} + fieldset.adatok legend { border-radius: 2px; background-color: #ff5722; color:white; padding: 2px 4px; } + + fieldset.adatok.kesz legend { background-color:lightgreen} + + form button.btnHfStatusz { + background-color: #eee; + border-radius: 2px; + border: solid 1px #888; + color: #888; + padding:2px 18px 2px 4px; + } + form button.btnHfStatusz span { color:#eee; } + form button.btnHfStatusz.kesz span { color: lightgreen; } + + form button.btnHfStatusz:hover { + background-color:lightgreen; + color:black; + border-color:black; + } + form button.btnHfStatusz.kesz:hover { + background-color: orange; + } + form button.btnHfStatusz:hover span { color: white; } + + form button.btnHfStatusz.kesz:hover span { color: orange } + + table.hazifeladatDiak { margin:auto; background-color: #eee;} + table.hazifeladatDiak thead tr th { background-color: #4caf50; color:white; font-weight:normal;} + table.hazifeladatDiak tbody tr td { background-color: white; font-weight:normal; padding: 2px 4px;} 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 3c36e9f2..e267cf27 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 @@ -528,7 +528,12 @@ } echo ''; if ($dOra['hazifeladatId']>0) { - echo ''; + if ($ADAT['diakHazifeladat'][$dOra['oraId']]['hazifeladatDiakStatus'] =='kész') { + $hfColor = 'lightgreen'; + } else { + $hfColor = '#ff5722'; + } + echo ''; } else { echo ''; } diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml index e2b6d3ef..c5a26c13 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml @@ -2,13 +2,13 @@ function putHazifeladat($ADAT) { - echo ''; - +*/ echo '
'._ALAPADATOK.''."\n"; echo ($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA.' – '.$ADAT['oraAdat']['tankorNev'].' – '.$ADAT['oraAdat']['kiCn']; @@ -18,19 +18,33 @@ if (__DIAK===true) { + if ($ADAT['hazifeladatDiak']['hazifeladatDiakStatus']=='kész') $_class = "kesz"; + + if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat')); echo '
'.ucfirst(_TANANYAG).''."\n"; if ($ADAT['oraAdat']['leiras']=='') { echo '

még nincs kitöltve

'; } else { echo '

'.$ADAT['oraAdat']['leiras'].'

'; } echo '
'."\n"; - echo '
'._HAZIFELADAT.''."\n"; + echo '
'._HAZIFELADAT.''."\n"; if ($ADAT['hazifeladatAdat']['hazifeladatLeiras']=='') { echo '

még nincs kitöltve

'; } else { echo ($ADAT['hazifeladatAdat']['hazifeladatLeiras']); } echo '
'."\n"; - + if ($ADAT['hazifeladatId']>0) { + echo '
'; + echo ''; + if ($ADAT['hazifeladatDiak']['hazifeladatDiakStatus']=='kész') { + echo ''; + } else { + echo ''; + } + echo '
'; + } + + echo formEnd(); } else { echo ''; if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat')); @@ -79,7 +93,35 @@ echo ''; echo '
'."\n"; if ($skin != 'ajax') formEnd(); + + + if (count($ADAT['hazifeladatDiak'])>0) { + echo '
'; + echo 'Visszajelzések'; + putHazifeladatDiak($ADAT); + echo '
'; + } + } + } + + function putHazifeladatDiak($ADAT) { + + if (count($ADAT['hazifeladatDiak'])==0) return false; + + echo ''; + echo ''; + echo ''; + echo ''; + for ($i=0; $i'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; } + echo '
diákláttastátusz
'.$D['diakNev'].''.$D['diakLattamDt'].''.$D['hazifeladatDiakStatus'].''.$D['hazifeladatDiakMegjegyzes'].'
'; } ?> 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 0aba3072..c04cd9ec 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,11 +262,12 @@ $_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':''; echo '
'; if (isset($_ORA['hazifeladatId'])) { - echo ''; + if ($_ORA['diakHazifeladat']['hazifeladatDiakStatus'] == 'kész') $_hfcolor = 'lightgreen'; + else $_hfcolor = '#e91e63'; + echo ''; } if (is_array($_hianyzasAdat)) { - echo ''; if ($_hianyzasAdat['hTipus']=='hiányzás') echo ''; @@ -336,7 +337,6 @@ if (MAYOR_SOCIAL === true) { if (in_array($_tankorTipus,array('délutáni','tanórán kívüli'))) { echo ' ¹'; } - echo '
'; if (count($T[$nap][$ora]['orak'])>$i+1) //echo '
'; -- cgit v1.2.3