Update 4859HEADmasterMaYor-dev

2 files changed, 36 insertions, 1 deletions

diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
index 6d7c5890..6e4cc053 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
@@ -156,6 +156,7 @@ CREATE TABLE `diak` (
   `megjegyzes` varchar(255) collate utf8_hungarian_ci default null,
   `NEKAzonosito` varchar(16) COLLATE utf8_hungarian_ci DEFAULT NULL,
   `torzslapszam` varchar(32) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `kretaFelhasznaloId` int(11) DEFAULT NULL,
   PRIMARY KEY (`diakId`),
   UNIQUE KEY `diakOid` (`oId`),
   KEY `kezdoTanev` (`kezdoTanev`,`kezdoSzemeszter`),
diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
index dbdc3ac6..a84bac9a 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
@@ -842,7 +842,7 @@ CREATE TABLE `felveteli_szobeli` (
   CONSTRAINT `felveteli_szobeli_ibfk_2` FOREIGN KEY (`tagozat`) REFERENCES `felveteli_tagozat` (`tagozat`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
 
- CREATE TABLE `felveteli_jelentkezes` (
+CREATE TABLE `felveteli_jelentkezes` (
   `oId` bigint(20) NOT NULL,
   `tagozat` int(11) unsigned NOT NULL DEFAULT '0',
   `ideiglenesRangsor` mediumint(8) unsigned NOT NULL,
@@ -863,6 +863,40 @@ CREATE TABLE `felveteli_iskolak` (
   KEY `ID_felveteli_iskolak_omkod` (`omkod`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
 
+CREATE TABLE `felveteli_eredmeny` (
+  `nev` varchar(50) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `oId` bigint(20) NOT NULL,
+  `evfolyam` enum('4','5','6','8','') COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `szulhely` varchar(255) CHARACTER SET utf8 DEFAULT NULL,
+  `szuldt` date DEFAULT NULL,
+  `an` varchar(50) CHARACTER SET utf8 DEFAULT NULL,
+  `lakcim_irsz` varchar(5) CHARACTER SET utf8 DEFAULT NULL,
+  `lakcim_telepules` varchar(40) CHARACTER SET utf8 DEFAULT NULL,
+  `lakcim_utcahazszam` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
+  `ert_nev` varchar(50) COLLATE utf8_hungarian_ci DEFAULT NULL,
+  `ert_irsz` varchar(5) CHARACTER SET utf8 DEFAULT NULL,
+  `ert_telepules` varchar(40) CHARACTER SET utf8 DEFAULT NULL,
+  `ert_utcahazszam` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
+  `allampolgarsag` varchar(40) CHARACTER SET utf8 DEFAULT 'magyar',
+  `email` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
+  `omkod` varchar(6) CHARACTER SET utf8 DEFAULT NULL,
+  `isk_nev` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
+  `isk_irsz` varchar(5) CHARACTER SET utf8 DEFAULT NULL,
+  `isk_telepules` varchar(40) CHARACTER SET utf8 DEFAULT NULL,
+  `isk_utcahazszam` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
+  `isk_tel` varchar(32) CHARACTER SET utf8 DEFAULT NULL,
+  `isk_email` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
+  `felvett` varchar(5) CHARACTER SET utf8 DEFAULT NULL,
+  `mashova` varchar(50) CHARACTER SET utf8 DEFAULT NULL,
+  `helyhiany` varchar(50) CHARACTER SET utf8 DEFAULT NULL,
+  `elutasitott` varchar(50) CHARACTER SET utf8 DEFAULT NULL,
+  `eredmenyId` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  UNIQUE KEY `idx_eredmenyId` (`eredmenyId`),
+  PRIMARY KEY (`oId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+
+
 DROP FUNCTION IF EXISTS getNev;
 DROP FUNCTION IF EXISTS getOraIgTime;
 DROP FUNCTION IF EXISTS getOraTolTime;