aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/www/skin/classic/module-naplo
diff options
context:
space:
mode:
Diffstat (limited to 'mayor-orig/www/skin/classic/module-naplo')
-rw-r--r--mayor-orig/www/skin/classic/module-naplo/css/orarend/orarendModosito.css3
-rw-r--r--mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml20
-rw-r--r--mayor-orig/www/skin/classic/module-naplo/html/intezmeny/terem.phtml7
-rw-r--r--mayor-orig/www/skin/classic/module-naplo/html/orarend/orarend.phtml51
-rw-r--r--mayor-orig/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml14
-rw-r--r--mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js13
-rw-r--r--mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js6
7 files changed, 92 insertions, 22 deletions
diff --git a/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarendModosito.css b/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarendModosito.css
index 4d2ef3aa..1d9f527b 100644
--- a/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarendModosito.css
+++ b/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarendModosito.css
@@ -3,7 +3,7 @@ h2 { text-align: center; color: red;}
h2.toPrint { display: none; }
table.toolBar tr td select, table.toolBar tr td option {
- font-size:11px;
+font-size:10px;
}
table.orarend {
@@ -45,6 +45,7 @@ table.orarend tr td select {
font-size: 10px;
background-color:#000011;
color: white;
+ max-width:140px;
}
div.unfinished {
diff --git a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml
index 22e807f5..7517709b 100644
--- a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml
+++ b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml
@@ -28,11 +28,6 @@
global $TANKOR_TIPUS;
/* $TOPOST['tankoradat'] */
-
- $TT=array();
- for ($i=0; $i<count($TOPOST['tankortanar']); $i++) {
- $TT[] = $TOPOST['tankortanar'][$i]['tanarNev'];
- }
if (!is_array($TARGY)) return false;
$SZEMCHECK = array();
@@ -61,11 +56,16 @@
echo '<h2>'._TANKOR.' ';
echo $MK['leiras'].'/'.$TARGY['targyNev'];
if ($TARGY['targyJelleg']!='') echo ' ('.$TARGY['targyJelleg'].')';
- echo ' '.implode(', ',$TT);
+ for ($i=0; $i<count($TOPOST['tankortanar']); $i++) {
+ echo ' ';
+ echo '<span class="tanarNev" data-tanarid="'.$TOPOST['tankortanar'][$i]['tanarId'].'" >';
+ echo $TOPOST['tankortanar'][$i]['tanarNev'];
+ echo '</span>';
+ }
echo '</h2>'."\n";
-
echo '<table>';
+
echo '<tr>'."\n";
echo '<th>'._ELNEVEZES.'</th>';
echo '<td>';
@@ -98,6 +98,12 @@
echo '</td>';
echo '</tr>';
echo '<tr>'."\n";
+ echo '<th>'._TANKORCN.'</th>';
+ echo '<td colspan="2">';
+ echo '<input type="text" name="tankorCn" value="'.$TOPOST['tankoradat']['cn'].'" />';
+ echo '</td>';
+ echo '</tr>'."\n";
+
echo '</table>';
echo '<h2>'._ALTALANOS.'</h2>'."\n";
diff --git a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/terem.phtml b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/terem.phtml
index 73cbede6..7b95fbc6 100644
--- a/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/terem.phtml
+++ b/mayor-orig/www/skin/classic/module-naplo/html/intezmeny/terem.phtml
@@ -12,16 +12,21 @@
echo '<th>'._FEROHELY.'</th>';
echo '<th>'._TIPUS.'</th>';
echo '<th>'._TELEPHELY.'</th>';
+ echo '<th>'._TEREMALLAPOT.'</th>';
echo '</tr></thead>'."\n";
echo '<tfoot><tr></tr></tfoot>'."\n";
echo '<tbody>';
foreach ($ADAT['teremAdat'] as $teremId => $tAdat) {
echo '<tr>';
echo '<td>'.$tAdat['teremId'].'</td>';
- echo '<td><a href="'.href('index.php?page=naplo&sub=intezmeny&f=terem&teremId='.$tAdat['teremId'].'&telephelyId='.$ADAT['telephelyId']).'">'.$tAdat['leiras'].'</a></td>';
+ echo '<td><a href="'.href('index.php?page=naplo&sub=intezmeny&f=terem&teremId='.$tAdat['teremId'].'&telephelyId='.$ADAT['telephelyId']).'">';
+ echo '<span class="icon-pencil-alt" style="color:#aaa;"></span> ';
+ echo $tAdat['leiras'];
+ echo '</a></td>';
echo '<td>'.$tAdat['ferohely'].'</td>';
echo '<td>'.$tAdat['tipus'].'</td>';
echo '<td>'.$ADAT['telephelyAdat'][ $tAdat['telephelyId'] ]['telephelyRovidNev'].'</td>';
+ echo '<td>'.$tAdat['teremAllapot'].'</td>';
echo '</tr>'."\n";
}
echo '</tbody>'."\n";
diff --git a/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarend.phtml b/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarend.phtml
index 0a0174bb..e34ea785 100644
--- a/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarend.phtml
+++ b/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarend.phtml
@@ -55,6 +55,25 @@
// if (is_array($ADAT['orarend']['assoc'])) {
if (TRUE) {
$T = $ADAT['orarend']['assoc'];
+
+ if (MAYOR_SOCIAL === true) {
+ echo '<h2 style="text-align: center;
+ background-color: #f06;
+ width: 220px;
+ margin: auto;
+ color: #fff;
+ margin-bottom: 8px;
+ border-radius: 4px;
+ padding: 2px;">MaYoR Social Edition</h2>';
+ formBegin();
+ echo '<input type="hidden" name="action" value="orarendiOraTeremModosit" />';
+ echo '<input type="hidden" name="dt" value="'.$ADAT['dt'].'" />';
+ echo '<input type="hidden" name="tanarId" value="'.$ADAT['tanarId'].'" />';
+ echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />';
+ echo '<input type="hidden" name="teremId" value="'.$ADAT['teremId'].'" />';
+ echo '<input type="hidden" name="diakId" value="'.$ADAT['diakId'].'" />';
+ echo '<input type="hidden" name="tankorId" value="'.$ADAT['tankorId'].'" />';
+ }
echo '<h2 class="toPrint">'.$ADAT['toPrint'].'</h2>';
echo '<table cellspacing="1" class="orarend '.$ADAT['orarendTipus'].'" align="center">'."\n";
echo '<thead>';
@@ -214,7 +233,9 @@
//
$het = $_T['het'];
$_ORA = $ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']];
- $_valosTeremId = (is_null($_ORA['teremId']))? $_T['teremId']:$_ORA['teremId'];
+
+$_valosTeremId = (is_null($_ORA['teremId']))? $_T['teremId']:$_ORA['teremId'];
+
$_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus'];
$_tankorTipusId = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipusId'];
$_oraMostVan = (in_array($_ORA['oraId'],$ADAT['orakMost']));
@@ -260,8 +281,8 @@
}
if ($TANKOR_DOLGOZAT[$_T['tankorId']][$dt]>0) echo '<span style="color:orange;" class="icon-idea-alt" title="bejelentett dolgozat dolgozatAdat" data-dolgozatid="'.$TANKOR_DOLGOZAT[$_T['tankorId']][$dt].'"></span>';
if ($TANKOR_JEGYZET[$_T['tankorId']][$dt]>0) echo '<span style="color:lightgreen;" class="icon-file-edit-alt" title="jegyzet"></span>';
- $_teremKiir = ($_T['teremId'] != $_valosTeremId) ? '<del>'.$ADAT['termek'][$_T['teremId']]['leiras'].'</del><ins>'.$ADAT['termek'][$_valosTeremId]['leiras'].'</ins>' : $ADAT['termek'][$_T['teremId']]['leiras'];
- $_ferohely = $ADAT['termek'][$_valosTeremId]['ferohely'];
+$_teremKiir = ($_T['teremId'] != $_valosTeremId) ? '<del>'.$ADAT['termek'][$_T['teremId']]['leiras'].'</del><ins>'.$ADAT['termek'][$_valosTeremId]['leiras'].'</ins>' : $ADAT['termek'][$_T['teremId']]['leiras'];
+$_ferohely = $ADAT['termek'][$_valosTeremId]['ferohely'];
$_letszam = $ADAT['tankorLetszamok'][$_T['tankorId']];
if ($_T['tankorId']!='') {
echo '<span title="'.$_targyJel.' '.$_osztalyJel.' ('.$ADAT['tankorok'][$_T['tankorId']][0]['tankorId'].') '.$_tankorTipus.'" >';
@@ -271,7 +292,27 @@
echo "$_targyjel : $_osztalyJel : ";
}
echo ', ';
- echo '<span title="'.$_ferohely.'/'.$_letszam.'" class="t'.( ($_ferohely!=0 && $_ferohely<$_letszam) ? 0 : 1).'">'.$_teremKiir.'</span>';
+ echo '<span class="normalTerem" data-tmpid="'.intval(++$tmpid).'" title="'.$_ferohely.'/'.$_letszam.'" class="t'.( ($_ferohely!=0 && $_ferohely<$_letszam) ? 0 : 1).'">'.$_teremKiir.'</span>';
+
+// mindenkinek módosítható (social edition)
+if (MAYOR_SOCIAL === true) {
+// if ($_valosTeremId == 0) {
+ // (`het`,`nap`,`ora`,`tanarId`,`tolDt` = teremId),
+ $_keyBase = 'OOM+'.$_T['het'].'+'.$nap.'+'.$ora.'+'.$_T['tanarId'].'+'.$_T['tolDt'];
+ $_hidden = ($_valosTeremId > 0)?' style="display:none" ':'';
+ echo '<select class="teremModosit onChangeSubmit" data-tmpid="'.intval($tmpid).'" name="'.$_keyBase.'" '.$_hidden.'>';
+ if ($_valosTeremId!=0)
+ echo '<option value="teremTorol">-nem tudom, de nem ez-</option>';
+ else
+ echo '<option value="0">-</option>';
+ foreach ($ADAT['termek'] as $__teremId => $__teremAdat) {
+ $_SEL = ($_valosTeremId == $__teremId) ? ' selected="selected" ':'';
+ echo '<option value="'.$__teremId.'" '.$_SEL.'>'.$__teremAdat['leiras'].'</option>';
+ }
+ echo '</select>';
+// }
+}
+
echo '<br/>';
if ($_ORA['kit']!='') {
echo '<span class="helyett">';
@@ -340,6 +381,8 @@
echo '</tbody>';
echo '</table>'."\n\n<!-- EOT -->\n\n";
+ if (MAYOR_SOCIAL === true) formEnd();
+
// } // foreach
} else {
diff --git a/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml b/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml
index bd9b13c1..468d11bf 100644
--- a/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml
+++ b/mayor-orig/www/skin/classic/module-naplo/html/orarend/orarendModosito.phtml
@@ -26,6 +26,7 @@
}
echo '<input type="hidden" name="action" value="do" />';
echo '<input type="hidden" name="tanarId" value="'.$ADAT['tanarId'].'" />';
+ echo '<input type="hidden" name="osztalyId" value="'.$ADAT['osztalyId'].'" />';
echo '<input type="hidden" name="refTolDt" value="'.$ADAT['refTolDt'].'" />';
echo '<input type="hidden" name="refIgDt" value="'.$ADAT['refIgDt'].'" />';
echo '<input type="hidden" name="tolDt" value="'.$ADAT['tolDt'].'" />';
@@ -194,11 +195,11 @@ for ($oi=0; $oi<count($ADAT['orarendioraTankor']['orarendiOra'][$het][$nap][$ora
//if ($_tankorId==$ADAT['assoc'][$nap][$ora]['orak'][$i]['tankorId']) {
// $X[] = $_tankorId;
//}
- echo '<option value="'.$__tanarId.'%'.$__osztalyJel.'%'.$__targyJel.'%'.$__tankorId.'"'.$__SEL.'>';
- echo $__TANKOR['tankorNev'];
- echo "($__tankorId)";
+ echo '<option value="'.$__tanarId.'%'.$__osztalyJel.'%'.$__targyJel.'%'.$__tankorId.'"'.$__SEL.'>';
+ echo $__TANKOR['tankorNev'];
+ echo "($__tankorId)";
//if (is_array($X) && in_array($_tankorId,$X)) echo '+';
- echo '</option>'."\n";
+ echo '</option>'."\n";
}
echo '</select>';
echo '</div>';
@@ -272,12 +273,15 @@ for ($oi=0; $oi<count($ADAT['orarendioraTankor']['orarendiOra'][$het][$nap][$ora
function _putPluszOra($het,$nap,$ora,$TANKOROK,$BLOKKOK) {
+
echo '<select name="ORARENDPLUSZ[]">';
echo '<option value="">'."$het-$nap-$ora".'</option>';
echo '<optgroup class="tankor" label="'._TANKOR.'">';
for ($i=0; $i<count($TANKOROK); $i++) {
- $key = "T.$het.$nap.$ora.".($_id = $TANKOROK[$i]['tankorId']);
+ $key = "T.$het.$nap.$ora.".($_id = $TANKOROK[$i]['tankorId']).'.'.$TANKOROK[$i]['tanarok'][0]['tanarId'];
$value = $TANKOROK[$i]['tankorNev'].' ('.$_id.')';
+ for ($j=0; $j<count($TANKOROK[$i]['tanarok']);$j++)
+ $value .= ' '.$TANKOROK[$i]['tanarok'][$j]['tanarNev'];
echo '<option value="'.$key.'">'.$value.'</option>'."\n";
}
echo '</optgroup><optgroup class="blokk" label="'._BLOKK.'">';
diff --git a/mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
index c357f692..80276f20 100644
--- a/mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
+++ b/mayor-orig/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
@@ -673,7 +673,7 @@ processJSONOraAdat = function(adat) {
// if (adat['oraAdat']['kiCn']!='') content += '<li><span>Tanár: ' + adat['oraAdat']['kiCn'] +'</li>';
if (adat['oraAdat']['kitCn']!='') content += '<li>Helyettesítendő: ' + adat['oraAdat']['kitCn'] +'</li>';
content += '<li>Terem: ' + (adat['oraAdat']['teremId']==null?'–':adat['oraAdat']['teremId']) +'</li>';
- content += '<li>Leírás: ' + mayorLeiras(adat['oraAdat']['leiras']) +'</li>';
+ content += '<li>Leírás: ' + (adat['oraAdat']['leiras']) +'</li>';
content += '</ul>';
if (adat['oraBeirhato']) content += adat['oraForm'];
@@ -854,8 +854,9 @@ processJSONTankorAdat = function(adat) {
content += '</ul>';
}
- content += '<h3>'+adat['leiras']+'</h3>';
+ content += '<h3>'+mayorLeiras(adat['leiras'])+'</h3>';
content += '<ul>';
+ content += '<li>megjegyzés: '+adat['cn']+'</li>';
content += '<li>névsor: '+adat['nevsor']+'</li>';
content += '<li>választható: '+adat['felveheto']+' ('+adat['min']+'-'+adat['max']+')</li>';
content += '<li>jelenlét: '+adat['jelenlet']+'</li>';
@@ -916,15 +917,19 @@ processJSONTankorAdat = function(adat) {
content += '<span style="display:none" id="mayorsidewindowtype" data-mayorsidewindowtype="tankor"></span>';
if ( $('#updateWindowSide').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtype')!='tankor' ) {
- $('#updateWindowSideSubTitle').html(adat['tankorNev']);
+// $('#updateWindowSideSubTitle').html(adat['tankorNev']);
+ $('#updateWindowSideSubTitle').html('<a href="'+href({'page':'naplo','sub':'intezmeny','f':'tankor','tankorId':adat['tankorId']})+'">'+adat['tankorNev']+'</a>');
$('#updateWindowSideSubContent').html(content);
$('#updateWindowSideSub').addClass('nyitva');
} else {
- $('#updateWindowSideTitle').html(adat['tankorNev']);
+// $('#updateWindowSideTitle').html(adat['tankorNev']);
+ $('#updateWindowSideTitle').html('<a href="'+href({'page':'naplo','sub':'intezmeny','f':'tankor','tankorId':adat['tankorId']})+'">'+adat['tankorNev']+'</a>');
$('#updateWindowSideContent').html(content);
$('#updateWindowSide').addClass('nyitva');
}
+ // IDE
+
}
diff --git a/mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js b/mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js
index 0a0875cb..664bacf1 100644
--- a/mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js
+++ b/mayor-orig/www/skin/classic/module-naplo/javascript/orarend/orarend.jquery.min.js
@@ -7,6 +7,12 @@ $(function() {
var origHtmlStr = $('table.orarend thead th.het').html();
+ $('form span.normalTerem').on('click',function(event) {
+ var el = $(event.target);
+ var tmpid = ($(el).data('tmpid'));
+ $("form select[data-tmpid='"+tmpid+"']").toggle();
+ });
+
$('table.orarend thead tr th').on('click',function() { // tool kezeles mobilon
if ($(this).data('napindex')>0 && isMobile() == true) {
$(this).find('table.orarend span.napLeiras').toggle();