'."\n";
@@ -95,11 +98,13 @@
function putTanevLezarasForm( $ADAT ) {
+ $tanev=$ADAT['tanev'];
+
formBegin(array('class'=>'intezmeny'));
echo '
'."\n";
echo '
';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml
index 84d3593a..805e57dc 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml
@@ -52,6 +52,7 @@
if (defined('__TELEPHELYID')) echo '
'.__INTEZMENY .', ' . __TANEV.'/'.(__TANEV+1).' ';
else echo '
'.__INTEZMENY . '/' . __TANEV.' ';
echo '';
+ if (MAYOR_SOCIAL === true) { echo '
〽️social ';}
if ($showHelp) echo '
? ';
echo ''."\n";
reset($TOOL);
@@ -101,15 +102,15 @@
}
if ($_diakId>0 && _POLICY=='private') {
echo '
';
- echo ' '."\n";
} elseif ($_tanarId>0 && _POLICY=='private') {
echo '
';
- echo ' '."\n";
}
if ($_tankorId>0 && _POLICY=='private') { //--TODO css class szemely->csoport
- echo '
';
+ echo ' ';
echo ' '."\n";
}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml
index 3cd8691b..5fe6435a 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml
@@ -21,6 +21,7 @@
echo '';
// FILTEREZÉS
@@ -45,7 +47,7 @@
echo '
';
+ echo '
';
+
formEnd();
}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml
index 2401da8f..4467fb48 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/tankor.phtml
@@ -28,7 +28,12 @@
global $TANKOR_TIPUS;
/* $TOPOST['tankoradat'] */
-
+
+ $tankorNevExtra = $TOPOST['tankoradat']['tankorNevExtra'];
+ if ($tankorNevExtra!='' && !in_array($tankorNevExtra,array_values($TANKOR_TIPUS))) {
+ $TANKOR_TIPUS[$tankorNevExtra] = $tankorNevExtra;
+ }
+
if (!is_array($TARGY)) return false;
$SZEMCHECK = array();
for ($i=0; $i
';
- foreach ($TANKOR_TIPUS as $_k=>$_v) {
- $_SEL = ($_v==$_tipus) ? ' selected="selected"':'';
- echo ''.$_k.' - '.$_v.' ';
- }
+ foreach ($TANKOR_TIPUS as $_k=>$_v) {
+ $_SEL = ($_v==$_tipus) ? ' selected="selected"':'';
+ echo ''.$_k.' - '.$_v.' ';
+ }
echo '';
if (defined('__AKG_TANKORNEV') && __AKG_TANKORNEV === true) {
echo '';
- echo '';
+ echo '';
echo '';
for ($i=0; $i1) {
*/ echo ' ';
echo '';
-/* REV 2185++ - tól nem kell, nem lehet. A típus determinál
- echo '';
- echo ''._JELENLET.' ';
-
+ echo ' ';
+ echo ''._TANKORCSOPORTOK.' '.$ADAT['tanev'];
+ echo ' ';
echo '';
- if (isset($TOPOST['tankoradat']['jelenlet'])) $_CHK[$TOPOST['tankoradat']['jelenlet']] = ' checked="checked"';
- else $_CHK['kötelező'] = ' checked="checked"';
- echo ''._KOTELEZO.' ';
- echo ''._NEMKOTELEZO.' ';
- echo '';
+ echo '- ';
+ for ($i=0; $i'.$CS['csoportNev'].'';
+ }
+ echo ' ';
+ echo ''.$CS['csoportNev'].'';
+ }
+
+
+ } else {
+ echo 'Nem módosítható';
+ }
echo ' ';
-
echo ' ';
-*/
+
echo '';
echo ''._RESZTVEVO_OSZTALYOK.' ';
- echo '';
+ echo '';
echo ''._OSZTALYJELE.' '._LEIRAS.' MaYoR Social Edition';
+ // echo 'MaYoR Social Edition ';
formBegin();
echo '';
-// Fejlesztés alatt, itt lehet majd felvenni az órát, ha már van órarend
-// Igaziból lehet, hogy ezt az órarend felületen célszerűbb lenne megcsinálni
-if ($ADAT['vanHaladasi'][$dt]>0) {
- echo '';
- if (isset($ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]['oraId'])) {
- echo ' ';
-}
+ // Itt lehet felvenni az órát, ha már van órarend
+ if ($ADAT['vanHaladasi'][$dt]>0) {
+ echo '';
+ if (isset($ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]['oraId'])) {
+ echo ' ';
+ }
+ //
$_ferohely = $ADAT['termek'][$_T['teremId']]['ferohely'];
$_letszam = $ADAT['tankorLetszamok'][$_T['tankorId']];
if ($_T['tankorId']!='') {
+ $_tankorEvesOraszam = floatval(($ADAT['tankorok'][$_T['tankorId']][0]['oraszam']+$ADAT['tankorok'][$_T['tankorId']][1]['oraszam'])/2);
// HACK - találjuk ki, hogy mi a kulcsa a kártyának
for ($_k=0; $_k0) {
} unset($_tmp);
// -------
if ($_kulcsTolDt!='') echo '';
- echo $ADAT['tankorok'][$_T['tankorId']][0]['tankorNev'];
+ echo '';
+ echo $ADAT['tankorok'][$_T['tankorId']][0]['tankorNev'];
echo ' ';
//echo '';
- echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+ echo '';
+ echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
echo ' ';
- if ($_ORA['ki']!='') echo ' '.$ADAT['tanarok'][$_ORA['ki']]['tanarNev'];
+ if ($_ORA['ki']!='') echo ' '.$ADAT['tanarok'][$_ORA['ki']]['tanarNev'].' ';
} else {
- echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+ echo '';
+ echo $ADAT['tanarok'][$_T['tanarId']]['tanarNev'];
+ echo ' ';
}
echo '
';
@@ -133,15 +155,18 @@ if ($ADAT['vanHaladasi'][$dt]>0) {
}
+
+ $__tankorIdHelper = 0;
if (isset($ADAT['haladasi']['orak'][$dt][$ora])) {
foreach($ADAT['haladasi']['orak'][$dt][$ora] as $__tankorId => $_O) {
if (!in_array($__tankorId,$CELLATANKORIDK)) {
//$_O = $ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']];
- echo '';
+ $__tankorIdHelper = $_O['tankorId']; // ha több van, az utolsó lesz
+ echo '
';
echo '
';
if (!in_array($_O['tipus'],array('elmarad','elmarad_máskor')))
echo '
';
- echo $ADAT['tankorok'][ $__tankorId ][0]['tankorNev'];
+ echo $ADAT['tankorok'][$__tankorId][0]['tankorNev'];
// array(13) { ["oraId"]=> string(5) "37936" ["dt"]=> string(10) "2016-01-08" ["ora"]=> string(2) "10" ["ki"]=> string(2) "81" ["kit"]=> NULL ["tankorId"]=> string(4) "3086" ["teremId"]=> NULL ["leiras"]=> string(0) "" ["tipus"]=> string(6) "egyéb" ["eredet"]=> string(8) "órarend" ["feladatTipusId"]=> NULL ["munkaido"]=> string(10) "lekötött" ["oo"]=> bool(false)
echo '
'.$_O['tipus'];
echo ' '.$_O['eredet'];
@@ -152,7 +177,7 @@ if ($ADAT['vanHaladasi'][$dt]>0) {
}
}
if (count($T[$nap][$ora]['orak'])==0 || !in_array($ADAT['tanarId'],$__tanarIdk)) {
- _putPluszOra($het,$nap,$ora,$TANKOROK,$BLOKKOK);
+ _putPluszOra($het,$nap,$ora,$TANKOROK,$BLOKKOK,$__tankorIdHelper);
//echo '
';
}
//echo '
';
@@ -271,18 +296,20 @@ for ($oi=0; $oi
';
echo ''."$het-$nap-$ora".' ';
echo '';
for ($i=0; $i'.$value.''."\n";
+ echo ''.$value.$helperStr.' '."\n";
}
echo ' ';
for ($i=0; $i'.$_T['tankorNev'].' ';
+ }
echo '';
echo '';
@@ -74,7 +77,6 @@
echo ' ';
echo '';
- flush();
}
} else {
echo '';
@@ -85,7 +87,10 @@
echo '
';
echo '';
- echo '
';
+ echo '';
+ echo '';
+ echo '
';
+ echo '
';
}
function putDolgozat($Dolgozat, $valaszthatoTankorok, $Tanarok, $ADAT) {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/tankor.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/tankor.phtml
index 48dd33ec..43455749 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/tankor.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/tankor.phtml
@@ -88,7 +88,7 @@
echo ''."\n";
echo ''."\n";
- echo $Jegyek['tankörök'][$tankorId]['tankorNev'];
+ echo ''.$Jegyek['tankörök'][$tankorId]['tankorNev'].' ';
//_inlineHelp('');
echo ' ('.implode(', ',$Jegyek['tanárok']['tanarNevek']).')';
echo ' '."\n";
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/tankorCsoport.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/tankorCsoport.phtml
index dda6a6dc..aff9a3df 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/tankorCsoport.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/tanev/tankorCsoport.phtml
@@ -123,7 +123,7 @@
formBegin(array('class'=>'csoportKereses'));
- echo 'Továbbképzés forduló dátum: '+adat['tovabbkepzesForduloDt']+' ';
content += '';
}
- content += ''+adat['tanarNev']+' ');
$('#updateWindowSideSubContent').html(content);
+ $('#mayorsidewindowtype').data('mayorsidewindowtypesub','tanar');
$('#updateWindowSideSub').addClass('nyitva');
} else {
+ content += ''+adat['tanarNev']+' ');
$('#updateWindowSideContent').html(content);
+ $('#mayorsidewindowtype').data('mayorsidewindowsubtype','');
$('#updateWindowSide').addClass('nyitva');
}
@@ -814,15 +849,18 @@ processJSONOsztalyAdat = function(adat) {
content += '';
content += '
';
content += '
';
+ content += '
';
content += '
'+adat['nev']+' ';
+
content += 'óraszám: '+adat['oraszam']+' ';
content += '';
+ if (typeof(adat.tankorCsoport) !== 'undefined') if (adat.tankorCsoport.length>0) { // todo
+ content += 'Tankörcsoport ('+adat.tankorCsoport.length+') ';
+ content += '';
+ for (i=0; i';
+ }
+ content += ' ';
+ }
if (adat.tankorBlokk.length>0) {
content += 'Tankörblokk ('+adat.tankorBlokk.length+') ';
content += '';
@@ -891,14 +937,16 @@ processJSONTankorAdat = function(adat) {
content += 'Osztályok ';
content += '';
if (adat.osztalyIds!=undefined) {
- for (i=0; i'+osztalyAdat.osztalyJel+' ('+osztalyAdat.leiras+') '+osztalyAdat.osztalyfonokNev+'';
- }
+ content += ''+osztalyAdat.osztalyJel+' ('+osztalyAdat.leiras+') '+osztalyAdat.osztalyfonokNev+'';
+ // content += ' ';
+ content += '';
+ }
}
content += ' ';
@@ -915,20 +963,55 @@ processJSONTankorAdat = function(adat) {
}
content += ' ';
- content += ''+adat['tankorNev']+' ');
$('#updateWindowSideSubContent').html(content);
- $('#updateWindowSideSub').addClass('nyitva');
+ $('#mayorsidewindowtype').data('mayorsidewindowtypesub','tankor');
+ $('#updateWindowSideSub').addClass('nyitva');
} else {
-// $('#updateWindowSideTitle').html(adat['tankorNev']);
+ if ( $('#updateWindowSideSub').hasClass('nyitva') ==true && $('#mayorsidewindowtype').data('mayorsidewindowtypesub')!='tankor' ) {
+ $('#updateWindowSideSub').removeClass('nyitva');
+ }
+ content += ''+adat['tankorNev']+' ');
$('#updateWindowSideContent').html(content);
+ $('#mayorsidewindowtype').data('mayorsidewindowsubtype','');
$('#updateWindowSide').addClass('nyitva');
}
+ // IDE
+
+}
+
+processJSONTankorCsoportAdat = function(adat) {
+
+ if (adat.visibleData != true) return false;
+ var content = '';
+
+ content += '';
+ content += '
';
+
+ if (adat.tankorCsoportTankorei.length>0) {
+ content += 'Tankörök ('+adat.tankorCsoportTankorei.length+') ';
+ content += '';
+ for (i=0; i'+_x.tankorNev+' '+_x.oraszam+'ó '+_y.oraszam+'ó';
+ }
+ content += ' ';
+ }
// IDE
+ content += ''+adat['tankorCsoportNev']+' ('+adat['tankorCsoportId']+') ');
+ $('#updateWindowSideSubContent').html(content);
+ $('#updateWindowSideSub').addClass('nyitva');
+ } else {
+ $('#updateWindowSideTitle').html(''+adat['tankorCsoportNev']+' ('+adat['tankorCsoportId']+') ');
+ $('#updateWindowSideContent').html(content);
+ $('#updateWindowSide').addClass('nyitva');
+ }
}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.jquery.min.js
index ceca5176..7beb8aea 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.jquery.min.js
@@ -2,11 +2,41 @@ $(function() {
$('#haladasiModositando').bind('click', function(event) {
$target = $(event.target);
$target.parent('div').toggleClass('haladasiModositando');
- //alert('Ez a funkció egy új fejlesztés!');
- //console.log($target);
});
$('table.orarend tbody tr td input[type=checkbox]').click(function() {
$(this).closest('div').toggleClass('torlesreJelolve');
});
+
+ $('#tankorAjanlo').click(function() {
+ $('table#orarend tbody tr td select[name="ORARENDPLUSZ[]"').each(function() {
+ selectElement = this;
+ $(this).find('option[data-hint="1"]').attr('selected','selected');
+
+ })
+ });
+
+ $('div span.tankorAdat').each(function(a) {
+ elem = $(this);
+ // v = parseFloat($('#sumOraszam').val()) + parseFloat(elem.data('tankorevesoraszam'));
+ v = parseInt($('#sumOraszam').val()) + 1;
+ $('#sumOraszam').val(v);
+ });
+
+ $('div.orarendModositoToolbox table.tanarTankor tr td.tankorAdat').hover(function(event) {
+ $target = $(event.target);
+ $('div.oraKartya span[data-tankorid="'+$target.data('tankorid')+'"]').toggleClass('highlight');
+ $('div.oraKartya span[data-tankorid="'+$target.data('tankorid')+'"]').parent('div').toggleClass('highlight');
+ });
+ $('table#orarend span').hover(function(event) {
+ $target = $(event.target);
+ $('div.oraKartya span[data-tankorid="'+$target.data('tankorid')+'"]').toggleClass('highlight');
+ $('div.oraKartya span[data-tankorid="'+$target.data('tankorid')+'"]').parent('div').toggleClass('highlight');
+ });
+
+ $('#tankorHelper').bind('click', function(event) {
+ $('div.orarendModositoToolbox table.tanarTankor').toggle();
+ });
+
+
});
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.js
index 25ab35a1..e69de29b 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/orarend/orarendModosito.js
@@ -1,80 +0,0 @@
-/*
-Event.observe(window, 'load', myPSFLoader, false);
-
-function myPSFLoader(evt) {
-
- doOnChange = function(event) {
- var element = $(Event.element(event));
- if (element.hasClassName('orarendTankor')) {
- var idArray = element.getAttribute('id').split('_');
- var id = idArray[1]+'_'+idArray[2]+'_'+idArray[3];
- var orarendTankor = element.up('table').getElementsBySelector('select.orarendTankor');
- var ertek = $F(element);
- $A(orarendTankor).each(
- function (elem, index) {
- if (elem.getAttribute('id').include(id)) {
- elem.setValue(ertek);
- }
- }
- );
-
- }
- }
-
- Event.observe(document.body, 'mayor:change', doOnChange);
-
- Event.observe(document.body, 'change', doOnChange);
-
-// Sortable.create('test', { tag:'div', overlap:'horizontal',constraint:false });
- Sortable.create('orarend', { tag:'div', only:'draggable' ,
- tree: true,
- treeTag: 'div',
- overlap:'vertical',
- dropOnEmpty:true,
- constraint:false,
- onEnd: function(){
- alert('onEnd');
- },
- onChange:function(e){
-// $('infoBox').update( Form.Element.getValue( e.down('input')) );
-
- e.addClassName('moved');
-
- e.down('input').checked=false;
- e.down('input').hide();
-
-// e.down('input').value='test';
-
- // ez az eredeti helye (het.nap.ora.tanarId)
- $('infoBox1').update( (e.down('input').value) );
- // ez az új helye
- $('infoBox2').update( e.up('td').getAttribute('id') );
-
- } });
-
-// new Draggable('draggable', { revert: true });
-// Droppables.add('droppable', { accept: 'draggable' });
-
-// Sortable.create(
-// 'sortable',
-// {onUpdate:function(){$('debug').update(++callsToOnUpdate+' call(s) to onUpdate')}}
-// );
-
-// $('targySelect').disable();
-// $('targySelect').hide(); $('mozgat').hide();
-// $('action').value='ujSorrend';
-// $('targyUl').show(); $('submit').show();
-
-
-// Sortable.create(
-// "draggable",
-// {dropOnEmpty:true,handle:'handle',containment:["draggable"],constraint:false,onChange:function(){}}
-// );
-
-
-// $('serialize').observe('click', function(event) {
-// alert(Sortable.serialize('sortable'));
-// });
-
-}
-*/
\ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
index b5a27219..5ec0ede5 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/osztalyozo/dolgozat.jquery.min.js
@@ -21,15 +21,18 @@ $(function() {
});
var chart = new google.visualization.Calendar(document.getElementById('chart_div'));
var options = {
- title: "Dolgozatok",
- height: 350,
+ title: "Dolgozatok (terhelés)",
colorAxis: {colors:['cornflowerblue','#ff0000']},
+ calendar: {
+ daysOfWeek: 'VHKSCPS'
+ }
};
chart.draw(data, options);
}
-/* google.charts.load('current', {'packages':['timeline']});
+/*
+ google.charts.load('current', {'packages':['timeline']});
google.charts.setOnLoadCallback(drawChart);
function drawChart() {
var data = new google.visualization.dataTable();
--
cgit v1.2.3