From 7891f65fb7544f3b1a126f8e0688889d6a6954f3 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Sun, 12 Jan 2020 12:53:59 +0100 Subject: Rev: 4589 --- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../www/include/modules/naplo/base/zcheck.php | 2 ++ .../www/include/modules/naplo/share/hirnok.php | 16 ++++++++++++++++ .../www/include/modules/naplo/share/kereso.php | 13 ++++++------- .../www/include/modules/naplo/share/orarend.php | 12 ++++++++++++ .../www/include/modules/naplo/uzeno/uzeno.php | 10 +++++++--- .../www/policy/private/naplo/hibabejelento/admin.php | 4 ++-- .../policy/private/naplo/hirnok/cronFutar-pre.php | 8 +++++++- .../www/policy/private/naplo/orarend/orarend-pre.php | 1 + .../www/policy/private/naplo/uzeno/postas-pre.php | 5 ++++- .../www/policy/private/naplo/uzeno/postas.php | 3 ++- .../ajax/module-naplo/html/hibabejelento/admin.phtml | 6 +++--- .../classic/module-naplo/css/orarend/orarend.css | 5 +++++ .../skin/classic/module-naplo/css/uzeno/uzeno.css | 3 +++ .../classic/module-naplo/html/hirnok/cronFutar.phtml | 18 ++++++++++++++++++ .../classic/module-naplo/html/hirnok/hirnok.phtml | 20 ++++++++++++++++++++ .../classic/module-naplo/html/orarend/orarend.phtml | 9 +++++++-- .../classic/module-naplo/html/uzeno/postas.phtml | 4 ++-- 18 files changed, 118 insertions(+), 23 deletions(-) (limited to 'mayor-orig/mayor-naplo') diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 7b690e22..0da8daf7 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4574 +4589 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php index 91e3905a..12b7dea5 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/base/zcheck.php @@ -99,4 +99,6 @@ if (count($KERELEM_TAG) ==0) $KERELEM_TAG = array('névsor','jogviszony','órarend, haladási','hiányzás, igazolás','jegy, zárójegy'); + if (!defined('__HABEL_GYURI_DEBUG')) define('__HABEL_GYURI_DEBUG',false); + ?> diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/hirnok.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/hirnok.php index 1ffdda96..94ffa865 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/hirnok.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/hirnok.php @@ -232,6 +232,22 @@ global $SZEMESZTER; ); } } + + // utolsó óra + if (__TANAR === true || (__NAPLOADMIN===true && $tanarId>0)) { + if (defined('__USERTANARID') && is_numeric(__USERTANARID)) { // cron esetén nincs ilyen + $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime, getOraIgTime(ora.oraId) AS igTime FROM (SELECT dt,max(ora) AS utolsooraateremben,teremId,terem.leiras AS teremNev FROM ora LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId) WHERE dt=curdate() AND teremId IS NOT NULL GROUP BY teremId) AS x LEFT JOIN ora ON (ora.dt = x.dt AND x.utolsooraateremben = ora.ora AND x.teremId = ora.teremId) WHERE ora.ki=%u"; + $v = array(__USERTANARID); + $r = db_query($q, array('fv'=>'getHirnokFolyam/haladasi2','modul'=>'naplo','result'=>'indexed','values'=>$v)); + for ($i=0; $i'utolsoora', + 'adat'=>$r[$i] + ); + } + } + } + // Üzenő // /* 20170418 initSzerep(); diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kereso.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kereso.php index b2bf2cf6..867fe15e 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kereso.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kereso.php @@ -5,19 +5,19 @@ $q = "SELECT DISTINCT diak.diakId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS diakNev, oId, osztalyJel FROM `diak` LEFT JOIN osztalyDiak ON (osztalyDiak.diakId=diak.diakId AND osztalyDiak.beDt<=NOW() AND (osztalyDiak.kiDt>=NOW() OR osztalyDiak.kiDt IS NULL)) LEFT JOIN " . __TANEVDBNEV . ".osztalyNaplo USING (osztalyId) - HAVING (diakNev LIKE '%s' OR oId LIKE '%s') ORDER BY diakNev LIMIT 100"; + HAVING (diakNev LIKE '%s' OR oId LIKE '%s') ORDER BY diakNev"; $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%','%'.$pattern.'%'))); return $r; } function getTanarokByPattern($pattern) { if ($pattern=='') return false; - $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev FROM `tanar` WHERE (kiDt IS NULL OR kiDt >=NOW()) HAVING tanarNev LIKE '%s' ORDER BY tanarNev LIMIT 100"; + $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev FROM `tanar` WHERE (kiDt IS NULL OR kiDt >=NOW()) HAVING tanarNev LIKE '%s' ORDER BY tanarNev"; $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%'))); return $r; } function getTankorokByPattern($pattern) { if ($pattern=='') return false; - $q = "SELECT tankorId, tankorNev AS tankorNev FROM `tankor`HAVING tankorNev LIKE '%s' ORDER BY tankorNev LIMIT 100"; + $q = "SELECT tankorId, tankorNev AS tankorNev FROM `tankor`HAVING tankorNev LIKE '%s' ORDER BY tankorNev"; $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%'))); return $r; } @@ -25,7 +25,7 @@ if ($pattern=='') return false; if ($SET['diakokkal']!==true) { $p= "TRIM(CONCAT_WS(' ',nevElotag, csaladinev, utonev)) "; - $q = "SELECT szuloId, $p AS szuloNev FROM `szulo` HAVING szuloNev LIKE '%s' ORDER BY szuloNev LIMIT 100"; + $q = "SELECT szuloId, $p AS szuloNev FROM `szulo` HAVING szuloNev LIKE '%s' ORDER BY szuloNev"; $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%'))); } else { @@ -42,13 +42,12 @@ $subquery = 'LEFT JOIN diak ON (szuloId IN (anyaId,apaId,neveloId,gondviseloId))'; $p = "CONCAT(TRIM(CONCAT_WS(' ',nevElotag, csaladinev, utonev)), ' (',TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)),')' ) "; - $q2 = "SELECT szuloId, $p AS szuloNev FROM `szulo` $subquery WHERE TRIM(CONCAT_WS(' ',nevElotag, csaladinev, utonev)) LIKE '%s' $W LIMIT 100"; + $q2 = "SELECT szuloId, $p AS szuloNev FROM `szulo` $subquery WHERE TRIM(CONCAT_WS(' ',nevElotag, csaladinev, utonev)) LIKE '%s' $W "; if (count($DIAKIDS)>0) { - $q1 = "SELECT szuloId, $p AS szuloNev FROM `szulo`$subquery WHERE diakId IN (".implode(',',$DIAKIDS).") $W LIMIT 100"; + $q1 = "SELECT szuloId, $p AS szuloNev FROM `szulo`$subquery WHERE diakId IN (".implode(',',$DIAKIDS).") $W "; $q = "$q1 UNION ($q2)"; } else $q = "($q2)"; $r = db_query("$q ORDER BY szuloNev", array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%'))); - } return $r; } diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php index 0e2a5836..5dae295a 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/orarend.php @@ -424,4 +424,16 @@ return db_query($q, array('fv'=>'orarendvane','modul'=>'naplo','result'=>'value')); } + function getUtolsoorak() { + $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime, getOraIgTime(ora.oraId) AS igTime +FROM (SELECT dt,max(ora) AS utolsooraateremben,teremId,terem.leiras AS teremNev FROM ora LEFT JOIN ".__INTEZMENYDBNEV.".terem +USING (teremId) WHERE teremId IS NOT NULL GROUP BY dt,teremId) AS x LEFT JOIN ora ON (ora.dt = x.dt AND x.utolsooraateremben = ora.ora AND x.teremId = ora.teremId)"; + $r = db_query($q, array('fv'=>'getUtolsoorak','modul'=>'naplo','result'=>'indexed')); + $RES = array(); + for ($i=0; $i diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/uzeno/uzeno.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/uzeno/uzeno.php index de157fa3..561c97ff 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/uzeno/uzeno.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/uzeno/uzeno.php @@ -180,9 +180,13 @@ $txt = ($ADAT['txt']); $dbName = 'naplo_'.__INTEZMENY.'_'.$ADAT['tanev']; - $q = "INSERT INTO `%s`.uzeno (dt,txt,feladoId,feladoTipus,cimzettId,cimzettTipus) VALUES (NOW(), '%s', %u, '%s', %u, '%s')"; - $v = array($dbName, $txt, $feladoId, $feladoTipus, $cimzettId, $cimzettTipus); - return db_query($q,array('fv' => 'uzeno/postUzenet', 'modul' => 'naplo_intezmeny', 'values' => $v)); + if ($cimzettId>0 && $feladoId>0 && $txt!='') { + $q = "INSERT INTO `%s`.uzeno (dt,txt,feladoId,feladoTipus,cimzettId,cimzettTipus) VALUES (NOW(), '%s', %u, '%s', %u, '%s')"; + $v = array($dbName, $txt, $feladoId, $feladoTipus, $cimzettId, $cimzettTipus); + return db_query($q,array('fv' => 'uzeno/postUzenet', 'modul' => 'naplo_intezmeny', 'values' => $v)); + } else { + return false; + } } // v3.1 diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php index f34d5eed..8296185e 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/hibabejelento/admin.php @@ -2,9 +2,9 @@ if (_RIGHTS_OK !== true) die(); - global $Kerelmek,$telephelyId,$TELEPHELY; + global $Kerelmek,$telephelyId,$TELEPHELY, $kerelemId; - if ($skin=='classic') putHibabejelento($telephelyId); + if ($skin=='classic' && !($kerelemId>0)) putHibabejelento($telephelyId); if (is_array($Kerelmek) && count($Kerelmek)>0) { if ($_GET['view']==2){ diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php index 5691de0f..c183ba30 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/hirnok/cronFutar-pre.php @@ -15,9 +15,15 @@ for ($i=0; $i$d['userAccount'], 'policy'=>$d['policy'], 'email'=>$d['email'], 'setDt'=> $refDt); + $ADAT['feliratkozas'][$d['naploTipus']][$d['naploId']][] = array( + 'userAccount'=>$d['userAccount'], + 'policy'=>$d['policy'], + 'email'=>$d['email'], + 'setDt'=> $refDt + ); } // Megszorítás: egy naplóbeli entitás utolsoEmailDt-je együtt kell, hogy mozogjon ebben a feldolgozási rendszerben. diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php index a7022d00..6421687a 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php @@ -224,6 +224,7 @@ $ADAT['dt'] = $dt; // show this... ha a skin ajax $ADAT['csengetesiRend'] = getCsengetesiRend(); + $ADAT['utolsoorak'] = getUtolsoorak(); $ADAT['telephelyId'] = $telephelyId; $ADAT['napiMinOra'] = getMinOra(); $ADAT['napiMaxOra'] = getMaxOra(); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php index 8f44cd8c..e1f28bc7 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas-pre.php @@ -27,6 +27,7 @@ $ADAT['cimzett'] = readVariable($_POST['cimzett'],'string'); $ADAT['diakokkal'] = readVariable($_POST['diakokkal'],'bool'); // ez mindig true $ADAT['txt'] = readVariable($_POST['txt'],'string'); + $ADAT['tanev'] = readVariable($_POST['tanev'],'numeric',__TANEV); list($_cimzettTipus,$_cimzettId) = explode('|',$ADAT['cimzett']); $ADAT['cimzettTipus'] = readVariable($_cimzettTipus,'strictstring',null); @@ -77,13 +78,15 @@ 'txt'=> $ADAT['txt'] ); if (postUzenet($P) === true) { - /* Ha sikered */ + /* Ha sikeres */ unset($_POST); header('Location: '.location('index.php?page=naplo&sub=uzeno&f=uzeno')); } else { $_SESSION['alert'][] = 'page::uzenorogziteshiba'; } + } else { + $_SESSION['alert'][] = 'page::uzenorogziteshiba'; } ?> diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php index 18ccddef..6d899712 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/uzeno/postas.php @@ -1,5 +1,6 @@ diff --git a/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml b/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml index 69585645..cc889416 100644 --- a/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml +++ b/mayor-orig/mayor-naplo/www/skin/ajax/module-naplo/html/hibabejelento/admin.phtml @@ -68,8 +68,8 @@ $_color='#ff5722'; $_class="icon-question-sign"; } - echo '
'; - echo '
Hangya - '.superdate($ADAT['kerelmek'][$i]['rogzitesDt']).'
'; + echo '
'; + echo '
Hangya - '.superdate($ADAT['kerelmek'][$i]['rogzitesDt']).'
'; echo ''; echo ''; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css index 0cfda59b..fab07933 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css @@ -71,6 +71,11 @@ table.orarend tbody tr td div.oraMostVan { border-color: lightgreen; border-width: 0px 4px 0px 4px; border-radius:2px; } +table.orarend tbody tr td div.utolsoora { + border-style: solid; + border-color: orange; border-width: 0px 0px 2px 0px; border-radius:2px; +} + table.orarend tbody tr td div.dolgozat { background-color: orange; color:white; border-radius:2px; padding:2px; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css index 04d5ea37..29c35b1a 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/uzeno/uzeno.css @@ -128,6 +128,9 @@ a span.icon-network { color: #aaa; } a:hover span.icon-network { color: cornflowerblue; } + #uzenoSearchIcon { cursor:pointer; background-color: #bbb; border-radius:2px; padding:3px 3px 2px 2px; color:white; } + #uzenoSearchIcon:hover { background-color: cornflowerblue; } + @media (max-width: 764px) { table.uzeno tbody tr td.felado { min-width:80px;} diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml index 84d59777..ffd8ed68 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml @@ -51,6 +51,24 @@ return $RETURN_STR; } + function generateFutar_utolsoora($D) { + $a_az[0] = 'a'; + $a_az[1] = 'az'; + $a_az[2] = 'a'; + $a_az[3] = 'a'; + $a_az[4] = 'a'; + $a_az[5] = 'az'; + $a_az[6] = 'a'; + $a_az[7] = 'a'; + $a_az[8] = 'a'; + $a_az[9] = 'a'; + $a_az[10] = 'a'; + $a_az[11] = 'a'; + $a_az[12] = 'a'; + $RETURN_STR .='Ma a haladási napló szerint a(z) '.$D['adat']['teremNev'].' teremben '.$a_az[$D['adat']['utolsooraateremben']].' '.$D['adat']['utolsooraateremben'].'. óra után már nincs óra!'; + return $RETURN_STR; + } + function generateFutarBadge_jegy($D) { // return 'face'; } diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml index a70662e9..61352d81 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml @@ -55,6 +55,9 @@ function putHirnokBadge_idoszak($D) { echo ''; } + function putHirnokBadge_utolsoora($D) { + echo ''; + } function putHirnokBadge_haladasiBeiratlan($D) { if ($D['db']!=0) @@ -113,6 +116,23 @@ echo 'Aktív '.$D['idoszakAdat']['tipus'].' időszak: '.$D['idoszakAdat']['tolDt'].' – '.$D['idoszakAdat']['igDt']; } + function putHirnok_utolsoora($D) { + $a_az[0] = 'a'; + $a_az[1] = 'az'; + $a_az[2] = 'a'; + $a_az[3] = 'a'; + $a_az[4] = 'a'; + $a_az[5] = 'az'; + $a_az[6] = 'a'; + $a_az[7] = 'a'; + $a_az[8] = 'a'; + $a_az[9] = 'a'; + $a_az[10] = 'a'; + $a_az[11] = 'a'; + $a_az[12] = 'a'; + echo 'Ma a haladási napló szerint a(z) '.$D['adat']['teremNev'].' teremben '.$a_az[$D['adat']['utolsooraateremben']].' '.$D['adat']['utolsooraateremben'].'. óra után már nincs óra!'; + } + function putHirnokBadge_hianyzas($D) { $ICON = array('késés'=>'timer','felmentés'=>'accessible','felszerelés hiány'=>'accessibility', 'hiányzás'=>'location_off'); // location_off, grid_off, blur_off 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 b8d74048..f8b8d393 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 @@ -24,6 +24,9 @@ function putOrarend($ADAT) { global $aHetNapjai,$skin; + // $ADAT['utolsoorak'][$teremId]['oraId'] + + /* Képzés-Mátrix */ //dump($ADAT['kepzesOraterv']); if (is_array($ADAT['kepzesOraterv']) && count($ADAT['kepzesOraterv'])>0) { @@ -237,6 +240,7 @@ $_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus']; $_tankorTipusId = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipusId']; $_oraMostVan = (in_array($_ORA['oraId'],$ADAT['orakMost'])); + $_utolsoora = ($_ORA['oraId']!='' && $_ORA['oraId'] == $ADAT['utolsoorak'][$dt][$_valosTeremId]['oraId']); // if ($kepzes_figyel &&$ADAT['tankorTipus'][$_tankorTipusId]['oratervi'] == 'óratervi' @@ -249,14 +253,15 @@ $_osztalyJel = $_T['osztalyJel']; // figyelem, itt jön a kiírás, a _putOra fv helyett: $_tipusClass = str_replace(' ','_',$_ORA['tipus']); - $_oraMostVanClass = ($_oraMostVan) ? ' oraMostVan':''; + $_oraMostVanClass = ($_oraMostVan) ? ' oraMostVan ':''; + $_utolsooraClass = ($_utolsoora) ? ' utolsoora ':''; if ($_T['jelleg']=='osztályfüggetlen') { $_tipusClass .= ' osztályfüggetlen'; } $_oraAdat = (isset($_ORA['oo']) && _POLICY!='public') ? 'oraAdat' : ''; // haladási $_hianyzasAdat = $ADAT['hianyzas'][$_ORA['oraId']][0]; $_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':''; - echo '
'; + echo '
'; if (is_array($_hianyzasAdat)) { echo ''; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml index 65a45fae..0ac05060 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/postas.phtml @@ -24,7 +24,7 @@ echo ''; // rendhagyó eset, mert az egész tartalmat lecseréli az onLoadUpdate, és a form-tól kezdjük... echo ''; echo ''; - echo ''; + echo '
'; echo '
'._UJ_UZENET; if (__UZENOADMIN ===true && $ADAT['user']['feladoTipus']!='admin') { echo '
'; echo _CIMZETT.': '; // echo 'ዖ'.''; - echo '⌕'; + echo ''; echo ''; echo ''; if (is_array($ADAT['r'])) { -- cgit v1.2.3