Rev: 4668rev4668

17 files changed, 67 insertions, 56 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index ed3cdf9c..1144753c 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4667
+4668
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index ed3cdf9c..1144753c 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4667
+4668
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index ed3cdf9c..1144753c 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4667
+4668
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index ed3cdf9c..1144753c 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4667
+4668
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 ed3cdf9c..1144753c 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 @@
-4667
+4668
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index ed3cdf9c..1144753c 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4667
+4668
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 ed3cdf9c..1144753c 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 @@
-4667
+4668
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 ed3cdf9c..1144753c 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 @@
-4667
+4668
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 ed3cdf9c..1144753c 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 @@
-4667
+4668
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index ed3cdf9c..1144753c 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4667
+4668
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php
index 097c6960..8497ec46 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/import/tantargyFelosztas-pre.php
@@ -31,7 +31,7 @@
     10.2.n.djpr	német nyelv	4,00	Dobrosi-Jelinek Piroska Rita	Nem
     12.2.n.djpr	német nyelv	3,00	Dobrosi-Jelinek Piroska Rita	Nem
     11.D		dráma	1,00	Dobrosi-Jelinek Piroska Rita	Nem
-
+    
 4. e-Napló, Tanórák Listája, Excel Export (jobb oldali gomb)
 
     _DATADIR.'/'."orarendiOra.tsv
@@ -45,7 +45,7 @@
     $IMPORT_FILES = array(
 	'csoportba_jaro_tanulok' => _DATADIR.'/'."csoportba_jaro_tanulok.tsv",
 	'osztalyba_jaro_tanulok' => _DATADIR.'/'."osztalyba_jaro_tanulok.tsv",
-	'tantargyfelosztas' => _DATADIR.'/'."ttfimport.tsvx",
+	'tantargyfelosztas' => _DATADIR.'/'."ttfimport.tsv",
 	'orarendiOra' => _DATADIR.'/'."orarendiOra.tsv",
 	'helyettesitett_tanorak' => _DATADIR.'/'."helyettesitett_tanorak.tsv",
 //	'elmaradt_tanorak' => _DATADIR.'/'."helyettesitett_tanorak.tsv",
@@ -144,33 +144,33 @@
 	    '12.E' => 99,
 	);
        } elseif (__INTEZMENY==='MZSG') {
-	    $ADAT['kulcsertektar']['osztalyjel2id'] = $OSZTALYJEL2ID = array(
-	    '7.a' => 72,
-	    '7.b' => 73,
-	    '8.a' => 74,
-	    '8.b' => 75,
-	    '9.ny' => 71,
-	    '9.a' => 60,
-	    '9.b' => 61,
-	    '9.c' => 68,
-	    '9.d' => 69,
-	    '9.e' => 70,
-	    '10.a' => 57,
-	    '10.b' => 58,
-	    '10.c' => 66,
-	    '10.d' => 67,
-	    '10.e' => 64,
-	    '11.a' => 50,
-	    '11.b' => 51,
-	    '11.c' => 62,
-	    '11.d' => 63,
-	    '11.e' => 59,
-	    '12.a' => 45,
-	    '12.b' => 46,
-	    '12.c' => 55,
-	    '12.d' => 56,
-	    '12.e' => 53,
-	    );
+            $ADAT['kulcsertektar']['osztalyjel2id'] = $OSZTALYJEL2ID = array(
+            '7.a' => 76,
+            '7.b' => 77,
+            '8.a' => 72,
+            '8.b' => 73,
+            '9.ny' => 78,
+            '9.a' => 74,
+            '9.b' => 75,
+            '9.c' => 79,
+            '9.d' => 80,
+            '9.e' => 71,
+            '10.a' => 60,
+            '10.b' => 61,
+            '10.c' => 68,
+            '10.d' => 69,
+            '10.e' => 70,
+            '11.a' => 57,
+            '11.b' => 58,
+            '11.c' => 66,
+            '11.d' => 67,
+            '11.e' => 64,
+            '12.a' => 50,
+            '12.b' => 51,
+            '12.c' => 62,
+            '12.d' => 63,
+            '12.e' => 59,
+            );
        } else {
 	$_SESSION['alert'][] = 'page:nincs_osztalyjel2id';
        }
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankor-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankor-pre.php
index 3cd8dbcb..c759a2c6 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankor-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/tankor-pre.php
@@ -31,6 +31,17 @@
     //$_TA = getTanevAdat($tanev);
     //$_TA['statusz'];
 
+    // A tankörcsoportok felvétele az Elnevezés ($TANKOR_TIPUS) mezőben kiválasztható listába)
+	$q = "select distinct csoportNev from csoport";
+	$lr = db_connect('naplo');
+	$r = db_query($q, array('fv'=>'AddCsoportToTankorTipus','v'=>array(),'result'=>'idonly'), $lr);
+	db_close($lr);
+	foreach ($r as $cs) {
+	    if(strlen($cs) > 30) $cs = substr($cs, 0, 28).'...';
+	    $TANKOR_TIPUS[$cs] = "($cs)"; 
+	}
+    // $TANKOR_TIPUS bővítés
+
     if (__NAPLOADMIN || __VEZETOSEG) {
 	switch ($action) {
 	    case 'ujTankor': // VAGY MÓDOSÍTÁS!!!
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index ed3cdf9c..1144753c 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4667
+4668
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index ed3cdf9c..1144753c 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4667
+4668
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 1fa15f3e..ae45fb75 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4667
-12421905b927411d792ce05fa6839c19  mayor-fenntarto-rev4667.tgz
-db2b2dcf41d7963595bbe3f89b628eb5  mayor-installer-sulix-rev4667.tgz
-1b5aea4fa9dbcd8cd7a1322806d0cad6  mayor-wiki-rev4667.tgz
-f5596230af831f567090cd6289a951b0  mayor-installer-rev4667.tgz
-dc9121b7acd0524b15ed197317922dfc  mayor-portal-rev4667.tgz
-adef1f1a9ad2377c4fc1f015e80bb967  mayor-felveteli-rev4667.tgz
-0803506dbba98804bbccb8b304ee5d54  mayor-jatek-rev4667.tgz
-6301ed4fe064156a99b374f60a3bf1e3  mayor-locales-jp_JP-rev4667.tgz
-473c695c9c5b7644a8f36f144fcc2b1e  mayor-locales-de_DE-rev4667.tgz
-7e0c26710e7de18159463230e1ae410b  mayor-locales-en_US-rev4667.tgz
-c9ef30a83faef3ec9b68551100fad925  mayor-naplo-rev4667.tgz
-85bf87666c11a43ad77d477e02307fe8  mayor-base-rev4667.tgz
+Revision 4668
+d31c2e99f5971da280de226d58efb1fe  mayor-fenntarto-rev4668.tgz
+8c5aad6ff460483f39cf322c684f7ae5  mayor-installer-sulix-rev4668.tgz
+144adb4ed5747b3fdd2bcb5f968166c1  mayor-wiki-rev4668.tgz
+3ade4f8cb094f846c33fda6ff728cd42  mayor-installer-rev4668.tgz
+d21f84d601d41b4dceeb0279b9045437  mayor-portal-rev4668.tgz
+ac2517fa941fefad37f7200b0ed2a4f6  mayor-felveteli-rev4668.tgz
+0b8529f409d21c8f029fa86eb6d1b272  mayor-jatek-rev4668.tgz
+123950373ab1b5fa1b2920927c4e95b0  mayor-locales-jp_JP-rev4668.tgz
+a54261cd74ed2b410e4453d6d9360c43  mayor-locales-de_DE-rev4668.tgz
+a934d21e116794142150a48e38fb9ae3  mayor-locales-en_US-rev4668.tgz
+91d52124b4e62d7744462c4fc53c98b4  mayor-naplo-rev4668.tgz
+8894910d63f85409e7dacf5b6c4a5200  mayor-base-rev4668.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index ed3cdf9c..1144753c 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4667
+4668
diff --git a/rev.txt b/rev.txt
index ed3cdf9c..1144753c 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4667
+4668