aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig
diff options
context:
space:
mode:
authorM.Gergo2020-04-04 12:40:03 +0200
committerM.Gergo2020-04-04 12:40:03 +0200
commit8c9ffb12892161e5a0fc12c97aa0c8d90f99eb6c (patch)
tree1bac3477a16d3aef1a98b23d3c43efcba0ee0368 /mayor-orig
parentf140bf024b58d159d37a1cf73735cb6afa6da3f3 (diff)
downloadmayor-8c9ffb12892161e5a0fc12c97aa0c8d90f99eb6c.tar.gz
mayor-8c9ffb12892161e5a0fc12c97aa0c8d90f99eb6c.zip
Rev: 4649rev4649
Diffstat (limited to 'mayor-orig')
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev2
-rw-r--r--mayor-orig/mayor-jatek/log/mayor-jatek.rev2
-rw-r--r--mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev2
-rw-r--r--mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev2
-rw-r--r--mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev2
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php31
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml4
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-wiki/log/mayor-wiki.rev2
-rw-r--r--mayor-orig/md5sum26
-rw-r--r--mayor-orig/rev.txt2
16 files changed, 57 insertions, 30 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4648
+4649
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 31e10e49..1aa1538a 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 @@
-4648
+4649
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4648
+4649
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 31e10e49..1aa1538a 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 @@
-4648
+4649
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 31e10e49..1aa1538a 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 @@
-4648
+4649
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 31e10e49..1aa1538a 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 @@
-4648
+4649
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4648
+4649
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 8c5bd077..625b6b13 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
@@ -164,12 +164,37 @@
$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));
+ if (diakSajatHazifeladatE($hazifeladatId)) {
+ $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));
+ }
}
}
}
+ function diakSajatHazifeladatE($hazifeladatId) {
+ $sajat = false;
+ if (__DIAK===true && $hazifeladatId>0) {
+ if (defined('__USERDIAKID') && __USERDIAKID>0) {
+ $diakId=__USERDIAKID;
+ } elseif (defined('__SZULODIAKID') && __SZULODIAKID>0) {
+ $diakId=__SZULODIAKID;
+ }
+ if ($diakId>0) {
+
+ $q = "SELECT tankorId,dt AS oraDt FROM oraHazifeladat LEFT JOIN ora USING (oraId) WHERE hazifeladatId=%u";
+ $values = array($hazifeladatId);
+ $ORA = db_query($q, array('debug'=>false,'modul'=>'naplo','result'=>'record','values'=>$values));
+
+ $dt = $ORA['oraDt'];
+ $tankorId = $ORA['tankorId'];
+ $diakTankorIds = getTankorIdsByDiakIds(array($diakId), array('tanev' => __TANEV,'tolDt'=>$dt,'igDt'=>$dt,'felmentettekkel'=>true));
+
+ if (in_array($tankorId,$diakTankorIds)) $sajat = true;
+ }
+ }
+ return $sajat;
+ }
?> \ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index ffe8a4dd..419fbc49 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -221,7 +221,9 @@ echo '<style type="text/css">
$_diakId = $ADAT['hazifeladatDiak'][$i]['diakId'];
if (!is_array($ADAT['nevsor']['nevek'][$_diakId])) {
$EXTRA = $ADAT['hazifeladatDiak'][$i];
- $ADAT['nevsor']['nevek'][$EXTRA['diakId']] = array('diakId'=>$ADAT['hazifeladatDiak'][$i]['diakId'],'diakNev'=>$EXTRA['diakNev'],'extra'=>'add');
+ if ($EXTRA['hazifeladatDiakStatus']!='') { // csak akkor rakjuk be a névsorba, ha késznek jelölte a diák
+ $ADAT['nevsor']['nevek'][$EXTRA['diakId']] = array('diakId'=>$ADAT['hazifeladatDiak'][$i]['diakId'],'diakNev'=>$EXTRA['diakNev'],'extra'=>'add');
+ }
}
}
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 84dbf239..25bb0e93 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4648
-d086af10898e4db86ad58a6f6a8cb9e1 mayor-fenntarto-rev4648.tgz
-68a39470addacc9872dfa0b78e77f505 mayor-installer-sulix-rev4648.tgz
-8e32bd80c182fd8edc2205fb695162ac mayor-wiki-rev4648.tgz
-7ff385259871d1e1de7be26631713fe1 mayor-installer-rev4648.tgz
-967b10bb174eb12bb916101dfed22e5e mayor-portal-rev4648.tgz
-e0cf0c0cd9a42caedebba2b088254ef5 mayor-felveteli-rev4648.tgz
-542c478343092580f6bc08cef4e61a44 mayor-jatek-rev4648.tgz
-02f71a4be04a6c451117f4f72db05567 mayor-locales-jp_JP-rev4648.tgz
-40130350f09899f27b7ed0a03a1697fd mayor-locales-de_DE-rev4648.tgz
-b9ffaed9f2964c007bcfaed56332c7d1 mayor-locales-en_US-rev4648.tgz
-7e1f7b7eb79e843e902e89785cc564e4 mayor-naplo-rev4648.tgz
-e8f59df1952886bfbc3beef2dcdc3564 mayor-base-rev4648.tgz
+Revision 4649
+709e72ec09b32363f51856e1ca499094 mayor-fenntarto-rev4649.tgz
+07033ea928d45c0754d1fb15aab497c3 mayor-installer-sulix-rev4649.tgz
+d1c3b64425a318308663d4959a442034 mayor-wiki-rev4649.tgz
+f41fb6a773a2de9c4e666886193a7908 mayor-installer-rev4649.tgz
+630c89f1e34b006dbeb5b4a2c3926495 mayor-portal-rev4649.tgz
+d3b29786c697c6a49cdec14d3ac7c8ed mayor-felveteli-rev4649.tgz
+75dbc2bb9e099d7783d5792897eccd1b mayor-jatek-rev4649.tgz
+94ea3091ec60b8413bd1eb9f065224ba mayor-locales-jp_JP-rev4649.tgz
+e452e9124ae788622702ac9e191ffb49 mayor-locales-de_DE-rev4649.tgz
+7b6b5b01836a8012ac87245f65ce80fc mayor-locales-en_US-rev4649.tgz
+a1911715cb2311bcadde0b3ffa13251c mayor-naplo-rev4649.tgz
+cd7088e0524d8eeafbb47e84c47cafab mayor-base-rev4649.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4648
+4649