From a6185f7270c04c7469ea1a785e5cb35d2c3fdea6 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Tue, 21 Sep 2021 13:20:05 +0200 Subject: Rev: 4814 --- .../css/intezmeny/tankorTanarHozzarendeles.css | 4 +- .../classic/module-naplo/html/intezmeny/diak.phtml | 1 + .../module-naplo/html/intezmeny/osztaly.phtml | 62 +++++++++ .../module-naplo/html/intezmeny/tanarok.phtml | 144 ++++++++++++++------ .../html/intezmeny/tankorTanarHozzarendeles.phtml | 6 +- .../module-naplo/html/intezmeny/terem.phtml | 10 +- .../module-naplo/html/intezmeny/valtas.phtml | 147 ++++++++++++++------- .../module-naplo/html/orarend/orarendBetolto.phtml | 8 +- .../html/orarend/orarendModosito.phtml | 9 ++ .../classic/module-naplo/html/share/face.phtml | 21 +++ .../module-naplo/html/tanev/targyBontas.phtml | 2 +- .../module-naplo/javascript/naplo.jquery.min.js | 3 + 12 files changed, 314 insertions(+), 103 deletions(-) (limited to 'mayor-orig/mayor-naplo/www/skin') diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css index a346f49c..684a4b0b 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/intezmeny/tankorTanarHozzarendeles.css @@ -74,7 +74,7 @@ div.tanarTankor table tbody tr th.slctd { background-color: rgba(0,200,0,0.7); } div.tanarTankor table tbody tr td:hover input[type="checkbox"] { display:table-cell; } -pre { text-align: left; } + pre { text-align: left; } div.tankorTanar table#tt thead tr th.szurt { display: none; } div.tankorTanar table#tt thead tr td.szurt { display: none; } div.tankorTanar table#tt tbody tr td.szurt { display: none; } @@ -90,5 +90,5 @@ pre { text-align: left; } filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); } - + table#tt tr td.checked { background-color: lightgreen !important;} diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml index c217bd88..0f754633 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/diak.phtml @@ -409,6 +409,7 @@ echo ''."\n"; echo ''; echo ''; + echo ''; echo ''."\n"; echo ''; echo ''; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml index 01a9b0d8..26fbea77 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/osztaly.phtml @@ -462,5 +462,67 @@ function putOidEllenor($ADAT) { } +function putOsztalyGrid($ADAT) { + echo ''; + + echo '

'.$ADAT['osztalyAdat']['osztalyJel'].'

'; + echo '

'; + for ($i=0; $i'; + echo '
'; + echo $ADAT['osztalyAdat']['osztalyfonokok'][$i]['tanarNev']; + echo '
osztályfőnök'; + echo ''; + } + // echo $ADAT['osztalyAdat']['osztalyfonokNev']; + echo '

'; + if (count($ADAT['osztalyAdat']['kepzes'])>0) { + echo '

'; + for ($i=0; $i'; + } + echo '
'; + for ($i=0; $i'; // class="diakNev" -- jogosultságok! + echo '
'; + echo ''.$_D['diakNev'].''; + echo '
'; + } + echo ''; +} ?> \ No newline at end of file diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml index 40ee0453..e01375dc 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tanarok.phtml @@ -8,8 +8,17 @@ function putTanarLista($ADAT) { echo ''; for($i=0; $i'; - putFace($T['tanarId'],'tanar',0); + echo ''; + + if (($_img = getFaceURI($T['tanarId'],'tanar')) != '') { + echo ''; + } else { + echo '
'; + echo '
'; + echo '
'; + } + + //putFace($T['tanarId'],'tanar',0); echo ''; echo ''.$T['tanarNev'].''; if ($T['titulus']!='') echo '
'.$T['titulus'].'
'; @@ -18,7 +27,7 @@ function putTanarLista($ADAT) { elseif ($T['besorolas']=='Mesterpedagógus') echo '
'.lcfirst($T['besorolas']).'
'; elseif ($T['besorolas']=='Pedagógus I.') echo '
'.lcfirst($T['besorolas']).'
'; elseif ($T['besorolas']=='Pedagógus II.') echo '
'.lcfirst($T['besorolas']).'
'; -// else echo '
'.lcfirst($T['besorolas']).'
'."\n"; + else echo '
'.lcfirst($T['besorolas']).'
'."\n"; $osztalyai = ($ADAT[$T['tanarId']]['osztalyfonok']); for ($j=0; $j'; } + $munkakozossegei = ($ADAT[$T['tanarId']]['munkakozosseg']); - echo '
'; - $_MKNEV = array(); - for ($j=0; $j0) { + echo '
'; + // $_MKNEV = array(); + // for ($j=0; $j'; } - echo implode(', ',$_MKNEV).' munkaközösségi tag'; - echo '
'; if ($T['elerhetoseg']!='') echo '
'.$T['elerhetoseg'].'
'; if ($T['email']!='') echo ''; @@ -69,55 +81,101 @@ function putTanarLista($ADAT) { echo ''; } -/* -function putIntezmenyValaszto($Intezmenyek) { - - formBegin(); - echo ''."\n"; +function putTanarLista_large($ADAT) { - echo ''."\n"; +div.arckepPlaceholder {min-height:300px; min-width:100%; height:300px; margin-bottom: 2px; border: solid 1px #fff;} +h2.osztalyfonok { font-size: 14px; } +div.titulus {padding-bottom:4px;} +div.besorolas { font-size:x-small; color: #aaa;} - echo ''."\n"; + '; - formEnd(); + echo '
'; + for($i=0; $i'; + if (($_img = getFaceURI($T['tanarId'],'tanar')) != '') echo ''; + else { + echo '
'; + // echo '
'; + echo '
'; + } -function putTanevValaszto($Tanevek) { + echo '
'; - formBegin(); + echo '
'.$T['tanarNev'].'
'; - echo ''."\n"; + if ($T['titulus']!='') echo '
'.$T['titulus'].'
'; + if ($T['statusz']=='külső óraadó') echo '
'.$T['statusz'].'
'; - echo ''."\n"; + echo '
'; + } - echo ''."\n"; + echo '
'.kisbetus($T['besorolas']).'
'; - formEnd(); + if ($T['email']!='') echo ''; + + echo '
'; + + } + echo ''; } -*/ + + ?> diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml index aa9747fc..fa705502 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankorTanarHozzarendeles.phtml @@ -122,9 +122,11 @@ else { $class='tantan'; } $class .= ' col-'.$_tankorAdat['tankorId'].' row-'.$_tanarAdat['tanarId']; if (in_array($_tankorAdat['targyId'], $_tanarAdat['targyIds'])) { + $_CHK = in_array($_tanarAdat['tanarId'],$_tankorAdat['tanarIds']) ? ' checked="checked" ':''; + $_RO = (__NAPLOADMIN===true || __VEZETOSEG===true) ? '':' disabled="disabled" readonly="readonly" '; + $class .= in_array($_tanarAdat['tanarId'],$_tankorAdat['tanarIds']) ? ' checked ':''; echo ''; - $_CHK = in_array($_tanarAdat['tanarId'],$_tankorAdat['tanarIds']) ? 'checked="checked" ':''; - echo ''; + echo ''; echo ''; } else { echo ''; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml index 68c826f9..470c57f8 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/terem.phtml @@ -68,9 +68,13 @@ echo '
'; - echo ''."\n"; - echo ''.$ADAT['teremId'].'
'; - + if ($ADAT['teremId']>0) { + // echo ''."\n"; + // echo ''.$ADAT['teremId'].'
'; + echo ''."\n"; + echo $ADAT['teremId'].'→'; + echo '
'; + } echo ''."\n"; echo '
'."\n"; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml index 6811b588..0a2e7fde 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml @@ -1,5 +1,102 @@ + +div.tanarGrid { + width:100%; + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: center; + align-items: auto; + align-content: start +} +div.tanarGrid .item { + flex: 0 0 auto; + margin: 10px; + width: 300px; + background-color: #eee; + text-align:center; + padding:4px 4px; + border-radius:2px; +} + +h1.osztaly,h2.osztalyfonok,h3.kepzes { text-align:center; } + +div.tanarGrid .item:hover { + background-color: #ddd; +} + +img.arckep {min-height:300px; height:300px; margin-bottom: 2px; border: solid 1px #ddd;} +div.arckepPlaceholder {min-height:300px; min-width:100%; height:300px; margin-bottom: 2px; border: solid 1px #fff;} +h2.osztalyfonok { font-size: 14px; } +div.titulus {padding-bottom:4px;} +div.besorolas { font-size:x-small; color: #aaa;} + + '; + + echo '
'; + for($i=0; $i'; + if (($_img = getFaceURI($T['tanarId'],'tanar')) != '') echo ''; + else { + echo '
'; + // echo '
'; + echo '
'; + } + + echo '
'; + + echo '
'.$T['tanarNev'].'
'; + + if ($T['titulus']!='') echo '
'.$T['titulus'].'
'; + if ($T['statusz']=='külső óraadó') echo '
'.$T['statusz'].'
'; + + $osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]); + for ($j=0; $josztályfőnök '.$ADAT['osztalyok'][$_osztalyId]['osztalyJel']; + if ($ADAT['osztalyok'][$_osztalyId]['leiras']!='') echo ' ('.$ADAT['osztalyok'][$_osztalyId]['leiras'].')'; + echo '
'; + } + } + + $munkakozossegei = ($ADAT['tanarMunkakozosseg'][$T['tanarId']]); // vezetett + for ($j=0; $j'; + echo $munkakozossegei[$j]['munkakozossegNev']. ' munkaközösség-vezető'; + echo '
'; + } + + if (count($T['kepesites'])>0) { + echo '
'; + for ($j=0; $j'; + } + echo '
'; + } + + echo '
'.kisbetus($T['besorolas']).'
'; + + // dump($T); + if ($T['email']!='') echo ''; + + echo ''; + + } + echo ''; +} + + + function putTanarLista($ADAT) { echo ''; @@ -48,55 +145,5 @@ function putTanarLista($ADAT) { echo '
'; } -/* -function putIntezmenyValaszto($Intezmenyek) { - - formBegin(); - - echo ''."\n"; - - echo ''."\n"; - - echo ''."\n"; - - formEnd(); - -} - -function putTanevValaszto($Tanevek) { - - formBegin(); - - echo ''."\n"; - - echo ''."\n"; - - echo ''."\n"; - - formEnd(); -} -*/ ?> diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml index d6f037b0..cadb9520 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendBetolto.phtml @@ -2,8 +2,7 @@ function putFileValaszto($ADAT) { - formBegin(array('class'=>'file')); - + echo formBegin(array('class'=>'file','enctype'=>'multipart/form-data')); echo ''."\n"; echo ''."\n"; echo ''."\n"; @@ -12,6 +11,11 @@ echo ''."\n"; echo '
'; + + echo '
'; + echo ' (maximum méret: '.human_filesize(file_upload_max_size()).')'; + echo '
'; + echo '
'; echo '