From a50bf390cca05255feebfdce6bb70cdbb6c52733 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Tue, 15 Jun 2021 19:20:05 +0200 Subject: Rev: 4793 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- .../install/module-naplo/mysql/intezmeny.sql | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../mayor-naplo/update/pre004791-1-intezmeny.sql | 23 ++++++++++++++++++ .../www/include/modules/naplo/share/kepesites.php | 2 +- .../www/policy/private/naplo/export/kreta-pre.php | 28 +++++++++++++++++++--- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 ++++++++++---------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 19 files changed, 77 insertions(+), 32 deletions(-) create mode 100644 mayor-orig/mayor-naplo/update/pre004791-1-intezmeny.sql diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 32c9f82a..eda99782 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4790 +4793 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 32c9f82a..eda99782 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4790 +4793 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 32c9f82a..eda99782 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4790 +4793 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 32c9f82a..eda99782 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4790 +4793 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 32c9f82a..eda99782 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 @@ -4790 +4793 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 32c9f82a..eda99782 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4790 +4793 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 32c9f82a..eda99782 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 @@ -4790 +4793 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 32c9f82a..eda99782 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 @@ -4790 +4793 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 32c9f82a..eda99782 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 @@ -4790 +4793 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 327cf561..86b27d3f 100644 --- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql +++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql @@ -702,7 +702,7 @@ CREATE TABLE `kepzesOraterv` ( `szemeszter` tinyint(3) unsigned NOT NULL, `hetiOraszam` decimal(4,2) DEFAULT NULL, `kovetelmeny` enum('jegy','négyszintű (szöveges minősítés)','százalékos','aláírás','háromszintű','egyedi felsorolás','szöveges szempontrendszer','teljesített óra','nincs') COLLATE utf8_hungarian_ci DEFAULT NULL, - `tipus` enum('első nyelv','második nyelv','mintatantervi','kötelezően választható 1.','kötelezően választható 2.','szabadon választható 1.','szabadon választható 2.','művészetek') COLLATE utf8_hungarian_ci DEFAULT 'mintatantervi', + `tipus` enum('első nyelv','második nyelv','mintatantervi','kötelezően választható 1.','kötelezően választható 2.','szabadon választható 1.','szabadon választható 2.','művészetek','természettudomány') COLLATE utf8_hungarian_ci DEFAULT 'mintatantervi', PRIMARY KEY (`kepzesOratervId`), UNIQUE KEY `kot_kulcs2` (`kepzesId`,`targyId`,`evfolyamJel`,`szemeszter`), KEY `kepzesOraterv_FKIndex1` (`targyId`), diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 32c9f82a..eda99782 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4790 +4793 diff --git a/mayor-orig/mayor-naplo/update/pre004791-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004791-1-intezmeny.sql new file mode 100644 index 00000000..b3786834 --- /dev/null +++ b/mayor-orig/mayor-naplo/update/pre004791-1-intezmeny.sql @@ -0,0 +1,23 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4791 $$ +CREATE PROCEDURE upgrade_database_4791() +BEGIN + +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +IF EXISTS ( + SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='kepzesOraterv' AND COLUMN_NAME='tipus' +) THEN + + alter table `kepzesOraterv` modify `tipus` + enum('első nyelv','második nyelv','mintatantervi','kötelezően választható 1.','kötelezően választható 2.', + 'szabadon választható 1.','szabadon választható 2.','művészetek','természettudomány') CHARACTER SET utf8 COLLATE utf8_hungarian_ci DEFAULT 'mintatantervi'; + +END IF; + +END $$ +DELIMITER ; +CALL upgrade_database_4791(); + +-- | Warning | 3719 | 'utf8' is currently an alias for the character set UTF8MB3, but will be an alias for UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous. | +-- | Warning | 3778 | 'utf8_hungarian_ci' is a collation of the deprecated character set UTF8MB3. Please consider using UTF8MB4 with an appropriate collation instead. diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kepesites.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kepesites.php index 4315e64b..34e73988 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kepesites.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/kepesites.php @@ -17,7 +17,7 @@ } - function getTanarKepesitesIds($tanarIds) { + function getTanarKepesitesIds($tanarIds = null) { $q = "SELECT tanarId, kepesitesId FROM tanarKepesites"; if (is_array($tanarIds)) { diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kreta-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kreta-pre.php index 89129607..0f68d17a 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kreta-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/export/kreta-pre.php @@ -46,6 +46,7 @@ if (!__NAPLOADMIN && !__VEZETOSEG) { /* MÁSOLAT */ foreach ($ADAT['szuro']['targyak'] as $idx => $tAdat) $ADAT['targyAdat'][ $tAdat['targyId'] ] = $tAdat; + foreach ($ADAT['szuro']['osztalyok'] as $idx => $tAdat) $ADAT['osztalyAdat'][ $tAdat['osztalyId'] ] = $tAdat; // A szűrőben beállítottnak megefelő tankörök lekérése $ADAT['tankorok'] = getTankorokBySzuro($ADAT['szuro']); @@ -131,6 +132,12 @@ if (!__NAPLOADMIN && !__VEZETOSEG) { $EXPORT[0][] = 'Tantárgy'; $EXPORT[0][] = 'Óraszám'; $EXPORT[0][] = 'Tanár'; + + $EXPORT[0][] = 'Túlóra'; + $EXPORT[0][] = 'TTF óraszám korrekció'; + $EXPORT[0][] = 'Nemzetiségi óra'; + $EXPORT[0][] = 'Megbízási szerződéssel ellátott óra óraszáma'; + // ------- $j = 1; for ($i=0; $i 1 || $_osztalyJel != $_csoportNev) { + $EXPORT[$j][] = ''; + $EXPORT[$j][] = $_csoportNev; // B oszlop: csoport név + } else { + $EXPORT[$j][] = $_osztalyJel; // A oszlop: egész osztály + $EXPORT[$j][] = ''; + } + $EXPORT[$j][] = $ADAT['targyAdat'][ $ADAT['tankorok'][$i]['targyId'] ]['kretaTargyNev']!=''? + $ADAT['targyAdat'][ $ADAT['tankorok'][$i]['targyId'] ]['kretaTargyNev']: + $ADAT['targyAdat'][ $ADAT['tankorok'][$i]['targyId'] ]['targyNev']; // C oszlop: tantárgy neve // $EXPORT[$j][] = ''; // D oszlop: TRUE/FALSE??? $EXPORT[$j][] = $ADAT['tankorok'][$i]['hetiOraszam']/count($ADAT['tankorok'][$i]['tanarIds']); // E oszlop: heti óraszám if (is_array($utkozoNevuTanarok[$_tanarId]) && $_szulDt != '0000-00-00' && $_szulDt != '') $_tanarNev .= ' ('.$_szulDt.')'; // E oszlop: pedagógus neve $EXPORT[$j][] = $_tanarNev; // F oszlop + $EXPORT[$j][] = ''; // 'Túlóra'; + $EXPORT[$j][] = 'Nem'; // 'TTF óraszám korrekció'; + $EXPORT[$j][] = 'Nem'; // 'Nemzetiségi óra'; + $EXPORT[$j][] = ''; // 'Megbízási szerződéssel ellátott óra óraszáma'; $j++; } } diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 32c9f82a..eda99782 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4790 +4793 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 32c9f82a..eda99782 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4790 +4793 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 2137aee7..99d60cdf 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4790 -6d9d92ecb9cb7e28a9a6d734fc7048af mayor-fenntarto-rev4790.tgz -ef105430527181cf9419ec93f93f58ca mayor-installer-sulix-rev4790.tgz -9d9edebd951b6f5a85f3114457d7c52d mayor-wiki-rev4790.tgz -ebb762006019c1f6481261f7285a8ba0 mayor-installer-rev4790.tgz -e61c1aea1de71fab7c336961b1a1bba0 mayor-portal-rev4790.tgz -6fdc079882e1bae22a32a76ccf7ba8d1 mayor-felveteli-rev4790.tgz -18b0c6236780cba134f3bb1d6c08975b mayor-jatek-rev4790.tgz -2ca2f8804151f99004344ba2e48a430e mayor-locales-jp_JP-rev4790.tgz -ea5566c5d0e8b1583f0f94e4488cdb60 mayor-locales-de_DE-rev4790.tgz -17333ad76adfccd294c1ba1730a134bd mayor-locales-en_US-rev4790.tgz -de3a76f73d5bbc93c703f4b628efeca6 mayor-naplo-rev4790.tgz -19634ef39b14443cc27f635b7773bdf0 mayor-base-rev4790.tgz +Revision 4793 +ba5f756bba5ac3c7e78ce579c0597ffd mayor-fenntarto-rev4793.tgz +578d1032911dfc9fbdffc059f26040b1 mayor-installer-sulix-rev4793.tgz +9a44651fd5295ec9a68bde87f1aee714 mayor-wiki-rev4793.tgz +db7ba8f62aa6543ef3e1a0da2ac237a0 mayor-installer-rev4793.tgz +96034aee700ab8d17530450735b87c91 mayor-portal-rev4793.tgz +50bdbc83ed1faa7215189bca5bfa91ef mayor-felveteli-rev4793.tgz +c252464d47ca71cf4d296e5172811392 mayor-jatek-rev4793.tgz +447b4dad54de496a4dbf9bd0fb50d731 mayor-locales-jp_JP-rev4793.tgz +f04b6e815313c6ff3480f0c07bc28759 mayor-locales-de_DE-rev4793.tgz +7ed3deea683647b2392f65a4b1efd8e3 mayor-locales-en_US-rev4793.tgz +9fa6fbf0d5023d2e88d82d3b45ecf86a mayor-naplo-rev4793.tgz +e0e11de853ea059ea2c6c1a35f68b946 mayor-base-rev4793.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 32c9f82a..eda99782 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4790 +4793 diff --git a/rev.txt b/rev.txt index 32c9f82a..eda99782 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4790 +4793 -- cgit v1.2.3