aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/www/include/modules
diff options
context:
space:
mode:
authorM.Gergo2018-09-10 17:41:41 +0200
committerM.Gergo2018-09-10 17:41:41 +0200
commit20361aa31c7749c47416ea9b76fde393fa28cec6 (patch)
tree8279eb2f106612d8e217ef5c900f552c3855d4ee /mayor-orig/www/include/modules
parentc144cdab334ea104187cc80bf730259009e5fe8a (diff)
downloadmayor-20361aa31c7749c47416ea9b76fde393fa28cec6.tar.gz
mayor-20361aa31c7749c47416ea9b76fde393fa28cec6.zip
Rev: 4365
Diffstat (limited to 'mayor-orig/www/include/modules')
-rw-r--r--mayor-orig/www/include/modules/naplo/orarend/orarendTeremModositas.php25
-rw-r--r--mayor-orig/www/include/modules/naplo/osztalyozo/stat.php2
-rw-r--r--mayor-orig/www/include/modules/naplo/share/diak.php27
-rw-r--r--mayor-orig/www/include/modules/naplo/share/targy.php6
4 files changed, 34 insertions, 26 deletions
diff --git a/mayor-orig/www/include/modules/naplo/orarend/orarendTeremModositas.php b/mayor-orig/www/include/modules/naplo/orarend/orarendTeremModositas.php
index cc1b5ea6..62a2de0c 100644
--- a/mayor-orig/www/include/modules/naplo/orarend/orarendTeremModositas.php
+++ b/mayor-orig/www/include/modules/naplo/orarend/orarendTeremModositas.php
@@ -1,28 +1,3 @@
<?php
- function teremModositas($ADAT) {
-
- $dt = readVariable($ADAT['dt'], 'datetime', null);
- initTolIgDt($ADAT['tanev'], $dt, $dt);
- $tanevDb = tanevDbNev(__INTEZMENY, $ADAT['tanev']);
-
- $return = false;
-
- if (is_array($ADAT['foglaltTermek'][ $ADAT['teremId'] ])) {
-
- $return = $ADAT['foglaltTermek'][ $ADAT['teremId'] ]['tanarId'];
- // A foglalt terem felszabadítása
- $q = "UPDATE `%s`.orarendiOra SET teremId=NULL WHERE tolDt<='%s' AND '%s'<=igDt AND het=%u AND nap=%u AND ora=%u AND teremId=%u";
- $v = array($tanevDb, $dt, $dt, $ADAT['het'], $ADAT['nap'], $ADAT['ora'], $ADAT['teremId']);
- db_query($q, array('fv' => 'teremModositas/foglalt terem felszabadítása', 'modul' => 'naplo', 'values' => $v));
- }
- // teremhozzárendelés módosítása
- $q = "UPDATE `%s`.orarendiOra SET teremId=%u WHERE tolDt <= '%s' AND '%s' <= igDt AND het=%u AND nap=%u AND ora=%u AND tanarId=%u";
- $v = array($tanevDb, $ADAT['teremId'], $dt, $dt, $ADAT['het'], $ADAT['nap'], $ADAT['ora'], $ADAT['tanarId']);
- db_query($q, array('fv' => 'teremModositas/foglalt terem felszabadítása', 'modul' => 'naplo', 'values' => $v));
-
- return $return;
-
- }
-
?>
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/stat.php b/mayor-orig/www/include/modules/naplo/osztalyozo/stat.php
index c6be21fb..19bd76b0 100644
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/stat.php
+++ b/mayor-orig/www/include/modules/naplo/osztalyozo/stat.php
@@ -84,7 +84,7 @@
//??? 2009. shared lib ?
// A tárgyak lekérdezése a beírt jegyek alapján (lehet hozott jegy)
- $q = "SELECT DISTINCT targyId,targyNev
+ $q = "SELECT DISTINCT targyId,targyNev,targyJelleg, zaroKovetelmeny
FROM targy LEFT JOIN zaroJegy USING (targyId)
LEFT JOIN szemeszter ON kezdesDt<=hivatalosDt AND hivatalosDt<=zarasDt
WHERE tanev=%u AND szemeszter=%u ORDER BY targyNev";
diff --git a/mayor-orig/www/include/modules/naplo/share/diak.php b/mayor-orig/www/include/modules/naplo/share/diak.php
index 1eb746d6..24fade39 100644
--- a/mayor-orig/www/include/modules/naplo/share/diak.php
+++ b/mayor-orig/www/include/modules/naplo/share/diak.php
@@ -608,4 +608,31 @@
return db_query($q, array('fv'=>'getDiakNaploSorszam', 'modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
}
+
+ function getDiakNyelvvizsga($diakId) {
+ $q = "SELECT * FROM diakNyelvvizsga WHERE diakId=%u";
+ $v = array($diakId);
+ return db_query($q, array('fv'=>'getDiaknyelvvizsga', 'modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));
+ }
+
+ function diakNyelvvizsgaFelvesz($ADAT) {
+ $q = "INSERT INTO diakNyelvvizsga (diakId,targyId,vizsgaSzint,vizsgaTipus,vizsgaDt,vizsgaIntezmeny,vizsgaBizonyitvanySzam)
+ VALUES (%u,%u,'%s', '%s', '%s', '%s', '%s')";
+ $v = array($ADAT['diakId'],$ADAT['targyId'],$ADAT['vizsgaSzint'],$ADAT['vizsgaTipus'],$ADAT['vizsgaDt'],$ADAT['vizsgaIntezmeny'],$ADAT['vizsgaBizonyitvanySzam']);
+ return db_query($q, array('fv'=>'diakNyelvvizsgaFelvesz', 'modul'=>'naplo_intezmeny','result'=>'record','values'=>$v));
+ }
+ function diakNyelvvizsgaTorol($ADAT) {
+ if (count($ADAT)>0) {
+ $q = "DELETE FROM diakNyelvvizsga WHERE nyelvvizsgaId IN (".implode(',',$ADAT).") ";
+ return db_query($q, array('fv'=>'diakNyelvvizsgaTorol', 'modul'=>'naplo_intezmeny','values'=>$v));
+ }
+ }
+
+ function getNyelvvizsgak($SET) {
+ if ($SET['igDt']=='') $SET['igDt'] = date('Y-m-d', strtotime('+365 days',strtotime($SET['tolDt'])));
+ $q = "SELECT * FROM diakNyelvvizsga WHERE vizsgaDt>='%s' AND vizsgaDt<'%s'";
+ $v = array($SET['tolDt'],$SET['igDt']);
+ return $r = db_query($q, array('fv'=>'getDiaknyelvvizsga', 'modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));
+ }
+
?>
diff --git a/mayor-orig/www/include/modules/naplo/share/targy.php b/mayor-orig/www/include/modules/naplo/share/targy.php
index 7a5280ea..2831e4cc 100644
--- a/mayor-orig/www/include/modules/naplo/share/targy.php
+++ b/mayor-orig/www/include/modules/naplo/share/targy.php
@@ -423,4 +423,10 @@
return $r = db_query($q, array('fv'=>'getTargyNev','modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
}
+ function getTargyByJelleg($targyJelleg) {
+ $q = "SELECT targyNev,targyId FROM targy WHERE targyJelleg='%s'";
+ $v = array($targyJelleg);
+ return $r = db_query($q, array('fv'=>'getTargyByJelleg','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));
+ }
+
?>