aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-naplo/www/skin
diff options
context:
space:
mode:
authorM.Gergo2024-09-29 04:30:59 +0200
committerM.Gergo2024-09-29 04:30:59 +0200
commitf55bad6878c678ce5aed406a5d2b31a6b3a523eb (patch)
tree27e7421dd8a7b65f4a1af3bc0a7f1ae073d97e78 /mayor-orig/mayor-naplo/www/skin
parent3d2ab46cef4f29a500f9a125460bb2993613c67e (diff)
parent8ba4eb09ddb764eaf01fabe30bdd49a202858d4d (diff)
downloadmayor-master.tar.gz
mayor-master.zip
Diffstat (limited to 'mayor-orig/mayor-naplo/www/skin')
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml13
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendTankor.phtml9
2 files changed, 15 insertions, 7 deletions
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml
index 60095e83..c5158391 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml
@@ -146,7 +146,7 @@
}
echo ', ';
echo '<span title="'.$_ferohely.'/'.$_letszam.'" class="t'.( ($_ferohely!=0 && $_ferohely<$_letszam) ? 0 : 1).'">'.$ADAT['termek'][$_T['teremId']]['leiras'].'</span>';
- _putTerem(array('name'=>'T_'.$het.'_'.$nap.'_'.$ora.'_'.$_T['tanarId'].'_'.$_kulcsTolDt, 'teremId'=>$_T['teremId']),$ADAT['termek']);
+ _putTerem(array('name'=>'T_'.$het.'_'.$nap.'_'.$ora.'_'.$_T['tanarId'].'_'.$_kulcsTolDt, 'teremId'=>$_T['teremId'], 'szabadTermek'=> $ADAT['szabadTermek'][$dt][$ora]),$ADAT['termek']);
echo '<br/>';
if ($_ORA['kit']!='') {
echo '<span class="helyett tanarAdat tanarNev" data-tanarid="'.$_T['tanarId'].'">';
@@ -346,12 +346,13 @@ for ($oi=0; $oi<count($ADAT['orarendioraTankor']['orarendiOra'][$het][$nap][$ora
echo '<option value="NULL" >'.'</option>'."\n";
foreach ($TERMEK as $_teremId => $_T) { // leiras|ferohely|tipus|telephely
$_SEL = ($ADAT['teremId']==$_T['teremId']) ? ' selected="selected" ' : '';
+ $_elerheto = (in_array($_teremId,$ADAT['szabadTermek'])) ? '': ($_SEL=='' ? ' FOGLALT! ': '***');
if ($_T['tipus'] == $_T['leiras']) $_leiras = $_T['tipus']; else $_leiras = $_T['leiras'].' ('.$_T['tipus'].')';
- if ($ADAT['teremId']==$_T['teremId']) {
- echo '<option class="orig" value="" '.$_SEL.'>***'.$_T['leiras'].' ['.$_T['ferohely'].'] '.$_T['tipus'].'</option>'."\n";
- } else {
- echo '<option value="'.$_T['teremId'].'" '.$_SEL.'>'. $_leiras .' ['.$_T['ferohely'].']'.'</option>'."\n";
- }
+ if ($ADAT['teremId']==$_T['teremId']) {
+ echo '<option class="orig" value="" '.$_SEL.'>***'.$_T['leiras'].' ['.$_T['ferohely'].'] '.$_T['tipus'].' '.$_elerheto.'</option>'."\n";
+ } else {
+ echo '<option value="'.$_T['teremId'].'" '.$_SEL.'>'. $_leiras .' ['.$_T['ferohely'].']'.$_elerheto.'</option>'."\n";
+ }
}
echo '</select>';
}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendTankor.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendTankor.phtml
index 08144c53..315dba0c 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendTankor.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarendTankor.phtml
@@ -38,7 +38,14 @@
$_targyJel = $T[$nap][$ora][$i]['targyJel'];
$_osztalyJel = $T[$nap][$ora][$i]['osztalyJel'];
$_teremId = ($T[$nap][$ora][$i]['teremId']=='')?'-':$T[$nap][$ora][$i]['teremId'];
- echo '<pre style="text-align: left">';
+
+ // INFOBOX
+ if ($ADAT['assoc'][$nap][$ora]['orak'][$i]['tankorId'] >0 ) {
+ $_cls="background-color: lightgreen; ";
+ } else {
+ $_cls='';
+ }
+ echo '<pre style="text-align: left ;'.$_cls.'">';
echo "targyJel: $_targyJel\n";
echo "osztalyJel: $_osztalyJel\n";
echo "teremId: $_teremId\n";