diff options
Diffstat (limited to 'mayor-orig')
24 files changed, 243 insertions, 122 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 391392cb..d006b5a6 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4509 +4519 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 391392cb..d006b5a6 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4509 +4519 diff --git a/mayor-orig/mayor-felveteli/www/include/menu/private/hu_HU/module-felveteli.php b/mayor-orig/mayor-felveteli/www/include/menu/private/hu_HU/module-felveteli.php index 5fa2d29d..a952965b 100644 --- a/mayor-orig/mayor-felveteli/www/include/menu/private/hu_HU/module-felveteli.php +++ b/mayor-orig/mayor-felveteli/www/include/menu/private/hu_HU/module-felveteli.php @@ -10,6 +10,7 @@ if (__FELVETELIADMIN===true) { $MENU['modules']['felveteli'] = array( 'szobeli' => array(array('txt' => 'Eredmények')), + 'kozponti' => array(array('txt' => 'Végeredmény')), // 'import' => array(array('txt' => 'Import')), 'level' => array(array('txt' => 'Levelek generálása')), 'levelIgazgato' => array(array('txt' => 'Levelek (igazgató)')), diff --git a/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php b/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php index c7534d0c..621ce7df 100644 --- a/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php +++ b/mayor-orig/mayor-felveteli/www/include/menu/public/hu_HU/module-felveteli.php @@ -24,9 +24,9 @@ 'human' => array(array('txt' => 'Humán','icon'=>'icon-hand-right')), 'informatika' => array(array('txt' => 'Informatika','icon'=>'icon-hand-right')), 'matematika' => array(array('txt' => 'Matematika','icon'=>'icon-hand-right')), -// 'kozponti' => array(array('txt' => 'Központi eredmények', 'url' => 'index.php?page=felveteli&sub=&f=kozponti')), + 'kozponti' => array(array('txt' => 'Központi eredmények', 'url' => 'index.php?page=felveteli&sub=&f=kozponti')), 'pontszamito' => array(array('txt' => 'Pontszámító segéd', 'url' => 'index.php?page=felveteli&sub=&f=pontszamito')), - 'szobeli' => array(array('txt' => 'Eredmények', 'url' => 'index.php?page=felveteli&sub=&f=szobeli')), +// 'szobeli' => array(array('txt' => 'Eredmények', 'url' => 'index.php?page=felveteli&sub=&f=szobeli')), // 'nyiltlevel2016' => array(array('txt' => 'Nyílt levél 2016', 'url' => 'index.php?page=felveteli&sub=&f=nyiltlevel2014')), 'kos' => array(array('txt'=>'Felvételi (általános iskola)', 'url'=>'index.php?page=felveteli&sub=kos')), ); diff --git a/mayor-orig/mayor-felveteli/www/include/modules/felveteli/szobeli.php b/mayor-orig/mayor-felveteli/www/include/modules/felveteli/szobeli.php index b108360a..6590e9ea 100644 --- a/mayor-orig/mayor-felveteli/www/include/modules/felveteli/szobeli.php +++ b/mayor-orig/mayor-felveteli/www/include/modules/felveteli/szobeli.php @@ -1,5 +1,20 @@ <?php + function updateLevelToken($oktid) { + if ($oktid=='') return false; + $token = bin2hex(openssl_random_pseudo_bytes(20)); + $ip = _clientIp(); + $q = "INSERT INTO levelLog_"._FELVETELI_EVE." (oktid,generalasDt,ip,token) VALUES ('%s',NOW(),'%s','%s')"; + $v = array($oktid,$ip,$token); + db_Query($q,array('modul'=>'felveteli','values'=>$v,'debug'=>false),$lr); + return $token; + } + + function checkLevelToken($token) { + + } + + function getIrasbeliEredmeny($nev,$oId) { $lr = @db_connect('felveteli'); $q = "SELECT * FROM irasbeli_eredmenyek_"._EV." WHERE nev='%s' AND oId='%s'"; diff --git a/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli.php b/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli.php index 0441e4ca..fa5c070b 100644 --- a/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli.php +++ b/mayor-orig/mayor-felveteli/www/policy/private/felveteli/szobeli.php @@ -14,11 +14,12 @@ if (_LEKERDEZHETO) { //if ($ADATOK['evfolyam']!='hat') // putJelentkezes($JEL,$ADATOK); // putSzobeliEredmeny($SZOBELI,$ADATOK); - putIdeiglenesEredmeny($EREDMENY,$ADATOK,$JEL); +// putIdeiglenesEredmeny($EREDMENY,$ADATOK,$JEL); $stamp = time(); if ( - strtotime(_VEGEREDMENY_PUBLIKALAS_DT)<=$stamp - && strtotime(_VEGEREDMENY_PUBLIKALAS_ENDDT)>$stamp + __FELVETELIADMIN===true || + (strtotime(_VEGEREDMENY_PUBLIKALAS_DT)<=$stamp + && strtotime(_VEGEREDMENY_PUBLIKALAS_ENDDT)>$stamp) ) { putVegeredmeny($ADATOK); } diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 391392cb..d006b5a6 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4509 +4519 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 391392cb..d006b5a6 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4509 +4519 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 391392cb..d006b5a6 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 @@ -4509 +4519 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 391392cb..d006b5a6 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4509 +4519 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 391392cb..d006b5a6 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 @@ -4509 +4519 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 391392cb..d006b5a6 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 @@ -4509 +4519 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 391392cb..d006b5a6 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 @@ -4509 +4519 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 5947c72f..f05feeed 100644 --- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql +++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql @@ -716,21 +716,6 @@ CREATE TABLE `kepzesOsztaly` ( CONSTRAINT `kepzesOsztaly_ibfk_2` FOREIGN KEY (`osztalyId`) REFERENCES `osztaly` (`osztalyId`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- DROP in rev. 3562 --- CREATE TABLE `kepzesTargyOraszam` ( --- `kepzesId` smallint(5) unsigned NOT NULL, --- `evfolyam` tinyint(3) unsigned NOT NULL, --- `targyId` smallint(5) unsigned NOT NULL, --- `oraszam` decimal(4,2) unsigned DEFAULT NULL, --- `kovetelmeny` enum('aláírás','vizsga','jegy') DEFAULT NULL, --- `jelenlet` enum('kötelező','nem kötelező') DEFAULT NULL, --- PRIMARY KEY (`kepzesId`,`evfolyam`,`targyId`), --- KEY `kepzesTargyOraszam_FKIndex1` (`kepzesId`), --- KEY `kepzesTargyOraszam_FKIndex2` (`targyId`), --- CONSTRAINT `kepzesTargyOraszam_ibfk_1` FOREIGN KEY (`kepzesId`) REFERENCES `kepzes` (`kepzesId`) ON DELETE CASCADE ON UPDATE CASCADE, --- CONSTRAINT `kepzesTargyOraszam_ibfk_2` FOREIGN KEY (`targyId`) REFERENCES `targy` (`targyId`) ON DELETE NO ACTION ON UPDATE NO ACTION --- ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - CREATE TABLE `tanmenet` ( `tanmenetId` int(10) unsigned NOT NULL auto_increment, `targyId` smallint(5) unsigned NOT NULL, @@ -1034,78 +1019,3 @@ CREATE TABLE `diakNyelvvizsga` ( END; // DELIMITER ; // --- DELIMITER // --- DROP FUNCTION IF EXISTS diakTorzslapszam // --- CREATE function diakTorzslapszam ( thisDiakId INT, thisOsztalyId INT ) returns INT --- READS SQL DATA --- BEGIN --- DECLARE i,d,n01,n02,n03,n04,n05,n06,n07,n08,n09,n10,n11,n12,n13 INT; -- for loop --- DECLARE error,inKezdoTanev,inVegzoTanev INT; --- DECLARE cur1 --- CURSOR FOR --- SELECT diakId, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev,thisOsztalyId),99) as ns01, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+1,thisOsztalyId),99) as ns02, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+2,thisOsztalyId),99) as ns03, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+3,thisOsztalyId),99) as ns04, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+4,thisOsztalyId),99) as ns05, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+5,thisOsztalyId),99) as ns06, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+6,thisOsztalyId),99) as ns07, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+7,thisOsztalyId),99) as ns08, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+8,thisOsztalyId),99) as ns09, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+9,thisOsztalyId),99) as ns10, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+10,thisOsztalyId),99) as ns11, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+11,thisOsztalyId),99) as ns12, --- ifnull(diakNaploSorszam(diakId,inKezdoTanev+12,thisOsztalyId),99) as ns13 --- FROM osztalyDiak --- WHERE osztalyId=thisOsztalyId --- ORDER BY ns01, ns02, ns03, ns04, ns05, ns06, ns07, ns08, ns09, ns10, ns11, ns12, ns13; --- DECLARE CONTINUE HANDLER FOR NOT FOUND SET error := 1; -- Ne csináljon semmit, menjen tovább... --- SELECT kezdoTanev FROM osztaly WHERE osztalyId=thisOsztalyId INTO inKezdoTanev; --- SET i := 1; --- OPEN cur1; --- lo: LOOP --- FETCH cur1 INTO d, n01, n02, n03, n04, n05, n06, n07, n08, n09, n10, n11, n12, n13; --- IF d = thisDiakId THEN --- LEAVE lo; --- END IF; --- SET i := i+1; --- END LOOP; --- CLOSE cur1; --- --- return i; --- END; // --- DELIMITER ; // - --- -- Egy újabb próbálkozás... --- DELIMITER // --- DROP FUNCTION IF EXISTS diakTorzslapszam // --- CREATE function diakTorzslapszam ( thisDiakId INT, thisOsztalyId INT ) returns INT --- READS SQL DATA --- BEGIN --- --- DECLARE ret INT; --- set @oszt=0; --- set @sz=0; --- -- set @ret = ( --- select sorsz from ( --- select --- @sz:=if(@osz=osztalyId,@sz:=@sz+1,1) as sorsz, --- @oszt:=osztalyId as o, --- osztalyId, diakId, sort, diakNev --- from ( --- select --- osztalyId, diakId, --- if (month(min(beDt))>8 or month(min(beDt))<6 or (month(min(beDt))=6 and day(min(beDt))<16), min(beDt), date_format(min(beDt),'%Y-09-01')) as sort, --- concat_ws(' ',viseltNevElotag, viseltCsaladinev, viseltUtonev) as diakNev --- from osztalyDiak left join diak using (diakId) --- group by osztalyId, diakId --- order by osztalyId, sort, diakNev --- ) as t --- ) as k --- where osztalyId=thisOsztalyId and diakId=thisDiakId into ret; --- --- return ret; --- END; // --- DELIMITER ; // - diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 391392cb..d006b5a6 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4509 +4519 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/zaradek.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/zaradek.php index edc432b4..ecbabce6 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/zaradek.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/zaradek.php @@ -476,6 +476,7 @@ $ZaradekIndex = array( 'következő évfolyamba léphet' => 20, // %évfolyam betűvel% 'tanulmányait befejezte, következő évfolyamon folytathatja' => 21, // %évfolyam% 'tanulmányait befejezte' => 102, + 'érettségi vizsgát tehet' => 61, 'szakképző évfolyamba léphet' => 38, // %szakképesítés% // mulasztás - de vizsgázat 'mulasztás miatt osztályozóvizsga' => 19, diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/kretaZarojegyImport-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/kretaZarojegyImport-pre.php new file mode 100644 index 00000000..7660b7ae --- /dev/null +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/kretaZarojegyImport-pre.php @@ -0,0 +1,136 @@ +<?php + +// FIGYELEM!!! AZONOS OSZLOPTÁRGYNEVEKNÉL NEM VÁRT MUKODÉS LÉPHET FEL +// -- TODO oszlopindex szinkronizálás! + + if (_RIGHTS_OK !== true) die(); + if (__NAPLOADMIN!==true) { + + $_SESSION['alert'][] = 'page:insufficient_access'; + + } + + require_once('include/modules/naplo/share/intezmenyek.php'); + require_once('include/modules/naplo/share/tanar.php'); + require_once('include/modules/naplo/share/file.php'); + require_once('include/modules/naplo/share/ora.php'); + + global $_TANEV; + + $ADAT['osztalyId'] = $osztalyId = readVariable($_POST['osztalyId'],'id'); + $MODIFYSQL = readVariable($_POST['MODIFYSQL'],'bool'); + +if ($osztalyId>0) { + + $ADAT['osztalyAdat'] = getOsztalyAdat($osztalyId); + + ini_set('max_execution_time', 120); + + $lr_intezmeny = db_connect('naplo_intezmeny'); + $lr_naplo = db_connect('naplo'); + + $q = "select getNev(diakId,'diak') COLLATE utf8_hungarian_ci AS diakNev,diakId,statusz,oId from ".__INTEZMENYDBNEV.".diak WHERE statusz!='jogviszonya lezárva' ORDER BY diakNev"; + $v = array(); + $DIAKNEV2diakId = db_query($q, array('debug'=>false,'modul'=>'naplo','values'=>$v,'result'=>'multiassoc','keyfield'=>'diakNev'),$lr_naplo); + + $q = "select targyNev COLLATE utf8_hungarian_ci AS targyNev, targyId, targyJelleg, zaroKovetelmeny, mkId, munkakozosseg.leiras AS mkNev FROM ".__INTEZMENYDBNEV.".targy LEFT JOIN ".__INTEZMENYDBNEV.".munkakozosseg USING (mkId) WHERE zaroKovetelmeny IN ('jegy','magatartás','szorgalom','féljegy') ORDER BY targyNev"; + $v = array(); + $TARGYNEV2targyId = db_query($q, array('debug'=>false,'modul'=>'naplo','values'=>$v,'result'=>'multiassoc','keyfield'=>'targyNev'),$lr_naplo); + $file = fopen("/tmp/kretaZarojegyImport.tsv.tsv","r"); + + $nofrow=0; + if ($file!==false) + while(! feof($file)) { + $nofrow++; + $line = (chop(fgets($file))); // no trim! + $record = explode("\t",$line); + dump($record); + + if ($nofrow==1) { + + } elseif($nofrow==2) { + for($i=0; $i<count($record); $i++) { + $oszlopIndex = $i; + $ADAT['oszlop2targyId'][$oszlopIndex] = null; + $_targyOszlopNev = kisbetus($record[$i]); + if ($_targyOszlopNev!='' && count($TARGYNEV2targyId[$_targyOszlopNev])>=1) { + $ADAT['targyMatrix'][$_targyOszlopNev] = $TARGYNEV2targyId[$_targyOszlopNev] ; + if (count($TARGYNEV2targyId[$_targyOszlopNev])==1) { + $ADAT['oszlop2targyId'][$oszlopIndex] = $TARGYNEV2targyId[$_targyOszlopNev][0]['targyId']; + } else { + $_tmp = readVariable($_POST['oszlop_'.($oszlopIndex)],'id'); + if (is_numeric($_tmp) && $_tmp>0) { + $ADAT['oszlop2targyId'][$oszlopIndex] = $_tmp; + } else { + // $ADAT['oszlop2targyId'][$oszlopIndex] = 10000+$oszlopIndex; + } + } + } else { + $ADAT['targyMatrix'][$_targyOszlopNev] = ''; + $_SESSION['alert'][] = 'info:none:'.serialize(1); + $ADAT['hiba'][] = ($record[$i]); + } + } + } else { + + $D = array(); + $D['diakNev'] = $record[0]; + if (count($DIAKNEV2diakId[$D['diakNev']])!=1) { + $_SESSION['alert'][] = 'info:dup_or_none:'.serialize($D['diakNev']).':'.serialize($DIAKNEV2diakId[$D['diakNev']]); + $ADAT['hiba'][] = $D; + continue;; + } else { + $D['diakId'] = $DIAKNEV2diakId[$D['diakNev']][0]['diakId']; + $D['oId'] = $DIAKNEV2diakId[$D['diakNev']][0]['oId']; + } + for($i=0; $i<count($record); $i++) { + $oszlopIndex = $i; + if (intval($ADAT['oszlop2targyId'][$oszlopIndex])==0 || intval($record[$i])==0) + continue;; + + $D['targyId'] = intval($ADAT['oszlop2targyId'][$oszlopIndex]); + $D['evfolyam'] = $ADAT['osztalyAdat']['evfolyam']; + $D['evfolyamJel'] = $ADAT['osztalyAdat']['evfolyamJel']; + $D['felev'] = 2; // TODO! + $D['hivatalosDt'] = $_TANEV['zarasDt']; + $D['jegy'] = intval($record[$i]); + $D['jegyTipus'] = 'jegy'; + //dump($ADAT['osztalyAdat']['evfolyamJel']); + $q = "SELECT count(*) AS db FROM zaroJegy WHERE diakId=%u AND targyId=%u AND evfolyamJel='%s' AND felev=%u"; + $v = array($D['diakId'], + $D['targyId'], + $D['evfolyamJel'], + $D['felev']); + $result = db_query($q, array('fv'=>'kretaImport','values'=>$v,'result'=>'value'),$lr_intezmeny); + if ($result==0) { + $q = "INSERT INTO zaroJegy (diakId,targyId,evfolyam,evfolyamJel,felev,jegy,jegyTipus,modositasDt,hivatalosDt) + VALUES (%u,%u,'%s','%s',%u,'%s','%s',NOW(),'%s')"; + $v = array($D['diakId'], + $D['targyId'], + $D['evfolyam'], + $D['evfolyamJel'], + $D['felev'], + $D['jegy'], + $D['jegyTipus'], + $D['hivatalosDt']); + if ($MODIFYSQL===true) db_query($q, array('fv'=>'kretaImport','values'=>$v),$lr_intezmeny); + dump($v); + dump($q); + } + + } + } // nofrow else + } // while + + fclose($file); + db_close($lr); + +} + + + + + $TOOL['osztalySelect'] = array('tipus'=>'cella'); + getToolParameters(); + +?>
\ No newline at end of file diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/kretaZarojegyImport.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/kretaZarojegyImport.php new file mode 100644 index 00000000..1769a3e4 --- /dev/null +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/admin/kretaZarojegyImport.php @@ -0,0 +1,9 @@ +<?php + + global $ADAT; + + putKretaZarojegyImport($ADAT); + + + +?>
\ No newline at end of file diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/kretaZarojegyImport.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/kretaZarojegyImport.phtml new file mode 100644 index 00000000..ed4c0e69 --- /dev/null +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/admin/kretaZarojegyImport.phtml @@ -0,0 +1,48 @@ +<?php + + function putKretaZarojegyImport($ADAT) { + + if ($ADAT['osztalyId']==0) { + echo '<h1 style="text-align: center">Először válassz osztályt!</h1>'; + return; + } else { + echo '<h1 style="text-align: center">Évfolyamjel: '.$ADAT['osztalyAdat']['evfolyamJel'].'</h1>'; + } + + $oszlopIndex = 0; + if (count($ADAT['targyMatrix'])>0) { + formBegin(); + echo '<table style="margin-left:40px;">'; + foreach ($ADAT['targyMatrix'] as $targyOszlopNev => $targyAdat) { + echo '<tr><td>'.($oszlopIndex).'</td><td>'.$targyOszlopNev.'</td>'; + echo '<td>'; + if (!is_array($targyAdat)) { + echo '-'; + } elseif (count($targyAdat)==1) { + echo $targyAdat[0]['targyNev']; // kovetelmeny, munkakozosseg + echo ' ('.$targyAdat[0]['targyId'].')'; // kovetelmeny, munkakozosseg + echo '<input type="hidden" name="oszlop_'.intval($oszlopIndex).'" value="'.$targyAdat[0]['targyId'].'" />'; + } else { + echo '<select name="oszlop_'.$oszlopIndex.'">'; + echo '<option value="">Válassz!</option>'; + for ($i=0; $i<count($targyAdat); $i++) { + $_SEL = ($_POST['oszlop_'.($oszlopIndex)] == $targyAdat[$i]['targyId']) ? ' selected="selected" ':''; + echo '<option value="'.$targyAdat[$i]['targyId'].'" '.$_SEL.'>'.$targyAdat[$i]['targyNev'].' - '.$targyAdat[$i]['targyJelleg'].' ('.$targyAdat[$i]['mkNev'].' munkaközösség) '.$targyAdat[$i]['zaroKovetelmeny'].' ('.$targyAdat[$i]['targyId'].')</option>'; + } + echo '</select>'; + } + echo '</td>'; + echo '</tr>'; + $oszlopIndex++; + } + echo '</table>'; + echo '<input type="hidden" name="osztalyId" value="'.intval($ADAT['osztalyId']).'" />'; + echo '<input type="checkbox" name="MODIFYSQL" value="1" />'; + echo '<input type="submit" />'; + formEnd(); + } + // dump($ADAT['oszlop2targyId']); + + + } +?>
\ No newline at end of file diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml index 4753fbf4..3a67bf6c 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/base.phtml @@ -47,7 +47,7 @@ echo '<td class="toolBarTitle" id="toolBarTitle" colspan="3">'; if (defined('__PAGETITLE')) echo __PAGETITLE.'<br/>'; - else echo 'MaYoR eleketronikus napló'.'<br/>'; + else echo 'MaYoR elektronikus napló'.'<br/>'; echo '<a href="'.href('index.php?page=naplo&sub=intezmeny&f=valtas').'">'; if (defined('__TELEPHELYID')) echo '<span id="toolBarIntezmeny" title="TelephelyId:".'.__TELEPHELYID.'>'.__INTEZMENY .', ' . __TANEV.'/'.(__TANEV+1).'</span>'; else echo '<span id="toolBarIntezmeny">'.__INTEZMENY . '/' . __TANEV.'</span>'; diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 391392cb..d006b5a6 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4509 +4519 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 391392cb..d006b5a6 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4509 +4519 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index b4d9288f..4a7391a7 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4509 -022b7b9b1f27ec24e6e72ee8f12d373e mayor-fenntarto-rev4509.tgz -ef1b756b4e2319bb51eec682efe048ef mayor-installer-sulix-rev4509.tgz -896ccbeb552210dd9a8c9bea5d4f1f51 mayor-wiki-rev4509.tgz -4bdb74be07277032b93fc69078130d95 mayor-installer-rev4509.tgz -ff3a434c3a2705ba743a887c664274ac mayor-portal-rev4509.tgz -fc95e870d72fdae37e661534c87a5ee9 mayor-felveteli-rev4509.tgz -a16f254bc14677d10d49af2e40983730 mayor-jatek-rev4509.tgz -d6a7116bbae4df835782118847d8e827 mayor-locales-jp_JP-rev4509.tgz -8f623b315490d313bd53737da8387d6b mayor-locales-de_DE-rev4509.tgz -943398b4dd16628e730b70a3d23ac11b mayor-locales-en_US-rev4509.tgz -d8d9f156033b0970916cbabf5b8da8e0 mayor-naplo-rev4509.tgz -4885b4b1192dd2778910f85a6274f48d mayor-base-rev4509.tgz +Revision 4519 +d8d174c5e025ba6cf41ed85a173801ec mayor-fenntarto-rev4519.tgz +9fa280782d384fc06b2d03bd63a848cf mayor-installer-sulix-rev4519.tgz +020356b030fc90247379c7d388b0e28b mayor-wiki-rev4519.tgz +eb494feb53285737e6d7678c8e0a19f5 mayor-installer-rev4519.tgz +dbf8b9e7e1a6e2be3d9f49535c10fa84 mayor-portal-rev4519.tgz +8b77472f2e28ace23ea87171b71d6c2d mayor-felveteli-rev4519.tgz +b711373e8ffcd348e0cfc9ca46e6619d mayor-jatek-rev4519.tgz +ac20e8fc5a90434d1fcebcb0ae151628 mayor-locales-jp_JP-rev4519.tgz +6063266ce09bd07d923b31f3dcc46645 mayor-locales-de_DE-rev4519.tgz +751c2ddc190b3040794281f90c73d45a mayor-locales-en_US-rev4519.tgz +cbc71960e406c811e2c10982c433aaae mayor-naplo-rev4519.tgz +f9c63999cfac37a528efd6f108887f3e mayor-base-rev4519.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 391392cb..d006b5a6 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4509 +4519 |