diff options
Diffstat (limited to 'mayor-orig')
17 files changed, 51 insertions, 29 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev +++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev +++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev +++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev +++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php index 53b6c763..8c5bd077 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php @@ -156,4 +156,20 @@ } + function oraHazifeladatDiakLatta($hazifeladatId) { + if (__DIAK===true && $hazifeladatId>0) { + if (defined('__USERDIAKID') && __USERDIAKID>0) { + $diakId=__USERDIAKID; + } elseif (defined('__SZULODIAKID') && __SZULODIAKID>0) { + $diakId=__SZULODIAKID; + } + if ($diakId>0) { + $q = "INSERT IGNORE INTO oraHazifeladatDiak (hazifeladatId,diakId,diakLattamDt) VALUES (%u,%u,NOW())"; + $values = array($hazifeladatId, $diakId); + db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values)); + } + } + } + + ?>
\ No newline at end of file diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php index 23d9f391..931b7dcd 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php @@ -105,9 +105,11 @@ } if ($diakId>0) { - $q = "INSERT IGNORE INTO oraHazifeladatDiak (hazifeladatId,diakId,diakLattamDt) VALUES (%u,%u,NOW())"; - $values = array($ADAT['hazifeladatId'], $diakId); - db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values)); + // $q = "INSERT IGNORE INTO oraHazifeladatDiak (hazifeladatId,diakId,diakLattamDt) VALUES (%u,%u,NOW())"; + // $values = array($ADAT['hazifeladatId'], $diakId); + // db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values)); + + oraHazifeladatDiakLatta($ADAT['hazifeladatId']); if ($action=='hazifeladatKesz') { if ($diakId>0 && $ADAT['hazifeladatId']>0) { diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php index 31dd4699..1596e591 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php @@ -30,6 +30,10 @@ $_JSON['oraAdat'] = $ORAADAT = getOraAdatById($oraId); + if ($ORAADAT['hazifeladatId']>0) { + oraHazifeladatDiakLatta($ORAADAT['hazifeladatId']); // log: diakLattamDt + } + if ($dolgozatBeirhato === true && $action=='dolgozatBeiras') { $dolgozatId = ujDolgozat('',$ORAADAT['tankorId']); dolgozatModositas($dolgozatId,'',$ORAADAT['dt']); diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index f60ce0ab..19543162 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4642 -a41d6a896afcbc699ca113dd206a5c22 mayor-fenntarto-rev4642.tgz -4279b8ac06cb7ae7f3ce91872f107b7f mayor-installer-sulix-rev4642.tgz -35556f0254ac535edd802d3bd409ad3f mayor-wiki-rev4642.tgz -0c04c43a6b16746ea18ffd2e58844e0a mayor-installer-rev4642.tgz -457035dc58d489da34bcdda1eef7c1cf mayor-portal-rev4642.tgz -c951c85fd4ca3738a160a6a2dcdd103a mayor-felveteli-rev4642.tgz -6e02e9bf29af5b20eef089f9dd323d0d mayor-jatek-rev4642.tgz -1046f7eddfd9a2cdd78a4371587cf1f9 mayor-locales-jp_JP-rev4642.tgz -9b914f32434afb5453462670ff91d28e mayor-locales-de_DE-rev4642.tgz -735b7bf5c322d7496f09160e23a15570 mayor-locales-en_US-rev4642.tgz -df2ec8d8fae2b2e8feac83fcfa175969 mayor-naplo-rev4642.tgz -82caa6467fec4455ab4ba3fc179f4603 mayor-base-rev4642.tgz +Revision 4643 +bc36d1c5e47744e544439c0030a091be mayor-fenntarto-rev4643.tgz +1d4e1f10ce7975b5239891389a099655 mayor-installer-sulix-rev4643.tgz +4ba1eea4e3571eac402b74229621f47d mayor-wiki-rev4643.tgz +8f0c90bb4b8f32c8155fbdc0930089fb mayor-installer-rev4643.tgz +b86eed6f38dfe5c5a6c43ecb41d6fade mayor-portal-rev4643.tgz +edf95931bebc03d1021c5d9af179bef3 mayor-felveteli-rev4643.tgz +c96ddf6ac402201374ca7ffb3a1b5b67 mayor-jatek-rev4643.tgz +23e9bdccc90a05baf51794a5dfd73fa5 mayor-locales-jp_JP-rev4643.tgz +0aee8ce539a4a01f6933c4826743be65 mayor-locales-de_DE-rev4643.tgz +658c650356020fb3e1947d18db0836bb mayor-locales-en_US-rev4643.tgz +659e20ffd263aa865b2b202967c7aa70 mayor-naplo-rev4643.tgz +9916a08bb6a312dec821621f9e9d104f mayor-base-rev4643.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4642 +4643 |