diff options
Diffstat (limited to 'mayor-orig/mayor-naplo/www/policy')
5 files changed, 77 insertions, 25 deletions
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas.php index d5ddca45..9725b1f9 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas.php @@ -3,6 +3,11 @@ if (_RIGHTS_OK !== true) die(); global $ADAT; - if (__INTEZMENY=='kanizsay') putTanarLista_large($ADAT); - else putTanarLista($ADAT); + if (__INTEZMENY=='kanizsay') { + $ADAT['kulsosview']=false; + putTanarLista_large($ADAT); + $ADAT['kulsosview']=true; + putTanarLista_large($ADAT); + } else putTanarLista($ADAT); + ?> diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap-pre.php index 46164faf..25332988 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap-pre.php @@ -2,14 +2,36 @@ if (_RIGHTS_OK !== true) die(); - if ($skin=='ajax') { +// if ($skin=='ajax') { require_once('include/modules/naplo/share/diak.php'); require_once('include/modules/naplo/share/osztaly.php'); - $ADAT['ma'] = getDiakBySzulDt($dt); + $ADAT['ma'] = getDiakBySzulDt(date('Y-m-d')); + + $dt = readVariable($_POST['dt'],'date'); + if (is_null($dt)) { + $refDt = date('Y-m-d',strtotime('+1 days')); + $dt = date('Y-m-d',strtotime('last sunday',strtotime($refDt))); + } + for ($i=0; $i<=6; $i++) { + $_md = date('m-d',strtotime('+'.$i.' day',strtotime($dt))); + $ADAT['heti'][$i]['dt']= date('Y-m-d',strtotime('+'.$i.' day',strtotime($dt))); + $ADAT['heti'][$i]['diakok'] = getDiakBySzulDt($_md); + } $ADAT['osztaly'] = getOsztalyok(__TANEV,array('result'=>'assoc')); - } +// } + + if ($skin!='ajax') { + global $_TANEV; + $TOOL['datumSelect'] = array( + 'tipus'=>'sor', 'post'=>array('tanarId', 'diakId', 'osztalyId', 'tankorId'), + 'paramName' => 'dt', 'hanyNaponta' => 7, + 'tolDt' => date('Y-m-d', strtotime('last sunday', strtotime($_TANEV['kezdesDt']))), + 'igDt' => date('Y-m-d', strtotime('last sunday', strtotime($_TANEV['zarasDt']))), + 'override' => true + ); + } ?> diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php index 93606734..390733b8 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/szulinap.php @@ -2,13 +2,14 @@ if (_RIGHTS_OK !== true) die(); - global $ADAT; + global $ADAT,$aHetNapjai; -if ($skin=='ajax') { +//if ($skin=='ajax') { $szulinapos= false; - if (__NAPLOADMIN || __TANAR) { +// if (__NAPLOADMIN===true || __TANAR===true) { +/* echo '<ul>'; for ($i=0; $i<count($ADAT['ma']['diak']); $i++) { echo '<li>'; @@ -18,6 +19,34 @@ if ($skin=='ajax') { echo '</li>'; } echo '</ul>'; +*/ + if ($skin!='ajax') echo '<div style="margin-left:40px">'; + + echo '<style type="text/css"> + a.btn_szulinap {display:block;text-align:center; margin-top:4px; margin-bottom:2px; } + a.btn_szulinap button { font-size:x-small;} + div.szulinaposok_dt {text-align: left; padding-left:4px; color:#888;padding-top:4px; padding-bottom:2px;} + ul.szulinap li span.eletkor {display:none;} + ul.szulinap:hover li span.eletkor { display: inline-block; background-color: #ddd; border-radius:10%; padding: 0px 4px; margin-left: 2px; } +</style>'; + + for ($n=0; $n<=6; $n++) { + echo '<div class="szulinaposok_dt">'.(date('Y.m.d.',strtotime($ADAT['heti'][$n]['dt']))).' '.$aHetNapjai[(6+date('w',strtotime($ADAT['heti'][$n]['dt'])))%7].'</div>'; + echo '<ul class="szulinap" style="list-style-type: none;">'; + for ($i=0; $i<count($ADAT['heti'][$n]['diakok']['diak']); $i++) { + $_D = $ADAT['heti'][$n]['diakok']['diak'][$i]; + echo '<li class="diakAdat diakNev" data-diakid="'.$_D['diakId'].'">'; + echo $ADAT['heti'][$n]['diakok']['diak'][$i]['viseltNevElotag'].' '; + echo $ADAT['heti'][$n]['diakok']['diak'][$i]['viseltCsaladinev'].' '; + echo $ADAT['heti'][$n]['diakok']['diak'][$i]['viseltUtonev']; + if ($ADAT['heti'][$n]['diakok']['diak'][$i]['diakEletkor']<=20) echo '<span class="eletkor">'.$ADAT['heti'][$n]['diakok']['diak'][$i]['diakEletkor'].'</span>'; + if ($ADAT['heti'][$n]['diakok']['diak'][$i]['osztaly'][0]['osztalyJel']!='') { + echo ' ('.$ADAT['heti'][$n]['diakok']['diak'][$i]['osztaly'][0]['osztalyJel'].')'; + } + echo '</li>'; + } + echo '</ul>'; + } if (is_array($ADAT['ma']['diakOsztaly'])) foreach($ADAT['ma']['diakOsztaly'] as $_diakId => $_osztalyId) { @@ -28,6 +57,13 @@ if ($skin=='ajax') { if ($szulinapos) echo _HAPPYBIRTHDAY; + echo '<a href="'.href('index.php?page=naplo&f=szulinap').'" class="btn_szulinap">'; + echo '<button><span class="icon-th-list" style="font-size:8px; color:#888"></span> Születésnaposok</button>'; + echo '</a>'; + + if ($skin!='ajax') echo '</div>'; + +/* if (is_array($O)) { echo '<ul>'; foreach($O as $osztalyId => $db) { @@ -38,7 +74,7 @@ if ($skin=='ajax') { } echo '</ul>'; } - -} +*/ +//} ?> diff --git a/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok-pre.php b/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok-pre.php index 18f17ec6..784f32f1 100644 --- a/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok-pre.php @@ -17,21 +17,6 @@ if (is_array($Telephelyek)) foreach ($Telephelyek as $index => $tAdat) $telephelyIds[] = $tAdat['telephelyId']; $tanev = readVariable($_POST['tanev'], 'id', defined('__TANEV') ? __TANEV : null, $Tanevek); $telephelyId = readVariable($_POST['telephelyId'], 'id', defined('__TELEPHELYID') ? __TELEPHELYID : null, $telephelyIds); -/* - if ($action == 'tanevValasztas') { - if (isset($tanev) && $tanev !== __TANEV) { - if (updateSessionTanev($tanev)) { - header('Location: '.location('index.php?page=naplo&sub=intezmeny&f=valtas')); - } - } - } elseif ($action == 'telephelyValasztas') { - if (isset($telephelyId) && $telephelyId != __TELEPHELYID) { - if (updateSessionTelephelyId($telephelyId)) { - header('Location: '.location('index.php?page=naplo&sub=intezmeny&f=valtas')); - } - } - } -*/ } $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus,statusz,besorolas,email,YEAR(beDt) AS belepesEve,IFNULL("",YEAR(kiDt)) AS kilepesEve, elerhetoseg')); $ADAT['targyak'] = getTargyak(array('arraymap'=>array('targyId'))); diff --git a/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok.php b/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok.php index d028bd19..97d9d6b0 100644 --- a/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok.php +++ b/mayor-orig/mayor-naplo/www/policy/public/naplo/intezmeny/tanarok.php @@ -3,6 +3,10 @@ if (_RIGHTS_OK !== true) die(); global $ADAT; + $ADAT['kulsosview'] = false; + putTanarLista_large($ADAT); + + $ADAT['kulsosview'] = true; putTanarLista_large($ADAT); ?> |