From c3cbdd8305d2c46a6a18fc4f1fcc3a3f3f127029 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Mon, 16 Mar 2020 23:29:28 +0100 Subject: Rev: 4620 --- .../www/skin/classic/module-naplo/css/naplo.css | 2 +- .../module-naplo/html/haladasi/haladasi.phtml | 12 +++++- .../module-naplo/html/haladasi/hazifeladat.phtml | 47 ++++++++++++++++++++++ .../module-naplo/html/orarend/orarend.phtml | 5 ++- .../module-naplo/javascript/naplo.jquery.min.js | 11 +++++ 5 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml (limited to 'mayor-orig/mayor-naplo/www/skin') diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css index 849a5afe..8f26e848 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css @@ -214,7 +214,7 @@ /* #updateWindowSide h3:before { font-family: 'Elusive-Icons'; font-size:10px; content: "\e0a4"; padding-right:8px;font-weight:100; }*/ - .updateWindowSide button.mentes, .updateWindowSide button.torles { margin: 4px 18px; height:2em; border-radius:2px; border: solid 1px white; color:white; background-color: #ddd;} + .updateWindowSide button.mentes, .updateWindowSide button.torles { margin: 4px 18px; height:2em; border-radius:2px; border: solid 1px white; color:white; background-color: #2196f3;} .updateWindowSide button.mentes:hover { background-color: lightgreen; } .updateWindowSide button.torles:hover { background-color: red; } 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 27eb51f1..e6377aeb 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 @@ -433,6 +433,7 @@ echo ''; } echo ''."\n"; + echo ''."\n"; echo ''."\n"; // ------------------------------------------------------------------------- echo ''."\n"; @@ -485,7 +486,6 @@ echo $dOra['oraszam']; echo ''; - } else { // itt kiírhatjuk a heti terhelését //echo 'eheti:'.($ADAT['oraTerheles'][$dOra['feladatTipusId']]['db']-$SZLO[$dOra['feladatTipusId']])."/".($ADAT['oraTerheles'][$dOra['feladatTipusId']]['db']).''; //echo 'eheti:'.($SZLO['sum']-$SZLO['sum_c'])."/".($SZLO['sum']).''; @@ -514,6 +514,16 @@ if (count($_C)>0) echo ''.implode(' ',$_C).''; } } + echo ''; + if ($dOra['hazifeladatId']>0) { + echo ''; + } else { + echo ''; + } + echo ''; + + + echo ''; // ----- Leírás --------------------------------- if ($modosithatoOra) { 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 new file mode 100644 index 00000000..acf8fcae --- /dev/null +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml @@ -0,0 +1,47 @@ +'; + echo ' + 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; } + '; + echo ''; + + echo '
'._ALAPADATOK.''."\n"; + + echo superdate($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA.' – '.$ADAT['oraAdat']['tankorNev'].' – '.$ADAT['oraAdat']['kiCn']; + + echo '

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

'; + + echo '
'."\n"; + + if (__DIAK===true) { + + echo '
'._HAZIFELADAT.''."\n"; + echo ($ADAT['hazifeladatAdat']['hazifeladatLeiras']); + echo '
'."\n"; + + } else { + echo ''; + if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat')); + echo ''; + echo ''; + echo ''; + + echo '
'._HAZIFELADAT.''."\n"; + echo ''; + echo " + "; + echo ''; + echo '
'."\n"; + if ($skin != 'ajax') formEnd(); + } + } + +?> 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 f8b8d393..0aba3072 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 @@ -234,7 +234,6 @@ // $het = $_T['het']; $_ORA = $ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]; - $_valosTeremId = (is_null($_ORA['teremId']))? $_T['teremId']:$_ORA['teremId']; $_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus']; @@ -262,8 +261,12 @@ $_hianyzasAdat = $ADAT['hianyzas'][$_ORA['oraId']][0]; $_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':''; echo '
'; + if (isset($_ORA['hazifeladatId'])) { + echo ''; + } if (is_array($_hianyzasAdat)) { + echo ''; if ($_hianyzasAdat['hTipus']=='hiányzás') echo ''; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js index c57e142e..251155a1 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js @@ -698,6 +698,7 @@ processJSONOraAdat = function(adat) { content += '
'; content += '

Haladási
'; content += '

Hiányzások
'; + content += '

Házi feladat
'; content += '
'; content += '

A haladási óra adatai

'; @@ -731,6 +732,16 @@ processJSONOraAdat = function(adat) { if (adat['dolgozatBeirhato']) { content += adat['dolgozatForm']; } + + + content += '

Házi feladat '; + content += ''; + content += '

'; + if (adat['oraAdat']['hazifeladatId']>0) { + content += '
'; + content += adat['oraAdat']['hazifeladatLeiras']; + content += '
'; + } if (adat['elozoOrak']!=undefined && adat['elozoOrak'].length>0) { content += '

Előző órák

'; content += '