diff options
| author | M.Gergo | 2020-04-06 15:57:22 +0200 |
|---|---|---|
| committer | M.Gergo | 2020-04-06 15:57:22 +0200 |
| commit | f41c58472a34b3a503bf253ea589f7875d351985 (patch) | |
| tree | a129f2b7c2ea771795acf8fddc41239651c52a73 /mayor-orig/mayor-naplo/www/include | |
| parent | 70180abdfc226d1640a0408248fefd1fd1e45c1f (diff) | |
| parent | df9e6d7a1ef747e2207bc2e18b96fca06cbef8f8 (diff) | |
| download | mayor-f41c58472a34b3a503bf253ea589f7875d351985.tar.gz mayor-f41c58472a34b3a503bf253ea589f7875d351985.zip | |
Merge branch 'MaYor-dev'
Original modifications pulled from http://www.mayor.hu
Diffstat (limited to 'mayor-orig/mayor-naplo/www/include')
| -rw-r--r-- | mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php | 31 |
1 files changed, 28 insertions, 3 deletions
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 |