aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-naplo
diff options
context:
space:
mode:
Diffstat (limited to 'mayor-orig/mayor-naplo')
-rw-r--r--mayor-orig/mayor-naplo/bin/xetex2pdf.sh4
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/targyBontas.php2
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php1
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/kepesitesek.jquery.min.js6
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tankorTanarHozzarendeles.jquery.min.js3
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tovabbkepzes.jquery.min.js3
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js31
8 files changed, 35 insertions, 17 deletions
diff --git a/mayor-orig/mayor-naplo/bin/xetex2pdf.sh b/mayor-orig/mayor-naplo/bin/xetex2pdf.sh
index a4f7bf3f..d7a880c7 100644
--- a/mayor-orig/mayor-naplo/bin/xetex2pdf.sh
+++ b/mayor-orig/mayor-naplo/bin/xetex2pdf.sh
@@ -12,8 +12,8 @@ HOME="/tmp"
export HOME
# Make sure this exists
-# cd $BASEDIR/print/module-naplo/tex/
-# fmtutil-sys --cnffile $BASEDIR/print/module-naplo/tex/mayor.cnf --fmtdir $BASEDIR/print/module-naplo/ --byfmt mayor
+# cd $BASEDIR/print/module-naplo/xetex/
+# fmtutil-sys --cnffile $BASEDIR/print/module-naplo/xetex/mayor-xetex.cnf --fmtdir $BASEDIR/print/module-naplo/ --byfmt mayor-xetex
cat <<EOF > $1.tex
%\font\kicsi=ecrm0500
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index e8f0acdd..ed3cdf9c 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4666
+4667
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/targyBontas.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/targyBontas.php
index 5b31bdec..625e0482 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/targyBontas.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/targyBontas.php
@@ -74,7 +74,7 @@
$bontasId = db_query($q, array('fv'=>'addBontas/insert','modul'=>'naplo','result'=>'insert','values'=>array($osztalyId,$kepzesOratervId,$targyId)), $lr);
// is_resource mysqli esetán nem jó (object)
- if (!$olr) db_close();
+ if (!$olr) db_close($lr);
return array(
'targyId' => $targyId,
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php
index c9aaf91b..2b9ad588 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tanev/targyBontas-pre.php
@@ -18,6 +18,7 @@
if ($ADAT['targyBontasStatus']===false && $action=='targyBontasInit') {
$ADAT['targyBontasStatus'] = initFromLastYear();
}
+dump($ADAT);
// telephely - csak szűréshez kell
$ADAT['telephelyId'] = $telephelyId = readVariable($_POST['telephelyId'], 'id');
// kötelező szűrési opció
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/kepesitesek.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/kepesitesek.jquery.min.js
index 75cd36c3..a57f781b 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/kepesitesek.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/kepesitesek.jquery.min.js
@@ -20,7 +20,8 @@ $(function() {
targyId = element.data('targyid');
kepesitesId = element.data('kepesitesid');
- postData = { 'action':'delTargy', 'targyId':targyId, 'kepesitesId':kepesitesId }
+ // postData = { 'action':'delTargy', 'targyId':targyId, 'kepesitesId':kepesitesId }
+ postData = { 'action':'delTargy', 'targyId':targyId, 'kepesitesId':kepesitesId, 'mayorToken': ($('body').data('mayortoken')) }
saltName = $('#kepesitesForm input.salt').prop('name');
saltValue = $('#kepesitesForm input.salt').val();
postData[saltName] = saltValue;
@@ -40,7 +41,8 @@ $(function() {
tanarId = element.data('tanarid');
kepesitesId = element.data('kepesitesid');
- postData = { 'action':'delTanar', 'tanarId':tanarId, 'kepesitesId':kepesitesId }
+ // postData = { 'action':'delTanar', 'tanarId':tanarId, 'kepesitesId':kepesitesId }
+ postData = { 'action':'delTanar', 'tanarId':tanarId, 'kepesitesId':kepesitesId, 'mayorToken': ($('body').data('mayortoken')) }
saltName = $('#kepesitesForm input.salt').prop('name');
saltValue = $('#kepesitesForm input.salt').val();
postData[saltName] = saltValue;
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tankorTanarHozzarendeles.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tankorTanarHozzarendeles.jquery.min.js
index 3a5df16f..2e975f4e 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tankorTanarHozzarendeles.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tankorTanarHozzarendeles.jquery.min.js
@@ -299,7 +299,8 @@ $(function() {
element.next('input#tankorNevExtra').show();
element.hide();
} else if (element.hasClass('tankorModosit')) {
- postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val() }
+ // postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val() }
+ postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val(), 'mayorToken': ($('body').data('mayortoken')) }
$('#updateWindowSide ul#tankorOsztaly input:checked').each(function(index){postData.osztalyIds.push($(this).val());})
$('#updateWindowSide ul#tankorSzemeszter input[type=text]').each(function(index){
if ($(this).val() != '') {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tovabbkepzes.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tovabbkepzes.jquery.min.js
index db9f0830..cc4a0426 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tovabbkepzes.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/intezmeny/tovabbkepzes.jquery.min.js
@@ -182,7 +182,8 @@ ajaxSetTanarAdat = function(tanarId,forduloDt,salt_name,salt_value) {
postData = {'tanarId':tanarId,
'forduloDt':forduloDt,
'sessionID': $('body').data('sessionid'),
- 'action':'modTanarTovabbkepzesForduloDt' }
+ 'action':'modTanarTovabbkepzesForduloDt',
+ 'mayorToken': ($('body').data('mayortoken')) }
postData[salt_name] = salt_value;
$.ajax({
type: "POST",
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js
index fd03b778..3b3e5ac3 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/tanev/targyBontas.jquery.min.js
@@ -17,7 +17,8 @@
}
ajaxGetTankorAdat = function(tankorId) {
- postData = { 'tankorId':tankorId }
+ // postData = { 'tankorId':tankorId }
+ postData = { 'tankorId':tankorId, 'mayorToken': ($('body').data('mayortoken')) }
$.ajax({
type: "POST",
@@ -552,8 +553,8 @@ $(function() {
} else if (element.hasClass('slideDown')) {
slideDown(element);
} else if (element.hasClass('addBontas')) {
-
- postData = { 'action':'addBontas', 'keys':element.closest('tr').data('keys')}
+// postData = { 'action':'addBontas', 'keys':element.closest('tr').data('keys') }
+ postData = { 'action':'addBontas', 'keys':element.closest('tr').data('keys'), 'mayorToken': ($('body').data('mayortoken')) }
saltName = $('#bontasForm input.salt').prop('name');
saltValue = $('#bontasForm input.salt').val();
postData[saltName] = saltValue;
@@ -566,6 +567,11 @@ $(function() {
}).done(function( msg, status, jqXHR ) {
updateSalt(jqXHR.getResponseHeader('Etag'));
processJSONAddBontas(msg);
+
+ }).fail(function( jqXHR, textStatus, errorThrown ) {
+ //console.log('fail');
+ //console.log(jqXHR);
+
});
} else if (element.hasClass('addBontasTargy')) {
@@ -582,7 +588,8 @@ $(function() {
$('#targyak').show().focus();
} else if (element.hasClass('selectTargy')) {
- postData = { 'action':'addBontasTargy', 'keys':$('div#targyak').data('keys'), 'targyId':element.data('targyid') }
+ // postData = { 'action':'addBontasTargy', 'keys':$('div#targyak').data('keys'), 'targyId':element.data('targyid') }
+ postData = { 'action':'addBontasTargy', 'keys':$('div#targyak').data('keys'), 'targyId':element.data('targyid'), 'mayorToken': ($('body').data('mayortoken')) }
saltName = $('#bontasForm input.salt').prop('name');
saltValue = $('#bontasForm input.salt').val();
postData[saltName] = saltValue;
@@ -599,7 +606,8 @@ $(function() {
} else if (element.hasClass('delBontas')) {
- postData = { 'action':'delBontas', 'keys':element.closest('div.bontas').data('keys')}
+ // postData = { 'action':'delBontas', 'keys':element.closest('div.bontas').data('keys') }
+ postData = { 'action':'delBontas', 'keys':element.closest('div.bontas').data('keys'), 'mayorToken': ($('body').data('mayortoken')) }
saltName = $('#bontasForm input.salt').prop('name');
saltValue = $('#bontasForm input.salt').val();
postData[saltName] = saltValue;
@@ -622,7 +630,8 @@ $(function() {
alert('Hiba! A bontás összóraszáma nagyobb a képzés-óratervben megadottnál!');
} {
- postData = { 'targyId':element.data('targyid'), 'bontasIds':element.data('keys').toString().split(',') }
+ // postData = { 'targyId':element.data('targyid'), 'bontasIds':element.data('keys').toString().split(',') }
+ postData = { 'targyId':element.data('targyid'), 'bontasIds':element.data('keys').toString().split(','), 'mayorToken': ($('body').data('mayortoken')) }
$.ajax({
type: "POST",
@@ -640,8 +649,10 @@ $(function() {
} else if (element.hasClass('tankorBontas') && !element.hasClass('tiltott')) {
+ // postData = { 'action':'bontasTankor', 'keys':$('#updateWindowSide').data('target').data('keys'),
+ // 'tankorId': element.data('tankorId'), 'hetiOraszam':element.data('hetiOraszam') }
postData = { 'action':'bontasTankor', 'keys':$('#updateWindowSide').data('target').data('keys'),
- 'tankorId': element.data('tankorId'), 'hetiOraszam':element.data('hetiOraszam') }
+ 'tankorId': element.data('tankorId'), 'hetiOraszam':element.data('hetiOraszam'), 'mayorToken': ($('body').data('mayortoken')) }
saltName = $('#bontasForm input.salt').prop('name');
saltValue = $('#bontasForm input.salt').val();
postData[saltName] = saltValue;
@@ -678,7 +689,8 @@ $(function() {
}
} else if (element.attr('id') == 'addTankor') {
- postData = { 'action':'ujTankor', 'bontasIds':$('#updateWindowSide').data('target').data('keys').toString().split(',') }
+ // postData = { 'action':'ujTankor', 'bontasIds':$('#updateWindowSide').data('target').data('keys').toString().split(',') }
+ postData = { 'action':'ujTankor', 'bontasIds':$('#updateWindowSide').data('target').data('keys').toString().split(','), 'mayorToken': ($('body').data('mayortoken')) }
$.ajax({
type: "POST",
@@ -699,7 +711,8 @@ $(function() {
ajaxGetTankorAdat(element.data('tankorid'));
} else if (element.hasClass('tankorModosit')) {
- postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val() }
+ // postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val() }
+ postData = { 'tankorId':$('#updateWindowSide').data('target').data('tankorid'),'osztalyIds': [], 'tankorSzemeszter': [], 'tankorNevExtra': $('#updateWindowSide input#tankorNevExtra').val(), 'mayorToken': ($('body').data('mayortoken')) }
$('#updateWindowSide ul#tankorOsztaly input:checked').each(function(index){postData.osztalyIds.push($(this).val());})
$('#updateWindowSide ul#tankorSzemeszter input[type=text]').each(function(index){
if ($(this).val() != '') {