Rev: 4666rev4666

16 files changed, 42 insertions, 27 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index c179a536..e8f0acdd 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4665
+4666
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index c179a536..e8f0acdd 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4665
+4666
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index c179a536..e8f0acdd 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4665
+4666
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index c179a536..e8f0acdd 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4665
+4666
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 c179a536..e8f0acdd 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 @@
-4665
+4666
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index c179a536..e8f0acdd 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4665
+4666
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 c179a536..e8f0acdd 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 @@
-4665
+4666
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 c179a536..e8f0acdd 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 @@
-4665
+4666
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 c179a536..e8f0acdd 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 @@
-4665
+4666
diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/base.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/base.sql
index 5695a5c5..7fc18fbe 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/base.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/base.sql
@@ -180,7 +180,9 @@ INSERT INTO `osztalyJelleg` VALUES (1,1,'Általános iskola',0,NULL,NULL,NULL,NU
 (173,NULL,'technikum AJKP előkészítő évfolyammal (1+5)',1,NULL,9,NULL,'AJKP',1,'9/AJKP,9,10,11,12,13','érettségi vizsga'),
 (174,NULL,'technikum két tanítási nyelvű előkészítő évfolyammal (1+5)',1,NULL,9,NULL,'Kny',1,'9/Kny,9,10,11,12,13','érettségi vizsga'),
 (175,NULL,'technikum nemzetiségi előkészítő évfolyammal (1+5)',1,NULL,9,NULL,'N',1,'9/N,9,10,11,12,13','érettségi vizsga'),
-(176,NULL,'technikum nyelvi előkészítő évfolyammal (1+5)',1,NULL,9,NULL,'Ny',1,'9/Ny,9,10,11,12,13','érettségi vizsga')
+(176,NULL,'technikum nyelvi előkészítő évfolyammal (1+5)',1,NULL,9,NULL,'Ny',1,'9/Ny,9,10,11,12,13','érettségi vizsga'),
+(201,NULL,'szakközépiskola - 3 szakképzési évfolyam (3)',1,NULL,9,11,NULL,1,'9,10,11','szakmai vizsga'),
+(202,NULL,'szakképző iskola - 3 szakképzési évfolyam (3)',1,NULL,9,11,NULL,1,'9,10,11','szakmai vizsga')
 ;
 
 CREATE TABLE `rpcJogosultsag` (
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index c179a536..e8f0acdd 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4665
+4666
diff --git a/mayor-orig/mayor-naplo/update/pre004665-1-mayor_naplo.sql b/mayor-orig/mayor-naplo/update/pre004665-1-mayor_naplo.sql
new file mode 100644
index 00000000..be03483b
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004665-1-mayor_naplo.sql
@@ -0,0 +1,13 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4665 $$
+CREATE PROCEDURE upgrade_database_4665()
+BEGIN
+
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+INSERT IGNORE INTO `osztalyJelleg` VALUES (201,NULL,'szakközépiskola - 3 szakképzési évfolyam (3)',1,NULL,9,11,NULL,1,'9,10,11','szakmai vizsga');
+INSERT IGNORE INTO `osztalyJelleg` VALUES (202,NULL,'szakképző iskola - 3 szakképzési évfolyam (3)',1,NULL,9,11,NULL,1,'9,10,11','szakmai vizsga');
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4665();
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index c179a536..e8f0acdd 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4665
+4666
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index c179a536..e8f0acdd 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4665
+4666
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 36054aa7..94455b85 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4665
-2ea12513c021fdc9bb3a55b9ca5fe618  mayor-fenntarto-rev4665.tgz
-20296e9e2031300d7add37bc00c69dc4  mayor-installer-sulix-rev4665.tgz
-91b6977fa45206b809b6ad19eaa792b9  mayor-wiki-rev4665.tgz
-410c625c0f440f563581869973cfa884  mayor-installer-rev4665.tgz
-80da9a7912279e0ffc666a501903c99a  mayor-portal-rev4665.tgz
-533010dfd1a08cda72b1203ed9087f02  mayor-felveteli-rev4665.tgz
-8d03c3f05c1a4b8957f8f31573ec55d8  mayor-jatek-rev4665.tgz
-1e6c10fe289a387827b315cd0075c9a4  mayor-locales-jp_JP-rev4665.tgz
-361fd88c7e573b5bec1482b6e100e859  mayor-locales-de_DE-rev4665.tgz
-22bbe2d863f6eec48feb32340c1efc45  mayor-locales-en_US-rev4665.tgz
-9becd273f608885f54ad333dc6d72d6a  mayor-naplo-rev4665.tgz
-6ce15c9ead15d8ff63369fa2d657c495  mayor-base-rev4665.tgz
+Revision 4666
+e99bb3fe3353e592b085eb6b0e942fe1  mayor-fenntarto-rev4666.tgz
+4796e189a5b07b9267eee3d43a261daf  mayor-installer-sulix-rev4666.tgz
+11dec0cd5dc52fd4eee503ff62a39c30  mayor-wiki-rev4666.tgz
+ee8577c049f2da3e965abab2cf532f05  mayor-installer-rev4666.tgz
+03e23eb86bdd9cf00ad475a3e07f1d65  mayor-portal-rev4666.tgz
+b9b8d38509bf6e2a0aa7f3c56e46cd9e  mayor-felveteli-rev4666.tgz
+1e74b0ca8f1b8b68adb3b699393a1472  mayor-jatek-rev4666.tgz
+b02845450d4c94d4c8988b5d8fe49459  mayor-locales-jp_JP-rev4666.tgz
+b898de6f4e387e33f8c2680f27185096  mayor-locales-de_DE-rev4666.tgz
+dedc7c77ac6cbc22af917bdce909a145  mayor-locales-en_US-rev4666.tgz
+d779e272ae945b2afe14d229b10c7b17  mayor-naplo-rev4666.tgz
+7545098d488c9221d763ce679913825d  mayor-base-rev4666.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index c179a536..e8f0acdd 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4665
+4666